=== modified file 'debian/changelog'
--- debian/changelog	2009-02-27 02:02:46 +0000
+++ debian/changelog	2009-03-05 03:01:28 +0000
@@ -1,3 +1,24 @@
+fast-user-switch-applet (2.24.0-0ubuntu9) jaunty; urgency=low
+
+  [ Chris Coulson ]
+  * 84_session_management.patch:
+    - Really don't hide shutdown and restart options when
+      gnome-power-manager is not available (LP: #298811).
+
+  [ Ted Gould ]
+  * 84_session_management.patch:
+    * Show dialogs when loging out, shutting down or restarting the
+      system to confirm that's what the user wants to do.
+      (LP: #283095)
+  * 88_status_icons.patch:
+    * Adding icons for the dialogs (above).  Some themes do not have
+      all of the icons required, so these are backup.  Taken from the
+      GNOME icon theme.
+  * Update other patches for line nums, etc.
+  * 92_autotools.patch: Regen for changes.
+
+ -- Ted Gould <ted@ubuntu.com>  Wed, 04 Mar 2009 21:01:24 -0600
+
 fast-user-switch-applet (2.24.0-0ubuntu8) jaunty; urgency=low
 
   * 84_session_management.patch:

=== modified file 'debian/patches/84_session_management.patch'
--- debian/patches/84_session_management.patch	2009-02-27 02:01:53 +0000
+++ debian/patches/84_session_management.patch	2009-03-05 15:53:22 +0000
@@ -1,7 +1,6 @@
-=== modified file 'data/fast-user-switch-applet.schemas.in'
-diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/configure.ac fast-user-switch-applet-2.24.0.new/configure.ac
---- fast-user-switch-applet-2.24.0/configure.ac	2008-09-22 14:56:37.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/configure.ac	2009-02-15 19:45:06.000000000 +0000
+=== modified file 'configure.ac'
+--- configure.ac	2008-07-17 23:20:39 +0000
++++ configure.ac	2009-02-27 01:48:37 +0000
 @@ -51,7 +51,9 @@
  PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
  	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
@@ -13,9 +12,10 @@
  AC_SUBST(APPLET_CFLAGS)
  AC_SUBST(APPLET_LIBS)
  
-diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/data/fast-user-switch-applet.schemas.in fast-user-switch-applet-2.24.0.new/data/fast-user-switch-applet.schemas.in
---- fast-user-switch-applet-2.24.0/data/fast-user-switch-applet.schemas.in	2009-02-15 19:45:04.000000000 +0000
-+++ fast-user-switch-applet-2.24.0.new/data/fast-user-switch-applet.schemas.in	2009-02-15 19:45:06.000000000 +0000
+
+=== modified file 'data/fast-user-switch-applet.schemas.in'
+--- data/fast-user-switch-applet.schemas.in	2008-08-27 17:47:43 +0000
++++ data/fast-user-switch-applet.schemas.in	2009-02-27 01:56:54 +0000
 @@ -75,6 +75,19 @@
        </locale>
      </schema>
@@ -36,10 +36,47 @@
        <key>/schemas/apps/fast-user-switch-applet/show_guest_login</key>
        <applyto>/apps/fast-user-switch-applet/show_guest_login</applyto>
        <owner>fast-user-switch-applet</owner>
-diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/src/applet.c fast-user-switch-applet-2.24.0.new/src/applet.c
---- fast-user-switch-applet-2.24.0/src/applet.c	2009-02-15 19:45:04.000000000 +0000
-+++ fast-user-switch-applet-2.24.0.new/src/applet.c	2009-02-15 19:45:48.000000000 +0000
-@@ -52,14 +52,18 @@
+
+=== modified file 'po/POTFILES.in'
+--- po/POTFILES.in	2006-10-25 02:40:34 +0000
++++ po/POTFILES.in	2009-03-05 15:42:14 +0000
+@@ -12,3 +12,4 @@
+ src/fusa-user.c
+ src/fusa-utils.c
+ src/gdm-queue.c
++src/logout-dialog.c
+
+=== modified file 'src/Makefile.am'
+--- src/Makefile.am	2006-10-24 00:27:57 +0000
++++ src/Makefile.am	2009-03-04 21:56:17 +0000
+@@ -21,7 +21,10 @@
+ 	fusa-user-menu-item.h		\
+ 	fusa-user-private.h		\
+ 	fusa-utils.h			\
+-	gdm-queue.h
++	applet.h			\
++	gdm-queue.h			\
++	fade-and-grab.h			\
++	logout-dialog.h
+ 
+ 
+ # ################### #
+@@ -44,7 +47,9 @@
+ 	fusa-user.c					\
+ 	fusa-user-menu-item.c				\
+ 	fusa-utils.c					\
+-	gdm-queue.c
++	gdm-queue.c					\
++	fade-and-grab.c					\
++	logout-dialog.c
+ 
+ fast_user_switch_applet_LDADD =				\
+ 	$(APPLET_LIBS)					\
+
+=== modified file 'src/applet.c'
+--- src/applet.c	2008-10-21 15:19:03 +0000
++++ src/applet.c	2009-03-05 02:15:16 +0000
+@@ -52,14 +52,21 @@
  #include <bonobo/bonobo-ui-util.h>
  
  #include <libgnome/gnome-init.h>
@@ -55,11 +92,14 @@
  #include "fusa-user-menu-item.h"
  #include "fusa-utils.h"
 +#include "gdm-queue.h"
++#include "logout-dialog.h"
++#include "fade-and-grab.h"
 +#include <polkit-gnome/polkit-gnome.h>
++#include "applet.h"
  
  
  /* **************** *
-@@ -75,9 +79,11 @@
+@@ -75,9 +82,11 @@
  #define SHOW_SCREEN_KEY	"/apps/fast-user-switch-applet/show_screen_item"
  #define SHOW_GUEST_KEY	"/apps/fast-user-switch-applet/show_guest_login"
  #define ACTIVE_ONLY_KEY	"/apps/fast-user-switch-applet/show_active_users_only"
@@ -71,7 +111,7 @@
  
  /* ******************** *
   *  Private Structures  *
-@@ -98,6 +104,14 @@
+@@ -98,6 +107,14 @@
    GtkWidget *separator_item;
    GtkWidget *login_screen_item;
    GtkWidget *login_window_item;
@@ -86,7 +126,7 @@
    GtkWidget *guest_session_item;
    GSList *items;
  
-@@ -110,6 +124,15 @@
+@@ -110,6 +127,15 @@
    GtkIconSize icon_size;
  
    gboolean guest_active;
@@ -102,7 +142,7 @@
  }
  FusaAppletData;
  
-@@ -120,6 +143,12 @@
+@@ -120,6 +146,12 @@
  }
  SelectorResponseData;
  
@@ -115,36 +155,40 @@
  
  /* ********************* *
   *  Function Prototypes  *
-@@ -231,6 +260,28 @@
- static void     user_notify_display_name_cb   (GObject         *object,
+@@ -232,6 +264,32 @@
  					       GParamSpec      *pspec,
  					       gpointer         data);
+ 
 +static void 	ck_priv_action_cb 	(PolKitAction  *action,
 +                					gboolean       gained_privilege,
 +               						GError        *error,
 +                					gchar *method);
++static gboolean ck_multiple_users   (void);
 +static void 	request_ck_priv_action 	(gchar *method,
 +										GError *error);
-+static gboolean		pk_can_do_action		(const gchar *action_id);
 +static PolKitAction *pk_get_action_from_error (GError *error);
++
 +static void     session_activate_cb          (GtkMenuItem *item,
 +			               gpointer     data);
 +static void     lock_screen_activate_cb  (GtkMenuItem *item,
 +			               gpointer     data);
 +static void     power_management_activate_cb  (GtkMenuItem *item,
 +			               gpointer     data);
++
 +static gboolean	try_ck_action		(DBusGConnection *connection,
 +										DBusGProxy *proxy,
 +										GError **error,
 +										gchar *method);
 +static void		consolekit_action	(gchar *method);
++
 +static void     gdm_restart_state_cb          (GdmResultState is_ok,
 +                           const gchar * answer,
 +                           gpointer data);
- 
++
  /* Utility Functions */
  static void      show_hide_guest              (FusaAppletData *adata);
-@@ -261,6 +312,13 @@
+ static void      reset_login_screen_item      (GtkWidget      *widget,
+@@ -259,6 +317,13 @@
  static void      make_label_larger            (GtkLabel       *label);
  static void      make_label_small_italic      (GtkLabel       *label);
  static void      fusa_applet_data_free        (FusaAppletData *adata);
@@ -158,7 +202,7 @@
  
  
  /* ****************** *
-@@ -270,7 +328,6 @@
+@@ -268,7 +333,6 @@
  static GtkTooltips *tooltips = NULL;
  static GnomeProgram *program = NULL;
  
@@ -166,7 +210,7 @@
  /* *************************** *
   *  Applet main() Declaration  *
   * *************************** */
-@@ -320,10 +377,12 @@
+@@ -318,10 +382,12 @@
        first_time = TRUE;
  
        program = gnome_program_init ("fast-user-switch-applet", VERSION,
@@ -180,7 +224,7 @@
        /* Do this here so it's only done once. */
        gtk_rc_parse_string ("style \"fast-user-switch-menubar-style\"\n"
  			   "{\n"
-@@ -347,6 +406,28 @@
+@@ -345,6 +411,28 @@
    adata->client = gconf_client_get_default ();
    adata->manager = fusa_manager_ref_default ();
  
@@ -209,7 +253,7 @@
    tmp = g_strdup_printf ("applet-user-menu-item-%p", adata);
    adata->user_menu_item_quark = g_quark_from_string (tmp);
    g_free (tmp);
-@@ -360,7 +441,7 @@
+@@ -358,7 +446,7 @@
    else
      g_object_ref (tooltips);
  
@@ -218,7 +262,7 @@
    gtk_container_set_border_width (GTK_CONTAINER (applet), 0);
    gtk_widget_set_name (GTK_WIDGET (applet), "fast-user-switch-applet");
    panel_applet_set_flags (applet, PANEL_APPLET_EXPAND_MINOR);
-@@ -559,10 +640,12 @@
+@@ -557,10 +645,12 @@
    g_signal_connect (adata->manager, "user-added",
  		    G_CALLBACK (manager_user_added_cb), adata);
  
@@ -231,7 +275,7 @@
    adata->login_screen_item = gtk_image_menu_item_new_with_label (_("Other"));
    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->login_screen_item),
  				 gtk_image_new ());
-@@ -576,6 +659,7 @@
+@@ -574,6 +664,7 @@
  		    G_CALLBACK (login_screen_activate_cb), adata);
    adata->items = g_slist_prepend (adata->items, adata->login_screen_item);
  
@@ -239,7 +283,7 @@
    adata->login_window_item = gtk_image_menu_item_new_with_label (_("Login Window"));
    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->login_window_item),
  				 gtk_image_new ());
-@@ -589,6 +673,79 @@
+@@ -587,6 +678,79 @@
  		    G_CALLBACK (login_window_activate_cb), adata);
    adata->items = g_slist_prepend (adata->items, adata->login_window_item);
  
@@ -260,7 +304,7 @@
 +
 +
 +  /* Add entry for log off */
-+  adata->close_session_item = gtk_image_menu_item_new_with_label (_("Log Out"));
++  adata->close_session_item = gtk_image_menu_item_new_with_label (_("Log Out..."));
 +  gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu),
 +			  adata->close_session_item);
 +  g_signal_connect (adata->close_session_item, "style-set",
@@ -293,7 +337,7 @@
 +		    G_CALLBACK (power_management_activate_cb), (gpointer)"Hibernate");
 +
 +  /* Add entry for shutdown */
-+  adata->reboot_item = gtk_image_menu_item_new_with_label (_("Restart"));
++  adata->reboot_item = gtk_image_menu_item_new_with_label (_("Restart..."));
 +  gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu),
 +			  adata->reboot_item);
 +  g_signal_connect (adata->reboot_item, "style-set",
@@ -304,7 +348,7 @@
 +		    G_CALLBACK (session_activate_cb), (gpointer)RESTART);
 +
 +  /* Add entry for shutdown */
-+  adata->shutdown_item = gtk_image_menu_item_new_with_label (_("Shut Down"));
++  adata->shutdown_item = gtk_image_menu_item_new_with_label (_("Shut Down..."));
 +  gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu),
 +			  adata->shutdown_item);
 +  g_signal_connect (adata->shutdown_item, "style-set",
@@ -318,8 +362,8 @@
 +
    use_xnest = panel_applet_gconf_get_bool (applet, USE_XNEST_KEY, NULL);
    value = gconf_client_get_string (adata->client, SHOW_SCREEN_KEY, NULL);
-   reset_login_screen_item (adata->login_screen_item, use_xnest, value, adata->manager);
-@@ -637,7 +794,7 @@
+   reset_login_screen_item (adata->login_screen_item, use_xnest, value);
+@@ -635,7 +799,7 @@
  			     client_notify_global_func, adata, NULL, NULL);
  
    adata->client_notify_lockdown_id =
@@ -328,7 +372,7 @@
                               client_notify_lockdown_func, adata, NULL, NULL);
  
    adata->items = g_slist_sort_with_data (adata->items,
-@@ -1199,6 +1356,7 @@
+@@ -1197,6 +1361,7 @@
  }
  
  
@@ -336,7 +380,7 @@
  /* *********************** *
   *  FusaManager Callbacks  *
   * *********************** */
-@@ -1320,6 +1478,11 @@
+@@ -1312,6 +1477,11 @@
            gtk_widget_show ( GTK_WIDGET (adata->applet));
          }
      }
@@ -348,7 +392,7 @@
  }            
  
  static void
-@@ -1363,7 +1526,6 @@
+@@ -1355,7 +1525,6 @@
    sort_menu (adata);
  }
  
@@ -356,7 +400,7 @@
  /* *********************** *
   *  GConfClient Callbacks  *
   * *********************** */
-@@ -1572,6 +1734,10 @@
+@@ -1564,6 +1733,10 @@
      {
        show_hide_guest (adata);
      }
@@ -367,12 +411,114 @@
  
    if (g_getenv ("LTSP_CLIENT") && (
        GTK_WIDGET_VISIBLE (adata->login_screen_item) ||
-@@ -1995,6 +2161,323 @@
+@@ -1987,6 +2160,493 @@
    gtk_label_set_text (data, fusa_user_get_display_name (FUSA_USER (object)));
  }
  
 +static gboolean
-+pk_can_do_action (const gchar    *action_id)
++ck_multiple_users (void)
++{
++	DBusGConnection * sbus = dbus_g_bus_get(DBUS_BUS_SYSTEM, NULL);
++	g_return_val_if_fail(sbus != NULL, TRUE); /* worst case */
++	DBusGProxy * proxy = dbus_g_proxy_new_for_name(sbus, "org.freedesktop.ConsoleKit",
++	                                                     "/org/freedesktop/ConsoleKit/Manager",
++	                                                     "org.freedesktop.ConsoleKit.Manager");
++
++	if (proxy == NULL) {
++		return TRUE;
++	}
++
++	gboolean result;
++	GError * error = NULL;
++	GPtrArray * seats = NULL;
++
++	result = dbus_g_proxy_call(proxy, "GetSeats", &error, G_TYPE_INVALID,
++	                           dbus_g_type_get_collection("GPtrArray", DBUS_TYPE_G_OBJECT_PATH), &seats, G_TYPE_INVALID);
++
++	if (!result) {
++		g_warning("Unable to get the seats for ConsoleKit");
++		g_error_free(error);
++		g_object_unref(proxy);
++		return TRUE;
++	}
++
++	guint seat;
++	guint session_cnt = 0;
++	for (seat = 0; seat < seats->len; seat++) {
++		gchar * seat_id = g_ptr_array_index(seats, seat);
++		DBusGProxy * seat_proxy = dbus_g_proxy_new_for_name(sbus, "org.freedesktop.ConsoleKit",
++		                                                    seat_id, "org.freedesktop.ConsoleKit.Seat");
++		g_free(seat_id);
++
++		if (seat_proxy == NULL) {
++			continue;
++		}
++
++		GPtrArray * sessions = NULL;
++		GError * seaterror = NULL;
++
++		gboolean result = dbus_g_proxy_call(seat_proxy,
++		                                    "GetSessions", &error, G_TYPE_INVALID,
++	                                        dbus_g_type_get_collection("GPtrArray", DBUS_TYPE_G_OBJECT_PATH), &sessions, G_TYPE_INVALID);
++
++		g_object_unref(seat_proxy);
++		if (!result) {
++			g_error_free(seaterror);
++			continue;
++		}
++
++		session_cnt += sessions->len;
++		g_ptr_array_free(sessions, TRUE);
++
++		/* Optimization, we don't care about more than one really */
++		if (session_cnt > 1) {
++			break;
++		}
++	}
++
++	g_ptr_array_free(seats, TRUE);
++	g_object_unref(proxy);
++
++	if (session_cnt > 1) {
++		return TRUE;
++	} else {
++		return FALSE;
++	}
++}
++
++gboolean
++pk_require_auth (LogoutDialogAction action) {
++	if (action == LOGOUT_DIALOG_LOGOUT) {
++		return FALSE;
++	}
++
++	gchar * pk_action;
++	if (ck_multiple_users()) {
++		if (action == LOGOUT_DIALOG_RESTART) {
++			pk_action = "org.freedesktop.consolekit.system.restart-multiple-users";
++		} else {
++			pk_action = "org.freedesktop.consolekit.system.stop-multiple-users";
++		}
++	} else {
++		if (action == LOGOUT_DIALOG_RESTART) {
++			pk_action = "org.freedesktop.consolekit.system.restart";
++		} else {
++			pk_action = "org.freedesktop.consolekit.system.stop";
++		}
++	}
++
++	PolKitResult polres;
++	if (pk_can_do_action(pk_action, &polres)) {
++		if (polres == POLKIT_RESULT_YES) {
++			return FALSE;
++		}
++		return TRUE;
++	}
++	return FALSE;
++}
++
++gboolean
++pk_can_do_action (const gchar    *action_id, PolKitResult * pol_result)
 +{
 +        PolKitGnomeContext *gnome_context;
 +        PolKitAction *action;
@@ -419,6 +565,10 @@
 +        polkit_action_unref (action);
 +                polkit_caller_unref (caller);
 +
++		if (pol_result != NULL) {
++			*pol_result = result;
++		}
++
 +        return result != POLKIT_RESULT_NO && result != POLKIT_RESULT_UNKNOWN;
 +}
 +
@@ -515,6 +665,67 @@
 +			  gpointer     data)
 +{
 +  gint action = (gint)data;
++
++  GtkWidget * dialog = NULL;
++
++  switch (action) {
++  case LOGOUT:
++    if (!pk_require_auth(LOGOUT_DIALOG_LOGOUT)) {
++		dialog = logout_dialog_new(LOGOUT_DIALOG_LOGOUT);
++	}
++  	break;
++  case SHUTDOWN:
++    if (!pk_require_auth(LOGOUT_DIALOG_SHUTDOWN)) {
++		dialog = logout_dialog_new(LOGOUT_DIALOG_SHUTDOWN);
++	}
++    break;
++  case RESTART:
++    if (!pk_require_auth(LOGOUT_DIALOG_RESTART)) {
++		dialog = logout_dialog_new(LOGOUT_DIALOG_RESTART);
++	}
++    break;
++  default:
++  	g_warning("Unknown session action");
++	return;
++  }
++
++  if (dialog != NULL) {
++	  g_object_ref(G_OBJECT(dialog));
++
++	  //grab_keyboard_and_mouse(dialog);
++	  GtkResponseType response = gtk_dialog_run(GTK_DIALOG(dialog));
++
++	  //ungrab_keyboard_and_mouse();
++	  gtk_widget_hide(dialog);
++	  gtk_widget_unrealize(dialog);
++	  g_object_unref(dialog);
++
++	  if (response == GTK_RESPONSE_HELP) {
++		action = RESTART;
++		response = GTK_RESPONSE_OK;
++	  }
++
++	  if (response != GTK_RESPONSE_OK) {
++		return;
++	  }
++  }
++
++#if 0
++  /* For debugging when you don't want to restart every time :) */
++  switch (action) {
++  case LOGOUT:
++	printf("Would logout\n");
++  	break;
++  case SHUTDOWN:
++	printf("Would shutdown\n");
++	break;
++  case RESTART:
++	printf("Would restart\n");
++	break;
++  }
++  return;
++#endif
++
 +  gchar * cmd = NULL;
 +  
 +  switch (action) {
@@ -529,7 +740,7 @@
 +  	g_warning("Unknown session action");
 +  }
 +  queue_authentication(gdk_screen_get_default());
-+  ask_gdm(gdm_restart_state_cb, data, cmd);
++  ask_gdm(gdm_restart_state_cb, action, cmd);
 +  return;
 +}
 +
@@ -578,7 +789,7 @@
 +	
 +	res = dbus_g_proxy_call_with_timeout(proxy, method, INT_MAX, error, G_TYPE_INVALID, G_TYPE_INVALID);
 +	if (!res) {
-+		g_warning("ConsoleKit action %s failed", method);
++		g_warning("ConsoleKit action %s failed: %s", method, (*error)->message);
 +		return FALSE;
 +	}
 +	
@@ -602,9 +813,10 @@
 +	                                            	"org.freedesktop.ConsoleKit",
 +	                                            	"/org/freedesktop/ConsoleKit/Manager",
 +	                                            	"org.freedesktop.ConsoleKit.Manager",
-+	                                           	 NULL);
++	                                           	 &error);
 +		if (ck_proxy == NULL) {
-+			g_warning("Unable to get DBus proxy to Consolekit manager interface.");
++			g_warning("Unable to get DBus proxy to Consolekit manager interface: %s.", error->message);
++			g_error_free(error);
 +			return;
 +		}		
 +		if (!try_ck_action(sbus, ck_proxy, &error, method)) {
@@ -613,11 +825,13 @@
 +				request_ck_priv_action(method, error);
 +			}
 +		}
++
++		g_object_unref(ck_proxy);
 +	}
 +	
-+	g_object_unref(ck_proxy);
-+	if (error != NULL)
++	if (error != NULL) {
 +		g_error_free(error);
++	}
 +	
 +	return;
 +}	
@@ -691,7 +905,7 @@
  
  /* ******************* *
   *  Utility Functions  *
-@@ -2568,10 +3051,141 @@
+@@ -2557,10 +3217,142 @@
  
    gconf_client_notify_remove (adata->client, adata->client_notify_applet_id);
    gconf_client_notify_remove (adata->client, adata->client_notify_global_id);
@@ -780,6 +994,15 @@
 +
 +	adata->lock_screen_allowed = !gconf_client_get_bool (adata->client, LOCK_SCREEN_KEY, NULL);
 +
++	if (pk_can_do_action("org.freedesktop.consolekit.system.restart", NULL) ||
++		pk_can_do_action("org.freedesktop.consolekit.system.restart-multiple-users", NULL)) {
++		adata->restart_available = TRUE;
++	}
++	if (pk_can_do_action("org.freedesktop.consolekit.system.stop", NULL) ||
++		pk_can_do_action("org.freedesktop.consolekit.system.stop-multiple-users", NULL)) {
++		adata->shutdown_available = TRUE;
++    }
++
 +	DBusGConnection * sbus;
 +	sbus = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
 +	if (sbus == NULL) {
@@ -823,13 +1046,1478 @@
 +
 +	dbus_g_connection_unref(sbus);
 +	
-+	if (pk_can_do_action("org.freedesktop.consolekit.system.restart") ||
-+		pk_can_do_action("org.freedesktop.consolekit.system.restart-multiple-users")) {
-+		adata->restart_available = TRUE;
-+	}
-+	if (pk_can_do_action("org.freedesktop.consolekit.system.stop") ||
-+		pk_can_do_action("org.freedesktop.consolekit.system.stop-multiple-users")) {
-+		adata->shutdown_available = TRUE;
-+    }
-+	return;
-+}
++	return;
++}
+
+=== added file 'src/applet.h'
+--- src/applet.h	1970-01-01 00:00:00 +0000
++++ src/applet.h	2009-03-04 21:56:17 +0000
+@@ -0,0 +1,10 @@
++
++#ifndef __SEEN_APPLET_H__
++#define __SEEN_APPLET_H__ 1
++
++#include <polkit-gnome/polkit-gnome.h>
++
++gboolean pk_require_auth (LogoutDialogAction action);
++gboolean		pk_can_do_action		(const gchar *action_id, PolKitResult * pol_result);
++
++#endif /* __SEEN_APPLET_H__ */
+
+=== added file 'src/fade-and-grab.c'
+--- src/fade-and-grab.c	1970-01-01 00:00:00 +0000
++++ src/fade-and-grab.c	2009-03-03 16:21:35 +0000
+@@ -0,0 +1,519 @@
++/*
++ * Gksu -- a library providing access to su functionality
++ * Copyright (C) 2004 Gustavo Noronha Silva
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library 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
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the
++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++ * Boston, MA 02111-1307, USA.
++ */
++
++#include <stdlib.h>
++#include <unistd.h>
++
++#include <gdk/gdk.h>
++#include <gdk/gdkx.h>
++
++#include <glib/gi18n.h>
++
++#include <gtk/gtkdialog.h>
++#include <gtk/gtkmessagedialog.h>
++
++/*
++ * code 'stolen' from gnome-session's logout.c
++ *
++ * Written by Owen Taylor <otaylor@redhat.com>
++ * Copyright (C) Red Hat
++ */
++typedef struct {
++  GdkScreen    *screen;
++  int           monitor;
++  GdkRectangle  area;
++  int           rowstride;
++  GdkWindow    *root_window;
++  GdkWindow    *draw_window;
++  GdkPixbuf    *start_pb, *end_pb, *frame;
++  guchar       *start_p, *end_p, *frame_p;
++  GTimeVal      start_time;
++  GdkGC        *gc;
++  gboolean      composited;
++} FadeoutData;
++
++FadeoutData *fade_data = NULL;
++static GList *fadeout_windows = NULL;
++
++#define FADE_DURATION 500.0
++
++int
++gsm_screen_get_width (GdkScreen *screen,
++		      int        monitor)
++{
++	GdkRectangle geometry;
++
++	gdk_screen_get_monitor_geometry (screen, monitor, &geometry);
++
++	return geometry.width;
++}
++
++int
++gsm_screen_get_height (GdkScreen *screen,
++		       int        monitor)
++{
++	GdkRectangle geometry;
++
++	gdk_screen_get_monitor_geometry (screen, monitor, &geometry);
++
++	return geometry.height;
++}
++
++int
++gsm_screen_get_x (GdkScreen *screen,
++		  int        monitor)
++{
++	GdkRectangle geometry;
++
++	gdk_screen_get_monitor_geometry (screen, monitor, &geometry);
++
++	return geometry.x;
++}
++
++int
++gsm_screen_get_y (GdkScreen *screen,
++		  int        monitor)
++{
++	GdkRectangle geometry;
++
++	gdk_screen_get_monitor_geometry (screen, monitor, &geometry);
++
++	return geometry.y;
++}
++
++static void
++get_current_frame (FadeoutData *fadeout,
++		   double    sat)
++{
++  guchar *sp, *ep, *fp;
++  int i, j, width, offset;
++
++  width = fadeout->area.width * 3;
++  offset = 0;
++
++  for (i = 0; i < fadeout->area.height; i++)
++    {
++      sp = fadeout->start_p + offset;
++      ep = fadeout->end_p   + offset;
++      fp = fadeout->frame_p + offset;
++
++      for (j = 0; j < width; j += 3)
++	{
++	  guchar r = abs (*(sp++) - ep[0]);
++	  guchar g = abs (*(sp++) - ep[1]);
++	  guchar b = abs (*(sp++) - ep[2]);
++
++	  *(fp++) = *(ep++) + r * sat;
++	  *(fp++) = *(ep++) + g * sat;
++	  *(fp++) = *(ep++) + b * sat;
++	}
++
++      offset += fadeout->rowstride;
++    }
++}
++
++static void
++darken_pixbuf (GdkPixbuf *pb)
++{
++  int width, height, rowstride;
++  int i, j;
++  guchar *p, *pixels;
++
++  width     = gdk_pixbuf_get_width (pb) * 3;
++  height    = gdk_pixbuf_get_height (pb);
++  rowstride = gdk_pixbuf_get_rowstride (pb);
++  pixels    = gdk_pixbuf_get_pixels (pb);
++
++  for (i = 0; i < height; i++)
++    {
++      p = pixels + (i * rowstride);
++      for (j = 0; j < width; j++)
++	p [j] >>= 1;
++    }
++}
++
++static gboolean
++fadeout_callback (FadeoutData *fadeout)
++{
++  GTimeVal current_time;
++  double elapsed, percent;
++
++  g_get_current_time (&current_time);
++  elapsed = ((((double)current_time.tv_sec - fadeout->start_time.tv_sec) * G_USEC_PER_SEC +
++	      (current_time.tv_usec - fadeout->start_time.tv_usec))) / 1000.0;
++
++  if (elapsed < 0)
++    {
++      g_warning ("System clock seemed to go backwards?");
++      elapsed = G_MAXDOUBLE;
++    }
++
++  if (elapsed > FADE_DURATION )
++    {
++      if (fadeout->composited)
++        {
++          gdk_window_set_opacity (fadeout->draw_window, 0.5);
++        }
++      else
++        {
++          gdk_draw_pixbuf (fadeout->draw_window,
++						   fadeout->gc,
++						   fadeout->end_pb,
++						   0, 0,
++						   0, 0,
++						   fadeout->area.width,
++						   fadeout->area.height,
++						   GDK_RGB_DITHER_NONE,
++						   0, 0);
++        }
++
++      return FALSE;
++    }
++
++  percent = elapsed / FADE_DURATION;
++
++  if (fadeout->composited)
++    {
++      gdk_window_set_opacity (fadeout->draw_window, percent/2);
++    }
++  else
++    {
++      get_current_frame (fadeout, 1.0 - percent);
++      gdk_draw_pixbuf (fadeout->draw_window,
++					   fadeout->gc,
++					   fadeout->frame,
++					   0, 0,
++					   0, 0,
++					   fadeout->area.width,
++					   fadeout->area.height,
++					   GDK_RGB_DITHER_NONE,
++					   0, 0);
++    }
++
++  gdk_flush ();
++
++  return TRUE;
++}
++
++static void
++hide_fadeout_windows (void)
++{
++  GList *l;
++
++  for (l = fadeout_windows; l; l = l->next)
++    {
++      gdk_window_hide (GDK_WINDOW (l->data));
++      g_object_unref (l->data);
++    }
++
++  g_list_free (fadeout_windows);
++  fadeout_windows = NULL;
++}
++
++static gboolean
++fadein_callback (FadeoutData *fadeout)
++{
++  GTimeVal current_time;
++  double elapsed, percent;
++
++  g_get_current_time (&current_time);
++  elapsed = ((((double)current_time.tv_sec - fadeout->start_time.tv_sec) * G_USEC_PER_SEC +
++	      (current_time.tv_usec - fadeout->start_time.tv_usec))) / 1000.0;
++
++  if (elapsed < 0)
++    {
++      g_warning ("System clock seemed to go backwards?");
++      elapsed = G_MAXDOUBLE;
++    }
++
++  if (elapsed > FADE_DURATION)
++    {
++      if (fadeout->composited)
++        {
++          gdk_window_set_opacity (fadeout->draw_window, 0.0);
++          gdk_window_resize (fadeout->draw_window, 4, 4);
++        }
++      else
++        {
++          gdk_draw_pixbuf (fadeout->draw_window,
++						   fadeout->gc,
++						   fadeout->end_pb,
++						   0, 0,
++						   0, 0,
++						   fadeout->area.width,
++						   fadeout->area.height,
++						   GDK_RGB_DITHER_NONE,
++						   0, 0);
++        }
++
++      g_object_unref (fadeout->gc);
++      g_object_unref (fadeout->start_pb);
++      g_object_unref (fadeout->end_pb);
++      g_object_unref (fadeout->frame);
++
++      g_free (fadeout);
++
++      hide_fadeout_windows ();
++
++      return FALSE;
++    }
++
++  percent = elapsed / FADE_DURATION;
++
++  if (fadeout->composited)
++    {
++      gdk_window_set_opacity (fadeout->draw_window, 0.5 - percent/2);
++    }
++  else
++    {
++      get_current_frame (fadeout, percent);
++      gdk_draw_pixbuf (fadeout->draw_window,
++					   fadeout->gc,
++					   fadeout->frame,
++					   0, 0,
++					   0, 0,
++					   fadeout->area.width,
++					   fadeout->area.height,
++					   GDK_RGB_DITHER_NONE,
++					   0, 0);
++    }
++
++  gdk_flush ();
++
++  return TRUE;
++}
++
++static void
++fadeout_screen (GdkScreen *screen,
++		int        monitor)
++{
++  GdkWindowAttr attr;
++  int attr_mask;
++  GdkGCValues values;
++  FadeoutData *fadeout;
++
++  fadeout = g_new (FadeoutData, 1);
++
++  fadeout->screen = screen;
++  fadeout->monitor = monitor;
++  fadeout->composited = gdk_screen_is_composited (screen);
++
++  fadeout->area.x = gsm_screen_get_x (screen, monitor);
++  fadeout->area.y = gsm_screen_get_y (screen, monitor);
++  fadeout->area.width = gsm_screen_get_width (screen, monitor);
++  fadeout->area.height = gsm_screen_get_height (screen, monitor);
++
++  fadeout->root_window = gdk_screen_get_root_window (screen);
++  attr.window_type = GDK_WINDOW_TOPLEVEL;
++  attr.x = fadeout->area.x;
++  attr.y = fadeout->area.y;
++  attr.width = 4;
++  attr.height = 4;
++  attr.wclass = GDK_INPUT_OUTPUT;
++  attr.visual = gdk_screen_get_system_visual (fadeout->screen);
++  attr.colormap = gdk_screen_get_default_colormap (fadeout->screen);
++  attr.override_redirect = TRUE;
++  attr_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP | GDK_WA_NOREDIR;
++
++  fadeout->draw_window = gdk_window_new (fadeout->root_window, &attr, attr_mask);
++  fadeout_windows = g_list_prepend (fadeout_windows, fadeout->draw_window);
++
++  fadeout->start_pb = gdk_pixbuf_get_from_drawable (NULL,
++						    fadeout->root_window,
++						    NULL,
++						    fadeout->area.x,
++						    fadeout->area.y,
++						    0, 0,
++						    fadeout->area.width,
++						    fadeout->area.height);
++
++  fadeout->end_pb = gdk_pixbuf_copy (fadeout->start_pb);
++  darken_pixbuf (fadeout->end_pb);
++
++  fadeout->frame = gdk_pixbuf_copy (fadeout->start_pb);
++  fadeout->rowstride = gdk_pixbuf_get_rowstride (fadeout->start_pb);
++
++  fadeout->start_p = gdk_pixbuf_get_pixels (fadeout->start_pb);
++  fadeout->end_p   = gdk_pixbuf_get_pixels (fadeout->end_pb);
++  fadeout->frame_p = gdk_pixbuf_get_pixels (fadeout->frame);
++
++  values.subwindow_mode = GDK_INCLUDE_INFERIORS;
++
++  fadeout->gc = gdk_gc_new_with_values (fadeout->root_window, &values, GDK_GC_SUBWINDOW);
++
++  if (fadeout->composited)
++    {
++      gdk_window_set_opacity (fadeout->draw_window, 0.0);
++    }
++  else
++    {
++      gdk_window_set_back_pixmap (fadeout->draw_window, NULL, FALSE);
++      gdk_draw_pixbuf (fadeout->draw_window,
++					   fadeout->gc,
++					   fadeout->frame,
++					   0, 0,
++					   0, 0,
++					   fadeout->area.width,
++					   fadeout->area.height,
++					   GDK_RGB_DITHER_NONE,
++					   0, 0);
++    }
++
++  gdk_window_show (fadeout->draw_window);
++  gdk_window_clear (fadeout->draw_window);
++  gdk_window_resize (fadeout->draw_window,
++                                         fadeout->area.width,
++                                         fadeout->area.height);
++
++  g_get_current_time (&fadeout->start_time);
++  g_idle_add ((GSourceFunc) fadeout_callback, fadeout);
++
++  fade_data = fadeout;
++}
++
++/* End of 'stolen' code */
++
++#define GRAB_TRIES	16
++#define GRAB_WAIT	250 /* milliseconds */
++
++typedef enum
++  {
++    FAILED_GRAB_MOUSE,
++    FAILED_GRAB_KEYBOARD
++  } FailedGrabWhat;
++
++void
++report_failed_grab (FailedGrabWhat what)
++{
++  GtkWidget *dialog;
++
++  dialog = g_object_new (GTK_TYPE_MESSAGE_DIALOG,
++			 "message-type", GTK_MESSAGE_WARNING,
++			 "buttons", GTK_BUTTONS_CLOSE,
++			 NULL);
++
++  switch (what)
++    {
++    case FAILED_GRAB_MOUSE:
++      gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG(dialog),
++				     _("<b><big>Could not grab your mouse.</big></b>"
++				       "\n\n"
++				       "A malicious client may be eavesdropping "
++				       "on your session or you may have just clicked "
++				       "a menu or some application just decided to get "
++				       "focus."
++				       "\n\n"
++				       "Try again."));
++
++      break;
++    case FAILED_GRAB_KEYBOARD:
++      gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG(dialog),
++				     _("<b><big>Could not grab your keyboard.</big></b>"
++				       "\n\n"
++				       "A malicious client may be eavesdropping "
++				       "on your session or you may have just clicked "
++				       "a menu or some application just decided to get "
++				       "focus."
++				       "\n\n"
++				       "Try again."));
++      break;
++    }
++
++  gtk_window_set_keep_above(GTK_WINDOW(dialog), TRUE);
++  gtk_dialog_run (GTK_DIALOG(dialog));
++  gtk_widget_destroy (dialog);
++
++  while (gtk_events_pending ())
++    gtk_main_iteration ();
++
++}
++
++void
++grab_keyboard_and_mouse (GtkWidget *dialog)
++{
++  GdkGrabStatus status;
++  gint grab_tries = 0;
++
++  fadeout_screen (gdk_screen_get_default (), 0);
++  gtk_widget_show_all (dialog);
++
++  /* reset cursor */
++  gdk_window_set_cursor(dialog->window, gdk_cursor_new(GDK_LEFT_PTR));
++
++  for(;;)
++    {
++      status = gdk_pointer_grab ((GTK_WIDGET(dialog))->window, TRUE, 0, NULL,
++				 NULL, GDK_CURRENT_TIME);
++      if (status == GDK_GRAB_SUCCESS)
++	break;
++      usleep (GRAB_WAIT * 1000);
++      if (++grab_tries > GRAB_TRIES)
++	{
++	  gtk_widget_hide (dialog);
++	  g_get_current_time (&fade_data->start_time);
++	  while (fadein_callback (fade_data) != FALSE);
++	  report_failed_grab (FAILED_GRAB_MOUSE);
++	  return;
++	}
++    }
++
++  for(;;)
++    {
++      status = gdk_keyboard_grab ((GTK_WIDGET(dialog))->window,
++				  FALSE, GDK_CURRENT_TIME);
++      if (status == GDK_GRAB_SUCCESS)
++	break;
++
++      usleep(GRAB_WAIT * 1000);
++
++      if (++grab_tries > GRAB_TRIES)
++	{
++	  gtk_widget_hide (dialog);
++	  g_get_current_time (&fade_data->start_time);
++	  while (fadein_callback (fade_data) != FALSE);
++	  report_failed_grab (FAILED_GRAB_KEYBOARD);
++	  return;
++	}
++    }
++
++  /* we "raise" the window because there is a race here for
++   * focus-follow-mouse and auto-raise WMs that may put the window
++   * in the background and confuse users
++   */
++  gtk_widget_set_parent_window(GTK_WIDGET(dialog), fade_data->draw_window);
++  gdk_window_set_transient_for(gtk_widget_get_window(GTK_WIDGET(dialog)), fade_data->draw_window);
++  gtk_window_set_keep_above(GTK_WINDOW(dialog), TRUE);
++  gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
++  gtk_window_present(GTK_WINDOW(dialog));
++
++  return;
++}
++
++void
++ungrab_keyboard_and_mouse (void)
++{
++  /* Ungrab */
++  gdk_pointer_ungrab(GDK_CURRENT_TIME);
++  gdk_keyboard_ungrab(GDK_CURRENT_TIME);
++  gdk_flush();
++
++  g_get_current_time (&fade_data->start_time);
++  while (fadein_callback (fade_data) != FALSE);
++}
+
+=== added file 'src/fade-and-grab.h'
+--- src/fade-and-grab.h	1970-01-01 00:00:00 +0000
++++ src/fade-and-grab.h	2009-03-03 05:09:54 +0000
+@@ -0,0 +1,11 @@
++
++#ifndef __SEEN_FADE_AND_GRAB__
++#define __SEEN_FADE_AND_GRAB__ 1
++
++#include <gtk/gtkdialog.h>
++
++void grab_keyboard_and_mouse (GtkWidget *dialog);
++void ungrab_keyboard_and_mouse (void);
++
++
++#endif /* __SEEN_FADE_AND_GRAB__  */
+
+=== added file 'src/logout-dialog.c'
+--- src/logout-dialog.c	1970-01-01 00:00:00 +0000
++++ src/logout-dialog.c	2009-03-05 15:24:24 +0000
+@@ -0,0 +1,805 @@
++/*
++ * libgksuui -- Gtk+ widget and convenience functions for requesting passwords
++ * Copyright (C) 2004 Gustavo Noronha Silva
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library 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
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the
++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++ * Boston, MA 02111-1307, USA.
++ */
++
++#include <string.h>
++#include <math.h>
++
++#include <gtk/gtk.h>
++#include <gdk/gdkx.h>
++#include <glib/gi18n.h>
++#include <X11/XKBlib.h>
++
++#include "../config.h"
++
++#include "logout-dialog.h"
++#include "applet.h"
++
++#define LABEL_CHAR_WIDTH  30
++
++enum {
++	PROP_ZERO,
++	PROP_ACTION
++};
++
++static void
++logout_dialog_class_init (LogoutDialogClass *klass);
++
++static void
++logout_dialog_init (LogoutDialog *logout_dialog);
++
++static void
++_round_rect (cairo_t* cr, gdouble  aspect, gdouble  x, gdouble  y, gdouble  corner, gdouble  width, gdouble  height);
++
++static gdouble*
++_kernel_1d_new (gint    radius, gdouble deviation /* pass 0.0f to calculate automatically */);
++
++static void
++_kernel_1d_delete (gdouble* kernel);
++
++static void
++_image_surface_blur (cairo_surface_t* surface, gint horz_radius, gint vert_radius);
++
++static void
++set_property (GObject * object, guint param_id, const GValue * value, GParamSpec *pspec);
++
++static void
++get_property (GObject * object, guint param_id, GValue * value, GParamSpec *pspec);
++
++static gboolean
++timer_cb (gpointer data);
++
++static void
++show_cb (GtkWidget * widget, gpointer data);
++
++static void
++check_restart (LogoutDialog * dialog);
++
++static const gchar * title_strings[LOGOUT_DIALOG_ACTION_CNT] = {
++	/* LOGOUT_DIALOG_LOGOUT, */ 	N_("Log Out"),
++	/* LOGOUT_DIALOG_RESTART, */	N_("Restart"),
++	/* LOGOUT_DIALOG_SHUTDOWN, */	N_("Shut Down")
++};
++
++static const gchar * restart_auth = N_("Restart...");
++
++static const gchar * body_logout_update = N_("You recently installed updates which will only take effect after a restart.  Restart to apply software updates.");
++
++static const gchar * icon_strings[LOGOUT_DIALOG_ACTION_CNT] = {
++	/* LOGOUT_DIALOG_LOGOUT, */ 	"system-log-out",
++	/* LOGOUT_DIALOG_RESTART, */	"system-restart",
++	/* LOGOUT_DIALOG_SHUTDOWN, */	"system-shutdown"
++};
++
++static const gchar * singular_strings[LOGOUT_DIALOG_ACTION_CNT] = {
++	/* LOGOUT_DIALOG_LOGOUT, */ 	N_("Unless you cancel, you will be logged out in %d second."),
++	/* LOGOUT_DIALOG_RESTART, */	N_("Unless you cancel, the computer will restart in %d second."),
++	/* LOGOUT_DIALOG_SHUTDOWN, */	N_("Unless you cancel, the computer will be shut down in %d second.")
++};
++
++static const gchar * plural_strings[LOGOUT_DIALOG_ACTION_CNT] = {
++	/* LOGOUT_DIALOG_LOGOUT, */ 	N_("Unless you cancel, you will be logged out in %d seconds."),
++	/* LOGOUT_DIALOG_RESTART, */	N_("Unless you cancel, the computer will restart in %d seconds."),
++	/* LOGOUT_DIALOG_SHUTDOWN, */	N_("Unless you cancel, the computer will be shut down in %d seconds.")
++};
++
++
++
++GType
++logout_dialog_get_type (void)
++{
++  static GType type = 0;
++
++  if (type == 0)
++    {
++      static const GTypeInfo info =
++	{
++	  sizeof (LogoutDialogClass), /* size of class */
++	  NULL, /* base_init */
++	  NULL, /* base_finalize */
++	  (GClassInitFunc) logout_dialog_class_init,
++	  NULL, /* class_finalize */
++	  NULL, /* class_data */
++	  sizeof (LogoutDialog), /* size of object */
++	  0, /* n_preallocs */
++	  (GInstanceInitFunc) logout_dialog_init /* instance_init */
++	};
++      type = g_type_register_static (gtk_dialog_get_type (),
++				     "LogoutDialogType",
++				     &info, 0);
++    }
++
++  return type;
++}
++
++static void
++logout_dialog_class_init (LogoutDialogClass *klass)
++{
++  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
++
++  gobject_class->set_property = set_property;
++  gobject_class->get_property = get_property;
++
++  g_object_class_install_property(gobject_class, PROP_ACTION,
++                                  g_param_spec_int("action", NULL, NULL,
++                                                   LOGOUT_DIALOG_LOGOUT, LOGOUT_DIALOG_SHUTDOWN,
++                                                   LOGOUT_DIALOG_LOGOUT, G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
++
++  return;
++}
++
++static void
++set_property (GObject * object, guint param_id, const GValue * value, GParamSpec *pspec)
++{
++	g_return_if_fail(param_id == PROP_ACTION);
++
++	LogoutDialog * dialog = LOGOUT_DIALOG(object);
++	dialog->action = (LogoutDialogAction)g_value_get_int(value);
++
++	gtk_image_set_from_icon_name(GTK_IMAGE(dialog->image), icon_strings[dialog->action], GTK_ICON_SIZE_DIALOG);
++	gtk_label_set_text(GTK_LABEL(dialog->title), title_strings[dialog->action]);
++	gtk_widget_hide(dialog->message);
++	gtk_button_set_label(GTK_BUTTON(dialog->ok_button), title_strings[dialog->action]);
++
++	gchar * timeouttxt = g_strdup_printf(ngettext(singular_strings[dialog->action], plural_strings[dialog->action], dialog->timeout), dialog->timeout);
++	gtk_label_set_text(GTK_LABEL(dialog->timeout_text), timeouttxt);
++	g_free(timeouttxt);
++
++	check_restart(dialog);
++
++	return;
++}
++
++static void
++get_property (GObject * object, guint param_id, GValue * value, GParamSpec *pspec)
++{
++	g_return_if_fail(param_id == PROP_ACTION);
++	g_value_set_int(value, LOGOUT_DIALOG(object)->action);
++}
++
++static gboolean
++timer_cb (gpointer data)
++{
++	LogoutDialog * dialog = LOGOUT_DIALOG(data);
++
++	if (dialog->timeout == 0) {
++		gtk_dialog_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
++		dialog->timerfunc = 0;
++		return FALSE;
++	} else {
++		dialog->timeout--;
++
++		gchar * timeouttxt = g_strdup_printf(ngettext(singular_strings[dialog->action], plural_strings[dialog->action], dialog->timeout), dialog->timeout);
++		gtk_label_set_text(GTK_LABEL(dialog->timeout_text), timeouttxt);
++		g_free(timeouttxt);
++	}
++
++	return TRUE;
++}
++
++static void
++show_cb (GtkWidget * widget, gpointer data)
++{
++	LogoutDialog * dialog = LOGOUT_DIALOG(widget);
++
++	if (dialog->timerfunc != 0) {
++		g_source_remove(dialog->timerfunc);
++		dialog->timerfunc = 0;
++	}
++
++	dialog->timerfunc = g_timeout_add_seconds(1, timer_cb, dialog);
++	return;
++}
++
++static void
++check_restart (LogoutDialog * dialog)
++{
++	if (dialog->action != LOGOUT_DIALOG_LOGOUT) {
++		return;
++	}
++
++	if (g_file_test("/var/run/reboot-required", G_FILE_TEST_EXISTS)) {
++		if (pk_can_do_action("org.freedesktop.consolekit.system.restart", NULL) ||
++			pk_can_do_action("org.freedesktop.consolekit.system.restart-multiple-users", NULL)) {
++
++			gtk_label_set_text(GTK_LABEL(dialog->message), _(body_logout_update));
++			gtk_widget_show(dialog->message);
++			if (pk_require_auth(LOGOUT_DIALOG_RESTART)) {
++				gtk_button_set_label(GTK_BUTTON(dialog->restart_button), _(restart_auth));
++			} else {
++				gtk_button_set_label(GTK_BUTTON(dialog->restart_button), _(title_strings[LOGOUT_DIALOG_RESTART]));
++			}
++			gtk_widget_show(dialog->restart_button);
++		}
++	}
++
++	return;
++}
++
++static gboolean
++focus_out_cb (GtkWidget *widget, GdkEventFocus *event, gpointer user_data)
++{
++  gtk_window_present (GTK_WINDOW(widget));
++  return TRUE;
++}
++
++static void
++_round_rect (cairo_t* cr,
++             gdouble  aspect,
++             gdouble  x,
++             gdouble  y,
++             gdouble  corner,
++             gdouble  width,
++             gdouble  height)
++{
++  gdouble radius = corner / aspect;
++
++  /* top-left, right of the corner */
++  cairo_move_to (cr, x + radius, y);
++
++  /* top-right, left of the corner */
++  cairo_line_to (cr,
++                 x + width - radius,
++                 y);
++
++  /* top-right, below the corner */
++  cairo_arc (cr,
++             x + width - radius,
++             y + radius,
++             radius,
++             -90.0f * G_PI / 180.0f,
++             0.0f * G_PI / 180.0f);
++
++  /* bottom-right, above the corner */
++  cairo_line_to (cr,
++                 x + width,
++                 y + height - radius);
++
++  /* bottom-right, left of the corner */
++  cairo_arc (cr,
++             x + width - radius,
++             y + height - radius,
++             radius,
++             0.0f * G_PI / 180.0f,
++             90.0f * G_PI / 180.0f);
++
++  /* bottom-left, right of the corner */
++  cairo_line_to (cr,
++                 x + radius,
++                 y + height);
++
++  /* bottom-left, above the corner */
++  cairo_arc (cr,
++             x + radius,
++             y + height - radius,
++             radius,
++             90.0f * G_PI / 180.0f,
++             180.0f * G_PI / 180.0f);
++
++  /* top-left, below the corner */
++  cairo_line_to (cr,
++                 x,
++                 y + radius);
++
++  /* top-left, right of the corner */
++  cairo_arc (cr,
++             x + radius,
++             y + radius,
++             radius,
++             180.0f * G_PI / 180.0f,
++             270.0f * G_PI / 180.0f);
++}
++
++static gdouble*
++_kernel_1d_new (gint    radius,
++                gdouble deviation /* pass 0.0f to calculate automatically */)
++{
++  gdouble* kernel = NULL;
++  gdouble  sum    = 0.0f;
++  gdouble  value  = 0.0f;
++  gint     i;
++  gint     size = 2 * radius + 1;
++  gdouble  radiusf;
++
++  /* sanity check */
++  if (radius <= 0)
++    return NULL;
++
++  /* get memory-chunk to hold blur-kernel */
++  kernel = (gdouble*) g_malloc0 ((size + 1) * sizeof (gdouble));
++  if (!kernel)
++    return NULL;
++
++  /* determine deviation */
++  radiusf = fabs (radius) + 1.0f;
++  if (deviation == 0.0f)
++    deviation = sqrt (-(radiusf * radiusf) / (2.0f * log (1.0f / 255.0f)));
++
++  /* fill blur-kernel */
++  kernel[0] = size;
++  value = (gdouble) -radius;
++  for (i = 0; i < size; i++)
++    {
++    kernel[1 + i] = 1.0f / (2.506628275f * deviation) *
++                    expf (-((value * value) /
++                    (2.0f * deviation * deviation)));
++    sum += kernel[1 + i];
++    value += 1.0f;
++    }
++
++  /* normalize values */
++  for (i = 0; i < size; i++)
++    kernel[1 + i] /= sum;
++
++  return kernel;
++}
++
++static void
++_kernel_1d_delete (gdouble* kernel)
++{
++  g_assert (kernel != NULL);
++  g_free ((gpointer) kernel);
++}
++
++static void
++_image_surface_blur (cairo_surface_t* surface,
++                     gint             horz_radius,
++                     gint             vert_radius)
++{
++  gint     iX;
++  gint     iY;
++  gint     i;
++  gint     x;
++  gint     y;
++  gint     stride;
++  gint     offset;
++  gint     base_offset;
++  gdouble* horz_blur;
++  gdouble* vert_blur;
++  gdouble* horz_kernel;
++  gdouble* vert_kernel;
++  guchar*  src;
++  gint     width;
++  gint     height;
++  gint     channels;
++
++  /* sanity checks */
++  if (!surface || horz_radius == 0 || vert_radius == 0)
++    return;
++
++  if (cairo_surface_get_type (surface) != CAIRO_SURFACE_TYPE_IMAGE)
++    return;
++
++  cairo_surface_flush (surface);
++
++  src  = cairo_image_surface_get_data (surface);
++  width  = cairo_image_surface_get_width (surface);
++  height = cairo_image_surface_get_height (surface);
++
++  /* only handle RGB- or RGBA-surfaces */
++  if (cairo_image_surface_get_format (surface) != CAIRO_FORMAT_ARGB32 &&
++      cairo_image_surface_get_format (surface) != CAIRO_FORMAT_RGB24)
++    return;
++
++  channels = 4;
++  stride = width * channels;
++
++  /* create buffers to hold the blur-passes */
++  horz_blur = (gdouble*) g_malloc0 (height * stride * sizeof (gdouble));
++  vert_blur = (gdouble*) g_malloc0 (height * stride * sizeof (gdouble));
++  if (!horz_blur || !vert_blur)
++    {
++      if (horz_blur)
++        g_free ((gpointer) horz_blur);
++
++      if (vert_blur)
++        g_free ((gpointer) vert_blur);
++
++      return;
++    }
++
++  horz_kernel = _kernel_1d_new (horz_radius, 0.0f);
++  vert_kernel = _kernel_1d_new (vert_radius, 0.0f);
++
++  if (!horz_kernel || !vert_kernel)
++    {
++
++      g_free ((gpointer) horz_blur);
++      g_free ((gpointer) vert_blur);
++
++      if (horz_kernel)
++        _kernel_1d_delete (horz_kernel);
++
++      if (vert_kernel)
++        _kernel_1d_delete (vert_kernel);
++
++      return;
++    }
++
++  /* horizontal pass */
++  for (iY = 0; iY < height; iY++)
++    {
++      for (iX = 0; iX < width; iX++)
++        {
++          gdouble red   = 0.0f;
++          gdouble green = 0.0f;
++          gdouble blue  = 0.0f;
++          gdouble alpha = 0.0f;
++
++          offset = ((gint) horz_kernel[0]) / -2;
++          for (i = 0; i < (gint) horz_kernel[0]; i++)
++            {
++              x = iX + offset;
++              if (x >= 0 && x < width)
++                {
++                  base_offset = iY * stride + x * channels;
++
++                  if (channels == 4)
++                    alpha += (horz_kernel[1+i] * (gdouble) src[base_offset + 3]);
++
++                  red   += (horz_kernel[1+i] * (gdouble) src[base_offset + 2]);
++                  green += (horz_kernel[1+i] * (gdouble) src[base_offset + 1]);
++                  blue  += (horz_kernel[1+i] * (gdouble) src[base_offset + 0]);
++                }
++
++              offset++;
++            }
++
++          base_offset = iY * stride + iX * channels;
++
++          if (channels == 4)
++            horz_blur[base_offset + 3] = alpha;
++
++          horz_blur[base_offset + 2] = red;
++          horz_blur[base_offset + 1] = green;
++          horz_blur[base_offset + 0] = blue;
++        }
++    }
++
++  /* vertical pass */
++  for (iY = 0; iY < height; iY++)
++    {
++      for (iX = 0; iX < width; iX++)
++        {
++          gdouble red   = 0.0f;
++          gdouble green = 0.0f;
++          gdouble blue  = 0.0f;
++          gdouble alpha = 0.0f;
++
++          offset = ((gint) vert_kernel[0]) / -2;
++          for (i = 0; i < (gint) vert_kernel[0]; i++)
++            {
++              y = iY + offset;
++              if (y >= 0 && y < height)
++                {
++                  base_offset = y * stride + iX * channels;
++
++                  if (channels == 4)
++                    alpha += (vert_kernel[1+i] * horz_blur[base_offset + 3]);
++
++                  red   += (vert_kernel[1+i] * horz_blur[base_offset + 2]);
++                  green += (vert_kernel[1+i] * horz_blur[base_offset + 1]);
++                  blue  += (vert_kernel[1+i] * horz_blur[base_offset + 0]);
++                }
++
++              offset++;
++            }
++
++          base_offset = iY * stride + iX * channels;
++
++          if (channels == 4)
++            vert_blur[base_offset + 3] = alpha;
++
++          vert_blur[base_offset + 2] = red;
++          vert_blur[base_offset + 1] = green;
++          vert_blur[base_offset + 0] = blue;
++        }
++    }
++
++  _kernel_1d_delete (horz_kernel);
++  _kernel_1d_delete (vert_kernel);
++
++  for (iY = 0; iY < height; iY++)
++    {
++      for (iX = 0; iX < width; iX++)
++        {
++          offset = iY * stride + iX * channels;
++
++          if (channels == 4)
++            src[offset + 3] = (guchar) vert_blur[offset + 3];
++
++          src[offset + 2] = (guchar) vert_blur[offset + 2];
++          src[offset + 1] = (guchar) vert_blur[offset + 1];
++          src[offset + 0] = (guchar) vert_blur[offset + 0];
++        }
++    }
++
++  cairo_surface_mark_dirty (surface);
++
++  g_free ((gpointer) horz_blur);
++  g_free ((gpointer) vert_blur);
++}
++
++static cairo_surface_t*
++_create_shadow_surface (gint    width,
++                        gint    height,
++                        gdouble corner_radius,
++                        gint    blur_radius)
++{
++  cairo_surface_t* surface;
++  cairo_t*         cr;
++
++  /* create image-surface and context */
++  surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height);
++  cr = cairo_create (surface);
++
++  /* clear context */
++  cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
++  cairo_paint (cr);
++
++  /* draw semi-transparent black rectangle with rounded corners */
++  cairo_set_source_rgba (cr, 0.0f, 0.0f, 0.0f, 0.65f);
++  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
++  _round_rect (cr,
++               1.0f,
++               (gdouble) blur_radius,
++               (gdouble) blur_radius,
++               corner_radius,
++               (gdouble) width - 2 * blur_radius,
++               (gdouble) height - 2 * blur_radius);
++  cairo_fill (cr);
++
++  /* blur twice with half the blur-radius, looks nicer */
++  _image_surface_blur (surface, blur_radius / 2, blur_radius / 2);
++  _image_surface_blur (surface, blur_radius / 2, blur_radius / 2);
++
++  /* clean up */
++  cairo_destroy (cr);
++
++  return surface;
++}
++
++static gboolean
++_transparent_clear_cb (GtkWidget      *widget,
++                       GdkEventExpose *event,
++                       LogoutDialog   *logout_dialog)
++{
++  cairo_t  *cr;
++  GtkStyle *style;
++  gdouble  opacity       = 0.85f;
++  gdouble  corner_radius = 3.75f;
++
++  /* create context */
++  cr = gdk_cairo_create (widget->window);
++
++  /* clear the background */
++  cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
++  cairo_paint (cr);
++
++  /* draw shadow */
++  if (cairo_surface_status (logout_dialog->shadow) == CAIRO_STATUS_SUCCESS)
++    {
++      cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
++      cairo_set_source_surface (cr, logout_dialog->shadow, 0, 0);
++      cairo_paint (cr);
++    }
++
++  /* create linear gradient from themes normal background-color */
++  style = gtk_widget_get_style (widget);
++  cairo_set_source_rgba (
++    cr,
++    (gdouble) style->bg[GTK_STATE_NORMAL].red / (gdouble) 0xFFFF,
++    (gdouble) style->bg[GTK_STATE_NORMAL].green / (gdouble) 0xFFFF,
++    (gdouble) style->bg[GTK_STATE_NORMAL].blue / (gdouble) 0xFFFF,
++    opacity);
++
++  /* draw a filled rounded rectangle */
++  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
++  _round_rect (cr,
++               1.0f, 
++               (gdouble) widget->allocation.x + 13.0f,
++               (gdouble) widget->allocation.y + 13.0f,
++               corner_radius,
++               (gdouble) widget->allocation.width - 30.0f,
++               (gdouble) widget->allocation.height - 30.0f);
++  cairo_fill (cr);
++
++  /* clean up afterwards */
++  cairo_destroy (cr);
++
++  return FALSE;
++}
++
++static void
++_unrealize_cb (GtkWidget    *widget,
++               LogoutDialog *logout_dialog)
++{
++  cairo_surface_destroy (logout_dialog->shadow);
++}
++
++static void 
++_realize_cb (GtkWidget    *widget,
++             LogoutDialog *logout_dialog)
++{
++  logout_dialog->shadow = _create_shadow_surface (widget->allocation.width,
++                                                  widget->allocation.height,
++                                                  3.75f,
++                                                  15);
++}
++
++static void
++logout_dialog_init (LogoutDialog *logout_dialog)
++{
++  GtkDialog *dialog;
++  gint      border_width = 6;
++
++  logout_dialog->timeout = 60;
++  logout_dialog->timerfunc = 0;
++
++  logout_dialog->composited = gdk_screen_is_composited (
++                                gtk_widget_get_screen (
++                                  GTK_WIDGET (logout_dialog)));
++
++  if (logout_dialog->composited)
++    {
++      GdkColormap *colormap;
++      GtkWidget   *main_dialog = GTK_WIDGET (logout_dialog);
++
++      colormap = gdk_screen_get_rgba_colormap (
++                   gtk_widget_get_screen (main_dialog));
++      if (colormap)
++        {
++          gtk_widget_set_colormap (main_dialog, colormap);
++          gtk_widget_set_app_paintable (main_dialog, TRUE);
++          g_signal_connect (G_OBJECT (main_dialog),
++                            "expose-event",
++                            G_CALLBACK (_transparent_clear_cb),
++                            (gpointer) logout_dialog);
++          g_signal_connect (G_OBJECT (main_dialog),
++                            "realize",
++                            G_CALLBACK (_realize_cb),
++                            (gpointer) logout_dialog);
++          g_signal_connect (G_OBJECT (main_dialog),
++                            "unrealize",
++                            G_CALLBACK (_unrealize_cb),
++                            (gpointer) logout_dialog);
++          border_width = 20;
++        }
++    }
++
++  gtk_widget_push_composite_child ();
++
++  /* dialog window */
++  dialog = GTK_DIALOG(logout_dialog);
++
++  /* make sure that our window will always have the focus */
++  g_signal_connect (G_OBJECT(dialog), "focus-out-event",
++		    G_CALLBACK(focus_out_cb), NULL);
++
++  logout_dialog->main_vbox = dialog->vbox;
++
++  gtk_window_set_title (GTK_WINDOW(logout_dialog), "");
++  gtk_dialog_set_has_separator (GTK_DIALOG(logout_dialog), FALSE);
++  gtk_container_set_border_width (GTK_CONTAINER(logout_dialog), border_width);
++  gtk_box_set_spacing (GTK_BOX(logout_dialog->main_vbox), 12);
++  gtk_window_set_resizable (GTK_WINDOW(logout_dialog), FALSE);
++
++  /* skip taskbar and  pager hint */
++  gtk_window_set_skip_pager_hint (GTK_WINDOW(logout_dialog), TRUE);
++  gtk_window_set_skip_taskbar_hint (GTK_WINDOW(logout_dialog), TRUE);
++  gtk_window_set_decorated(GTK_WINDOW(logout_dialog), FALSE);
++
++
++  /* center window */
++  gtk_window_set_position (GTK_WINDOW(logout_dialog), GTK_WIN_POS_CENTER);
++
++  /* the action buttons */
++  /*  the cancel button  */
++  logout_dialog->restart_button = gtk_dialog_add_button (dialog,
++						      GTK_STOCK_HELP,
++						      GTK_RESPONSE_HELP);
++  gtk_button_set_label(GTK_BUTTON(logout_dialog->restart_button), _(title_strings[LOGOUT_DIALOG_RESTART]));
++  gtk_widget_hide(logout_dialog->restart_button);
++
++  /*  the cancel button  */
++  logout_dialog->cancel_button = gtk_dialog_add_button (dialog,
++						      GTK_STOCK_CANCEL,
++						      GTK_RESPONSE_CANCEL);
++  /*  the ok button  */
++  logout_dialog->ok_button = gtk_dialog_add_button (dialog,
++						  GTK_STOCK_OK,
++						  GTK_RESPONSE_OK);
++  gtk_widget_grab_default (logout_dialog->ok_button);
++
++  /* Title */
++  logout_dialog->title = gtk_label_new(_(title_strings[logout_dialog->action]));
++  gtk_label_set_use_markup(GTK_LABEL(logout_dialog->title), TRUE);
++  gtk_box_pack_start (GTK_BOX(logout_dialog->main_vbox),
++		      logout_dialog->title, TRUE, TRUE, 4);
++  gtk_misc_set_alignment (GTK_MISC(logout_dialog->title), 0.5, 0);
++  gtk_widget_show(logout_dialog->title);
++
++  /* hbox */
++  logout_dialog->hbox = gtk_hbox_new (FALSE, 12);
++  gtk_container_set_border_width (GTK_CONTAINER(logout_dialog->hbox), 6);
++  gtk_box_pack_start (GTK_BOX(logout_dialog->main_vbox),
++		      logout_dialog->hbox, FALSE, FALSE, 0);
++  gtk_widget_show (logout_dialog->hbox);
++
++  /* image */
++  logout_dialog->image =
++    gtk_image_new_from_icon_name (icon_strings[logout_dialog->action],
++			      GTK_ICON_SIZE_DIALOG);
++  gtk_misc_set_alignment (GTK_MISC(logout_dialog->image), 0.5, 0);
++  gtk_box_pack_start (GTK_BOX(logout_dialog->hbox), logout_dialog->image,
++		      FALSE, FALSE, 0);
++  gtk_widget_show (logout_dialog->image);
++
++  /* vbox for text */
++  logout_dialog->vbox_text = gtk_vbox_new(FALSE, 12);
++  gtk_box_pack_start(GTK_BOX(logout_dialog->hbox), logout_dialog->vbox_text, TRUE, TRUE, 0);
++  gtk_widget_show(logout_dialog->vbox_text);
++
++  /* Message */
++  logout_dialog->message = gtk_label_new("");
++  gtk_label_set_line_wrap(GTK_LABEL(logout_dialog->message), TRUE);
++  gtk_label_set_single_line_mode(GTK_LABEL(logout_dialog->message), FALSE);
++  gtk_label_set_selectable(GTK_LABEL(logout_dialog->message), TRUE);
++  gtk_label_set_width_chars(GTK_LABEL(logout_dialog->message), LABEL_CHAR_WIDTH);
++  gtk_misc_set_alignment (GTK_MISC(logout_dialog->message), 0.0, 0.0);
++  gtk_box_pack_start(GTK_BOX(logout_dialog->vbox_text), logout_dialog->message, TRUE, TRUE, 0);
++  gtk_widget_show(logout_dialog->message);
++
++  /* timeout */
++  logout_dialog->timeout_text = gtk_label_new("");
++  gtk_label_set_line_wrap(GTK_LABEL(logout_dialog->timeout_text), TRUE);
++  gtk_label_set_single_line_mode(GTK_LABEL(logout_dialog->timeout_text), FALSE);
++  gtk_label_set_selectable(GTK_LABEL(logout_dialog->timeout_text), FALSE);
++  gtk_label_set_width_chars(GTK_LABEL(logout_dialog->timeout_text), LABEL_CHAR_WIDTH);
++  gtk_misc_set_alignment (GTK_MISC(logout_dialog->timeout_text), 0.0, 0.0);
++  gtk_box_pack_start(GTK_BOX(logout_dialog->vbox_text), logout_dialog->timeout_text, TRUE, TRUE, 0);
++  gtk_widget_show(logout_dialog->timeout_text);
++
++  gtk_widget_pop_composite_child ();
++
++  g_signal_connect(G_OBJECT(logout_dialog), "show", G_CALLBACK(show_cb), logout_dialog);
++
++  return;
++}
++
++/**
++ * logout_dialog_new:
++ *
++ * Creates a new #LogoutDialog.
++ *
++ * Returns: the new #LogoutDialog
++ */
++GtkWidget*
++logout_dialog_new (LogoutDialogAction action)
++{
++  LogoutDialog * dialog = g_object_new (LOGOUT_TYPE_DIALOG, "action", action, NULL);
++  return GTK_WIDGET(dialog);
++}
++
++LogoutDialogAction
++logout_dialog_get_action (LogoutDialog * dialog)
++{
++	return dialog->action;
++}
++
+
+=== added file 'src/logout-dialog.h'
+--- src/logout-dialog.h	1970-01-01 00:00:00 +0000
++++ src/logout-dialog.h	2009-03-04 19:04:03 +0000
+@@ -0,0 +1,102 @@
++/*
++ * libgksuui -- Gtk+ widget and convenience functions for requesting passwords
++ * Copyright (C) 2004 Gustavo Noronha Silva
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library 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
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the
++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++ * Boston, MA 02111-1307, USA.
++ */
++
++#ifndef __LOGOUT_DIALOG_H__
++#define __LOGOUT_DIALOG_H__
++
++#include <gtk/gtk.h>
++
++G_BEGIN_DECLS
++
++#define LOGOUT_TYPE_DIALOG (logout_dialog_get_type ())
++#define LOGOUT_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LOGOUT_TYPE_DIALOG, LogoutDialog))
++#define LOGOUT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LOGOUT_TYPE_DIALOG, LogoutDialogClass))
++#define LOGOUT_IS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LOGOUT_TYPE_DIALOG))
++#define LOGOUT_IS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LOGOUT_TYPE_CONTEXT))
++#define LOGOUT_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LOGOUT_TYPE_DIALOG, LogoutDialogClass))
++
++typedef struct _LogoutDialogClass LogoutDialogClass;
++typedef struct _LogoutDialog LogoutDialog;
++typedef enum _LogoutDialogAction LogoutDialogAction;
++
++enum _LogoutDialogAction {
++	LOGOUT_DIALOG_LOGOUT,
++	LOGOUT_DIALOG_RESTART,
++	LOGOUT_DIALOG_SHUTDOWN,
++	LOGOUT_DIALOG_ACTION_CNT
++};
++
++struct _LogoutDialogClass
++{
++  GtkDialogClass parent_class;
++};
++
++/**
++ * LogoutDialog:
++ * @dialog: parent widget
++ * @main_vbox: GtkDialog's vbox
++ * @hbox: box to separate the image of the right-side widgets
++ * @image: the authorization image, left-side widget
++ * @entry_vbox: right-side widgets container
++ * @label: message describing what is required from the user,
++ * right-side widget
++ * @entry: place to type the password in, right-side widget
++ * @ok_button: OK button of the dialog
++ * @cancel_button: Cancel button of the dialog
++ *
++ * Convenience widget based on #GtkDialog to request a password.
++ */
++struct _LogoutDialog
++{
++  GtkDialog dialog;
++
++  GtkWidget *main_vbox;
++  GtkWidget *hbox;
++  GtkWidget *image;
++  GtkWidget *ok_button;
++  GtkWidget *cancel_button;
++  GtkWidget *restart_button;
++  GtkWidget *title;
++  GtkWidget *vbox_text;
++  GtkWidget *message;
++  GtkWidget *timeout_text;
++
++  LogoutDialogAction action;
++
++  /* private */
++  gboolean        composited;
++  cairo_surface_t *shadow;
++  gchar *         timeout_result;
++  guint           timeout;
++  guint           timerfunc;
++};
++
++GType
++logout_dialog_get_type (void);
++
++GtkWidget*
++logout_dialog_new (LogoutDialogAction action);
++
++LogoutDialogAction
++logout_dialog_get_action (LogoutDialog * widget);
++
++G_END_DECLS
++
++#endif
+

=== modified file 'debian/patches/86_fusa_menu_item_changes.patch'
--- debian/patches/86_fusa_menu_item_changes.patch	2008-10-28 21:39:31 +0000
+++ debian/patches/86_fusa_menu_item_changes.patch	2009-03-05 15:58:32 +0000
@@ -1,7 +1,7 @@
 === modified file 'src/applet.c'
---- src/applet.c	2008-10-28 16:23:34 +0000
-+++ src/applet.c	2008-10-28 20:32:40 +0000
-@@ -608,6 +608,11 @@
+--- src/applet.c	2009-03-05 02:15:16 +0000
++++ src/applet.c	2009-03-05 02:17:45 +0000
+@@ -635,6 +635,11 @@
  	}
        else
  	gtk_widget_show (menuitem);
@@ -13,7 +13,7 @@
        g_signal_connect (users->data, "displays-changed",
  			G_CALLBACK (user_displays_changed_cb), adata);
  
-@@ -624,9 +629,7 @@
+@@ -651,9 +656,7 @@
    adata->items = g_slist_prepend (adata->items, adata->separator_item);
  
    /* Add the 'other user' entry */
@@ -24,7 +24,7 @@
    gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu),
  			  adata->login_screen_item);
    g_signal_connect (adata->login_screen_item, "style-set",
-@@ -741,6 +744,10 @@
+@@ -768,6 +771,10 @@
    g_signal_connect (adata->guest_session_item, "activate",
  					G_CALLBACK (guest_session_activate_cb), adata);
    adata->items = g_slist_prepend (adata->items, adata->guest_session_item);
@@ -35,7 +35,7 @@
  
    show_hide_guest (adata);
  
-@@ -1417,6 +1424,11 @@
+@@ -1444,6 +1451,11 @@
      }
    else
      gtk_widget_show (menuitem);
@@ -47,7 +47,7 @@
    g_signal_connect (user, "displays-changed",
  		    G_CALLBACK (user_displays_changed_cb), adata);
    sort_menu (adata);
-@@ -1495,6 +1507,10 @@
+@@ -1522,6 +1534,10 @@
    else
      gtk_widget_show (menuitem);
  
@@ -58,7 +58,7 @@
    sort_menu (adata);
  }
  
-@@ -2563,10 +2579,22 @@
+@@ -2983,10 +2999,22 @@
    column = 0;
    count = 0;
    items = adata->items;
@@ -81,7 +81,7 @@
  	  gtk_menu_attach (GTK_MENU (adata->menu), items->data,
  			   column, column + 1, row, row + 1);
  	  row++;
-@@ -2584,6 +2612,7 @@
+@@ -3004,6 +3032,7 @@
                items->data, count++);
  	}
  

=== modified file 'debian/patches/88_status_icons.patch'
--- debian/patches/88_status_icons.patch	2008-10-28 21:39:31 +0000
+++ debian/patches/88_status_icons.patch	2009-03-05 15:57:21 +0000
@@ -1,23 +1,28 @@
 === modified file 'configure.ac'
---- configure.ac	2008-07-17 23:20:39 +0000
-+++ configure.ac	2008-09-03 18:35:30 +0000
-@@ -311,6 +311,19 @@
+--- configure.ac	2009-02-27 01:48:37 +0000
++++ configure.ac	2009-03-02 21:21:23 +0000
+@@ -313,6 +313,24 @@
  AC_OUTPUT([
  Makefile
  data/Makefile
 +data/icons/Makefile
 +data/icons/16x16/Makefile
 +data/icons/16x16/status/Makefile
++data/icons/16x16/actions/Makefile
 +data/icons/22x22/Makefile
 +data/icons/22x22/status/Makefile
++data/icons/22x22/actions/Makefile
 +data/icons/24x24/Makefile
 +data/icons/24x24/status/Makefile
++data/icons/24x24/actions/Makefile
 +data/icons/32x32/Makefile
 +data/icons/32x32/status/Makefile
++data/icons/32x32/actions/Makefile
 +data/icons/48x48/Makefile
 +data/icons/48x48/status/Makefile
 +data/icons/scalable/Makefile
 +data/icons/scalable/status/Makefile
++data/icons/scalable/actions/Makefile
  help/Makefile
  src/Makefile
  po/Makefile.in
@@ -39,9 +44,104 @@
 === added directory 'data/icons/16x16'
 === added file 'data/icons/16x16/Makefile.am'
 --- data/icons/16x16/Makefile.am	1970-01-01 00:00:00 +0000
-+++ data/icons/16x16/Makefile.am	2008-09-03 16:47:54 +0000
++++ data/icons/16x16/Makefile.am	2009-03-02 21:21:23 +0000
 @@ -0,0 +1,1 @@
-+SUBDIRS = status
++SUBDIRS = status actions
+
+=== added directory 'data/icons/16x16/actions'
+=== added file 'data/icons/16x16/actions/Makefile.am'
+--- data/icons/16x16/actions/Makefile.am	1970-01-01 00:00:00 +0000
++++ data/icons/16x16/actions/Makefile.am	2009-03-02 21:21:23 +0000
+@@ -0,0 +1,19 @@
++
++iconsdir = $(pkgdatadir)/icons/hicolor/16x16/actions
++
++icons_DATA =  \
++	system-shutdown.png		\
++	system-restart.png		\
++	system-log-out.png
++
++system-shutdown.png: system-shutdown.png.uuencode
++	uudecode -o system-shutdown.png $(srcdir)/system-shutdown.png.uuencode
++
++system-restart.png: system-restart.png.uuencode
++	uudecode -o system-restart.png $(srcdir)/system-restart.png.uuencode
++
++system-log-out.png: system-log-out.png.uuencode
++	uudecode -o system-log-out.png $(srcdir)/system-log-out.png.uuencode
++
++CLEANFILES = $(icons_DATA)
++
+
+=== added file 'data/icons/16x16/actions/system-log-out.png.uuencode'
+--- data/icons/16x16/actions/system-log-out.png.uuencode	1970-01-01 00:00:00 +0000
++++ data/icons/16x16/actions/system-log-out.png.uuencode	2009-03-02 21:21:23 +0000
+@@ -0,0 +1,13 @@
++begin 644 system-log-out.png.uunencode
++MB5!.1PT*&@H````-24A$4@```!`````0"`8````?\_]A````!'-"250("`@(
++M?`ADB````4Y)1$%4.(VEDT%+`D$8AI]QMPTZ="A"C=("[2)TZ"9$=1#RTO8K
++M]-`?T(1B3^%OV'Y%1K#'*,\>O&:!0M+6(0BZ;.9TJ%G4766A]S0SWS?/?._,
++M-X((.K;G#R72`1!BN'=5&MRKF!X%()'.;G$;@*;3O@.$BL6B`&8I4(%I&W)T
++M+B07((I-I^T`Z+'A_E2`:1N?^4(.3==^2Y>2[L-+[?GI36N4/4&()BM8B.D:
++M3:?M+^0+.800%=-^K4QN;I0]$;"@COGH>W.+J\870#J;()U-C.6I0P(`%;BU
++M&)AV<'VFA>^!MQ2:]:>=OJ=9%L.I@)L3WM7XZ-*H)=>7_0M-9>*TA&N!=QX`
++M3#X=P-KF"AM;27H=UP?T.NX9$`0`J$X;5:_CTGUTZT)2367BH;9\0-@E24']
++MNN2=FK91#=VM`-.:)(K^_1<B`Y3%`VO\Y7X`J]QH/P7HY"@`````245.1*Y"
++"8((`
++`
++end
+
+=== added file 'data/icons/16x16/actions/system-restart.png.uuencode'
+--- data/icons/16x16/actions/system-restart.png.uuencode	1970-01-01 00:00:00 +0000
++++ data/icons/16x16/actions/system-restart.png.uuencode	2009-03-02 21:21:23 +0000
+@@ -0,0 +1,23 @@
++begin 644 system-restart.png.uunencode
++MB5!.1PT*&@H````-24A$4@```!`````0"`8````?\_]A````!'-"250("`@(
++M?`ADB````!ET15AT4V]F='=A<F4`=W=W+FEN:W-C87!E+F]R9YON/!H```,+
++M241!5#B-;9)-:%17%,?_Y[[[,LY7)J.3S\:8$4%%TQ8UIM"0ME#H8D1*%11!
++M+,6&@CNA^G0CV,U805<EE%:$DK2E4BDEK[.HK;9JH3$BFF#4-O.:F&2::6(F
++MF8\WF7ES3Q?.@UEXX.[.^?$_OW.)F>%6-!9?3T1G`;S!S"U$M`30!+,:`/"C
++M91KEFMY3``;(!41C\7=!]+4W$)1KPT&].5(/KZ[!ME>1^G<AE_HO4P'S1Y9I
++M?!N-Q?L!?`Z@@9@9T5A\*XA&0Y%&G\?C0<BOHS421"3D123D0\"K(Y,MX$IB
++MM)#-%^_XUNB[[6*ICAEKGP/VG/O"ZP]\(#1-V+DLE%*0@BJ-ZX*%[9L[`CNV
++MM%.=KD%JA,3M"=73M4%\-GB]Y%141%17.KAJVX*=,J]K;BY$VMI/.!6U/I5>
++MWG?MUOB];\R10LXN0I<:]K_]LNAH;@```J">`YC]0I#3U[OKLM#D,H"KEFFD
++M+-/X.3E\<N?TW.*QBY>O87YQ!59J!8Y2KDMV$ZB76IL^J0]X+W2V-W4!L&IL
++M2R(Z^F;/YE)'2QA-81^D$&X"EM6^\(V!PUF\N+YDYM?OCO]3O#\Q72000(!3
++M46L`L'N%50"Z&ZOF_0K@*(#R"\#2,HT9%^"<__@]#0"48MP8G52)W\>>@OE5
++MRS0RM5-GAAZVK:SD-_PP_,M-``WN"B`")F>7X9%`XK<'!.#3VN'N_B$_$25[
++M7MDT.#4]UPU``[`J`$`((@#H;*U':V,]/CS01Z&@[_S&/>=&HK'X[BKCB$>7
++MTII*'7_T.-E+1&7+-,K2U9G-EW#S7I+?ZMY$;8TA'-K[FF]D?'K77Y.SUZ.Q
++M>)TFI001SRD%(30BHJL`(*O6Z-+WM^V9^4SR[MA4YSM]7?Y0T(N.M@CY_'Y?
++M>BF/]+,L*HXB(00R"^D"F,\"@*B*HYGYS"5K^.3VY6S^_>]^^G/I2N).;NS)
++M+.87<\C993`3G'*IDEE(VV#NMTSC(0"X5_@*P!'+-+CZ>70`>XG$,8"W,7.8
++BB-(`_F#FTY9I_.W*_1_JNEZN.T\]P0````!)14Y$KD)@@@``
++`
++end
+
+=== added file 'data/icons/16x16/actions/system-shutdown.png.uuencode'
+--- data/icons/16x16/actions/system-shutdown.png.uuencode	1970-01-01 00:00:00 +0000
++++ data/icons/16x16/actions/system-shutdown.png.uuencode	2009-03-02 21:21:23 +0000
+@@ -0,0 +1,19 @@
++begin 644 system-shutdown.png.uunencode
++MB5!.1PT*&@H````-24A$4@```!`````0"`8````?\_]A````!F)+1T0`````
++M``#Y0[M_````"7!(67,```W7```-UP%"*)MX````!W1)344'U@()$B\?C\T+
++M_@```DA)1$%4.,NMDTU+5'$4QG_G7]YQFBO59*.6O2F:DC@(+GQ9!RUFZUK&
++M")62:"/"H"!DB)$A4>!,X@<P(6IIM*M<"#9]!1.F*77T_N_,G>Z%V\([86[M
++M;,[FG.<<?N<YPK&8G9M)`@-`-Q`%=H$-8&5B/+5\O%Z.-'8"BWV]_3WQ>!=F
++MQ$1$\'T?;6NRV4T^?_FT#@Q/C*>^_2,0-*\E!X=BAF&0W\GA>BX@*!&J#(.Z
++MV@;*3IFEY4P>N%T148'08G)P*%;Z7>1[;@O/<Q$1HN>BB!(\SV4[MX7G>]Q-
++MWHL!BY4-U.S<3+*OM[\'!5I;*!$6YE\A(ERJOT+D3`W/G[Y`B;!_4"`<KJ:O
++MM[\G8(4"!N+Q+O:M/42$A?F7-#5?1^00SUGS+(6#/9[-+5`3,=DI_"(>[R(`
++MC0*ZS8B)ZWJ(".ETFI&140@$4,+C)].DTVE"H3">YV)&3((KH8"HB(#O_YV:
++MRV\?KFP5`M(JR(+O4ZF+5@1V?=]'*86(D$@DF)J<1D3Q(Y\C_S/'9&J*1"*!
++M456%4@K?]PG\@0(VM*TQC!`BPL-'8]QJ[Z"UJ9W6YC9:FMK05I',ZPRZJ#%.
++MA]"V)C`7"EC)9C>)U38@(ER[<97[8Z-8>A]M6VC;8G7U#:%J@Y)3Y$+T(MGL
++M)L`*P*D/:Q^_WFQON=/9T=D8K@Y3+CLX90>[J+%+FF+11ML6CE,B>KX6IU3B
++MW?NWZQ/CJ0='C32\M)S)XPN7ZQL)A\*'3!!$!,,(T5#7B%MV*TX<_K^_<))O
++8/''\`4UN\VOJ4U'D`````$E%3D2N0F""
++`
++end
 
 === added directory 'data/icons/16x16/status'
 === added file 'data/icons/16x16/status/Makefile.am'
@@ -158,9 +258,139 @@
 === added directory 'data/icons/22x22'
 === added file 'data/icons/22x22/Makefile.am'
 --- data/icons/22x22/Makefile.am	1970-01-01 00:00:00 +0000
-+++ data/icons/22x22/Makefile.am	2008-09-03 18:35:30 +0000
++++ data/icons/22x22/Makefile.am	2009-03-02 21:21:23 +0000
 @@ -0,0 +1,1 @@
-+SUBDIRS = status
++SUBDIRS = status actions
+
+=== added directory 'data/icons/22x22/actions'
+=== added file 'data/icons/22x22/actions/Makefile.am'
+--- data/icons/22x22/actions/Makefile.am	1970-01-01 00:00:00 +0000
++++ data/icons/22x22/actions/Makefile.am	2009-03-02 21:21:23 +0000
+@@ -0,0 +1,19 @@
++
++iconsdir = $(pkgdatadir)/icons/hicolor/22x22/actions
++
++icons_DATA =  \
++	system-shutdown.png		\
++	system-restart.png		\
++	system-log-out.png
++
++system-shutdown.png: system-shutdown.png.uuencode
++	uudecode -o system-shutdown.png $(srcdir)/system-shutdown.png.uuencode
++
++system-restart.png: system-restart.png.uuencode
++	uudecode -o system-restart.png $(srcdir)/system-restart.png.uuencode
++
++system-log-out.png: system-log-out.png.uuencode
++	uudecode -o system-log-out.png $(srcdir)/system-log-out.png.uuencode
++
++CLEANFILES = $(icons_DATA)
++
+
+=== added file 'data/icons/22x22/actions/system-log-out.png.uuencode'
+--- data/icons/22x22/actions/system-log-out.png.uuencode	1970-01-01 00:00:00 +0000
++++ data/icons/22x22/actions/system-log-out.png.uuencode	2009-03-02 21:21:23 +0000
+@@ -0,0 +1,24 @@
++begin 644 system-log-out.png.uuencode
++MB5!.1PT*&@H````-24A$4@```!8````6"`8```#$M&P[````!'-"250("`@(
++M?`ADB````UA)1$%4.(VM4UUL%%44_N[/S.[L+EEH;1=JM[2+NT"06I1""^4G
++M_C:%-BF$!!-?#+I&'_3!%Q,?W$3BF\]`)?:%2-3P5PAL2(QM+$$K%+KMTAJT
++MA9I68XT-C?LS<V?F^M"A:;>S#13/Y&1N<L[YYOO.=X=@&;'_F/:TU\O/F):H
++MXTRYG<^;!R^]FYN8WT.7`ZQIZJG-T>>WOMYRQ/-L=,M635-/%?8L"UB8>F,L
++MLH'U_?TMHC4Q)DR]\7\!5KAR_<[HH%57N@_#HT.6PI7KA3W<;;"U0]U$@"%7
++M4$4=T0W]Z/#=`2TUTE_'&;NMY^TW"OO((M`3\"F*/UU?NZ.J)ARA$A)2VI#.
++M,SXQAH&A_HPPS9O"$N]=C!MI-P*+&*M\Q?&*T)K0ZK(0_>I"YX+:SFV[$"SQ
++MX9677_/?NS?:E$JGAMS(`04[;C^I'E84?N"%Y^JU:S>Z,YRSS[OB!J&,?QH,
++MKLR4E*W";U,IC$SVH:HZO*0_"QA;-DYOC&W`X,B`-?U@^NX_X[F/VHY[FCDE
++M'S;4;_?=G[J#TA5K\%2P`E+:2^$NE-%^4CUDV?B&,W9?F-BM@`C)Y7##]FU!
++MB^60$UD$>`FN]?Z(YI:7D+S\W6*FC'Y\]DC^,]?]/(R#G8%SU=7A?155Y<J?
++MT^,(ET7PP_<_977#\+W:L@<2CJF.N8;,H#>90E?<(*[7#0#V)L"%*5IK(I7L
++MUS_26!N*XM;-=$Y8YFG&6=/5RSWKW>:H0A-`D7L,`-T)F&T=DDEF0U@F))&8
++MF9D!L<DOY][.O;644N`1_CQ+FHB$8P"SL:5QH^;Q*9^T?ZE]O;<3WB<$%NA)
++M]J$[V2=_'YO,US:N\Z\L#;2NDMY;![[0*A\;^-`)!`%("V*VD1LE4Y/3/>D;
++M8YGHYDJM,E+^#.$X7VR>`$!;ARI=*C)<4YY=&UOM?^AT(@&:"GN.@=(W&U[<
++MI/1>'31%3@]<>1]ZX?B<>4W-M6X?]>>S!ABE_P)`(@$;T-]IZU#C(``AQ`IX
++MX`66`.Y-IMPE49JEP`?%)!<+#@!=<8,Z9S;OS3#K`7&R'(!T<B[&?X870!:`
++M.;_&`:@`%">YRYG/4V8""ZX9F>A'"+.K$$Z:`&P.P'"2.`QI$<9P&`6`N=6I
++=.L-?`!X4*OD/P4\](F[NSE@`````245.1*Y"8((`
++`
++end
+
+=== added file 'data/icons/22x22/actions/system-restart.png.uuencode'
+--- data/icons/22x22/actions/system-restart.png.uuencode	1970-01-01 00:00:00 +0000
++++ data/icons/22x22/actions/system-restart.png.uuencode	2009-03-02 21:21:23 +0000
+@@ -0,0 +1,33 @@
++begin 644 system-restart.png.uuencode
++MB5!.1PT*&@H````-24A$4@```!8````6"`8```#$M&P[````!'-"250("`@(
++M?`ADB````!ET15AT4V]F='=A<F4`=W=W+FEN:W-C87!E+F]R9YON/!H```2^
++M241!5#B-M95+;%15&,?_WSGWSIU'I].6/NEKVI)""D0T&@2,,?4!6-"8"$'#
++MPA7@4B4\9*$;'@TF))I`)&AB@AM1-$"%A>$E5D-K+`D0!-IF6NE[.N^9>^?>
++M>SXW4VBI"S;>Y+^YYSN_\S_?^9\<8F;\'Y]XDB+:?$H^25W3^D/A^G5'R@"`
++M_LMQ2\?!5I#8Q43MK+@&!)V`-`@3S+BH7/=4Q63YU=[>;?;,G.8W#U0I5W0+
++M=ML'NO9%YH")0,T=G2>8L,7G#WH\?I\FI0:/1X,F`'9=6);EIE/)M)G-:R#J
++M]&=R1RP?A"N\/<S<*B0U]I_9/:3-=MK<T?FUT/1-H8I*OU(*K%SHFH!'$S!T
++M#;HF($61U&LK0D2,2&1\[Q343H!&6L(UC:-C4VDKZR@`>`ANZCBX4DKYMK\X
++M%(A/CBOEND(*B;CK,#,<GU?/EI65^*NJ%NB*@9SI8NF2!A^K6M]4-!E<T=9`
++M/W1-.I8.->?P!(D=1#*0CD6YHK*2&EN:S;*:ZN\&S^T63%QEY9W71L>F3O?=
++M^#N;C">YKC*(:-+$5"J/EG`UZ5*`"20=F@MFT%K'L6GQDM98VY*FO_)Y)P:H
++MPP`0.;<G-G!VU_6!L[NVL'+6#$1&>G[ON9VI"GE05Q%$]\T1:%)`*34?#((1
++M"H4>M#37?AGR>T^"Q%V7/;''$S/8]7&?<M5>V[(UGU?'V'0&`&!X)!S7)6G0
++MW!XS.%M:$OP\Z/.>S>>-*;;HFV!]97)^%#N7"X$S+ZYJ,TJ+`Z@L"^*%Y;7P
++MZ!)@HJPMYH+#:;/I<E6_NO3>5@4`V-8Z+]_A=0=JH(D+Q/!?[KYIJ4)49Q++
++MS![-EU3`K`O2O*%SDL%%\V@`B)&"H%>EZ[_C&-.^_ZH!`,ZS$?GYTPEF\*,<
++M,Y>\_VZ[YM$?M3UK.?C^_'4K&LM]&.G:?:/PVP*`9[<?UX%2_^IE3YL+@OG2
++M:W_VK>X?&#[.C/+'>DQD&!(_7KT/9F#]RC"Z>^[FXLGLT<CY/2<?=Z>I0)4T
++MU#'#E_HI8:J*J>G$=I+2G1E_%#<""`33=M&\,`0I"$/C,8!H^:*U^^OG[5NB
++MV'75JD0JN[6G[];.>#P>!O/`PX5G=8B$(*Q9MA#W_HGCSG`<[VQ\WG>YY][+
++M]_H?W&G:<.@+4MP+*8>*0B6:;G@_\PBWY-??>E^R;8>EIMM.7IV8!R8`@@B"
++M7:QJJT8JY^#68!3+6NMD:[C:/S@\\5$LE<DE$UF12R4#5B8)W3#@#03@DQK%
++M)\9-,LUOYSM61,.CTWSZ0F^"B<6*Q77:BK:P?S1N(F^[J*@HTX*A4)!K&:YB
++MY"P'6<M!.F-B:FPT#<?]8/#2)^9#H\P,(I+AUP_8AJZEHY&>C<G^BV.E2S>]
++M$5S0L*.QOKRVO*Q4#Q0%A*9KR.1L9$P;R;2):#2F$K%$WLU$.X>O'#X*P`1@
++M,G-^!NP-KS\8R\7N;Q[_XZM;`'P%>4M:VI\J:GANB^8M?@8D#%T*VW:59&8H
++M.W,M,])W;/IVUPT`N8*RS)R=`5/#*_O>&OIE_Q4`7@#&+.D%26F$=%_5HC([
++M,1FS$D,Q`/E"KJT"-`7`8F:>]S01D9P%FY$&0`)@`&Y!=D%Y``XSN[,Y_P)8
++3%4N3I+^9VP````!)14Y$KD)@@@``
++`
++end
+
+=== added file 'data/icons/22x22/actions/system-shutdown.png.uuencode'
+--- data/icons/22x22/actions/system-shutdown.png.uuencode	1970-01-01 00:00:00 +0000
++++ data/icons/22x22/actions/system-shutdown.png.uuencode	2009-03-02 21:21:23 +0000
+@@ -0,0 +1,33 @@
++begin 644 system-shutdown.png.uuencode
++MB5!.1PT*&@H````-24A$4@```!8````6"`8```#$M&P[````!F)+1T0`_P#_
++M`/^@O:>3````"7!(67,```W7```-UP%"*)MX````!W1)344'U@()$C`[?I3A
++ML0``!,A)1$%4.,M]E5EL$T<8Q_\[ZYWUO7%-L@Z)CU2J>DJE\(8J$:M2!:)2
++M$5!5/%1-'W!-27BI>G"H0J@M$%0)EP(!)$JACR6(2PZ5(*TH/)1#;1\`\4!L
++M)\)'2`#'=CSKW9D^8+LQ1U<:K6;TS6__^_^^;T;",Y[U`_&UC!EQQMA+AF$X
++M..<2(4102AFE]*;=KN[?NV?HT+/V2X\O]&]8M[)4*N_KB?3HJU>]ATBX!ZI=
++M!20)@G,P5L58*H7AX[]@+#TVY7:[8C]\OW_X?\'Q3V('IJ:F8CNW#R(8#"*7
++MRR&?SZ%6JS5C9%F&S^='=[`+$^,3V+1E(_Q^_Z&A?0=C<UGR7*C#X8PE=N^!
++M6;-P\]8-%(M%<,Y;E'#.4:F4D<OFX'*YL>;]-;AT^8]%"]YXO?OJE6NG6Q3W
++M;UBW,I\O'#]R^"?<O9O%O7N%)SP30CS52:?3A7`XA%A\+72]8U7#%@(`I5)Y
++MWXYO!S$Y.8E<+@?.^1-*%R]^$X00"`%P+B#$HU$JE9#-9O'UMF]0*I=_;,23
++M]0/QM3V1'KVK>SXRF7$0TJI2DJ06M;(L0Y)($RY)P.3D/00"`41"$>_Z@?C'
++M`$`8,^*K5JY&.I6:`ZQ72/\`+,MJ46Z:)OK[^YM^-_[LSITQK'AW!1@S/JN#
++MV8OA<!BE4J4>+,"YP-#002Q?_LY3O5ZV;!D.'#C8LCXS,X-@,`3&6!@`B&$8
++M3E55P3EO^B:$P/GSY]';V]N<-],E`=%H%!<N7(`0_R75-$THB@+#,&P`0#CG
++M$@0@25*+#?E\'HJBU+T$+EVZ"-.T((0`I13Y?+XEOB&L;@TAA!#!A8`LRRW*
++M=%U'M5JM5P&O6\3!.<`8@Z[K3RE%`?(H^Q*AE,XR5H73Z6@IL6@TBM'1T::J
++MAG(`&!T=130:;0$KB@+&#*@JM0`(HJKJK70Z!9?+U?+U6"R&9#*)D9$1,,8@
++M21(88Q@9&4$RF40L%FO&<\[1WMZ.\8EQ4$H+=3`=&CXQ#$W3T-:FP;*L)CR1
++M2""3R:"OKP_1:!1]?7W(9#)()!(M4,XY='T>3ITZ"688>QLM33[\Z(/<IB\W
++MM]M5.U+I-$S3!"&DF=#&^_'6YIS#LBR$0B&8IH%=W^VJ'CE\-`Q@F@"0(<2G
++M6[[:#)?'C4"G#IO-!M,T6S+=&(VY:9JHU6KH[`Q`T[S8NFTK\KG\8+-!`="_
++M__IG8N&BA<]?O7;EE:5O+X5LDR#+!.5RY0FP95FP+`NJJB(4"L+G\V''X';,
++M5F8OGQ@^N1M`"4!5!J``L-^\<>O/<"0<.7WFU`M+EO2BNVL^O%XW7"X/**6@
++ME,+A<$#3-`0"'>CN[D*Q6,07&S]'M5J]^OOHQ6V<\T*M5BLVP!(`25$4.9W*
++M7`ETZO>O7[^VX/;MVS04"D/7._"<SP>?OPT^7QL<#CL*A0*._7P,9Y-G:P8S
++MAG/9PE&/QSUN&+5"L5B<`5"3ZD>G`D#5-,VG:9KN=#H[7WWMY=5NC_LMSGF'
++M81@RYQR$$%!*N<TF/ZR49R_?GW[P6UN;+TNI,FY95F9Z>KIP[MROLP"$-.=Z
++M(@!4O]_O]7@\\^QVNR;+Q"5)Q$D(L0/"1H@,2JEP.IU5K]=3]GJ]%:_7^]#C
++B\4P">`"@NG/G(`>`?P'#CHX!#,V)=0````!)14Y$KD)@@@``
++`
++end
 
 === added directory 'data/icons/22x22/status'
 === added file 'data/icons/22x22/status/Makefile.am'
@@ -302,9 +532,141 @@
 === added directory 'data/icons/24x24'
 === added file 'data/icons/24x24/Makefile.am'
 --- data/icons/24x24/Makefile.am	1970-01-01 00:00:00 +0000
-+++ data/icons/24x24/Makefile.am	2008-09-03 18:35:30 +0000
++++ data/icons/24x24/Makefile.am	2009-03-02 21:21:23 +0000
 @@ -0,0 +1,1 @@
-+SUBDIRS = status
++SUBDIRS = status actions
+
+=== added directory 'data/icons/24x24/actions'
+=== added file 'data/icons/24x24/actions/Makefile.am'
+--- data/icons/24x24/actions/Makefile.am	1970-01-01 00:00:00 +0000
++++ data/icons/24x24/actions/Makefile.am	2009-03-02 21:21:23 +0000
+@@ -0,0 +1,19 @@
++
++iconsdir = $(pkgdatadir)/icons/hicolor/24x24/actions
++
++icons_DATA =  \
++	system-shutdown.png		\
++	system-restart.png		\
++	system-log-out.png
++
++system-shutdown.png: system-shutdown.png.uuencode
++	uudecode -o system-shutdown.png $(srcdir)/system-shutdown.png.uuencode
++
++system-restart.png: system-restart.png.uuencode
++	uudecode -o system-restart.png $(srcdir)/system-restart.png.uuencode
++
++system-log-out.png: system-log-out.png.uuencode
++	uudecode -o system-log-out.png $(srcdir)/system-log-out.png.uuencode
++
++CLEANFILES = $(icons_DATA)
++
+
+=== added file 'data/icons/24x24/actions/system-log-out.png.uuencode'
+--- data/icons/24x24/actions/system-log-out.png.uuencode	1970-01-01 00:00:00 +0000
++++ data/icons/24x24/actions/system-log-out.png.uuencode	2009-03-02 21:21:23 +0000
+@@ -0,0 +1,25 @@
++begin 644 system-log-out.png.uuencode
++MB5!.1PT*&@H````-24A$4@```!@````8"`8```#@=SWX````!F)+1T0`_P#_
++M`/^@O:>3````"7!(67,```!(````2`!&R6L^```#7$E$051(Q[U376P4910]
++MW\_,[NPN66AM%VJWM*N[0H!2E$*K%8B_3;%-"B&1Q!>#+M$'?>#%Q`<WT?CF
++M,U")?2$2-8I6`AL28AM+@`J%;KNT!FVAIL588T/C_LQ\,_/QP)1LV]FV:=`S
++MN9F9W#/WW/N=.\!_#++2#U\[JCWN]?)O34O4<:;<R.?-_6?>R4W,Y]&5"FB:
++M>G)+].GM!UL.>39'MVW7-/6D&V_%`L+4&V.1#:SO[V\0K8DQ8>J-CU1`X<JE
++MFZ.#5EWI7@R/#ED*5RZY\7BQ`JT=ZB8"#+D65]01W=`_&;XUH*5&^NLX8S?T
++MO/V&&]?5Y-;C\"F*/UU?^VQ533A")22DM"&=:WQB#`-#_1EAFM>$)=[],6ZD
++MBS7J.H'*5QVK"*T+K2T+T2]_Z)R3>V['\PB6^/#R2Z_Z;]\>;4JE4T-89!L7
++M>-!^0GU=4?B^9[;6:Q>O=F<X9Y]UQ0U"&?\X&%R=*2E;@]^G4AB9[$-5=7A)
++M#Q=,8-DXM3&V`8,C`];TO>E;_XSG/F@[YFGFE!QIJ-_INS-U$Z6KUN&Q8`6D
++MM)>JOW"T]A/J`<O&UYRQ.\+$+@5$2"Z'&W;N"%HLAYS((L!+<+'W,II;7D3R
++M[(6%73/ZX7>'\I\6-;D0^SL#IZNKPWLKJLJ5/Z?'$2Z+X.>?KF1UP_"]TK(;
++M$H[YSA(8,H/>9`I=<8,4-7D6>Q+@PA2M-9%*]MO=--:'HKA^+9T3EGF*<=9T
++M_FS/4Z[&*C2QZ!;-HCL!LZU#,LEL",N$)!(S,S,@-OGU]-NYMY8T`,O\DRUI
++M(A*.`<S&ML:-FL>G?-3^A?;5GDYX'Y&`0$^R#]W)/OG'V&2^MO$)_^K20.L:
++MZ;V^[W.M<L4"!XXC"$!:$`_(W"B9FISN25\=RT2W5&J5D?(G"<?WB]5XN$5M
++M':ITR<IP37EV?6RM?W8S$@G05-AS%)2^V?#")J7W_*`I<GK@W'O0W03FF-S4
++M7.O6@#^?-<`H_1<`$@G8@'ZXK4.-@P"$$"O@@1=8AD!O,N4^)J59"KR_'+^*
++M"G3%#>J\LX([<WPB3I0#D$X\Q/@O\`+(`C#GYV8%5`"*$]SEF1=P36#.>I*)
++M?H2<(Q).F`#L0@'#">)T3(M,`*?#0,&1JCK#7P#NS>_^?\%]934](M%OTA``
+++````245.1*Y"8((`
++`
++end
+
+=== added file 'data/icons/24x24/actions/system-restart.png.uuencode'
+--- data/icons/24x24/actions/system-restart.png.uuencode	1970-01-01 00:00:00 +0000
++++ data/icons/24x24/actions/system-restart.png.uuencode	2009-03-02 21:21:23 +0000
+@@ -0,0 +1,33 @@
++begin 644 system-restart.png.uuencode
++MB5!.1PT*&@H````-24A$4@```!@````8"`8```#@=SWX````!F)+1T0`_P#_
++M`/^@O:>3````"7!(67,```!(````2`!&R6L^```$KDE$051(Q^536VQ4511=
++M^]Q[Y\Y,.YVVT$Y+2SMM32$5(FH,`L:8^D!HU)B(0:,?_HA^JD1H,(9$>04C
++MB282#)J8P`\J&J&5#S45L1I:0DF`5`I]2I_3>;_NW'O.]L,ITI9)_/+'G:SD
++MW)MS]EIGK;.!_T]M.:']FVW!)_<%:S=^6#[W384V-F[>VPP2;S-1*RNN!L$@
++M(`G"-#-^4E)^63&S].R%"]OLN3,-3^\)*"FZ!<O6H<YW1@H0,#6V'3C*A*T>
++MK\_E\GIT3=/A<NG0!<!2PK(LF4S$D]ET3@?1`6\J<\CR0$CA[F'F9J%1_>"I
++MG:,`H"]2WG;@<Z$;6_P5E5ZE%%A)&+J`2Q<P#1V&+J")8LVHJ?`3,49&IMI#
++M4-L!&F\*5M=/3(:25MI1<_WF$00W[UU+@I[SEOB+HC-32DDI-*$A*AUFAN-Q
++M&^GR\E)O(+#$4`QDLA)WKZSSL*KQA&;COC4M=?1UQXQC&;A%(&XG$"1>(]**
++MDI%9KJBLI/JFQFQY==6)X8Z=@HD#5LYY8F(R=++OTA_I>#3.M94^S,:S""5R
++M:`I6D:$),($TA^Y,P*"-CF/3BI7-D9:5#1=S.2<"J(,`,-K1'ADZO>/\T.D=
++M6UDY&P9'QGM^Z[F:"OA=J*WPH?OR.'1-0"E5F``$T^_WWVQJK#GB][J/@<0U
++MR:[(PIR&.W?U*:G:;<O6/6X#D^$4`,!T:7"D),VD.V?`X'19J>\CG\=]*I<S
++M0VS1%[[EE?'%3WC_:B;^[N%U+69921$JRWUX:'4-7(8&,%':%@5"3F8;N@(W
++M5-<K+RL4J/J->ZHE\1EB>+NZ+UN*^6]QG!?)[-(]\5OGY\U!0]O^&087WZDQ
++M,1(0]+@FO?V.&?84$L`Y-D<Z=T\#Q(OG@+GT]1=;=9?Q3S1IR\%7WY^W9B.9
++M-T<[=U[*_[8`X/Y7CQA`F7?]JGNS2WRYLG,7^M;?&!S[%*"E!3(@,DT-WYR]
++M#F9@T]H@NGNN9:+Q]">C9]J/+52KJZ*`9JK#IB?Q;2RK*D+AV#;2-#GOZ<\C
++M((!`R-H2C<O\T`1A="H"$*UN>N+]Y8O\T%`BI5H72Z1?ZNF[LCT:C0;!/#A/
++MQ`('20C"AE7+,/!G%/UC4;SPU(.>KIZ!1P=NW.P/MNW[F!3W0M-&B_VENFW+
++M#UQ"EO[R:^\CMNVPIANVDU-'"Q(0`$$$P1+K6JJ0R#BX,C2+5<VU6G.PRCLT
++M-OU6))'*Q&-ID4G$BZQ4'(9IPEU4!(^F4W1Z*DO9[/'"-U!$8Q-A/GFF-\;$
++M8LV*6GU-2]`[$<TB9TM45)3K/K_?QS4,J1@9RT':<I!,91&:G$C"D6\,=^W.
++MSG?QMG5I<^N[`\-3R>A8[S.AB\</A;*^B?Z16)-T<EY#"&&Z#/*X#4C)L&R)
++M5-I">#:LPC,A2R9G#X[\^-[Q?$\&(!?.@3NX:5\D$[G^_-3OGUT!X,G#7=K4
++M>D]QW0-;=7?)?2!A&IJP;:DT9H:R4^=2XWV'PU<[+@'(Y)'.8QX!U3VVZ]G1
++M'_;\#,`-P+P-1AZ:9OH-3^"N<CLV$[%BHQ$`N?Q<6/GFB?R:%Q(LM,Y8`'W!
++M]24`.X\<`&?.EO^T_@+8L3&R"+8"00```!ET15AT4V]F='=A<F4`=W=W+FEN
++::W-C87!E+F]R9YON/!H`````245.1*Y"8((`
++`
++end
+
+=== added file 'data/icons/24x24/actions/system-shutdown.png.uuencode'
+--- data/icons/24x24/actions/system-shutdown.png.uuencode	1970-01-01 00:00:00 +0000
++++ data/icons/24x24/actions/system-shutdown.png.uuencode	2009-03-02 21:21:23 +0000
+@@ -0,0 +1,34 @@
++begin 644 system-shutdown.png.uuencode
++MB5!.1PT*&@H````-24A$4@```!@````8"`8```#@=SWX````!F)+1T0`_P#_
++M`/^@O:>3````"7!(67,```W7```-UP%"*)MX````!W1)344'U@()$C$.,3P4
++MTP``!-A)1$%42,>]E%ML%%48Q_]S9O?,WJ?KTLZ6=B\U,5X3$=Z("=V8&`@F
++M$L`8'HSU@;5(X<5XX1)#B`J4F+`B4"!!!!^E!)!L,8'5(#S()>H#$!YH=]NP
++ME]("V]WMGMF9<WQ@=^F4QNB#3G)FYLR<<W[?]__^^8#_^)+^[N?Z#;UK&=-[
++M&6//Z;KNY)Q+A!!!*664TIL.AW)@W]Z!P_\:T+=QW<I2J;R_*]JEK5[U%J*1
++M+B@.!9`D",[!6!7#(R,8//$#AM/#$QZ/._[-UP<&_Q&@]X/XP8F)B?BN'?T(
++MA4+(Y7+(YW.HU6K--;(LP^\/H#/4@;'1,6S>N@F!0.#PP/Y#\=GGR;,/=SI=
++M\<2>O3!J)F[>NH%BL0C.N643YQR52AFY;`YNMP=KWEZ#2Y=_7;3@E9<[KUZY
++M=F;.#/HVKEN9SQ=.'#WR'>[>S>+>O<(3Z0HAYA3!Y7(C$@DCWKL6FM:V:J9<
++MI/%2*I7W[_RR'^/CX\CE<N"</Q'YXL6O@A`"(0#.!81X-$JE$K+9+#[?_@5*
++MY?*W,_>0AENZHEU:1^=\9#*C(,0:M21)ENAE688DD29$DH#Q\7L(!H.(AJ.^
++M]1MZW[<`&--[5ZU<C?3(R(R#Z]+U;8!IFI9,#,-`7U]?LQZ-3._<&<:*-U>`
++M,?VC60#V;"020:E4J6\2X%Q@8.`0EB]_8\Y:+%NV#`</'K)\GYJ:0B@4!F,L
++M8@'HNNY2%`6<\Z:N0@B</W\>W=W=S7FSK!(0B\5PX<(%"/&X^(9AP&ZW0]=U
++MFP7`.9<@`$F2+/+D\WG8[?:ZUL"E2Q=A&":$$*"4(I_/6]8W`JQ+1A[?"!%<
++M",BR;(E4TS14J]6Z:WA=.@[.`<88-$V;P\("Y)%+I":`4CK-6!4NE]-BS5@L
++MAE0JU8RRD0D`I%(IQ&(Q"\!NMX,Q'8I"30"B"5`4Y58Z/0*WVVV))AZ/(YE,
++M8FAH"(PQ2)($QAB&AH:03"81C\>;ZSGG:&UMQ>C8*"BEA5D`.C!X<A"JJJ*E
++M185IFDU((I%`)I-!3T\/8K$8>GIZD,EDD$@D+(=SSJ%I\W#Z]"DP7=\WNU60
++M=]][)[?YTRVM#L6!D70:AF&`$-(L?.,YNV5PSF&:)L+A,`Q#Q^ZO=E>/'CD6
++M`3`)P"#-IB?$AUL_VP*WUX-@NP:;S0;#,"S.:(S&W#`,U&HUM+<'H:H^;-N^
++M#?E<OG]F(VUT4_K'[W^.+5RT\.FKUZZ\L/3UI9!M$F29H%RN/`$P31.F:4)1
++M%(3#(?C]?NSLWX'IRO3EDX.G]@`H`:@",!L`.P#'S1NW?HM$(]$S/YY^9LF2
++M;G1VS(?/YX';[06E%)12.)U.J*J*8+`-G9T=*!:+^&33QZA6JU=_25W<SCDO
++MU&JU8AW`Y1FUD.QVNYP>R5P)MFOWKU^_MN#V[=LT'(Y`T]KPE-\/?Z`%?G\+
++MG$X'"H4"CG]_'&>39VLZTP=SV<(QK]<SJNNU0K%8G`)0LQ2YGH6BJJI?557-
++MY7*UO_C2\ZL]7L]KG/,V7==ESCD((:"4<IM-?E@I3U^^/_G@YY86?Y92^ZAI
++MFIG)R<G"N7,_33=L*LUV$P`E$`CXO%[O/(?#H<HR<4L2<1%"'("P$2*#4BI<
++M+E?5Y_.6?3Y?Q>?S/?1ZO>,`'@"H[MK5S_%_77\!_8R0^)=IAAH`````245.
++%1*Y"8((`
++`
++end
 
 === added directory 'data/icons/24x24/status'
 === added file 'data/icons/24x24/status/Makefile.am'
@@ -450,9 +812,129 @@
 === added directory 'data/icons/32x32'
 === added file 'data/icons/32x32/Makefile.am'
 --- data/icons/32x32/Makefile.am	1970-01-01 00:00:00 +0000
-+++ data/icons/32x32/Makefile.am	2008-09-03 18:35:30 +0000
++++ data/icons/32x32/Makefile.am	2009-03-02 21:21:23 +0000
 @@ -0,0 +1,1 @@
-+SUBDIRS = status
++SUBDIRS = status actions
+
+=== added directory 'data/icons/32x32/actions'
+=== added file 'data/icons/32x32/actions/Makefile.am'
+--- data/icons/32x32/actions/Makefile.am	1970-01-01 00:00:00 +0000
++++ data/icons/32x32/actions/Makefile.am	2009-03-02 21:21:23 +0000
+@@ -0,0 +1,15 @@
++
++iconsdir = $(pkgdatadir)/icons/hicolor/32x32/actions
++
++icons_DATA =  \
++	system-restart.png		\
++	system-log-out.png
++
++system-restart.png: system-restart.png.uuencode
++	uudecode -o system-restart.png $(srcdir)/system-restart.png.uuencode
++
++system-log-out.png: system-log-out.png.uuencode
++	uudecode -o system-log-out.png $(srcdir)/system-log-out.png.uuencode
++
++CLEANFILES = $(icons_DATA)
++
+
+=== added file 'data/icons/32x32/actions/system-log-out.png.uuencode'
+--- data/icons/32x32/actions/system-log-out.png.uuencode	1970-01-01 00:00:00 +0000
++++ data/icons/32x32/actions/system-log-out.png.uuencode	2009-03-02 21:21:23 +0000
+@@ -0,0 +1,35 @@
++begin 644 system-log-out.png.uuencode
++MB5!.1PT*&@H````-24A$4@```"`````@"`8```!S>GKT````!'-"250("`@(
++M?`ADB```!3%)1$%46(7%E^]O4U48Q[_G_NQ=VXV6S0U&QN\)"`.5`0'!:1AA
++M(-L(Q*"``28D^LI7O#":\!_XRJ"4(29F-2'(^*%D($(B"&/@0+8289/1T3'7
++MT4%I>WMO>\_QQ6ZAZ]K1#8A/\N2<>^_SXW.>\YR<%OB?A;SH@.M<EJD\!S<H
++M+6,$E!!REA'NTZ,[U.Z7#E"[US*%LW`=;\^OYDN+RV#0&#SWKN!2VZ\!%N5G
++M'_DDU)?JP[U(`"*S,\L6O,/G%^7B?/]^_!$X"'N>@OESWG!`BGV=SN>%`E#&
++MIDZ>6(JV@5.(&B%H1AAWPA=15#B1,,8J7SH``*C&`!CHDV?&*")L(*.]D$W0
++M]USR&IZP'QB%(ZT!@??83GTR1\B=6[YKTPH*IJ`OU`D`4*1\>'LZ&"'D='K7
++M9\AZES1;$.26#:NV6BVB+:W-3^>^5Q\%!A82QD6(!1TS9I7PSE=LH(S"W_L0
++M=V_W!A`5TC;AB`#KOD4.S\MM*Y=73;'9;<2G71_RG6<B\L69T%6#-IT_?I/&
++MM$7@+(4\!S>CM`Q9',,1MX`7+/M?FS5O4D%>,>E4+^!&<U<\$M2>^"QY<RF,
++M`AVY-B=7/F]QZ96_FILII9L;Z_0E(\5-EHQ-6/.-N-WI&%^[8/I2\9[6"F]G
++MKQZ-Q`X?VZ43'MCB=#HC,XK+T!NYC;;`:4R;-%M<O:)FKB//<6E]O=1<NU_9
++MG0U`VBVHV`-A7(G4MW'5-D<0/G3U>]BMJSU>(Z[-X7EQKB@I9VO>W933I]V"
++M+^PQ`W$HL;^.(F4FM%@4ATX>Q+%=^C-[+&,%B,'994%!)!Y$YY^]$4)9%:.*
++M@W#\+Y5OK<T)&7[XPAXPQL`8@R3(&#"Z<#UP%'9Y7#:+SPQP;@_BX,GNAI]=
++MVH4S+2$]3C?%J7Z7%VG3LO(*ARQ)Z'AX$8PQ@`&28($D6/'WU1XHLCWKY,`(
++M37ADA_I5Q7?8>VX;-`!8?T`^/&=6V<SB_*G<=?\)&,P``/"<"*MLQ\U6GQIZ
++MI"H@!`R`),JHW@>6'),1,(Z1JJ.[M*;$NZPNHYIZR^?%A<5?5"Q<J]P(-"&D
++M!0``',<ASSH>W1W]4;\O>(@:=.NBE:_"1B>@Q%X&0H866-<UN)OV/FBLT_.?
++M68$APNB7E>4;+)Z'OR&D!<`80,##82V$_]]^P]\3;!?MT8]C07EU3(L5A.3[
++M\(3O#PL34^FP=UD!,`H+"/`XUH=QMO'0=!6YPD3D8@(NM]_D8X)>U?@^]'7U
++MV-+Z^S]-F>)PA/0Q1CX:-4!"K$HN/"W=*%U0!%[@8)?RD:-8]6@4*P'=?;Q.
++M.X51_L88U6U("$$XJ*+]LE=]'.N'2AY@;<5&2<FQUM>ZI`]&$VM,``F):T:=
++MY[)7O1=J@XH`UBS?J(P58G0`YJ%JW*F[AT"000C+&""&]$#U/HFE,Y)$&4CY
++MTKA3=]>Z)+2W>.M1#F62;2YJ5GRHN$^Z&@"XQP0``-MK/QN6#`"Z'ET#^/00
++M-RYU-TRO7`R_<3O;O)D!HL9C=$;.#[?D@4@X"HXC_E2(ZGUHL`M%\$9;GQ_`
++M?;P^HS'A\(`QLGG46;(%2+D^"9Z>:9*B$M*>]R=[QYL/+/5#)@!B.G'FG$N9
++M)X_)8)G$!H":B9/'9&4)`&Z,R@,034T5)X`H``U`W$R86D4*@`HIA,D)4E>=
++MF`.#6Y!C+D`&@"@-)A?:GK2XL`F26@DD*@`\W:_AU]70/DB,/(`8`-U4_'CB
++M0+)/"(!J:MBT32O/^^>4P^`6""84`6!@L.PQ<SZB_`<1[R;%,!+MK0````!)
++'14Y$KD)@@@``
++`
++end
+
+=== added file 'data/icons/32x32/actions/system-restart.png.uuencode'
+--- data/icons/32x32/actions/system-restart.png.uuencode	1970-01-01 00:00:00 +0000
++++ data/icons/32x32/actions/system-restart.png.uuencode	2009-03-02 21:21:23 +0000
+@@ -0,0 +1,54 @@
++begin 644 system-restart.png.uuencode
++MB5!.1PT*&@H````-24A$4@```"`````@"`8```!S>GKT````!'-"250("`@(
++M?`ADB```"*Q)1$%46(7%EVMP5=45Q_]K/\ZY]]Q[\^0A""8$`D3EX8,BMF*L
++MMD`4=*K.:)WIM'6F3G7:?K!*83J6&6<*4:?M=*;UT6J_5-MB1ZME0FD5D58*
++MI#X0"123YH9`("'DAMS7>>Q'/]PDW$0J^*EK9LT^'_;9_]]>9ZV]]@'^3[9@
++M76L*`,2G39JWIG66X?9.@-U,#(NLL95@Q&`M(U!`C(:)Z(A2:A\I[&+DM7=N
++M_VYP(?'ZEB<N"91^$\`5=+X)<V[;LH2(?FXMKDVFDI1(IN(Q+X&DYX(+`5=R
++M<,X`'4)%"KE\00T.G,EG1K(.8_P?41`^9XOAMO2N3?[DM6>O:YT9([8WBM3L
++M=-L&^@1`_:VMZXGP6%5-3:RBJIIQSL$X`V<,;,PY@\,97(<CYG)XKD`BQA&3
++MA)/]9W"TJR][O"]C#<S31M//TFV/G@*`^M6;ZYV8V--RTY)I?]KQ+O\$0,.M
++MK5NX$`]-F3DC*:4#QDK"7#!PSB%Y"8`807`.P0F.9'`$AQ0,KL-0Z4E4>!)&
++M1?C@4$^P_T"7,1:_U,9N%8)MNV_M\IKY<V?PC4_\$>FV#32>`W6KMMS*!']P
++MRHR922$$B`AA$$"%`8Q6QH)("J)X+(9DTD-5305BK@01P1+`&(&(X$<&.J^0
++MB`FL7-'D-J]8@+?W'7GHG?;.A[]YY_6F;O9TIHT9WW0)X.ZMG/OIIZNG3DLQ
++MSI$_.V)'AC,`9S:52!(X@]::BJ'N&1[)DSI^XH11>DEE*AG-;;BTHG'.)22E
++M1*@-&"-P1M`6.%M02,0XUMZ\-';7JJ4HAL2Z3_N8624G`M05.F]WXHE*(27.
++MG#H9&:OYW'ES"I=,K\U$2D6=O0,I%_2YO<_<FQY[L;EYD^C6=F7VH\Y'/OCP
++M:/.5377LVL5SG%C,@1\9,"(P1M`&R.05',&1R4<(E`$Q3`3@3'[5C7L50P,#
++M`1<<RY8N[G!=.4)$Q1/]0Y=9@]:]SYT3!X!=NS8I`#L![)RWIG76P</'OM=Q
++MI/?;-RQ?X%YW58,(-2$T=C0B#($R")2!'VK`GDL]!@#6FA4J##4`MNS:Q6\D
++MO=A!5XK#KB,/YWT_3H0]YRO7,>O<OOYXUY\??<1$9N'N_4???.:EM_*YD2RF
++MI9S1ZB$$D4$0&92RR4X$@#'3\MDL:Y@S^^]5B=C[SJBXZ_`.%=GIVN+C3P,H
++M!_GXM>^O'LSD7WI^ZVX(9L`YP1B+0%D$JI1\K*SX!`!80+@Q]]C"QKH_<,YR
++M("IR0H$1%81DKX:*1Q<#``!U:S9_T7/E?=_YVDV(+`,CP`\-PJCDI6HY-W^\
++M#..NV!%SV2%!5+","L**(H0H2(,GW3!_P>,5`.I;?KS<=<3KW[KG!B]5D4`^
++M,'`$']_]6.!I<@0(;)OKQ)YU`WT8\Z\)-]U$JFS=P8L1;VC9LHAS]K=OW'U#
++M8M:,:DA.J$T*&&N1<$O/@`5G!%86@?/V@L]J<U=MGJ?YQ>5)N8T?Q?4MFZTC
++M.0#`6HM(F4]]$0"X1F/7C@V=GU5TLHWGP.,/?P61MM#&`B#$'8+G<#`BA$HA
++MTA;=O4/XU>]WY;2RUW?M^,%G%M_TEA4X^J[3MN]?C0.G,D^DVS:L&@<P%CAP
++M+`]M+#R7HR8A4)V0")5&7!*&AL[B^:UO%R*E;TFW;3QX(;'FK_\FIIV*R[]P
++MR^)>UP_C@=:>/G8@KESNF<#<"^#+$R)@[;G#P14,CF`PUL)S&'+9')[^W>ZB
++M'^BU/=LW[KNH[7H)$9E@O2D4?U$T)JXMO#"RGE$JD?/#EK%IXP!*6UAKX0H&
++M5Q)<R6",A2N!QU]X`V&D7^[9OF'G18D#&"[DA93RCBB(=@*(:VT\2_`ZNT\L
++M]X.@#BA5Y7A;,*,1<"6#*UBIHQF+T``/W-N,Z5,J[II_^U,[ZU=OKK\8`"EE
++M(Q>\/U2Z*0BCIC!232/YPM*N[IX;DXF4)<X&)@!8,`A&<`7!%:7=:V-P.AO!
++M]1*X_YZ5WHTK%JZ4CC@T;]V3/[T0B"7V>2_F%H(P:O)#=7FNX"_:W_[1+62M
++M$:[#&6$?,.%2:N$ZO!0!R1`J#6,LC+'(*8TH;S!_WBQ>=^E4[_V.G@</=*0?
++M:+S]R7<BI9]*>/Y;AU[>%(ZM=-7]+]8QAHW3:E.Y,(R:^OH':]+I8W%.7%=/
++MFRXS@Z?/&F5?'`=@1)'21KJ"84:5"T]:^$I@*&?@AZ72U-HB$RA82[AB88.S
++MH/$R='7WW_QQU_%EPR/D-*Y[ZB/ANK.8D%H'^5E6D3ER)#LEE\M96$L5E=6(
++MIU(R#`.$13];5_!?Z1Z/`)$6!%D_Q45/[RGS[$N[V8IK&OSFZYIBE7&!3#Z"
++M/QJ-4!ED(P5M#&JGUE+MU-K*HA]B:#B[;&2D@*+O0RD#6"+F.C0]54'"<6",
++M@8H4,@/]60;SX.A]XMPGX(QPM*M/O_C:WN%BMN_./?N#.]H_['G@FD7U[.HK
++MY[C521<C>8-0`<98*&41*HTH,HB4`7/BJ*R)(V4T(FV@M2:M#+0Q)7$58?!D
++M7]Y$T:__T[9AV[@N`%3/_](/O9ADK_[UO3.9]+NK!]I?.#;<M:M=Y49>&2Q*
++M\\&14TW'3PXJ1TA94Q6'%!S66"A3.K:5MJ535!MH71(TQL(:"V,,1H8SYDQ_
++MOZ^"[$_2?WEL<UGR&P+`ZELV:\Y99BB]Y\;,P=<&`3AE+D6\.EG=M&9EQ=2Y
++MMY&3N+HBY:EI4VMCB5222RE!W($R%F&DH91"OA#`+^21RV7]_$@6UD0'"GT'
++M?S1P8.N'`"(`X9@3`*IO^7%'_E3'VM/O_78(@!P3/L\HA4C$DG.OO]RK;ECB
++M5$Q9P(5WF26J`$A8`&2A0"9KHNAH5!S:>[:W?4<N_<_>,N$)(P&E'\5_O[[>
++M'Q,I<U$VBM%/-N:$<^W<CKHN<S7J4=DXV<]['Z`R`#Y)F$T2GPPP!F$F@>@R
++KT7--YW\`G,^H3)A=`,"4@=A/K#3)_@M0@$4\&EPK50````!)14Y$KD)@@@``
++`
++end
 
 === added directory 'data/icons/32x32/status'
 === added file 'data/icons/32x32/status/Makefile.am'
@@ -859,9 +1341,966 @@
 === added directory 'data/icons/scalable'
 === added file 'data/icons/scalable/Makefile.am'
 --- data/icons/scalable/Makefile.am	1970-01-01 00:00:00 +0000
-+++ data/icons/scalable/Makefile.am	2008-09-03 18:35:30 +0000
++++ data/icons/scalable/Makefile.am	2009-03-02 21:21:23 +0000
 @@ -0,0 +1,1 @@
-+SUBDIRS = status
++SUBDIRS = status actions
+
+=== added directory 'data/icons/scalable/actions'
+=== added file 'data/icons/scalable/actions/Makefile.am'
+--- data/icons/scalable/actions/Makefile.am	1970-01-01 00:00:00 +0000
++++ data/icons/scalable/actions/Makefile.am	2009-03-02 21:21:23 +0000
+@@ -0,0 +1,8 @@
++
++iconsdir = $(pkgdatadir)/icons/hicolor/scalable/actions
++
++icons_DATA =  \
++	system-restart.svg \
++	system-log-out.svg \
++	system-shutdown.svg
++
+
+=== added file 'data/icons/scalable/actions/system-log-out.svg'
+--- data/icons/scalable/actions/system-log-out.svg	1970-01-01 00:00:00 +0000
++++ data/icons/scalable/actions/system-log-out.svg	2009-03-02 21:21:23 +0000
+@@ -0,0 +1,284 @@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<!-- Created with Inkscape (http://www.inkscape.org/) -->
++<svg
++   xmlns:dc="http://purl.org/dc/elements/1.1/"
++   xmlns:cc="http://web.resource.org/cc/"
++   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++   xmlns:svg="http://www.w3.org/2000/svg"
++   xmlns="http://www.w3.org/2000/svg"
++   xmlns:xlink="http://www.w3.org/1999/xlink"
++   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
++   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
++   width="48"
++   height="48"
++   id="svg5157"
++   sodipodi:version="0.32"
++   inkscape:version="0.45"
++   version="1.0"
++   sodipodi:docname="system-log-out.svg"
++   sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/actions"
++   inkscape:output_extension="org.inkscape.output.svg.inkscape">
++  <defs
++     id="defs5159">
++    <linearGradient
++       inkscape:collect="always"
++       id="linearGradient7130">
++      <stop
++         style="stop-color:#4e9a06;stop-opacity:1"
++         offset="0"
++         id="stop7132" />
++      <stop
++         style="stop-color:#73d216;stop-opacity:1"
++         offset="1"
++         id="stop7134" />
++    </linearGradient>
++    <linearGradient
++       id="linearGradient7121">
++      <stop
++         style="stop-color:#ffffff;stop-opacity:1;"
++         offset="0"
++         id="stop7123" />
++      <stop
++         style="stop-color:#8ae234;stop-opacity:1"
++         offset="1"
++         id="stop7125" />
++    </linearGradient>
++    <linearGradient
++       id="linearGradient6998"
++       inkscape:collect="always">
++      <stop
++         id="stop7000"
++         offset="0"
++         style="stop-color:#000000;stop-opacity:1;" />
++      <stop
++         id="stop7002"
++         offset="1"
++         style="stop-color:#000000;stop-opacity:0;" />
++    </linearGradient>
++    <linearGradient
++       inkscape:collect="always"
++       xlink:href="#linearGradient7130"
++       id="linearGradient7145"
++       gradientUnits="userSpaceOnUse"
++       x1="11.5"
++       y1="68.75"
++       x2="-13.247213"
++       y2="21.843145" />
++    <linearGradient
++       inkscape:collect="always"
++       xlink:href="#linearGradient7121"
++       id="linearGradient7147"
++       gradientUnits="userSpaceOnUse"
++       x1="-33.040741"
++       y1="10.966461"
++       x2="-30.919424"
++       y2="17.448257" />
++    <radialGradient
++       inkscape:collect="always"
++       xlink:href="#linearGradient6998"
++       id="radialGradient7161"
++       gradientUnits="userSpaceOnUse"
++       gradientTransform="matrix(1,0,0,0.3222749,0,20.728756)"
++       cx="19.688505"
++       cy="30.585787"
++       fx="19.688505"
++       fy="30.585787"
++       r="4.6624851" />
++    <radialGradient
++       inkscape:collect="always"
++       xlink:href="#linearGradient6998"
++       id="radialGradient7163"
++       gradientUnits="userSpaceOnUse"
++       gradientTransform="matrix(1,0,0,0.3222749,0,20.728756)"
++       cx="19.688505"
++       cy="30.585787"
++       fx="19.688505"
++       fy="30.585787"
++       r="4.6624851" />
++  </defs>
++  <sodipodi:namedview
++     id="base"
++     pagecolor="#ffffff"
++     bordercolor="#666666"
++     borderopacity="1.0"
++     gridtolerance="10000"
++     guidetolerance="10"
++     objecttolerance="10"
++     inkscape:pageopacity="0.0"
++     inkscape:pageshadow="2"
++     inkscape:zoom="1"
++     inkscape:cx="197.95843"
++     inkscape:cy="28.49025"
++     inkscape:document-units="px"
++     inkscape:current-layer="layer2"
++     width="48px"
++     height="48px"
++     inkscape:window-width="872"
++     inkscape:window-height="624"
++     inkscape:window-x="684"
++     inkscape:window-y="208"
++     showborder="false"
++     inkscape:showpageshadow="false"
++     showgrid="false"
++     showguides="true"
++     inkscape:guide-bbox="true"
++     gridspacingx="0.5px"
++     gridspacingy="0.5px"
++     gridempspacing="2"
++     inkscape:grid-points="true" />
++  <metadata
++     id="metadata5162">
++    <rdf:RDF>
++      <cc:Work
++         rdf:about="">
++        <dc:format>image/svg+xml</dc:format>
++        <dc:type
++           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
++        <dc:title>System-log-out</dc:title>
++        <dc:date>2007-08-27</dc:date>
++        <dc:creator>
++          <cc:Agent>
++            <dc:title>Lapo Calamandrei</dc:title>
++          </cc:Agent>
++        </dc:creator>
++        <dc:source />
++        <cc:license
++           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
++        <dc:contributor>
++          <cc:Agent>
++            <dc:title>Kalle Persson</dc:title>
++          </cc:Agent>
++        </dc:contributor>
++        <dc:subject>
++          <rdf:Bag>
++            <rdf:li>logout</rdf:li>
++            <rdf:li>exit</rdf:li>
++            <rdf:li>man</rdf:li>
++            <rdf:li>sign</rdf:li>
++            <rdf:li>running</rdf:li>
++          </rdf:Bag>
++        </dc:subject>
++      </cc:Work>
++      <cc:License
++         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
++        <cc:permits
++           rdf:resource="http://web.resource.org/cc/Reproduction" />
++        <cc:permits
++           rdf:resource="http://web.resource.org/cc/Distribution" />
++        <cc:requires
++           rdf:resource="http://web.resource.org/cc/Notice" />
++        <cc:permits
++           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
++        <cc:requires
++           rdf:resource="http://web.resource.org/cc/ShareAlike" />
++        <cc:requires
++           rdf:resource="http://web.resource.org/cc/SourceCode" />
++      </cc:License>
++    </rdf:RDF>
++  </metadata>
++  <g
++     inkscape:label="shadow"
++     inkscape:groupmode="layer"
++     id="layer1"
++     style="display:inline">
++    <g
++       id="g6227"
++       transform="matrix(0.6759778,0,0,0.8422279,-72.059226,25.879981)"
++       style="opacity:0.33000004" />
++    <g
++       id="g7008"
++       style="opacity:0.5"
++       transform="matrix(1.2209709,0,0,1.465165,4.32932,-3.7089664)">
++      <path
++         transform="matrix(1.356682,0,0,1.1785115,-7.0105312,-5.8165354)"
++         d="M 24.35099 30.585787 A 4.6624851 1.5026019 0 1 1  15.02602,30.585787 A 4.6624851 1.5026019 0 1 1  24.35099 30.585787 z"
++         sodipodi:ry="1.5026019"
++         sodipodi:rx="4.6624851"
++         sodipodi:cy="30.585787"
++         sodipodi:cx="19.688505"
++         id="path6984"
++         style="opacity:0.5;fill:url(#radialGradient7161);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.69999992;stroke-opacity:1"
++         sodipodi:type="arc" />
++      <path
++         transform="matrix(3.7061179,0,0,1.3310245,-58.247641,-11.710432)"
++         d="M 24.35099 30.585787 A 4.6624851 1.5026019 0 1 1  15.02602,30.585787 A 4.6624851 1.5026019 0 1 1  24.35099 30.585787 z"
++         sodipodi:ry="1.5026019"
++         sodipodi:rx="4.6624851"
++         sodipodi:cy="30.585787"
++         sodipodi:cx="19.688505"
++         id="path6986"
++         style="opacity:0.25;fill:url(#radialGradient7163);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.69999992;stroke-opacity:1"
++         sodipodi:type="arc" />
++    </g>
++  </g>
++  <g
++     inkscape:groupmode="layer"
++     id="layer2"
++     inkscape:label="omino">
++    <g
++       id="g7138"
++       transform="translate(40,0)">
++      <g
++         id="g7094">
++        <path
++           id="path5955"
++           d="M -7.5,5.5 C -9.708,5.5 -11.5,7.292 -11.5,9.5 C -11.5,11.708 -9.7080001,13.5 -7.5,13.5 C -5.292,13.5 -3.5000001,11.708 -3.5,9.5 C -3.5,7.292 -5.2920001,5.5 -7.5,5.5 z M -20.6875,11.5 C -21.228728,11.552698 -21.725172,11.823486 -22.0625,12.25 L -26.0625,17.25 C -26.752856,18.112945 -26.612945,19.372144 -25.75,20.0625 C -24.887055,20.752856 -23.627856,20.612945 -22.9375,19.75 L -19.53125,15.5 L -15.75,15.5 L -22.1875,23.3125 C -22.420945,23.645583 -22.50685,24.06221 -22.5,24.5 L -22.5,31.5 L -30.5,31.5 L -30.5,35.5 L -20.5,35.5 C -19.395476,35.49989 -18.50011,34.604524 -18.5,33.5 L -18.5,27.3125 L -13.5,32.3125 L -13.5,40.5 L -9.5,40.5 L -9.5,31.5 L -9.5,30.65625 L -10.09375,30.09375 L -14.84375,25.34375 L -11.5,21.28125 L -11.5,22.5 C -11.49989,23.604524 -10.604524,24.49989 -9.5,24.5 L -2.5,24.5 C -1.778728,24.510201 -1.113613,24.122995 -0.75,23.5 C -0.386387,22.877006 -0.386387,22.122995 -0.75,21.5 C -1.113613,20.877004 -1.778728,20.489799 -2.5,20.5 L -7.5,20.5 L -7.5,16 C -10.390638,16 -12.843604,14.110886 -13.6875,11.5 L -20.5,11.5 C -20.562466,11.497069 -20.625034,11.497069 -20.6875,11.5 z "
++           style="opacity:1;fill:url(#linearGradient7145);fill-opacity:1;fill-rule:evenodd;stroke:#4e9a06;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
++      </g>
++      <path
++         d="M -20.625,12.5 C -20.883516,12.532601 -21.119099,12.669978 -21.28125,12.875 L -25.28125,17.875 C -25.632167,18.313646 -25.563646,18.930333 -25.125,19.28125 C -24.686354,19.632167 -24.069667,19.563646 -23.71875,19.125 L -20.3125,14.875 C -20.122073,14.638438 -19.834933,14.500611 -19.53125,14.5 L -15.75,14.5 C -15.36741,14.504084 -15.020291,14.724946 -14.854508,15.069775 C -14.688724,15.414605 -14.733008,15.823641 -14.96875,16.125 L -21.375,23.875 C -21.378721,23.880309 -21.37135,23.900494 -21.375,23.90625 L -21.40625,23.9375 C -21.46879,24.048638 -21.50412,24.205427 -21.5,24.46875 C -21.499838,24.479166 -21.499838,24.489584 -21.5,24.5 L -21.5,31.5 C -21.503016,32.051031 -21.948969,32.496984 -22.5,32.5 L -29.5,32.5 L -29.5,34.5 L -20.5,34.5 C -19.938773,34.499944 -19.500056,34.061227 -19.5,33.5 L -19.5,27.3125 C -19.504078,26.903415 -19.259899,26.532643 -18.882467,26.374807 C -18.505035,26.216972 -18.069603,26.303544 -17.78125,26.59375 L -12.78125,31.59375 C -12.595622,31.786381 -12.494406,32.045043 -12.5,32.3125 L -12.5,39.5 L -10.5,39.5 L -10.5,31.5 L -10.5,31.09375 L -10.78125,30.8125 C -10.791666,30.812662 -10.802084,30.812662 -10.8125,30.8125 L -15.5625,26.0625 C -15.923992,25.696513 -15.95096,25.116711 -15.625,24.71875 L -12.28125,20.65625 C -12.013038,20.330928 -11.570348,20.207488 -11.172497,20.347084 C -10.774646,20.486681 -10.506139,20.859664 -10.5,21.28125 L -10.5,22.5 C -10.499944,23.061227 -10.061227,23.499944 -9.5,23.5 L -2.5,23.5 C -2.1471898,23.50499 -1.8109749,23.318639 -1.625,23 C -1.439414,22.682027 -1.4394134,22.317974 -1.625,22 C -1.8109749,21.68136 -2.1471889,21.49501 -2.5,21.5 L -7.5,21.5 C -8.0510308,21.496984 -8.4969843,21.051031 -8.5,20.5 L -8.5,16.84375 C -11.109944,16.483168 -13.278833,14.83457 -14.3125,12.5 L -20.5,12.5 C -20.520828,12.500648 -20.541672,12.500648 -20.5625,12.5 C -20.578034,12.499271 -20.578204,12.5 -20.59375,12.5 C -20.609296,12.5 -20.609466,12.499271 -20.625,12.5 z "
++         id="path7104"
++         style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#8ae234;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
++         inkscape:original="M -20.6875 11.5 C -21.228728 11.552698 -21.725172 11.823486 -22.0625 12.25 L -26.0625 17.25 C -26.752856 18.112945 -26.612945 19.372144 -25.75 20.0625 C -24.887055 20.752856 -23.627856 20.612945 -22.9375 19.75 L -19.53125 15.5 L -15.75 15.5 L -22.1875 23.3125 C -22.420945 23.645583 -22.50685 24.06221 -22.5 24.5 L -22.5 31.5 L -30.5 31.5 L -30.5 35.5 L -20.5 35.5 C -19.395476 35.49989 -18.50011 34.604524 -18.5 33.5 L -18.5 27.3125 L -13.5 32.3125 L -13.5 40.5 L -9.5 40.5 L -9.5 31.5 L -9.5 30.65625 L -10.09375 30.09375 L -14.84375 25.34375 L -11.5 21.28125 L -11.5 22.5 C -11.49989 23.604524 -10.604524 24.49989 -9.5 24.5 L -2.5 24.5 C -1.778728 24.510201 -1.113613 24.122995 -0.75 23.5 C -0.386387 22.877006 -0.386387 22.122995 -0.75 21.5 C -1.113613 20.877004 -1.778728 20.489799 -2.5 20.5 L -7.5 20.5 L -7.5 16 C -10.390638 16 -12.843604 14.110886 -13.6875 11.5 L -20.5 11.5 C -20.562466 11.497069 -20.625034 11.497069 -20.6875 11.5 z "
++         inkscape:radius="-1.0054175"
++         sodipodi:type="inkscape:offset" />
++      <path
++         sodipodi:nodetypes="cccccccsscccscccccccccccccsccccc"
++         id="path7106"
++         d="M -1.625,22 C -1.810975,21.68136 -2.147189,21.49501 -2.5,21.5 L -7.5,21.5 C -8.051031,21.496984 -8.496984,21.051031 -8.5,20.5 L -8.5,16.84375 C -11.109944,16.483168 -13.278833,14.83457 -14.3125,12.5 L -20.5,12.5 C -20.520828,12.500648 -20.541672,12.500648 -20.5625,12.5 C -20.578034,12.499271 -20.578204,12.5 -20.59375,12.5 C -20.609296,12.5 -20.609466,12.499271 -20.625,12.5 C -20.883516,12.532601 -21.119099,12.669978 -21.28125,12.875 L -25.28125,17.875 C -25.632167,18.313646 -25.563646,18.930333 -25.125,19.28125 M -10.5,31.5 L -10.5,31.09375 L -10.78125,30.8125 C -10.791666,30.812662 -10.802084,30.812662 -10.8125,30.8125 L -15.5625,26.0625 C -15.923992,25.696513 -15.95096,25.116711 -15.625,24.71875 M -12.5,32.3125 L -12.5,39.5 M -14.854508,15.069775 C -14.688724,15.414605 -14.733008,15.823641 -14.96875,16.125 L -21.375,23.875 C -21.378721,23.880309 -21.37135,23.900494 -21.375,23.90625 L -21.40625,23.9375 C -21.46879,24.048638 -21.50412,24.205427 -21.5,24.46875 C -21.499838,24.479166 -21.499838,24.489584 -21.5,24.5 L -21.5,31.5 C -21.503016,32.051031 -21.948969,32.496984 -22.5,32.5 L -29.5,32.5 L -29.5,34.5"
++         style="opacity:0.3;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;display:inline" />
++      <path
++         inkscape:export-ydpi="90"
++         inkscape:export-xdpi="90"
++         inkscape:export-filename="/home/kalle/Desktop/system-log-out.png"
++         sodipodi:type="arc"
++         style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient7147);stroke-width:0.6666649;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
++         id="path7119"
++         sodipodi:cx="-31.5"
++         sodipodi:cy="16"
++         sodipodi:rx="2"
++         sodipodi:ry="2"
++         d="M -29.5 16 A 2 2 0 1 1  -33.5,16 A 2 2 0 1 1  -29.5 16 z"
++         transform="matrix(1.500004,0,0,1.500004,39.750134,-14.500064)" />
++    </g>
++    <g
++       id="g7055"
++       transform="translate(130,0)">
++      <path
++         sodipodi:nodetypes="ccc"
++         id="path7045"
++         d="M -28.5,33.5 L -20.5,33.5 L -20.5,24.5"
++         style="opacity:0.4089219;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
++      <path
++         sodipodi:nodetypes="ccc"
++         id="path7047"
++         d="M -24.5,18.5 L -20.5,13.5 L -11.5,13.5"
++         style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
++      <path
++         sodipodi:nodetypes="ccc"
++         id="path7049"
++         d="M -2.5,22.5 L -9.5,22.5 L -9.5,13.5"
++         style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
++      <path
++         sodipodi:nodetypes="ccc"
++         id="path7051"
++         d="M -11.5,38.5 L -11.5,31.5 L -18.5,24.5"
++         style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
++      <path
++         sodipodi:nodetypes="cc"
++         id="path7053"
++         d="M -10,14 L -19.5,25.5"
++         style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
++    </g>
++  </g>
++</svg>
+
+=== added file 'data/icons/scalable/actions/system-restart.svg'
+--- data/icons/scalable/actions/system-restart.svg	1970-01-01 00:00:00 +0000
++++ data/icons/scalable/actions/system-restart.svg	2009-03-02 21:21:23 +0000
+@@ -0,0 +1,397 @@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<!-- Created with Inkscape (http://www.inkscape.org/) -->
++<svg
++   xmlns:dc="http://purl.org/dc/elements/1.1/"
++   xmlns:cc="http://web.resource.org/cc/"
++   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++   xmlns:svg="http://www.w3.org/2000/svg"
++   xmlns="http://www.w3.org/2000/svg"
++   xmlns:xlink="http://www.w3.org/1999/xlink"
++   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
++   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
++   inkscape:export-ydpi="90.000000"
++   inkscape:export-xdpi="90.000000"
++   inkscape:export-filename="c:\Tango\git\view-refresh.png"
++   width="48"
++   height="48"
++   id="svg11300"
++   sodipodi:version="0.32"
++   inkscape:version="0.45"
++   sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/actions"
++   sodipodi:docname="view-refresh.svg"
++   version="1.0"
++   inkscape:r_cx="true"
++   inkscape:r_cy="true"
++   inkscape:output_extension="org.inkscape.output.svg.inkscape">
++  <defs
++     id="defs3">
++    <linearGradient
++       inkscape:collect="always"
++       id="linearGradient5335">
++      <stop
++         style="stop-color:#ffffff;stop-opacity:1;"
++         offset="0"
++         id="stop5337" />
++      <stop
++         style="stop-color:#ffffff;stop-opacity:0;"
++         offset="1"
++         id="stop5339" />
++    </linearGradient>
++    <linearGradient
++       id="linearGradient5313">
++      <stop
++         id="stop5315"
++         offset="0"
++         style="stop-color:#99b8df;stop-opacity:1" />
++      <stop
++         style="stop-color:#3969a8;stop-opacity:1;"
++         offset="0.23705086"
++         id="stop5333" />
++      <stop
++         style="stop-color:#4f7eba;stop-opacity:1;"
++         offset="0.54706067"
++         id="stop5317" />
++      <stop
++         id="stop5321"
++         offset="0.74557692"
++         style="stop-color:#96b6d7;stop-opacity:1" />
++      <stop
++         style="stop-color:#a0bddc;stop-opacity:1"
++         offset="0.87321436"
++         id="stop5331" />
++      <stop
++         id="stop5319"
++         offset="1"
++         style="stop-color:#729fcf;stop-opacity:1;" />
++    </linearGradient>
++    <linearGradient
++       id="linearGradient8152">
++      <stop
++         style="stop-color:#3465a4;stop-opacity:1;"
++         offset="0"
++         id="stop8154" />
++      <stop
++         id="stop3174"
++         offset="0.5"
++         style="stop-color:#4f7eba;stop-opacity:1;" />
++      <stop
++         style="stop-color:#729fcf;stop-opacity:1;"
++         offset="1"
++         id="stop8156" />
++    </linearGradient>
++    <linearGradient
++       id="linearGradient3207">
++      <stop
++         style="stop-color:#eeeeec;stop-opacity:0.47058824;"
++         offset="0"
++         id="stop3209" />
++      <stop
++         style="stop-color:#eeeeec;stop-opacity:0;"
++         offset="1"
++         id="stop3211" />
++    </linearGradient>
++    <linearGradient
++       inkscape:collect="always"
++       id="linearGradient2847">
++      <stop
++         style="stop-color:#3465a4;stop-opacity:1;"
++         offset="0"
++         id="stop2849" />
++      <stop
++         style="stop-color:#3465a4;stop-opacity:0;"
++         offset="1"
++         id="stop2851" />
++    </linearGradient>
++    <linearGradient
++       id="linearGradient2831">
++      <stop
++         style="stop-color:#3465a4;stop-opacity:1;"
++         offset="0"
++         id="stop2833" />
++      <stop
++         id="stop2855"
++         offset="0.33333334"
++         style="stop-color:#5b86be;stop-opacity:1;" />
++      <stop
++         style="stop-color:#83a8d8;stop-opacity:0;"
++         offset="1"
++         id="stop2835" />
++    </linearGradient>
++    <linearGradient
++       inkscape:collect="always"
++       id="linearGradient8662">
++      <stop
++         style="stop-color:#000000;stop-opacity:1;"
++         offset="0"
++         id="stop8664" />
++      <stop
++         style="stop-color:#000000;stop-opacity:0;"
++         offset="1"
++         id="stop8666" />
++    </linearGradient>
++    <linearGradient
++       inkscape:collect="always"
++       xlink:href="#linearGradient2831"
++       id="linearGradient1486"
++       gradientUnits="userSpaceOnUse"
++       gradientTransform="matrix(1.0818662,0,0,1.1166851,-0.8207482,-1.8622434)"
++       x1="13.478554"
++       y1="10.612206"
++       x2="15.419417"
++       y2="19.115122" />
++    <linearGradient
++       inkscape:collect="always"
++       xlink:href="#linearGradient2847"
++       id="linearGradient1488"
++       gradientUnits="userSpaceOnUse"
++       gradientTransform="matrix(-1.0818662,0,0,-1.1166851,50.09459,49.644854)"
++       x1="37.128052"
++       y1="29.729605"
++       x2="37.40255"
++       y2="26.800913" />
++    <radialGradient
++       inkscape:collect="always"
++       xlink:href="#linearGradient8662"
++       id="radialGradient1503"
++       gradientUnits="userSpaceOnUse"
++       gradientTransform="matrix(1,0,0,0.536723,0,16.87306)"
++       cx="24.837126"
++       cy="36.421127"
++       fx="24.837126"
++       fy="36.421127"
++       r="15.644737" />
++    <linearGradient
++       inkscape:collect="always"
++       xlink:href="#linearGradient8152"
++       id="linearGradient8158"
++       x1="49.412277"
++       y1="37.904068"
++       x2="11.881318"
++       y2="19.776045"
++       gradientUnits="userSpaceOnUse" />
++    <linearGradient
++       inkscape:collect="always"
++       xlink:href="#linearGradient2831"
++       id="linearGradient8170"
++       gradientUnits="userSpaceOnUse"
++       gradientTransform="matrix(-1.0818662,0,0,-1.1166851,48.639854,47.862243)"
++       x1="13.478554"
++       y1="10.612206"
++       x2="15.419417"
++       y2="19.115122" />
++    <linearGradient
++       inkscape:collect="always"
++       xlink:href="#linearGradient2847"
++       id="linearGradient8172"
++       gradientUnits="userSpaceOnUse"
++       gradientTransform="matrix(1.0818662,0,0,1.1166851,-2.2754847,-3.644854)"
++       x1="37.128052"
++       y1="29.729605"
++       x2="37.40255"
++       y2="26.800913" />
++    <linearGradient
++       inkscape:collect="always"
++       xlink:href="#linearGradient8152"
++       id="linearGradient8174"
++       gradientUnits="userSpaceOnUse"
++       x1="49.412277"
++       y1="37.904068"
++       x2="11.881318"
++       y2="19.776045" />
++    <linearGradient
++       inkscape:collect="always"
++       xlink:href="#linearGradient3207"
++       id="linearGradient8178"
++       gradientUnits="userSpaceOnUse"
++       x1="5.8925977"
++       y1="20.540676"
++       x2="45.198921"
++       y2="27.721035" />
++    <linearGradient
++       inkscape:collect="always"
++       xlink:href="#linearGradient5313"
++       id="linearGradient8180"
++       gradientUnits="userSpaceOnUse"
++       x1="61.572533"
++       y1="28.049652"
++       x2="10.969182"
++       y2="20.333939" />
++    <linearGradient
++       inkscape:collect="always"
++       xlink:href="#linearGradient5335"
++       id="linearGradient5341"
++       x1="8.6878577"
++       y1="25.265626"
++       x2="52.122673"
++       y2="25.265626"
++       gradientUnits="userSpaceOnUse" />
++  </defs>
++  <sodipodi:namedview
++     stroke="#3465a4"
++     fill="#729fcf"
++     id="base"
++     pagecolor="#ffffff"
++     bordercolor="#e8e8e8"
++     borderopacity="0.86666667"
++     inkscape:pageopacity="0.0"
++     inkscape:pageshadow="2"
++     inkscape:zoom="1"
++     inkscape:cx="48.628749"
++     inkscape:cy="21.704614"
++     inkscape:current-layer="layer1"
++     showgrid="true"
++     inkscape:grid-bbox="true"
++     inkscape:document-units="px"
++     inkscape:showpageshadow="false"
++     inkscape:window-width="892"
++     inkscape:window-height="938"
++     inkscape:window-x="374"
++     inkscape:window-y="37"
++     width="48px"
++     height="48px"
++     borderlayer="true" />
++  <metadata
++     id="metadata4">
++    <rdf:RDF>
++      <cc:Work
++         rdf:about="">
++        <dc:format>image/svg+xml</dc:format>
++        <dc:type
++           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
++        <dc:creator>
++          <cc:Agent>
++            <dc:title>Jakub Steiner</dc:title>
++          </cc:Agent>
++        </dc:creator>
++        <dc:source>http://jimmac.musichall.cz</dc:source>
++        <cc:license
++           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
++        <dc:title>View Refresh</dc:title>
++        <dc:subject>
++          <rdf:Bag>
++            <rdf:li>reload</rdf:li>
++            <rdf:li>refresh</rdf:li>
++            <rdf:li>view</rdf:li>
++          </rdf:Bag>
++        </dc:subject>
++        <dc:contributor>
++          <cc:Agent>
++            <dc:title>Ricardo 'Rick' González</dc:title>
++          </cc:Agent>
++        </dc:contributor>
++      </cc:Work>
++      <cc:License
++         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
++        <cc:permits
++           rdf:resource="http://web.resource.org/cc/Reproduction" />
++        <cc:permits
++           rdf:resource="http://web.resource.org/cc/Distribution" />
++        <cc:requires
++           rdf:resource="http://web.resource.org/cc/Notice" />
++        <cc:permits
++           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
++        <cc:requires
++           rdf:resource="http://web.resource.org/cc/ShareAlike" />
++        <cc:requires
++           rdf:resource="http://web.resource.org/cc/SourceCode" />
++      </cc:License>
++    </rdf:RDF>
++  </metadata>
++  <g
++     id="layer1"
++     inkscape:label="Layer 1"
++     inkscape:groupmode="layer"
++     inkscape:r_cx="true"
++     inkscape:r_cy="true">
++    <path
++       transform="matrix(-1.5146484,0,0,-0.7917058,60.923237,69.528413)"
++       d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1  9.1923885,36.421127 A 15.644737 8.3968935 0 1 1  40.481863 36.421127 z"
++       sodipodi:ry="8.3968935"
++       sodipodi:rx="15.644737"
++       sodipodi:cy="36.421127"
++       sodipodi:cx="24.837126"
++       id="path8660"
++       style="opacity:0.36111109;color:#000000;fill:url(#radialGradient1503);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
++       sodipodi:type="arc"
++       inkscape:r_cx="true"
++       inkscape:r_cy="true" />
++    <path
++       style="color:#000000;fill:url(#linearGradient1486);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient1488);stroke-width:1.04300582000000008;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible;opacity:0.51807229"
++       d="M 20.478497,9.7711467 C 20.478497,9.7711467 12.632988,7.9438002 14.368023,21.024298 L 5.1028658,21.024298 C 5.1028658,21.024298 6.0085332,7.5377773 20.478497,9.7711467 z "
++       id="path2865"
++       inkscape:r_cx="true"
++       inkscape:r_cy="true"
++       sodipodi:nodetypes="cccc" />
++    <g
++       id="g1878"
++       transform="matrix(-0.6129282,-0.5154381,-0.5178496,0.610074,58.686164,13.911361)"
++       inkscape:r_cx="true"
++       inkscape:r_cy="true"
++       style="fill:url(#linearGradient8158);fill-opacity:1;stroke:#204a87;stroke-width:1.24932528;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
++      <path
++         sodipodi:nodetypes="ccccccc"
++         id="path1880"
++         d="M 45.862102,50.273522 C 62.924432,34.96305 47.150241,15.929711 22.760624,12.513943 L 22.113577,3.1522143 L 7.613534,20.510135 L 22.703188,33.23244 C 22.703188,33.23244 22.454828,23.347105 22.454828,23.347105 C 41.289895,24.339584 54.775794,35.675041 45.862102,50.273522 z "
++         style="opacity:1;color:#000000;fill:url(#linearGradient8180);fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:1.24977946000000006;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
++         inkscape:r_cx="true"
++         inkscape:r_cy="true" />
++    </g>
++    <g
++       style="fill:none;fill-opacity:1;stroke:url(#linearGradient5341);stroke-width:1.24928653000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:0.54819277"
++       inkscape:r_cy="true"
++       inkscape:r_cx="true"
++       transform="matrix(-0.612811,-0.5154406,-0.5177506,0.6100769,58.675633,13.911365)"
++       id="g3185">
++      <path
++         sodipodi:type="inkscape:offset"
++         inkscape:radius="-1.197237"
++         inkscape:original="M 22.125 3.15625 L 7.625 20.5 L 22.71875 33.21875 C 22.718749 33.21875 22.46875 23.34375 22.46875 23.34375 C 41.298509 24.342727 54.468144 35.661007 45.5625 50.25 C 62.614067 34.952315 46.852277 15.923275 22.46875 12.5 L 22.125 3.15625 z "
++         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5341);stroke-width:1.24928653000000001;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
++         id="path3189"
++         d="M 21.0625,6.3125 L 9.3125,20.34375 L 21.46875,30.59375 C 21.39688,27.754893 21.28125,23.375 21.28125,23.375 C 21.27502,23.044409 21.405774,22.725958 21.642519,22.495132 C 21.879264,22.264306 22.200923,22.141654 22.53125,22.15625 C 32.170255,22.667629 40.441027,25.773015 45.28125,30.875 C 48.676469,34.453835 50.102049,39.131532 49.125,44.21875 C 50.368339,42.205641 51.107893,40.194594 51.375,38.21875 C 51.870422,34.55401 50.856988,30.946652 48.5625,27.59375 C 43.973525,20.887947 34.236978,15.361613 22.3125,13.6875 C 21.732114,13.606381 21.295727,13.117098 21.28125,12.53125 L 21.0625,6.3125 z "
++         transform="translate(1.0080026e-6,8.5223784e-7)" />
++    </g>
++    <g
++       id="g2424"
++       transform="matrix(0.190868,0.16126,0.16126,-0.190868,-0.719083,15.30613)"
++       inkscape:r_cx="true"
++       inkscape:r_cy="true"
++       style="opacity:0.5;fill:none;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
++    <path
++       sodipodi:nodetypes="cccc"
++       inkscape:r_cy="true"
++       inkscape:r_cx="true"
++       id="path8160"
++       d="M 27.340608,36.228853 C 27.340608,36.228853 35.186117,38.0562 33.451082,24.975702 L 42.71624,24.975702 C 42.71624,24.975702 41.810572,38.462223 27.340608,36.228853 z "
++       style="color:#000000;fill:url(#linearGradient8170);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient8172);stroke-width:1.04300582000000008;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible;opacity:0.51807229" />
++    <g
++       style="fill:url(#linearGradient8174);fill-opacity:1;stroke:#204a87;stroke-width:1.24932528;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
++       inkscape:r_cy="true"
++       inkscape:r_cx="true"
++       transform="matrix(0.6101332,0.5154999,0.5154881,-0.6101471,-10.618024,32.088556)"
++       id="g8162">
++      <path
++         inkscape:r_cy="true"
++         inkscape:r_cx="true"
++         style="opacity:1;color:#000000;fill:url(#linearGradient8180);fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:1.25256376;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible;enable-background:accumulate"
++         d="M 45.862102,50.273522 C 62.924432,34.96305 47.150241,15.929711 22.760624,12.513943 L 22.113577,3.1522141 L 7.6135337,20.510135 L 22.703188,33.23244 C 22.703188,33.23244 22.454828,23.347105 22.454828,23.347105 C 41.289895,24.339584 54.775794,35.675041 45.862102,50.273522 z "
++         id="path8164"
++         sodipodi:nodetypes="ccccccc" />
++    </g>
++    <g
++       id="g8166"
++       transform="matrix(0.6128107,0.5154406,0.5177504,-0.6100769,-10.856505,32.088635)"
++       inkscape:r_cx="true"
++       inkscape:r_cy="true"
++       style="fill:none;fill-opacity:1;stroke:#204a87;stroke-width:1.24928653;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
++      <path
++         transform="matrix(0.9972307,-2.4605589e-3,-2.4605593e-3,0.9980642,0.2457029,0.2077351)"
++         d="M 21.0625,6.3125 L 9.3125,20.34375 L 21.46875,30.59375 C 21.39688,27.754893 21.28125,23.375 21.28125,23.375 C 21.27502,23.044409 21.405774,22.725958 21.642519,22.495132 C 21.879264,22.264306 22.200923,22.141654 22.53125,22.15625 C 32.170255,22.667629 40.441027,25.773015 45.28125,30.875 C 48.676469,34.453835 50.102049,39.131532 49.125,44.21875 C 50.368339,42.205641 51.107893,40.194594 51.375,38.21875 C 51.870422,34.55401 50.856988,30.946652 48.5625,27.59375 C 43.973525,20.887947 34.236978,15.361613 22.3125,13.6875 C 21.732114,13.606381 21.295727,13.117098 21.28125,12.53125 L 21.0625,6.3125 z "
++         id="path8168"
++         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient8178);stroke-width:1.24973191;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.70588235;visibility:visible;display:block;overflow:visible"
++         inkscape:original="M 22.125 3.15625 L 7.625 20.5 L 22.71875 33.21875 C 22.718749 33.21875 22.46875 23.34375 22.46875 23.34375 C 41.298509 24.342727 54.468144 35.661007 45.5625 50.25 C 62.614067 34.952315 46.852277 15.923275 22.46875 12.5 L 22.125 3.15625 z "
++         inkscape:radius="-1.197237"
++         sodipodi:type="inkscape:offset" />
++    </g>
++  </g>
++</svg>
+
+=== added file 'data/icons/scalable/actions/system-shutdown.svg'
+--- data/icons/scalable/actions/system-shutdown.svg	1970-01-01 00:00:00 +0000
++++ data/icons/scalable/actions/system-shutdown.svg	2009-03-02 21:21:23 +0000
+@@ -0,0 +1,247 @@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<!-- Created with Inkscape (http://www.inkscape.org/) -->
++<svg
++   xmlns:dc="http://purl.org/dc/elements/1.1/"
++   xmlns:cc="http://web.resource.org/cc/"
++   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++   xmlns:svg="http://www.w3.org/2000/svg"
++   xmlns="http://www.w3.org/2000/svg"
++   xmlns:xlink="http://www.w3.org/1999/xlink"
++   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
++   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
++   sodipodi:docname="gnome-shutdown.svg"
++   sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/apps"
++   inkscape:version="0.45"
++   sodipodi:version="0.32"
++   id="svg11142"
++   height="48"
++   width="48"
++   version="1.0"
++   inkscape:output_extension="org.inkscape.output.svg.inkscape">
++  <defs
++     id="defs3">
++    <linearGradient
++       id="linearGradient4749">
++      <stop
++         id="stop4751"
++         offset="0"
++         style="stop-color:#ffffff;stop-opacity:1;" />
++      <stop
++         style="stop-color:#ffffff;stop-opacity:0.0000000;"
++         offset="0.50000000"
++         id="stop4757" />
++      <stop
++         id="stop4753"
++         offset="1.0000000"
++         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
++    </linearGradient>
++    <linearGradient
++       id="linearGradient11264"
++       inkscape:collect="always">
++      <stop
++         id="stop11266"
++         offset="0"
++         style="stop-color:#000000;stop-opacity:1;" />
++      <stop
++         id="stop11268"
++         offset="1"
++         style="stop-color:#000000;stop-opacity:0;" />
++    </linearGradient>
++    <linearGradient
++       id="linearGradient11178">
++      <stop
++         style="stop-color:#d1d1cc;stop-opacity:1.0000000;"
++         offset="0.0000000"
++         id="stop11180" />
++      <stop
++         id="stop4735"
++         offset="0.50000000"
++         style="stop-color:#d1d1d1;stop-opacity:1.0000000;" />
++      <stop
++         style="stop-color:#b9b9b9;stop-opacity:1.0000000;"
++         offset="1.0000000"
++         id="stop11188" />
++    </linearGradient>
++    <linearGradient
++       id="linearGradient11164">
++      <stop
++         id="stop11166"
++         offset="0"
++         style="stop-color:#eeeeec;stop-opacity:1;" />
++      <stop
++         style="stop-color:#c6c6bf;stop-opacity:1.0000000;"
++         offset="0.26988637"
++         id="stop11172" />
++      <stop
++         id="stop11176"
++         offset="0.37900311"
++         style="stop-color:#f9f9f8;stop-opacity:1.0000000;" />
++      <stop
++         id="stop11174"
++         offset="0.75000000"
++         style="stop-color:#c8c8c2;stop-opacity:1.0000000;" />
++      <stop
++         id="stop11168"
++         offset="1.0000000"
++         style="stop-color:#eeeeec;stop-opacity:1.0000000;" />
++    </linearGradient>
++    <linearGradient
++       gradientUnits="userSpaceOnUse"
++       y2="23.071428"
++       x2="42.471249"
++       y1="23.071428"
++       x1="7.1433797"
++       id="linearGradient11170"
++       xlink:href="#linearGradient11164"
++       inkscape:collect="always" />
++    <radialGradient
++       gradientTransform="matrix(1.364252,-9.115392e-17,9.115392e-17,1.364252,-9.47947,-5.618016)"
++       gradientUnits="userSpaceOnUse"
++       r="18.672388"
++       fy="17.224812"
++       fx="24.673435"
++       cy="17.224812"
++       cx="24.673435"
++       id="radialGradient11234"
++       xlink:href="#linearGradient11178"
++       inkscape:collect="always" />
++    <radialGradient
++       gradientUnits="userSpaceOnUse"
++       r="18.214285"
++       fy="23.071428"
++       fx="25.785715"
++       cy="23.071428"
++       cx="25.785715"
++       id="radialGradient11270"
++       xlink:href="#linearGradient11264"
++       inkscape:collect="always" />
++    <linearGradient
++       gradientUnits="userSpaceOnUse"
++       y2="8.5882788"
++       x2="25.785715"
++       y1="21.978363"
++       x1="25.785715"
++       id="linearGradient4755"
++       xlink:href="#linearGradient4749"
++       inkscape:collect="always" />
++  </defs>
++  <sodipodi:namedview
++     inkscape:window-y="423"
++     inkscape:window-x="840"
++     inkscape:window-height="606"
++     inkscape:window-width="750"
++     stroke="#555753"
++     fill="#edd400"
++     inkscape:showpageshadow="false"
++     inkscape:document-units="px"
++     inkscape:grid-bbox="true"
++     showgrid="false"
++     inkscape:current-layer="layer1"
++     inkscape:cy="-10.815272"
++     inkscape:cx="85.353158"
++     inkscape:zoom="1"
++     inkscape:pageshadow="2"
++     inkscape:pageopacity="0.0"
++     borderopacity="0.32941176"
++     bordercolor="#666666"
++     pagecolor="#ffffff"
++     id="base"
++     showguides="true"
++     inkscape:guide-bbox="true" />
++  <metadata
++     id="metadata4">
++    <rdf:RDF>
++      <cc:Work
++         rdf:about="">
++        <dc:format>image/svg+xml</dc:format>
++        <dc:type
++           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
++        <dc:title>Shutdown</dc:title>
++        <dc:creator>
++          <cc:Agent>
++            <dc:title>Jakub Steiner</dc:title>
++          </cc:Agent>
++        </dc:creator>
++        <cc:license
++           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
++        <dc:source>http://jimmac.musichall.cz</dc:source>
++        <dc:subject>
++          <rdf:Bag>
++            <rdf:li>lock</rdf:li>
++            <rdf:li>key</rdf:li>
++            <rdf:li>secure</rdf:li>
++          </rdf:Bag>
++        </dc:subject>
++      </cc:Work>
++      <cc:License
++         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
++        <cc:permits
++           rdf:resource="http://web.resource.org/cc/Reproduction" />
++        <cc:permits
++           rdf:resource="http://web.resource.org/cc/Distribution" />
++        <cc:requires
++           rdf:resource="http://web.resource.org/cc/Notice" />
++        <cc:permits
++           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
++        <cc:requires
++           rdf:resource="http://web.resource.org/cc/ShareAlike" />
++        <cc:requires
++           rdf:resource="http://web.resource.org/cc/SourceCode" />
++      </cc:License>
++    </rdf:RDF>
++  </metadata>
++  <g
++     inkscape:groupmode="layer"
++     inkscape:label="Layer 1"
++     id="layer1">
++    <path
++       sodipodi:type="arc"
++       style="opacity:1;color:#000000;fill:url(#radialGradient11270);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.8505457;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
++       id="path11262"
++       sodipodi:cx="25.785715"
++       sodipodi:cy="23.071428"
++       sodipodi:rx="18.214285"
++       sodipodi:ry="18.214285"
++       d="M 44 23.071428 A 18.214285 18.214285 0 1 1  7.5714302,23.071428 A 18.214285 18.214285 0 1 1  44 23.071428 z"
++       transform="matrix(1.269833,0,0,1.269833,-9.24356,-4.225444)" />
++    <path
++       transform="matrix(1.175715,0,0,1.175715,-6.816669,-3.911156)"
++       d="M 44 23.071428 A 18.214285 18.214285 0 1 1  7.5714302,23.071428 A 18.214285 18.214285 0 1 1  44 23.071428 z"
++       sodipodi:ry="18.214285"
++       sodipodi:rx="18.214285"
++       sodipodi:cy="23.071428"
++       sodipodi:cx="25.785715"
++       id="path11152"
++       style="opacity:1;color:#000000;fill:url(#linearGradient11170);fill-opacity:1;fill-rule:evenodd;stroke:#74796e;stroke-width:0.8505457;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
++       sodipodi:type="arc" />
++    <path
++       sodipodi:type="arc"
++       style="opacity:1;color:#000000;fill:url(#radialGradient11234);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.93590021;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
++       id="path11154"
++       sodipodi:cx="25.785715"
++       sodipodi:cy="23.071428"
++       sodipodi:rx="18.214285"
++       sodipodi:ry="18.214285"
++       d="M 44 23.071428 A 18.214285 18.214285 0 1 1  7.5714302,23.071428 A 18.214285 18.214285 0 1 1  44 23.071428 z"
++       transform="matrix(1.06849,0,0,1.06849,-4.051771,-2.437299)" />
++    <path
++       sodipodi:nodetypes="czs"
++       id="path4743"
++       d="M 19.1468,14.674063 C 12.154448,18.486901 15.316371,29.412893 23.310313,29.412893 C 31.220984,29.412893 34.766419,19.054547 27.473824,14.674063"
++       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
++    <path
++       id="path4745"
++       d="M 23.364832,19.364034 L 23.364832,11.95091"
++       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:2.99999905;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
++    <path
++       transform="matrix(1.04555,0,0,1.04555,-3.460245,-1.908039)"
++       d="M 44 23.071428 A 18.214285 18.214285 0 1 1  7.5714302,23.071428 A 18.214285 18.214285 0 1 1  44 23.071428 z"
++       sodipodi:ry="18.214285"
++       sodipodi:rx="18.214285"
++       sodipodi:cy="23.071428"
++       sodipodi:cx="25.785715"
++       id="path4747"
++       style="opacity:0.88235294;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4755);stroke-width:0.95643449;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
++       sodipodi:type="arc" />
++  </g>
++</svg>
 
 === added directory 'data/icons/scalable/status'
 === added file 'data/icons/scalable/status/Makefile.am'
@@ -1337,9 +2776,9 @@
 +</svg>
 
 === modified file 'src/applet.c'
---- src/applet.c	2008-10-28 20:32:40 +0000
-+++ src/applet.c	2008-10-28 20:33:19 +0000
-@@ -85,6 +85,8 @@
+--- src/applet.c	2009-03-05 02:17:45 +0000
++++ src/applet.c	2009-03-05 02:18:06 +0000
+@@ -88,6 +88,8 @@
  #define LOCKDOWN_KEY    LOCKDOWN_DIR "/disable_user_switching"
  #define LOCK_SCREEN_KEY  LOCKDOWN_DIR "/disable_lock_screen"
  
@@ -1348,7 +2787,7 @@
  /* ******************** *
   *  Private Structures  *
   * ******************** */
-@@ -361,6 +363,10 @@
+@@ -388,6 +390,10 @@
  
        g_type_init();
  

=== modified file 'debian/patches/90_status_management.patch'
--- debian/patches/90_status_management.patch	2009-02-27 02:01:53 +0000
+++ debian/patches/90_status_management.patch	2009-03-05 15:55:31 +0000
@@ -1,7 +1,20 @@
 === modified file 'Makefile.am'
-diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/configure.ac fast-user-switch-applet-2.24.0.new/configure.ac
---- fast-user-switch-applet-2.24.0/configure.ac	2009-02-15 19:25:57.000000000 +0000
-+++ fast-user-switch-applet-2.24.0.new/configure.ac	2009-02-15 19:25:59.000000000 +0000
+--- Makefile.am	2007-02-20 20:19:47 +0000
++++ Makefile.am	2008-08-27 21:11:03 +0000
+@@ -38,8 +38,7 @@
+ 	intltool-extract		\
+ 	intltool-merge			\
+ 	intltool-update			\
+-	./po/.intltool-merge-cache	\
+-	gnome-doc-utils.make
++	./po/.intltool-merge-cache
+ 
+ MAINTAINERCLEANFILES =	\
+ 	intltool-*.in	\
+
+=== modified file 'configure.ac'
+--- configure.ac	2009-03-02 21:21:23 +0000
++++ configure.ac	2009-03-02 22:11:23 +0000
 @@ -47,11 +47,13 @@
  PANEL_REQUIRED_VERSION=2.0.0
  GLADE_REQUIRED_VERSION=2.0.0
@@ -12,13 +25,14 @@
  	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
  	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
  	     gio-2.0 >= $GLIB_REQUIRED_VERSION
-+	     dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
++		 dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
  	     polkit-gnome
  	     libgnomeui-2.0)
  AC_SUBST(APPLET_CFLAGS)
-diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/data/fast-user-switch-applet.schemas.in fast-user-switch-applet-2.24.0.new/data/fast-user-switch-applet.schemas.in
---- fast-user-switch-applet-2.24.0/data/fast-user-switch-applet.schemas.in	2009-02-15 19:25:57.000000000 +0000
-+++ fast-user-switch-applet-2.24.0.new/data/fast-user-switch-applet.schemas.in	2009-02-15 19:25:59.000000000 +0000
+
+=== modified file 'data/fast-user-switch-applet.schemas.in'
+--- data/fast-user-switch-applet.schemas.in	2009-02-27 01:56:54 +0000
++++ data/fast-user-switch-applet.schemas.in	2009-02-27 02:31:26 +0000
 @@ -75,6 +75,19 @@
        </locale>
      </schema>
@@ -39,30 +53,66 @@
        <key>/schemas/apps/fast-user-switch-applet/show_session_commands</key>
        <applyto>/apps/fast-user-switch-applet/show_session_commands</applyto>
        <owner>fast-user-switch-applet</owner>
-diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/Makefile.am fast-user-switch-applet-2.24.0.new/Makefile.am
---- fast-user-switch-applet-2.24.0/Makefile.am	2008-09-22 14:54:53.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/Makefile.am	2009-02-15 19:25:59.000000000 +0000
-@@ -38,8 +38,7 @@
- 	intltool-extract		\
- 	intltool-merge			\
- 	intltool-update			\
--	./po/.intltool-merge-cache	\
--	gnome-doc-utils.make
-+	./po/.intltool-merge-cache
- 
- MAINTAINERCLEANFILES =	\
- 	intltool-*.in	\
-diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/po/POTFILES.in fast-user-switch-applet-2.24.0.new/po/POTFILES.in
---- fast-user-switch-applet-2.24.0/po/POTFILES.in	2008-09-22 14:54:53.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/po/POTFILES.in	2009-02-15 19:25:59.000000000 +0000
-@@ -12,3 +12,4 @@
- src/fusa-user.c
+
+=== modified file 'po/POTFILES.in'
+--- po/POTFILES.in	2009-03-05 15:42:14 +0000
++++ po/POTFILES.in	2009-03-05 15:46:16 +0000
+@@ -13,3 +13,4 @@
  src/fusa-utils.c
  src/gdm-queue.c
+ src/logout-dialog.c
 +src/status-manager.c
-diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/src/applet.c fast-user-switch-applet-2.24.0.new/src/applet.c
---- fast-user-switch-applet-2.24.0/src/applet.c	2009-02-15 19:25:57.000000000 +0000
-+++ fast-user-switch-applet-2.24.0.new/src/applet.c	2009-02-15 19:25:59.000000000 +0000
+
+=== modified file 'src/Makefile.am'
+--- src/Makefile.am	2009-03-04 21:56:17 +0000
++++ src/Makefile.am	2009-03-04 22:23:55 +0000
+@@ -13,6 +13,8 @@
+ 	Makefile.in
+ 
+ EXTRA_DIST =				\
++	status-manager-marshal.list	\
++	\
+ 	fusa-display.h			\
+ 	fusa-display-private.h		\
+ 	fusa-manager.h			\
+@@ -23,9 +25,14 @@
+ 	fusa-utils.h			\
+ 	applet.h			\
+ 	gdm-queue.h			\
++	status-manager-marshal.h	\
++	status-manager.h		\
+ 	fade-and-grab.h			\
+ 	logout-dialog.h
+ 
++DISTCLEANFILES =			\
++	status-manager-marshal.c	\
++	status-manager-marshal.h
+ 
+ # ################### #
+ #  The Applet Itself  #
+@@ -48,6 +55,8 @@
+ 	fusa-user-menu-item.c				\
+ 	fusa-utils.c					\
+ 	gdm-queue.c					\
++	status-manager-marshal.c			\
++	status-manager.c				\
+ 	fade-and-grab.c					\
+ 	logout-dialog.c
+ 
+@@ -55,6 +64,9 @@
+ 	$(APPLET_LIBS)					\
+ 	$(X_LIBS)
+ 
++status-manager-marshal.c: status-manager-marshal.list
++	glib-genmarshal --body --prefix=status_manager_marshal $(srcdir)/status-manager-marshal.list > status-manager-marshal.c
++	glib-genmarshal --header --prefix=status_manager_marshal $(srcdir)/status-manager-marshal.list > status-manager-marshal.h
+ 
+ # ##################### #
+ #  Testing Application  #
+
+=== modified file 'src/applet.c'
+--- src/applet.c	2009-03-05 02:18:06 +0000
++++ src/applet.c	2009-03-05 02:18:19 +0000
 @@ -60,6 +60,7 @@
  #include <dbus/dbus-glib.h>
  
@@ -71,7 +121,7 @@
  #include "fusa-user-menu-item.h"
  #include "fusa-utils.h"
  #include "gdm-queue.h"
-@@ -79,6 +80,7 @@
+@@ -82,6 +83,7 @@
  #define SHOW_SCREEN_KEY	"/apps/fast-user-switch-applet/show_screen_item"
  #define SHOW_GUEST_KEY	"/apps/fast-user-switch-applet/show_guest_login"
  #define ACTIVE_ONLY_KEY	"/apps/fast-user-switch-applet/show_active_users_only"
@@ -79,7 +129,7 @@
  #define SHOW_SESSION_COMMANDS "/apps/fast-user-switch-applet/show_session_commands"
  
  #define LOCKDOWN_DIR    "/desktop/gnome/lockdown"
-@@ -97,13 +99,13 @@
+@@ -100,13 +102,13 @@
  
    GConfClient *client;
    FusaManager *manager;
@@ -94,7 +144,7 @@
    GtkWidget *login_screen_item;
    GtkWidget *login_window_item;
    GtkWidget *session_separator_item;
-@@ -113,8 +115,14 @@
+@@ -116,8 +118,14 @@
    GtkWidget *hibernate_item;
    GtkWidget *reboot_item;
    GtkWidget *shutdown_item;
@@ -109,7 +159,7 @@
    GSList *items;
  
    guint client_notify_applet_id;
-@@ -195,6 +203,28 @@
+@@ -198,6 +206,28 @@
  			 gpointer           data,
  			 const gchar       *cname);
  
@@ -138,7 +188,7 @@
  /* FusaManager Callbacks */
  static void manager_user_added_cb       (FusaManager  *manager,
  					 FusaUser     *user,
-@@ -214,6 +244,13 @@
+@@ -217,6 +247,13 @@
  static void user_displays_changed_cb    (FusaUser *user,
  					 gpointer  data);
  
@@ -152,7 +202,7 @@
  /* GConfClient Callbacks */
  static void client_notify_applet_func (GConfClient *client,
  				       guint        cnxn_id,
-@@ -313,6 +350,7 @@
+@@ -318,6 +355,7 @@
  static void      make_label_bold              (GtkLabel       *label);
  static void      make_label_larger            (GtkLabel       *label);
  static void      make_label_small_italic      (GtkLabel       *label);
@@ -160,7 +210,7 @@
  static void      fusa_applet_data_free        (FusaAppletData *adata);
  static void      dbus_namechange              (DBusGProxy * proxy,
                             const gchar * name,
-@@ -344,6 +382,7 @@
+@@ -349,6 +387,7 @@
   *  PanelApplet Callbacks  *
   * *********************** */
  
@@ -168,7 +218,7 @@
  static gboolean
  applet_fill_cb (PanelApplet *applet,
  	        const gchar *iid,
-@@ -384,6 +423,7 @@
+@@ -389,6 +428,7 @@
  				    NULL);
  
        g_type_init();
@@ -176,7 +226,7 @@
  
        /* Add App specific icons to the search path */
        gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(),
-@@ -394,13 +434,24 @@
+@@ -399,13 +439,24 @@
  			   "{\n"
  			     "GtkMenuBar::shadow-type = none\n"
  			     "GtkMenuBar::internal-padding = 0\n"
@@ -201,7 +251,7 @@
  			   "widget \"*.fast-user-switch-applet\" style \"fast-user-switch-applet-style\"\n");
        gtk_window_set_default_icon_name ("stock_people");
        g_set_application_name (_("Fast User Switch Applet"));
-@@ -411,6 +462,7 @@
+@@ -416,6 +467,7 @@
  
    adata->client = gconf_client_get_default ();
    adata->manager = fusa_manager_ref_default ();
@@ -209,7 +259,7 @@
  
    discover_pm_abilities(adata);
  
-@@ -535,14 +587,18 @@
+@@ -540,14 +592,18 @@
    g_signal_connect_after (adata->menubar, "expose-event",
  			  G_CALLBACK (menubar_expose_event_cb), adata);
    gtk_container_add (GTK_CONTAINER (applet), adata->menubar);
@@ -228,7 +278,7 @@
    gtk_widget_show (hbox);
    
    value = panel_applet_gconf_get_string (applet, DISPLAY_KEY, NULL);
-@@ -558,7 +614,7 @@
+@@ -563,7 +619,7 @@
  	    g_signal_connect (user, "notify::display-name",
  			      G_CALLBACK (user_notify_display_name_cb),
  			      adata->imglabel);
@@ -237,7 +287,7 @@
  	  gtk_widget_show (adata->imglabel);
  	}
        else if (strcmp (value, "icon") == 0)
-@@ -583,6 +639,20 @@
+@@ -588,6 +644,20 @@
      }
    g_free (value);
  
@@ -258,7 +308,7 @@
    adata->menu = gtk_menu_new ();
    gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), adata->menu);
    g_signal_connect (adata->menu, "style-set",
-@@ -591,6 +661,63 @@
+@@ -596,6 +666,63 @@
  		    G_CALLBACK (menu_expose_cb), adata);
    gtk_widget_show (adata->menu);
  
@@ -322,7 +372,7 @@
    active_only = gconf_client_get_bool (adata->client, ACTIVE_ONLY_KEY, NULL);
  
    /* This next part populates the list with all the users we currently know
-@@ -651,23 +778,6 @@
+@@ -656,23 +783,6 @@
    g_signal_connect (adata->manager, "user-added",
  		    G_CALLBACK (manager_user_added_cb), adata);
  
@@ -346,7 +396,7 @@
    /* Add an entry for a login window */
    adata->login_window_item = gtk_image_menu_item_new_with_label (_("Login Window"));
    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->login_window_item),
-@@ -680,26 +790,13 @@
+@@ -685,24 +795,11 @@
  		    G_CALLBACK (menuitem_destroy_cb), adata);
    g_signal_connect (adata->login_window_item, "activate",
  		    G_CALLBACK (login_window_activate_cb), adata);
@@ -369,21 +419,9 @@
 -
 -
    /* Add entry for log off */
--  adata->close_session_item = gtk_image_menu_item_new_with_label (_("Log Out"));
-+  adata->close_session_item = gtk_image_menu_item_new_with_label (_("Log out"));
-   gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu),
- 			  adata->close_session_item);
-   g_signal_connect (adata->close_session_item, "style-set",
-@@ -743,7 +840,7 @@
- 		    G_CALLBACK (session_activate_cb), (gpointer)RESTART);
- 
-   /* Add entry for shutdown */
--  adata->shutdown_item = gtk_image_menu_item_new_with_label (_("Shut Down"));
-+  adata->shutdown_item = gtk_image_menu_item_new_with_label (_("Shut down"));
-   gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu),
- 			  adata->shutdown_item);
-   g_signal_connect (adata->shutdown_item, "style-set",
-@@ -779,14 +876,6 @@
+   adata->close_session_item = gtk_image_menu_item_new_with_label (_("Log Out..."));
+   gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu),
+@@ -784,14 +881,6 @@
  
    show_hide_guest (adata);
  
@@ -398,7 +436,7 @@
    key = panel_applet_gconf_get_full_key (applet, DISPLAY_KEY);
    if (key)
      {
-@@ -1368,6 +1457,50 @@
+@@ -1373,6 +1462,50 @@
    g_free (license_i18n);
  }
  
@@ -449,7 +487,7 @@
  
  
  /* *********************** *
-@@ -1548,6 +1681,50 @@
+@@ -1547,6 +1680,50 @@
    sort_menu (adata);
  }
  
@@ -500,7 +538,7 @@
  /* *********************** *
   *  GConfClient Callbacks  *
   * *********************** */
-@@ -1685,12 +1862,6 @@
+@@ -1684,12 +1861,6 @@
        reset_login_window_item (adata->login_window_item,
  			       gconf_value_get_bool (value), str);
        g_free (str);
@@ -513,7 +551,7 @@
      }
  
    g_free (key);
-@@ -1760,14 +1931,10 @@
+@@ -1759,14 +1930,10 @@
      {
  	  update_session_ui(adata);
      }
@@ -532,7 +570,7 @@
  
    sort_menu (adata);
  }
-@@ -2773,7 +2940,6 @@
+@@ -2939,7 +3106,6 @@
  			   gconstpointer b,
  			   gpointer      data)
  {
@@ -540,7 +578,7 @@
    gboolean a_is_user, b_is_user;
  
    a_is_user = FUSA_IS_USER_MENU_ITEM (a);
-@@ -2789,19 +2955,6 @@
+@@ -2955,19 +3121,6 @@
      return fusa_user_collate (fusa_user_menu_item_get_user ((FusaUserMenuItem *) a),
  			      fusa_user_menu_item_get_user ((FusaUserMenuItem *) b));
  
@@ -560,7 +598,7 @@
    return 0;
  }
  
-@@ -2820,6 +2973,18 @@
+@@ -2986,6 +3139,18 @@
  
    screen_height = gdk_screen_get_height (gtk_widget_get_screen (adata->menu));
  
@@ -579,7 +617,7 @@
    n_items = 0;
    items = adata->items;
    while (items)
-@@ -2855,8 +3020,10 @@
+@@ -3021,8 +3186,10 @@
  	    fusa_user_menu_item_set_conflict(items->data, FALSE);
  	  }
  
@@ -591,7 +629,7 @@
  	  row++;
  	  if (row > n_rows)
  	    {
-@@ -2869,7 +3036,8 @@
+@@ -3035,7 +3202,8 @@
             * have to set that explicitly.
             */
            gtk_menu_reorder_child (GTK_MENU (adata->menu),
@@ -601,7 +639,7 @@
  	}
  
  	  prev = items;
-@@ -3079,18 +3247,60 @@
+@@ -3244,18 +3412,60 @@
    pango_attr_list_unref (list);
  }
  
@@ -662,9 +700,10 @@
    g_object_unref (tooltips);
  
    /* DBus Proxy */
-diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/src/gdm-queue.c fast-user-switch-applet-2.24.0.new/src/gdm-queue.c
---- fast-user-switch-applet-2.24.0/src/gdm-queue.c	2008-09-22 14:54:48.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/src/gdm-queue.c	2009-02-15 19:25:59.000000000 +0000
+
+=== modified file 'src/gdm-queue.c'
+--- src/gdm-queue.c	2007-12-15 05:57:42 +0000
++++ src/gdm-queue.c	2008-08-26 14:44:09 +0000
 @@ -130,10 +130,13 @@
    new_request->callback = callback;
    new_request->data = data;
@@ -689,56 +728,21 @@
    int ret;
    gchar *command_with_newline;
  #ifndef MSG_NOSIGNAL
-diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/src/Makefile.am fast-user-switch-applet-2.24.0.new/src/Makefile.am
---- fast-user-switch-applet-2.24.0/src/Makefile.am	2008-09-22 14:54:48.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/src/Makefile.am	2009-02-15 19:25:59.000000000 +0000
-@@ -13,6 +13,8 @@
- 	Makefile.in
- 
- EXTRA_DIST =				\
-+	status-manager-marshal.list	\
-+	\
- 	fusa-display.h			\
- 	fusa-display-private.h		\
- 	fusa-manager.h			\
-@@ -21,8 +23,13 @@
- 	fusa-user-menu-item.h		\
- 	fusa-user-private.h		\
- 	fusa-utils.h			\
--	gdm-queue.h
--
-+	gdm-queue.h			\
-+	status-manager-marshal.h	\
-+	status-manager.h
-+
-+DISTCLEANFILES =			\
-+	status-manager-marshal.c	\
-+	status-manager-marshal.h
- 
- # ################### #
- #  The Applet Itself  #
-@@ -44,12 +51,17 @@
- 	fusa-user.c					\
- 	fusa-user-menu-item.c				\
- 	fusa-utils.c					\
--	gdm-queue.c
-+	gdm-queue.c					\
-+	status-manager-marshal.c			\
-+	status-manager.c
- 
- fast_user_switch_applet_LDADD =				\
- 	$(APPLET_LIBS)					\
- 	$(X_LIBS)
- 
-+status-manager-marshal.c: status-manager-marshal.list
-+	glib-genmarshal --body --prefix=status_manager_marshal $(srcdir)/status-manager-marshal.list > status-manager-marshal.c
-+	glib-genmarshal --header --prefix=status_manager_marshal $(srcdir)/status-manager-marshal.list > status-manager-marshal.h
- 
- # ##################### #
- #  Testing Application  #
-diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/src/status-manager.c fast-user-switch-applet-2.24.0.new/src/status-manager.c
---- fast-user-switch-applet-2.24.0/src/status-manager.c	1970-01-01 01:00:00.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/src/status-manager.c	2009-02-15 19:29:12.000000000 +0000
+
+=== added file 'src/status-manager-marshal.list'
+--- src/status-manager-marshal.list	1970-01-01 00:00:00 +0000
++++ src/status-manager-marshal.list	2008-08-26 16:36:04 +0000
+@@ -0,0 +1,6 @@
++# Pidgin Interface (im.pidgin)
++# Signal: SavedstatusChanged
++VOID:INT,INT
++# Mission Control Interface (org.freedesktop.Telepathy.MissionControl)
++# Signal: PresenceChanged
++VOID:UINT,STRING
+
+=== added file 'src/status-manager.c'
+--- src/status-manager.c	1970-01-01 00:00:00 +0000
++++ src/status-manager.c	2009-02-27 02:05:57 +0000
 @@ -0,0 +1,732 @@
 +/*
 + * Fast User Switch Applet: status-manager.c
@@ -1472,9 +1476,10 @@
 +
 +	return;
 +}
-diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/src/status-manager.h fast-user-switch-applet-2.24.0.new/src/status-manager.h
---- fast-user-switch-applet-2.24.0/src/status-manager.h	1970-01-01 01:00:00.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/src/status-manager.h	2009-02-15 19:25:59.000000000 +0000
+
+=== added file 'src/status-manager.h'
+--- src/status-manager.h	1970-01-01 00:00:00 +0000
++++ src/status-manager.h	2008-08-29 16:46:57 +0000
 @@ -0,0 +1,75 @@
 +/* 
 + * Fast User Switch Applet: status-manager.h
@@ -1551,13 +1556,4 @@
 +G_END_DECLS
 +
 +#endif /* !__FUSA_STATUS_MANAGER_H__ */
-diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/src/status-manager-marshal.list fast-user-switch-applet-2.24.0.new/src/status-manager-marshal.list
---- fast-user-switch-applet-2.24.0/src/status-manager-marshal.list	1970-01-01 01:00:00.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/src/status-manager-marshal.list	2009-02-15 19:25:59.000000000 +0000
-@@ -0,0 +1,6 @@
-+# Pidgin Interface (im.pidgin)
-+# Signal: SavedstatusChanged
-+VOID:INT,INT
-+# Mission Control Interface (org.freedesktop.Telepathy.MissionControl)
-+# Signal: PresenceChanged
-+VOID:UINT,STRING
+

=== modified file 'debian/patches/91_ltsp_new_features.patch'
--- debian/patches/91_ltsp_new_features.patch	2009-02-27 02:01:53 +0000
+++ debian/patches/91_ltsp_new_features.patch	2009-03-05 15:52:25 +0000
@@ -1,7 +1,7 @@
-diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/src/applet.c fast-user-switch-applet-2.24.0.new/src/applet.c
---- fast-user-switch-applet-2.24.0/src/applet.c	2009-02-10 18:53:32.000000000 +0000
-+++ fast-user-switch-applet-2.24.0.new/src/applet.c	2009-02-10 18:56:00.000000000 +0000
-@@ -2645,7 +2645,6 @@
+=== modified file 'src/applet.c'
+--- src/applet.c	2009-03-05 02:18:19 +0000
++++ src/applet.c	2009-03-05 02:18:33 +0000
+@@ -2812,7 +2812,6 @@
      } else {
        g_warning("GDM Command failed: ERROR");
      }
@@ -9,7 +9,7 @@
    }
  
    switch (action) {
-@@ -2681,7 +2680,8 @@
+@@ -2849,7 +2848,8 @@
     * gdm-guest-session installed, offer it */
    if (show_guest && !adata->guest_active &&
        access ("/usr/share/gdm/guest-session/guest-session-launch", X_OK) == 0 &&
@@ -19,22 +19,19 @@
      gtk_widget_show (adata->guest_session_item);
    else
      gtk_widget_hide (adata->guest_session_item);
-@@ -3358,11 +3358,13 @@
+@@ -3523,12 +3523,14 @@
  	if (adata->hibernate_available) {
  		gtk_widget_show(adata->hibernate_item);
  	}
--	if (adata->restart_available) {
--		gtk_widget_show(adata->reboot_item);
--	}
--	if (adata->shutdown_available) {
--		gtk_widget_show(adata->shutdown_item);
 +	if (!g_getenv("LTSP_CLIENT")) {
-+		if (adata->restart_available) {
-+			gtk_widget_show(adata->reboot_item);
-+		}
-+		if (adata->shutdown_available) {
-+			gtk_widget_show(adata->shutdown_item);
-+    	}
+ 	if (adata->restart_available) {
+ 		gtk_widget_show(adata->reboot_item);
+ 	}
+ 	if (adata->shutdown_available) {
+ 		gtk_widget_show(adata->shutdown_item);
      }
++	}
    }
  
+   return;
+

=== modified file 'debian/patches/92_autotools.patch'
--- debian/patches/92_autotools.patch	2009-02-27 02:01:53 +0000
+++ debian/patches/92_autotools.patch	2009-03-04 23:21:39 +0000
@@ -1,6 +1,23 @@
 diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/aclocal.m4 fast-user-switch-applet-2.24.0.new/aclocal.m4
---- fast-user-switch-applet-2.24.0/aclocal.m4	2008-09-22 15:25:32.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/aclocal.m4	2009-02-09 19:52:03.000000000 +0000
+--- fast-user-switch-applet-2.24.0/aclocal.m4	2008-09-22 09:25:32.000000000 -0500
++++ fast-user-switch-applet-2.24.0.new/aclocal.m4	2009-03-04 17:19:42.000000000 -0600
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
++# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
+ 
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ # 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+@@ -13,8 +13,8 @@
+ 
+ m4_ifndef([AC_AUTOCONF_VERSION],
+   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+-m4_if(AC_AUTOCONF_VERSION, [2.61],,
+-[m4_warning([this file was generated for autoconf 2.61.
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
++[m4_warning([this file was generated for autoconf 2.63.
+ You have another version of autoconf.  It may work, but is not guaranteed to.
+ If you have problems, you may need to regenerate the build system entirely.
+ To do so, use the procedure documented by the package, typically `autoreconf'.])])
 @@ -34,8 +34,10 @@
      GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
    fi
@@ -27,284 +44,15 @@
  
    AC_SUBST(GCONF_SCHEMA_FILE_DIR)
    AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-@@ -634,102 +638,419 @@
+@@ -634,6656 +638,36 @@
    AC_SUBST(WARN_CXXFLAGS)
  ])
  
-+dnl Do not call GNOME_DOC_DEFINES directly.  It is split out from
-+dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself.
-+AC_DEFUN([GNOME_DOC_DEFINES],
-+[
-+AC_ARG_WITH([help-dir],
-+  AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),,
-+  [with_help_dir='${datadir}/gnome/help'])
-+HELP_DIR="$with_help_dir"
-+AC_SUBST(HELP_DIR)
-+
-+AC_ARG_WITH([omf-dir],
-+  AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),,
-+  [with_omf_dir='${datadir}/omf'])
-+OMF_DIR="$with_omf_dir"
-+AC_SUBST(OMF_DIR)
-+
-+AC_ARG_WITH([help-formats],
-+  AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),,
-+  [with_help_formats=''])
-+DOC_USER_FORMATS="$with_help_formats"
-+AC_SUBST(DOC_USER_FORMATS)
-+
-+AC_ARG_ENABLE([scrollkeeper],
-+	[AC_HELP_STRING([--disable-scrollkeeper],
-+			[do not make updates to the scrollkeeper database])],,
-+	enable_scrollkeeper=yes)
-+AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"])
-+
-+dnl disable scrollkeeper automatically for distcheck
-+DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
-+AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
-+
-+AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"])
-+])
-+
-+# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
-+#
-+AC_DEFUN([GNOME_DOC_INIT],
-+[
-+ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1])
-+
-+PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required],
-+	[gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no])
-+
-+if test "$gdu_cv_have_gdu" = "yes"; then
-+	ifelse([$2],,[:],[$2])
-+else
-+	ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3])
-+fi
-+
-+GNOME_DOC_DEFINES
-+])
-+
-+
-+dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-+# serial 40 IT_PROG_INTLTOOL
-+AC_DEFUN([IT_PROG_INTLTOOL], [
-+AC_PREREQ([2.50])dnl
-+AC_REQUIRE([AM_NLS])dnl
-+
-+case "$am__api_version" in
-+    1.[01234])
-+	AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
-+    ;;
-+    *)
-+    ;;
-+esac
-+
-+if test -n "$1"; then
-+    AC_MSG_CHECKING([for intltool >= $1])
-+
-+    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-+    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 $< [$]@' 
-+     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
-+     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' 
-+      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+
-+AC_SUBST(INTLTOOL_DESKTOP_RULE)
-+AC_SUBST(INTLTOOL_DIRECTORY_RULE)
-+AC_SUBST(INTLTOOL_KEYS_RULE)
-+AC_SUBST(INTLTOOL_PROP_RULE)
-+AC_SUBST(INTLTOOL_OAF_RULE)
-+AC_SUBST(INTLTOOL_PONG_RULE)
-+AC_SUBST(INTLTOOL_SERVER_RULE)
-+AC_SUBST(INTLTOOL_SHEET_RULE)
-+AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
-+AC_SUBST(INTLTOOL_UI_RULE)
-+AC_SUBST(INTLTOOL_XAM_RULE)
-+AC_SUBST(INTLTOOL_KBD_RULE)
-+AC_SUBST(INTLTOOL_XML_RULE)
-+AC_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-+AC_SUBST(INTLTOOL_CAVES_RULE)
-+AC_SUBST(INTLTOOL_SCHEMAS_RULE)
-+AC_SUBST(INTLTOOL_THEME_RULE)
-+AC_SUBST(INTLTOOL_SERVICE_RULE)
-+AC_SUBST(INTLTOOL_POLICY_RULE)
-+
-+# Check the gettext tools to make sure they are GNU
-+AC_PATH_PROG(XGETTEXT, xgettext)
-+AC_PATH_PROG(MSGMERGE, msgmerge)
-+AC_PATH_PROG(MSGFMT, msgfmt)
-+AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-+    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-+fi
-+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
-+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
-+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
-+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-+    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-+fi
-+
-+AC_PATH_PROG(INTLTOOL_PERL, [perl])
-+if test -z "$INTLTOOL_PERL"; then
-+   AC_MSG_ERROR([perl not found; required for intltool])
-+fi
-+if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
-+   AC_MSG_ERROR([perl 5.x required for intltool])
-+fi
-+if test "x$2" != "xno-xml"; then
-+   AC_MSG_CHECKING([for XML::Parser])
-+   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-+       AC_MSG_RESULT([ok])
-+   else
-+       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
-+   fi
-+fi
-+
-+# Substitute ALL_LINGUAS so we can use it in po/Makefile
-+AC_SUBST(ALL_LINGUAS)
-+
-+# Set DATADIRNAME correctly if it is not set yet
-+# (copied from glib-gettext.m4)
-+if test -z "$DATADIRNAME"; then
-+  AC_LINK_IFELSE(
-+    [AC_LANG_PROGRAM([[]],
-+                     [[extern int _nl_msg_cat_cntr;
-+                       return _nl_msg_cat_cntr]])],
-+    [DATADIRNAME=share],
-+    [case $host in
-+    *-*-solaris*)
-+    dnl On Solaris, if bind_textdomain_codeset is in libc,
-+    dnl GNU format message catalog is always supported,
-+    dnl since both are added to the libc all together.
-+    dnl Hence, we'd like to go with DATADIRNAME=share
-+    dnl in this case.
-+    AC_CHECK_FUNC(bind_textdomain_codeset,
-+      [DATADIRNAME=share], [DATADIRNAME=lib])
-+    ;;
-+    *)
-+    [DATADIRNAME=lib]
-+    ;;
-+    esac])
-+fi
-+AC_SUBST(DATADIRNAME)
-+
-+IT_PO_SUBDIR([po])
-+
-+])
-+
-+
-+# IT_PO_SUBDIR(DIRNAME)
-+# ---------------------
-+# All po subdirs have to be declared with this macro; the subdir "po" is
-+# declared by IT_PROG_INTLTOOL.
-+#
-+AC_DEFUN([IT_PO_SUBDIR],
-+[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
-+dnl
-+dnl The following CONFIG_COMMANDS should be exetuted at the very end
-+dnl of config.status.
-+AC_CONFIG_COMMANDS_PRE([
-+  AC_CONFIG_COMMANDS([$1/stamp-it], [
-+    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" ]; then
-+       AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
-+    fi
-+    rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
-+    >"$1/stamp-it.tmp"
-+    [sed '/^#/d
-+	 s/^[[].*] *//
-+	 /^[ 	]*$/d
-+	'"s|^|	$ac_top_srcdir/|" \
-+      "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
-+    ]
-+    [sed '/^POTFILES =/,/[^\\]$/ {
-+		/^POTFILES =/!d
-+		r $1/POTFILES
-+	  }
-+	 ' "$1/Makefile.in" >"$1/Makefile"]
-+    rm -f "$1/Makefile.tmp"
-+    mv "$1/stamp-it.tmp" "$1/stamp-it"
-+  ])
-+])dnl
-+])
-+
-+# deprecated macros
-+AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
-+# A hint is needed for aclocal from Automake <= 1.9.4:
-+# AC_DEFUN([AC_PROG_INTLTOOL], ...)
-+
-+
- # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-+#
-+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-+#                 2006, 2007, 2008 Free Software Foundation, Inc.
-+#   Written by Gordon Matzigkeit, 1996
-+#
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to copy and/or distribute it, with or without
-+# modifications, as long as this notice is preserved.
-+
-+m4_define([_LT_COPYING], [dnl
-+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-+#                 2006, 2007, 2008 Free Software Foundation, Inc.
-+#   Written by Gordon Matzigkeit, 1996
-+#
-+#   This file is part of GNU Libtool.
-+#
-+# GNU Libtool 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 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.
-+])
- 
+-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+-
 -# serial 52 Debian 1.5.26-1ubuntu1 AC_PROG_LIBTOOL
-+# serial 56 LT_INIT
- 
- 
+-
+-
 -# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
 -# -----------------------------------------------------------
 -# If this macro is not defined by Autoconf, define it here.
@@ -313,17 +61,8 @@
 -         [m4_define([AC_PROVIDE_IFELSE],
 -	         [m4_ifdef([AC_PROVIDE_$1],
 -		           [$2], [$3])])])
-+# LT_PREREQ(VERSION)
-+# ------------------
-+# Complain and exit if this libtool version is less that VERSION.
-+m4_defun([LT_PREREQ],
-+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
-+       [m4_default([$3],
-+		   [m4_fatal([Libtool version $1 or higher is required],
-+		             63)])],
-+       [$2])])
- 
- 
+-
+-
 -# AC_PROG_LIBTOOL
 -# ---------------
 -AC_DEFUN([AC_PROG_LIBTOOL],
@@ -357,17 +96,8 @@
 -	     [define([LT_AC_PROG_GCJ],
 -		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
 -])])# AC_PROG_LIBTOOL
-+# _LT_CHECK_BUILDDIR
-+# ------------------
-+# Complain if the absolute build directory name contains unusual characters
-+m4_defun([_LT_CHECK_BUILDDIR],
-+[case `pwd` in
-+  *\ * | *\	*)
-+    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
-+esac
-+])
- 
- 
+-
+-
 -# _AC_PROG_LIBTOOL
 -# ----------------
 -AC_DEFUN([_AC_PROG_LIBTOOL],
@@ -375,53 +105,19 @@
 -AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
 -AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
 -AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-+# LT_INIT([OPTIONS])
-+# ------------------
-+AC_DEFUN([LT_INIT],
-+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-+AC_BEFORE([$0], [LT_LANG])dnl
-+AC_BEFORE([$0], [LT_OUTPUT])dnl
-+AC_BEFORE([$0], [LTDL_INIT])dnl
-+m4_require([_LT_CHECK_BUILDDIR])dnl
-+
-+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-+dnl unless we require an AC_DEFUNed macro:
-+AC_REQUIRE([LTOPTIONS_VERSION])dnl
-+AC_REQUIRE([LTSUGAR_VERSION])dnl
-+AC_REQUIRE([LTVERSION_VERSION])dnl
-+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-+m4_require([_LT_PROG_LTMAIN])dnl
-+
-+dnl Parse OPTIONS
-+_LT_SET_OPTIONS([$0], [$1])
- 
- # This can be used to rebuild libtool when needed
+-
+-# This can be used to rebuild libtool when needed
 -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="$ltmain"
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- AC_SUBST(LIBTOOL)dnl
- 
+-
+-# Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+-AC_SUBST(LIBTOOL)dnl
+-
 -# Prevent multiple expansion
 -define([AC_PROG_LIBTOOL], [])
 -])# _AC_PROG_LIBTOOL
-+_LT_SETUP
- 
-+# Only expand once:
-+m4_define([LT_INIT])
-+])# LT_INIT
-+
-+# Old names:
-+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
- 
+-
+-
 -# AC_LIBTOOL_SETUP
 -# ----------------
 -AC_DEFUN([AC_LIBTOOL_SETUP],
@@ -430,151 +126,82 @@
 -AC_REQUIRE([AC_ENABLE_STATIC])dnl
 -AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
 -AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+
-+# _LT_CC_BASENAME(CC)
-+# -------------------
-+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-+m4_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_FILEUTILS_DEFAULTS
-+# ----------------------
-+# It is okay to use these file commands and assume they have been set
-+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
-+m4_defun([_LT_FILEUTILS_DEFAULTS],
-+[: ${CP="cp -f"}
-+: ${MV="mv -f"}
-+: ${RM="rm -f"}
-+])# _LT_FILEUTILS_DEFAULTS
-+
-+
-+# _LT_SETUP
-+# ---------
-+m4_defun([_LT_SETUP],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
- AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+_LT_DECL([], [host_alias], [0], [The host system])dnl
-+_LT_DECL([], [host], [0])dnl
-+_LT_DECL([], [host_os], [0])dnl
-+dnl
-+_LT_DECL([], [build_alias], [0], [The build system])dnl
-+_LT_DECL([], [build], [0])dnl
-+_LT_DECL([], [build_os], [0])dnl
-+dnl
- AC_REQUIRE([AC_PROG_CC])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([LT_PATH_LD])dnl
-+AC_REQUIRE([LT_PATH_NM])dnl
-+dnl
- AC_REQUIRE([AC_PROG_LN_S])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
-+test -z "$LN_S" && LN_S="ln -s"
-+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
-+dnl
-+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
-+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
-+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
- dnl
+-dnl
 -AC_LIBTOOL_SYS_MAX_CMD_LEN
 -AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
 -AC_LIBTOOL_OBJDIR
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-+m4_require([_LT_CMD_RELOAD])dnl
-+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
-+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-+
-+_LT_CONFIG_LIBTOOL_INIT([
-+# See if we are running on zsh, and set the options which allow our
-+# commands through without removal of \ escapes INIT.
-+if test -n "\${ZSH_VERSION+set}" ; then
-+   setopt NO_GLOB_SUBST
-+fi
-+])
-+if test -n "${ZSH_VERSION+set}" ; then
-+   setopt NO_GLOB_SUBST
-+fi
-+
-+_LT_CHECK_OBJDIR
- 
+-
 -AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
 -_LT_AC_PROG_ECHO_BACKSLASH
-+m4_require([_LT_TAG_COMPILER])dnl
-+_LT_PROG_ECHO_BACKSLASH
- 
- case $host_os in
- aix3*)
-@@ -745,6545 +1066,7753 @@
- 
- # Sed substitution that helps us do robust quoting.  It backslashifies
- # metacharacters that are still active within double-quoted strings.
+-
+-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']
-+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
- 
- # Same as above, but do not quote variable references.
+-
+-# Same as above, but do not quote variable references.
 -[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
-+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 delay expansion of an escaped single quote.
-+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-+
- # Sed substitution to avoid accidental globbing in evaled expressions
- no_glob_subst='s/\*/\\\*/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:
+-# Global variables:
 -default_ofile=libtool
-+ofile=libtool
- can_build_shared=yes
- 
- # All known linkers require a `.a' archive for static linking (except MSVC,
- # which needs '.lib').
- libext=a
+-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, :)
-+with_gnu_ld="$lt_cv_prog_gnu_ld"
- 
- old_CC="$CC"
- old_CFLAGS="$CFLAGS"
- 
- # Set sane defaults for various variables
+-
+-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 "$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 "$LD" && LD=ld
 -test -z "$LN_S" && LN_S="ln -s"
 -test -z "$MAGIC_CMD" && MAGIC_CMD=file
 -test -z "$NM" && NM=nm
@@ -582,8 +209,8 @@
 -test -z "$OBJDUMP" && OBJDUMP=objdump
 -test -z "$RANLIB" && RANLIB=:
 -test -z "$STRIP" && STRIP=:
- test -z "$ac_objext" && ac_objext=o
- 
+-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'
@@ -601,27 +228,19 @@
 -  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
-+test -z "$MAGIC_CMD" && MAGIC_CMD=file
- case $deplibs_check_method in
- file_magic*)
-   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+-_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
-+    _LT_PATH_MAGIC
-   fi
-   ;;
- esac
- 
+-  fi
+-  ;;
+-esac
+-
 -_LT_REQUIRED_DARWIN_CHECKS
-+# Use C for the default configuration in the libtool script
-+LT_SUPPORTED_TAG([CC])
-+_LT_LANG_C_CONFIG
-+_LT_LANG_DEFAULT_CONFIG
-+_LT_CONFIG_COMMANDS
-+])# _LT_SETUP
- 
+-
 -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)
@@ -630,62 +249,37 @@
 -    [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
-+# _LT_PROG_LTMAIN
-+# ---------------
-+# Note that this code is called both from `configure', and `config.status'
-+# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
-+# `config.status' has no value for ac_aux_dir unless we are using Automake,
-+# so we pass a copy along to make sure it has a sensible value anyway.
-+m4_defun([_LT_PROG_LTMAIN],
-+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
-+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-+ltmain="$ac_aux_dir/ltmain.sh"
-+])# _LT_PROG_LTMAIN
- 
+-
 -# 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
-+# So that we can recreate a full libtool script including additional
-+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-+# in macros and then make a single call at the end using the `libtool'
-+# label.
- 
+-
 -# If no C compiler was specified, use CC.
 -LTCC=${LTCC-"$CC"}
- 
+-
 -# If no C compiler flags were specified, use CFLAGS.
 -LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
-+# ----------------------------------------
-+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-+m4_define([_LT_CONFIG_LIBTOOL_INIT],
-+[m4_ifval([$1],
-+          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
-+                     [$1
-+])])])
- 
+-
 -# Allow CC to be a program name with arguments.
 -compiler=$CC
 -])# _LT_AC_SYS_COMPILER
-+# Initialize.
-+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
- 
- 
+-
+-
 -# _LT_CC_BASENAME(CC)
 -# -------------------
 -# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
@@ -699,27 +293,9 @@
 -  esac
 -done
 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+# _LT_CONFIG_LIBTOOL([COMMANDS])
-+# ------------------------------
-+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-+m4_define([_LT_CONFIG_LIBTOOL],
-+[m4_ifval([$1],
-+          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
-+                     [$1
-+])])])
-+
-+# Initialize.
-+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
-+
-+
-+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
-+# -----------------------------------------------------
-+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
-+[_LT_CONFIG_LIBTOOL([$1])
-+_LT_CONFIG_LIBTOOL_INIT([$2])
- ])
- 
- 
+-])
+-
+-
 -# _LT_COMPILER_BOILERPLATE
 -# ------------------------
 -# Check for compiler boilerplate output or warnings with
@@ -732,17 +308,8 @@
 -_lt_compiler_boilerplate=`cat conftest.err`
 -$rm conftest*
 -])# _LT_COMPILER_BOILERPLATE
-+# _LT_FORMAT_COMMENT([COMMENT])
-+# -----------------------------
-+# Add leading comment marks to the start of each line, and a trailing
-+# full-stop to the whole comment if one is not present already.
-+m4_define([_LT_FORMAT_COMMENT],
-+[m4_ifval([$1], [
-+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
-+              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
-+)])
- 
- 
+-
+-
 -# _LT_LINKER_BOILERPLATE
 -# ----------------------
 -# Check for linker boilerplate output or warnings with
@@ -755,7 +322,7 @@
 -_lt_linker_boilerplate=`cat conftest.err`
 -$rm -r conftest*
 -])# _LT_LINKER_BOILERPLATE
- 
+-
 -# _LT_REQUIRED_DARWIN_CHECKS
 -# --------------------------
 -# Check for some things on darwin
@@ -764,7 +331,7 @@
 -    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
@@ -826,24 +393,8 @@
 -    fi
 -    ;;
 -  esac
-+
-+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
-+# -------------------------------------------------------------------
-+# CONFIGNAME is the name given to the value in the libtool script.
-+# VARNAME is the (base) name used in the configure script.
-+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
-+# VARNAME.  Any other value will be used directly.
-+m4_define([_LT_DECL],
-+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
-+    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
-+	[m4_ifval([$1], [$1], [$2])])
-+    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
-+    m4_ifval([$4],
-+	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
-+    lt_dict_add_subkey([lt_decl_dict], [$2],
-+	[tagged?], [m4_ifval([$5], [yes], [no])])])
- ])
- 
+-])
+-
 -# _LT_AC_SYS_LIBPATH_AIX
 -# ----------------------
 -# Links a minimal program and checks the executable
@@ -869,29 +420,8 @@
 -fi],[])
 -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 -])# _LT_AC_SYS_LIBPATH_AIX
- 
-+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
-+# --------------------------------------------------------
-+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
-+
-+
-+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
-+# ------------------------------------------------
-+m4_define([lt_decl_tag_varnames],
-+[_lt_decl_filter([tagged?], [yes], $@)])
-+
-+
-+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
-+# ---------------------------------------------------------
-+m4_define([_lt_decl_filter],
-+[m4_case([$#],
-+  [0], [m4_fatal([$0: too few arguments: $#])],
-+  [1], [m4_fatal([$0: too few arguments: $#: $1])],
-+  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
-+  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
-+  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
-+])
- 
+-
+-
 -# _LT_AC_SHELL_INIT(ARG)
 -# ----------------------
 -AC_DEFUN([_LT_AC_SHELL_INIT],
@@ -901,43 +431,8 @@
 -$1
 -AC_DIVERT_POP
 -])# _LT_AC_SHELL_INIT
- 
-+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
-+# --------------------------------------------------
-+m4_define([lt_decl_quote_varnames],
-+[_lt_decl_filter([value], [1], $@)])
-+
-+
-+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
-+# ---------------------------------------------------
-+m4_define([lt_decl_dquote_varnames],
-+[_lt_decl_filter([value], [2], $@)])
-+
-+
-+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
-+# ---------------------------------------------------
-+m4_define([lt_decl_varnames_tagged],
-+[_$0(m4_quote(m4_default([$1], [[, ]])),
-+     m4_quote(m4_if([$2], [],
-+		     m4_quote(lt_decl_tag_varnames),
-+		  m4_quote(m4_shift($@)))),
-+     m4_split(m4_normalize(m4_quote(_LT_TAGS))))])
-+m4_define([_lt_decl_varnames_tagged], [lt_combine([$1], [$2], [_], $3)])
-+
-+
-+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
-+# ------------------------------------------------
-+m4_define([lt_decl_all_varnames],
-+[_$0(m4_quote(m4_default([$1], [[, ]])),
-+     m4_if([$2], [],
-+	   m4_quote(lt_decl_varnames),
-+	m4_quote(m4_shift($@))))[]dnl
-+])
-+m4_define([_lt_decl_all_varnames],
-+[lt_join($@, lt_decl_varnames_tagged([$1],
-+			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
-+])
- 
+-
+-
 -# _LT_AC_PROG_ECHO_BACKSLASH
 -# --------------------------
 -# Add some code to the start of the generated configure script which
@@ -946,21 +441,14 @@
 -[_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
-+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
-+# ------------------------------------
-+# Quote a variable value, and forward it to `config.status' so that its
-+# declaration there will have the same value as in `configure'.  VARNAME
-+# must have a single quote delimited value for this to work.
-+m4_define([_LT_CONFIG_STATUS_DECLARE],
-+[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
- 
+-
 -echo=${ECHO-echo}
 -if test "X[$]1" = X--no-reexec; then
 -  # Discard the --no-reexec flag, and continue.
@@ -975,7 +463,7 @@
 -  # 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
@@ -984,22 +472,11 @@
 -EOF
 -  exit 0
 -fi
-+# _LT_CONFIG_STATUS_DECLARATIONS
-+# ------------------------------
-+# We delimit libtool config variables with single quotes, so when
-+# we write them to config.status, we have to be sure to quote all
-+# embedded single quotes properly.  In configure, this macro expands
-+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
-+#
-+#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
-+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
-+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
-+    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
- 
+-
 -# 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
@@ -1013,14 +490,7 @@
 -    fi
 -  done
 -fi
-+# _LT_LIBTOOL_TAGS
-+# ----------------
-+# Output comment and list of tags supported by the script
-+m4_defun([_LT_LIBTOOL_TAGS],
-+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-+available_tags="_LT_TAGS"dnl
-+])
- 
+-
 -if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
 -   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
 -   test "X$echo_testing_string" = "X$echo_test_string"; then
@@ -1031,7 +501,7 @@
 -  #   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"
@@ -1044,26 +514,7 @@
 -    fi
 -  done
 -  IFS="$lt_save_ifs"
-+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
-+# -----------------------------------
-+# Extract the dictionary values for VARNAME (optionally with TAG) and
-+# expand to a commented shell variable setting:
-+#
-+#    # Some comment about what VAR is for.
-+#    visible_name=$lt_internal_name
-+m4_define([_LT_LIBTOOL_DECLARE],
-+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
-+					   [description])))[]dnl
-+m4_pushdef([_libtool_name],
-+    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
-+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
-+    [0], [_libtool_name=[$]$1],
-+    [1], [_libtool_name=$lt_[]$1],
-+    [2], [_libtool_name=$lt_[]$1],
-+    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
-+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
-+])
- 
+-
 -  if test "X$echo" = Xecho; then
 -    # We didn't find a better echo, so look for alternatives.
 -    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
@@ -1104,7 +555,7 @@
 -      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
@@ -1112,17 +563,7 @@
 -	  fi
 -	  prev="$cmd"
 -	done
-+# _LT_LIBTOOL_CONFIG_VARS
-+# -----------------------
-+# Produce commented declarations of non-tagged libtool config variables
-+# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
-+# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
-+# section) are produced by _LT_LIBTOOL_TAG_VARS.
-+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
-+[m4_foreach([_lt_var],
-+    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
-+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
- 
+-
 -	if test "$prev" != 'sed 50q "[$]0"'; then
 -	  echo_test_string=`eval $prev`
 -	  export echo_test_string
@@ -1136,26 +577,18 @@
 -  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
-+# _LT_LIBTOOL_TAG_VARS(TAG)
-+# -------------------------
-+m4_define([_LT_LIBTOOL_TAG_VARS],
-+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
-+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
- 
+-
 -AC_SUBST(ECHO)
 -])])# _LT_AC_PROG_ECHO_BACKSLASH
- 
-+# _LT_TAGVAR(VARNAME, [TAGNAME])
-+# ------------------------------
-+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
- 
+-
+-
 -# _LT_AC_LOCK
 -# -----------
 -AC_DEFUN([_LT_AC_LOCK],
@@ -1163,7 +596,7 @@
 -    [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
@@ -1214,28 +647,7 @@
 -  fi
 -  rm -rf conftest*
 -  ;;
-+# _LT_CONFIG_COMMANDS
-+# -------------------
-+# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
-+# variables for single and double quote escaping we saved from calls
-+# to _LT_DECL, we can put quote escaped variables declarations
-+# into `config.status', and then the shell code to quote escape them in
-+# for loops in `config.status'.  Finally, any additional code accumulated
-+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
-+m4_defun([_LT_CONFIG_COMMANDS],
-+[AC_PROVIDE_IFELSE([LT_OUTPUT],
-+	dnl If the libtool generation code has been placed in $CONFIG_LT,
-+	dnl instead of duplicating it all over again into config.status,
-+	dnl then we will have config.status run $CONFIG_LT later, so it
-+	dnl needs to know what name is stored there:
-+        [AC_CONFIG_COMMANDS([libtool],
-+            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
-+    dnl If the libtool generation code is destined for config.status,
-+    dnl expand the accumulated commands and init code now:
-+    [AC_CONFIG_COMMANDS([libtool],
-+        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
-+])#_LT_CONFIG_COMMANDS
- 
+-
 -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
 -s390*-*linux*|sparc*-*linux*)
 -  # Find out which ABI we are using.
@@ -1260,30 +672,7 @@
 -          LD="${LD-ld} -m elf32_sparc"
 -          ;;
 -      esac
-+
-+# Initialize.
-+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
-+[
-+
-+# 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
-+
-+sed_quote_subst='$sed_quote_subst'
-+double_quote_subst='$double_quote_subst'
-+delay_variable_subst='$delay_variable_subst'
-+_LT_CONFIG_STATUS_DECLARATIONS
-+LTCC='$LTCC'
-+LTCFLAGS='$LTCFLAGS'
-+compiler='$compiler_DEFAULT'
-+
-+# Quote evaled strings.
-+for var in lt_decl_all_varnames([[ \
-+]], lt_decl_quote_varnames); do
-+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-+    *[[\\\\\\\`\\"\\\$]]*)
-+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-       ;;
+-      ;;
 -    *64-bit*)
 -      case $host in
 -        x86_64-*kfreebsd*-gnu)
@@ -1302,15 +691,12 @@
 -          LD="${LD-ld} -m elf64_sparc"
 -          ;;
 -      esac
-+    *)
-+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-       ;;
-     esac
+-      ;;
+-    esac
 -  fi
 -  rm -rf conftest*
 -  ;;
-+done
- 
+-
 -*-*-sco3.2v5*)
 -  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
 -  SAVE_CFLAGS="$CFLAGS"
@@ -1338,62 +724,26 @@
 -	fi
 -	;;
 -      esac
-+# Double-quote double-evaled strings.
-+for var in lt_decl_all_varnames([[ \
-+]], lt_decl_dquote_varnames); do
-+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-+    *[[\\\\\\\`\\"\\\$]]*)
-+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-+      ;;
-+    *)
-+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-       ;;
-     esac
+-      ;;
+-    esac
 -  fi
 -  rm -rf conftest*
 -  ;;
-+done
- 
+-
 -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)
-+# Fix-up fallback echo if it was mangled by the above quoting rules.
-+case \$lt_ECHO in
-+*'\\\[$]0 --fallback-echo"')dnl "
-+  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
-   ;;
+-  ;;
 -  ])
- esac
- 
+-esac
+-
 -need_locks="$enable_libtool_lock"
-+_LT_OUTPUT_LIBTOOL_INIT
-+])
- 
+-
 -])# _LT_AC_LOCK
- 
-+# LT_OUTPUT
-+# ---------
-+# This macro allows early generation of the libtool script (before
-+# AC_OUTPUT is called), incase it is used in configure for compilation
-+# tests.
-+AC_DEFUN([LT_OUTPUT],
-+[: ${CONFIG_LT=./config.lt}
-+AC_MSG_NOTICE([creating $CONFIG_LT])
-+cat >"$CONFIG_LT" <<_LTEOF
-+#! $SHELL
-+# Generated by $as_me.
-+# Run this file to recreate a libtool stub with the current configuration.
-+
-+lt_cl_silent=false
-+SHELL=\${CONFIG_SHELL-$SHELL}
-+_LTEOF
-+
-+cat >>"$CONFIG_LT" <<\_LTEOF
-+AS_SHELL_SANITIZE
-+_AS_PREPARE
- 
+-
+-
 -# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
 -#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
 -# ----------------------------------------------------------------
@@ -1430,57 +780,15 @@
 -   fi
 -   $rm conftest*
 -])
-+exec AS_MESSAGE_FD>&1
-+exec AS_MESSAGE_LOG_FD>>config.log
-+{
-+  echo
-+  AS_BOX([Running $as_me.])
-+} >&AS_MESSAGE_LOG_FD
-+
-+lt_cl_help="\
-+\`$as_me' creates a local libtool stub from the current configuration,
-+for use in further configure time tests before the real libtool is
-+generated.
-+
-+Usage: $[0] [[OPTIONS]]
-+
-+  -h, --help      print this help, then exit
-+  -V, --version   print version number, then exit
-+  -q, --quiet     do not print progress messages
-+  -d, --debug     don't remove temporary files
-+
-+Report bugs to <bug-libtool@gnu.org>."
-+
-+lt_cl_version="\
-+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
-+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
-+configured by $[0], generated by m4_PACKAGE_STRING.
-+
-+Copyright (C) 2008 Free Software Foundation, Inc.
-+This config.lt script is free software; the Free Software Foundation
-+gives unlimited permision to copy, distribute and modify it."
- 
+-
 -if test x"[$]$2" = xyes; then
 -    ifelse([$5], , :, [$5])
 -else
 -    ifelse([$6], , :, [$6])
 -fi
 -])# AC_LIBTOOL_COMPILER_OPTION
-+while test $[#] != 0
-+do
-+  case $[1] in
-+    --version | --v* | -V )
-+      echo "$lt_cl_version"; exit 0 ;;
-+    --help | --h* | -h )
-+      echo "$lt_cl_help"; exit 0 ;;
-+    --debug | --d* | -d )
-+      debug=: ;;
-+    --quiet | --q* | --silent | --s* | -q )
-+      lt_cl_silent=: ;;
- 
-+    -*) AC_MSG_ERROR([unrecognized option: $[1]
-+Try \`$[0] --help' for more information.]) ;;
- 
+-
+-
 -# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
 -#                          [ACTION-SUCCESS], [ACTION-FAILURE])
 -# ------------------------------------------------------------
@@ -1510,48 +818,15 @@
 -   $rm -r conftest*
 -   LDFLAGS="$save_LDFLAGS"
 -])
-+    *) AC_MSG_ERROR([unrecognized argument: $[1]
-+Try \`$[0] --help' for more information.]) ;;
-+  esac
-+  shift
-+done
- 
+-
 -if test x"[$]$2" = xyes; then
 -    ifelse([$4], , :, [$4])
 -else
 -    ifelse([$5], , :, [$5])
-+if $lt_cl_silent; then
-+  exec AS_MESSAGE_FD>/dev/null
- fi
+-fi
 -])# AC_LIBTOOL_LINKER_OPTION
-+_LTEOF
- 
-+cat >>"$CONFIG_LT" <<_LTEOF
-+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
-+_LTEOF
-+
-+cat >>"$CONFIG_LT" <<\_LTEOF
-+AC_MSG_NOTICE([creating $ofile])
-+_LT_OUTPUT_LIBTOOL_COMMANDS
-+AS_EXIT(0)
-+_LTEOF
-+chmod +x "$CONFIG_LT"
-+
-+# configure is writing to config.log, but config.lt does its own redirection,
-+# appending to config.log, which fails on DOS, as config.log is still kept
-+# open by configure.  Here we exec the FD to /dev/null, effectively closing
-+# config.log, so it can be properly (re)opened and appended to by config.lt.
-+if test "$no_create" != yes; then
-+  lt_cl_success=:
-+  test "$silent" = yes &&
-+    lt_config_lt_args="$lt_config_lt_args --quiet"
-+  exec AS_MESSAGE_LOG_FD>/dev/null
-+  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-+  exec AS_MESSAGE_LOG_FD>>config.log
-+  $lt_cl_success || AS_EXIT(1)
-+fi
-+])# LT_OUTPUT
- 
+-
+-
 -# AC_LIBTOOL_SYS_MAX_CMD_LEN
 -# --------------------------
 -AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
@@ -1560,7 +835,7 @@
 -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
@@ -1569,36 +844,14 @@
 -    # check would be larger than it should be.
 -    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
 -    ;;
-+# _LT_CONFIG(TAG)
-+# ---------------
-+# If TAG is the built-in tag, 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 TAG from the
-+# matching tagged config vars.
-+m4_defun([_LT_CONFIG],
-+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+_LT_CONFIG_SAVE_COMMANDS([
-+  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
-+  m4_if(_LT_TAG, [C], [
-+    # 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
-+
-+    cfgfile="${ofile}T"
-+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-+    $RM "$cfgfile"
- 
+-
 -  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;
 -    ;;
-+    cat <<_LT_EOF >> "$cfgfile"
-+#! $SHELL
- 
+-
 -  cygwin* | mingw*)
 -    # On Win9x/ME, this test blows up -- it succeeds, but takes
 -    # about 5 minutes as the teststring grows exponentially.
@@ -1609,14 +862,7 @@
 -    # all of the supported platforms: 8192 (on NT/2K/XP).
 -    lt_cv_sys_max_cmd_len=8192;
 -    ;;
-+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-+#
-+_LT_COPYING
-+_LT_LIBTOOL_TAGS
- 
+-
 -  amigaos*)
 -    # On AmigaOS with pdksh, this test takes hours, literally.
 -    # So we just punt and use a minimum line length of 8192.
@@ -1636,17 +882,12 @@
 -    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`
 -    ;;
-+# ### BEGIN LIBTOOL CONFIG
-+_LT_LIBTOOL_CONFIG_VARS
-+_LT_LIBTOOL_TAG_VARS
-+# ### END LIBTOOL CONFIG
- 
+-
 -  interix*)
 -    # We know the value 262144 and hardcode it with a safety zone (like BSD)
 -    lt_cv_sys_max_cmd_len=196608
 -    ;;
-+_LT_EOF
- 
+-
 -  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
@@ -1693,19 +934,8 @@
 -      # 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
-+  case $host_os in
-+  aix3*)
-+    cat <<\_LT_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
-+_LT_EOF
-     ;;
-   esac
+-    ;;
+-  esac
 -])
 -if test -n $lt_cv_sys_max_cmd_len ; then
 -  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
@@ -1713,23 +943,15 @@
 -  AC_MSG_RESULT(none)
 -fi
 -])# AC_LIBTOOL_SYS_MAX_CMD_LEN
- 
-+  _LT_PROG_LTMAIN
- 
+-
+-
 -# _LT_AC_CHECK_DLFCN
 -# ------------------
 -AC_DEFUN([_LT_AC_CHECK_DLFCN],
 -[AC_CHECK_HEADERS(dlfcn.h)dnl
 -])# _LT_AC_CHECK_DLFCN
-+  # 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 '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-+    || (rm -f "$cfgfile"; exit 1)
- 
-+  _LT_PROG_XSI_SHELLFNS
- 
+-
+-
 -# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
 -#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
 -# ---------------------------------------------------------------------
@@ -1743,36 +965,13 @@
 -  cat > conftest.$ac_ext <<EOF
 -[#line __oline__ "configure"
 -#include "confdefs.h"
-+  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-+    || (rm -f "$cfgfile"; exit 1)
- 
+-
 -#if HAVE_DLFCN_H
 -#include <dlfcn.h>
 -#endif
-+  mv -f "$cfgfile" "$ofile" ||
-+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-+  chmod +x "$ofile"
-+],
-+[cat <<_LT_EOF >> "$ofile"
- 
+-
 -#include <stdio.h>
-+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
-+dnl in a comment (ie after a #).
-+# ### BEGIN LIBTOOL TAG CONFIG: $1
-+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
-+# ### END LIBTOOL TAG CONFIG: $1
-+_LT_EOF
-+])dnl /m4_if
-+],
-+[m4_if([$1], [], [
-+    PACKAGE='$PACKAGE'
-+    VERSION='$VERSION'
-+    TIMESTAMP='$TIMESTAMP'
-+    RM='$RM'
-+    ofile='$ofile'], [])
-+])dnl /_LT_CONFIG_SAVE_COMMANDS
-+])# _LT_CONFIG
- 
+-
 -#ifdef RTLD_GLOBAL
 -#  define LT_DLGLOBAL		RTLD_GLOBAL
 -#else
@@ -1782,7 +981,7 @@
 -#    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
@@ -1804,26 +1003,17 @@
 -#    endif
 -#  endif
 -#endif
-+# LT_SUPPORTED_TAG(TAG)
-+# ---------------------
-+# Trace this macro to discover what tags are supported by the libtool
-+# --tag option, using:
-+#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
-+AC_DEFUN([LT_SUPPORTED_TAG], [])
- 
+-
 -#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;
-+# C support is built-in for now
-+m4_define([_LT_LANG_C_enabled], [])
-+m4_define([_LT_TAGS], [])
- 
+-
 -  if (self)
 -    {
 -      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
@@ -1832,7 +1022,7 @@
 -    }
 -  else
 -    puts (dlerror ());
- 
+-
 -    exit (status);
 -}]
 -EOF
@@ -1851,24 +1041,8 @@
 -fi
 -rm -fr conftest*
 -])# _LT_AC_TRY_DLOPEN_SELF
-+# LT_LANG(LANG)
-+# -------------
-+# Enable libtool support for the given language if not already enabled.
-+AC_DEFUN([LT_LANG],
-+[AC_BEFORE([$0], [LT_OUTPUT])dnl
-+m4_case([$1],
-+  [C],			[_LT_LANG(C)],
-+  [C++],		[_LT_LANG(CXX)],
-+  [Java],		[_LT_LANG(GCJ)],
-+  [Fortran 77],		[_LT_LANG(F77)],
-+  [Fortran],		[_LT_LANG(FC)],
-+  [Windows Resource],	[_LT_LANG(RC)],
-+  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
-+    [_LT_LANG($1)],
-+    [m4_fatal([$0: unsupported language: "$1"])])])dnl
-+])# LT_LANG
- 
- 
+-
+-
 -# AC_LIBTOOL_DLOPEN_SELF
 -# ----------------------
 -AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
@@ -1880,78 +1054,24 @@
 -else
 -  lt_cv_dlopen=no
 -  lt_cv_dlopen_libs=
-+# _LT_LANG(LANGNAME)
-+# ------------------
-+m4_defun([_LT_LANG],
-+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
-+  [LT_SUPPORTED_TAG([$1])dnl
-+  m4_append([_LT_TAGS], [$1 ])dnl
-+  m4_define([_LT_LANG_]$1[_enabled], [])dnl
-+  _LT_LANG_$1_CONFIG($1)])dnl
-+])# _LT_LANG
- 
+-
 -  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=
 -   ;;
-+# _LT_LANG_DEFAULT_CONFIG
-+# -----------------------
-+m4_defun([_LT_LANG_DEFAULT_CONFIG],
-+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
-+  [LT_LANG(CXX)],
-+  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
-+
-+AC_PROVIDE_IFELSE([AC_PROG_F77],
-+  [LT_LANG(F77)],
-+  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
-+
-+AC_PROVIDE_IFELSE([AC_PROG_FC],
-+  [LT_LANG(FC)],
-+  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
-+
-+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
-+dnl pulling things in needlessly.
-+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-+  [LT_LANG(GCJ)],
-+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-+    [LT_LANG(GCJ)],
-+    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
-+      [LT_LANG(GCJ)],
-+      [m4_ifdef([AC_PROG_GCJ],
-+	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
-+       m4_ifdef([A][M_PROG_GCJ],
-+	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
-+       m4_ifdef([LT_PROG_GCJ],
-+	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
-+
-+AC_PROVIDE_IFELSE([LT_PROG_RC],
-+  [LT_LANG(RC)],
-+  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
-+])# _LT_LANG_DEFAULT_CONFIG
-+
-+# Obsolete macros:
-+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
-+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
-+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
-+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
-+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
-+dnl AC_DEFUN([AC_LIBTOOL_FC], [])
-+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
- 
+-
 -  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],
@@ -1961,11 +1081,7 @@
 -    lt_cv_dlopen_self=yes
 -    ])
 -   ;;
-+# _LT_TAG_COMPILER
-+# ----------------
-+m4_defun([_LT_TAG_COMPILER],
-+[AC_REQUIRE([AC_PROG_CC])dnl
- 
+-
 -  *)
 -    AC_CHECK_FUNC([shl_load],
 -	  [lt_cv_dlopen="shl_load"],
@@ -1986,54 +1102,31 @@
 -      ])
 -    ;;
 -  esac
-+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
-+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
-+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
-+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
- 
+-
 -  if test "x$lt_cv_dlopen" != xno; then
 -    enable_dlopen=yes
 -  else
 -    enable_dlopen=no
 -  fi
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
- 
+-
 -  case $lt_cv_dlopen in
 -  dlopen)
 -    save_CPPFLAGS="$CPPFLAGS"
 -    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
- 
+-
 -    save_LDFLAGS="$LDFLAGS"
 -    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
-+])# _LT_TAG_COMPILER
- 
+-
 -    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)
 -    ])
-+# _LT_COMPILER_BOILERPLATE
-+# ------------------------
-+# Check for compiler boilerplate output or warnings with
-+# the simple compiler test code.
-+m4_defun([_LT_COMPILER_BOILERPLATE],
-+[m4_require([_LT_DECL_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
- 
+-
 -    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],
@@ -2043,125 +1136,26 @@
 -	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
 -      ])
 -    fi
- 
+-
 -    CPPFLAGS="$save_CPPFLAGS"
 -    LDFLAGS="$save_LDFLAGS"
 -    LIBS="$save_LIBS"
 -    ;;
 -  esac
-+# _LT_LINKER_BOILERPLATE
-+# ----------------------
-+# Check for linker boilerplate output or warnings with
-+# the simple link test code.
-+m4_defun([_LT_LINKER_BOILERPLATE],
-+[m4_require([_LT_DECL_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
- 
+-
 -  case $lt_cv_dlopen_self in
 -  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
 -  *) enable_dlopen_self=unknown ;;
 -  esac
-+# _LT_REQUIRED_DARWIN_CHECKS
-+# -------------------------
-+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
-+  case $host_os in
-+    rhapsody* | darwin*)
-+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-+    AC_CHECK_TOOL([LIPO], [lipo], [:])
-+    AC_CHECK_TOOL([OTOOL], [otool], [:])
-+    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
-+    _LT_DECL([], [DSYMUTIL], [1],
-+      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
-+    _LT_DECL([], [NMEDIT], [1],
-+      [Tool to change global to local symbols on Mac OS X])
-+    _LT_DECL([], [LIPO], [1],
-+      [Tool to manipulate fat objects and archives on Mac OS X])
-+    _LT_DECL([], [OTOOL], [1],
-+      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
-+    _LT_DECL([], [OTOOL64], [1],
-+      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
- 
+-
 -  case $lt_cv_dlopen_self_static in
 -  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
 -  *) enable_dlopen_self_static=unknown ;;
-+    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.
-+	rm -rf libconftest.dylib*
-+	echo "int foo(void){return 1;}" > conftest.c
-+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
-+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-+        _lt_result=$?
-+	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
-+	  lt_cv_apple_cc_single_mod=yes
-+	else
-+	  cat conftest.err >&AS_MESSAGE_LOG_FD
-+	fi
-+	rm -rf libconftest.dylib*
-+	rm -f conftest.*
-+      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.[[012]])
-+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-+    darwin1.*)
-+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+    darwin*) # darwin 5.x on 
-+      # 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
+-  esac
 -fi
 -])# AC_LIBTOOL_DLOPEN_SELF
 -
-+    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
-+])
- 
+-
 -# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
 -# ---------------------------------
 -# Check to see if options -c and -o are simultaneously supported by compiler
@@ -2176,7 +1170,7 @@
 -   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.
@@ -2210,69 +1204,16 @@
 -   cd ..
 -   rmdir conftest
 -   $rm conftest*
-+# _LT_DARWIN_LINKER_FEATURES
-+# --------------------------
-+# Checks for linker and compiler features on darwin
-+m4_defun([_LT_DARWIN_LINKER_FEATURES],
-+[
-+  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
-+  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+  _LT_TAGVAR(hardcode_direct, $1)=no
-+  _LT_TAGVAR(hardcode_automatic, $1)=yes
-+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+  _LT_TAGVAR(whole_archive_flag_spec, $1)=''
-+  _LT_TAGVAR(link_all_deplibs, $1)=yes
-+  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-+  if test "$GCC" = "yes"; then
-+    output_verbose_link_cmd=echo
-+    _LT_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_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+    _LT_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_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}"
-+    m4_if([$1], [CXX],
-+[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-+      _LT_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_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
-+  _LT_TAGVAR(ld_shlibs, $1)=no
-+  fi
- ])
+-])
 -])# AC_LIBTOOL_PROG_CC_C_O
- 
-+# _LT_SYS_MODULE_PATH_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.
-+m4_defun([_LT_SYS_MODULE_PATH_AIX],
-+[m4_require([_LT_DECL_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_SYS_MODULE_PATH_AIX
- 
+-
+-
 -# 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
@@ -2292,17 +1233,8 @@
 -  need_locks=no
 -fi
 -])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
-+# _LT_SHELL_INIT(ARG)
-+# -------------------
-+m4_define([_LT_SHELL_INIT],
-+[ifdef([AC_DIVERSION_NOTICE],
-+	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-+	 [AC_DIVERT_PUSH(NOTICE)])
-+$1
-+AC_DIVERT_POP
-+])# _LT_SHELL_INIT
- 
- 
+-
+-
 -# AC_LIBTOOL_OBJDIR
 -# -----------------
 -AC_DEFUN([AC_LIBTOOL_OBJDIR],
@@ -2311,51 +1243,15 @@
 -mkdir .libs 2>/dev/null
 -if test -d .libs; then
 -  lt_cv_objdir=.libs
-+# _LT_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.
-+m4_defun([_LT_PROG_ECHO_BACKSLASH],
-+[_LT_SHELL_INIT([
-+# Check that we are running under the correct shell.
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+
-+case X$lt_ECHO in
-+X*--fallback-echo)
-+  # Remove one level of quotation (which was required for Make).
-+  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-+  ;;
-+esac
-+
-+ECHO=${lt_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
+-else
 -  # MS-DOS does not allow filenames that begin with a dot.
 -  lt_cv_objdir=_libs
-+  # Restart under the correct shell.
-+  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
- fi
+-fi
 -rmdir .libs 2>/dev/null])
 -objdir=$lt_cv_objdir
 -])# AC_LIBTOOL_OBJDIR
- 
-+if test "X[$]1" = X--fallback-echo; then
-+  # used as fallback echo
-+  shift
-+  cat <<_LT_EOF
-+[$]*
-+_LT_EOF
-+  exit 0
-+fi
- 
+-
+-
 -# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
 -# ----------------------------------------------
 -# Check hardcoding attributes.
@@ -2365,10 +1261,7 @@
 -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
-+# 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
- 
+-
 -  # 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
@@ -2378,113 +1271,17 @@
 -     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
 -    # Linking always hardcodes the temporary library directory.
 -    _LT_AC_TAGVAR(hardcode_action, $1)=relink
-+if test -z "$lt_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 &&
-+	 { 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
+-  else
 -    # We can link without hardcoding, and we can hardcode nonexisting dirs.
 -    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
-+    # 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
 -else
 -  # We cannot hardcode anything, or else we can only hardcode existing
 -  # directories.
 -  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
- fi
+-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
@@ -2492,21 +1289,10 @@
 -     test "$enable_shared" = no; then
 -  # Fast installation is not necessary
 -  enable_fast_install=needless
-+# Copy echo and quote the copy suitably for passing to libtool from
-+# the Makefile, instead of quoting the original, which is used later.
-+lt_ECHO=$ECHO
-+if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-+   lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
- fi
+-fi
 -])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
- 
-+AC_SUBST(lt_ECHO)
-+])
-+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-+_LT_DECL([], [ECHO], [1],
-+    [An echo program that does not interpret backslashes])
-+])# _LT_PROG_ECHO_BACKSLASH
- 
+-
+-
 -# AC_LIBTOOL_SYS_LIB_STRIP
 -# ------------------------
 -AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
@@ -2535,15 +1321,8 @@
 -  esac
 -fi
 -])# AC_LIBTOOL_SYS_LIB_STRIP
- 
-+# _LT_ENABLE_LOCK
-+# ---------------
-+m4_defun([_LT_ENABLE_LOCK],
-+[AC_ARG_ENABLE([libtool-lock],
-+  [AS_HELP_STRING([--disable-libtool-lock],
-+    [avoid locking (might break parallel builds)])])
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
- 
+-
+-
 -# AC_LIBTOOL_SYS_DYNAMIC_LINKER
 -# -----------------------------
 -# PORTME Fill in your ld.so characteristics
@@ -2578,22 +1357,7 @@
 -    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"`
-+# 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
+-  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=
@@ -2601,39 +1365,10 @@
 -  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"
-+  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
+-    else
 -      test -d "$lt_sys_path" && \
 -	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-+      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
 -  done
 -  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
 -BEGIN {RS=" "; FS="/|\n";} {
@@ -2674,10 +1409,8 @@
 -
 -  # AIX 3 has no versioning support, so we append a major version to the name.
 -  soname_spec='${libname}${release}${shared_ext}$major'
-+  fi
-+  rm -rf conftest*
-   ;;
- 
+-  ;;
+-
 -aix[[4-9]]*)
 -  version_type=linux
 -  need_lib_prefix=no
@@ -2703,51 +1436,7 @@
 -	can_build_shared=no
 -      fi
 -      ;;
-+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+s390*-*linux*|s390*-*tpf*|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*|s390*-*tpf*)
-+	    LD="${LD-ld} -m elf64_s390"
-+	    ;;
-+	  sparc*-*linux*)
-+	    LD="${LD-ld} -m elf64_sparc"
-+	    ;;
-+	esac
-+	;;
-     esac
+-    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.
@@ -2763,53 +1452,21 @@
 -      soname_spec='${libname}${release}${shared_ext}$major'
 -    fi
 -    shlibpath_var=LIBPATH
-   fi
-+  rm -rf conftest*
-   ;;
- 
+-  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'
-+*-*-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_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[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
-   ;;
+-  ;;
 -
 -beos*)
 -  library_names_spec='${libname}${shared_ext}'
 -  dynamic_linker="$host_os ld.so"
 -  shlibpath_var=LIBRARY_PATH
-+sparc*-*solaris*)
-+  # Find out which ABI we are using.
-+  echo 'int i;' > conftest.$ac_ext
-+  if AC_TRY_EVAL(ac_compile); then
-+    case `/usr/bin/file conftest.o` in
-+    *64-bit*)
-+      case $lt_cv_prog_gnu_ld in
-+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-+      *)
-+	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*
-   ;;
-+esac
- 
+-  ;;
+-
 -bsdi[[45]]*)
 -  version_type=linux
 -  need_version=no
@@ -2823,15 +1480,13 @@
 -  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
 -  # libtool to hard-code these into programs
 -  ;;
-+need_locks="$enable_libtool_lock"
-+])# _LT_ENABLE_LOCK
- 
+-
 -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'
@@ -2846,15 +1501,7 @@
 -      dlpath=$dir/\$dldll~
 -       $rm \$dlpath'
 -    shlibpath_overrides_runpath=yes
-+# _LT_CMD_OLD_ARCHIVE
-+# -------------------
-+m4_defun([_LT_CMD_OLD_ARCHIVE],
-+[AC_CHECK_TOOL(AR, ar, false)
-+test -z "$AR" && AR=ar
-+test -z "$AR_FLAGS" && AR_FLAGS=cru
-+_LT_DECL([], [AR], [1], [The archiver])
-+_LT_DECL([], [AR_FLAGS], [1])
- 
+-
 -    case $host_os in
 -    cygwin*)
 -      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
@@ -2883,10 +1530,7 @@
 -      ;;
 -    esac
 -    ;;
-+AC_CHECK_TOOL(STRIP, strip, :)
-+test -z "$STRIP" && STRIP=:
-+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
- 
+-
 -  *)
 -    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
 -    ;;
@@ -2895,11 +1539,7 @@
 -  # FIXME: first we should search . and the directory the executable is in
 -  shlibpath_var=PATH
 -  ;;
-+AC_CHECK_TOOL(RANLIB, ranlib, :)
-+test -z "$RANLIB" && RANLIB=:
-+_LT_DECL([], [RANLIB], [1],
-+    [Commands used to install an old-style archive])
- 
+-
 -darwin* | rhapsody*)
 -  dynamic_linker="$host_os dyld"
 -  version_type=darwin
@@ -2927,11 +1567,7 @@
 -freebsd1*)
 -  dynamic_linker=no
 -  ;;
-+# 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=
- 
+-
 -freebsd* | dragonfly*)
 -  # DragonFly does not have aout.  When/if they implement a new
 -  # versioning mechanism, adjust this.
@@ -2956,8 +1592,7 @@
 -      ;;
 -  esac
 -  shlibpath_var=LD_LIBRARY_PATH
-+if test -n "$RANLIB"; then
-   case $host_os in
+-  case $host_os in
 -  freebsd2*)
 -    shlibpath_overrides_runpath=yes
 -    ;;
@@ -2969,25 +1604,14 @@
 -  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
 -    shlibpath_overrides_runpath=no
 -    hardcode_into_libs=yes
-+  openbsd*)
-+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-     ;;
+-    ;;
 -  *) # from 4.6 on, and DragonFly
 -    shlibpath_overrides_runpath=yes
 -    hardcode_into_libs=yes
-+  *)
-+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-     ;;
-   esac
+-    ;;
+-  esac
 -  ;;
-+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-+fi
-+_LT_DECL([], [old_postinstall_cmds], [2])
-+_LT_DECL([], [old_postuninstall_cmds], [2])
-+_LT_TAGDECL([], [old_archive_cmds], [2],
-+    [Commands used to build an old-style archive])
-+])# _LT_CMD_OLD_ARCHIVE
- 
+-
 -gnu*)
 -  version_type=linux
 -  need_lib_prefix=no
@@ -2997,7 +1621,7 @@
 -  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.
@@ -3043,44 +1667,7 @@
 -  # HP-UX runs *really* slowly unless shared libraries are mode 555.
 -  postinstall_cmds='chmod 555 $lib'
 -  ;;
-+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-+# ----------------------------------------------------------------
-+# Check whether the given compiler option works
-+AC_DEFUN([_LT_COMPILER_OPTION],
-+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_DECL_SED])dnl
-+AC_CACHE_CHECK([$1], [$2],
-+  [$2=no
-+   m4_if([$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*
-+])
- 
+-
 -interix[[3-9]]*)
 -  version_type=linux
 -  need_lib_prefix=no
@@ -3092,13 +1679,7 @@
 -  shlibpath_overrides_runpath=no
 -  hardcode_into_libs=yes
 -  ;;
-+if test x"[$]$2" = xyes; then
-+    m4_if([$5], , :, [$5])
-+else
-+    m4_if([$6], , :, [$6])
-+fi
-+])# _LT_COMPILER_OPTION
- 
+-
 -irix5* | irix6* | nonstopux*)
 -  case $host_os in
 -    nonstopux*) version_type=nonstopux ;;
@@ -3135,54 +1716,12 @@
 -  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
 -  hardcode_into_libs=yes
 -  ;;
-+# Old name:
-+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
-+
-+
-+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-+#                  [ACTION-SUCCESS], [ACTION-FAILURE])
-+# ----------------------------------------------------
-+# Check whether the given linker option works
-+AC_DEFUN([_LT_LINKER_OPTION],
-+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_DECL_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"
-+])
- 
+-
 -# No shared lib support for Linux oldld, aout, or coff.
 -linux*oldld* | linux*aout* | linux*coff*)
 -  dynamic_linker=no
 -  ;;
-+if test x"[$]$2" = xyes; then
-+    m4_if([$4], , :, [$4])
-+else
-+    m4_if([$5], , :, [$5])
-+fi
-+])# _LT_LINKER_OPTION
- 
+-
 -# This must be Linux ELF.
 -linux* | k*bsd*-gnu)
 -  version_type=linux
@@ -3197,17 +1736,13 @@
 -  # Some rework will be needed to allow for fast_install
 -  # before this can be enabled.
 -  hardcode_into_libs=yes
-+# Old name:
-+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
- 
+-
 -  # 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,
@@ -3216,16 +1751,7 @@
 -  # assume the GNU/Linux dynamic linker is in use.
 -  dynamic_linker='GNU/Linux ld.so'
 -  ;;
-+# LT_CMD_MAX_LEN
-+#---------------
-+AC_DEFUN([LT_CMD_MAX_LEN],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+# 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"
- 
+-
 -netbsdelf*-gnu)
 -  version_type=linux
 -  need_lib_prefix=no
@@ -3237,15 +1763,7 @@
 -  hardcode_into_libs=yes
 -  dynamic_linker='NetBSD ld.elf_so'
 -  ;;
-+  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
-+    ;;
- 
+-
 -netbsd*)
 -  version_type=sunos
 -  need_lib_prefix=no
@@ -3263,30 +1781,14 @@
 -  shlibpath_overrides_runpath=yes
 -  hardcode_into_libs=yes
 -  ;;
-+  gnu*)
-+    # Under GNU Hurd, this test is not required because there is
-+    # no limit to the length of command line arguments.
-+    # Libtool will interpret -1 as no limit whatsoever
-+    lt_cv_sys_max_cmd_len=-1;
-+    ;;
- 
+-
 -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
 -  ;;
-+  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;
-+    ;;
- 
+-
 -nto-qnx*)
 -  version_type=linux
 -  need_lib_prefix=no
@@ -3296,12 +1798,7 @@
 -  shlibpath_var=LD_LIBRARY_PATH
 -  shlibpath_overrides_runpath=yes
 -  ;;
-+  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;
-+    ;;
- 
+-
 -openbsd*)
 -  version_type=sunos
 -  sys_lib_dlsearch_path_spec="/usr/lib"
@@ -3322,96 +1819,12 @@
 -      *)
 -	shlibpath_overrides_runpath=yes
 -	;;
-+  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
+-      esac
 -  else
 -    shlibpath_overrides_runpath=yes
 -  fi
 -  ;;
-+    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
-+      # Make teststring a little bigger before we do anything with it.
-+      # a 1K string should be a reasonable start.
-+      for i in 1 2 3 4 5 6 7 8 ; do
-+        teststring=$teststring$teststring
-+      done
-+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+      # If test is not a shell built-in, we'll probably end up computing a
-+      # maximum length that is only half of the actual maximum length, but
-+      # we can't tell.
-+      while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
-+	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
-+	      test $i != 17 # 1/2 MB should be enough
-+      do
-+        i=`expr $i + 1`
-+        teststring=$teststring$teststring
-+      done
-+      # Only check the string length outside the loop.
-+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-+      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
-+max_cmd_len=$lt_cv_sys_max_cmd_len
-+_LT_DECL([], [max_cmd_len], [0],
-+    [What is the maximum length of a command?])
-+])# LT_CMD_MAX_LEN
- 
+-
 -os2*)
 -  libname_spec='$name'
 -  shrext_cmds=".dll"
@@ -3420,11 +1833,7 @@
 -  dynamic_linker='OS/2 ld.exe'
 -  shlibpath_var=LIBPATH
 -  ;;
-+# Old name:
-+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
- 
+-
 -osf3* | osf4* | osf5*)
 -  version_type=osf
 -  need_lib_prefix=no
@@ -3435,16 +1844,11 @@
 -  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
 -  ;;
-+# _LT_HEADER_DLFCN
-+# ----------------
-+m4_defun([_LT_HEADER_DLFCN],
-+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
-+])# _LT_HEADER_DLFCN
- 
+-
 -solaris*)
 -  version_type=linux
 -  need_lib_prefix=no
@@ -3457,7 +1861,7 @@
 -  # 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'
@@ -3469,20 +1873,7 @@
 -  fi
 -  need_version=yes
 -  ;;
-+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-+#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-+# ----------------------------------------------------------------
-+m4_defun([_LT_TRY_DLOPEN_SELF],
-+[m4_require([_LT_HEADER_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 <<_LT_EOF
-+[#line __oline__ "configure"
-+#include "confdefs.h"
- 
+-
 -sysv4 | sysv4.3*)
 -  version_type=linux
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -3506,10 +1897,7 @@
 -      ;;
 -  esac
 -  ;;
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
- 
+-
 -sysv4*MP*)
 -  if test -d /usr/nec ;then
 -    version_type=linux
@@ -3518,8 +1906,7 @@
 -    shlibpath_var=LD_LIBRARY_PATH
 -  fi
 -  ;;
-+#include <stdio.h>
- 
+-
 -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 -  version_type=freebsd-elf
 -  need_lib_prefix=no
@@ -3563,47 +1950,14 @@
 -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"
-+#ifdef RTLD_GLOBAL
-+#  define LT_DLGLOBAL		RTLD_GLOBAL
-+#else
-+#  ifdef DL_GLOBAL
-+#    define LT_DLGLOBAL		DL_GLOBAL
-+#  else
-+#    define LT_DLGLOBAL		0
-+#  endif
-+#endif
- 
+-
 -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
-+/* 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
- 
+-
+-
 -# _LT_AC_TAGCONFIG
 -# ----------------
 -AC_DEFUN([_LT_AC_TAGCONFIG],
@@ -3629,24 +1983,11 @@
 -  if test -z "$LTCFLAGS"; then
 -    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
 -  fi
-+void fnord() { int i=42;}
-+int main ()
-+{
-+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+  int status = $lt_dlunknown;
- 
+-
 -  # 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'`
-+  if (self)
-+    {
-+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+      /* dlclose (self); */
-+    }
-+  else
-+    puts (dlerror ());
- 
+-
 -  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
 -  for tagname in $tagnames; do
 -    IFS="$lt_save_ifs"
@@ -3655,30 +1996,13 @@
 -    "") ;;
 -    *)  AC_MSG_ERROR([invalid tag name: $tagname])
 -	;;
-+    exit (status);
-+}]
-+_LT_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_TRY_DLOPEN_SELF
- 
+-    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
@@ -3693,18 +2017,7 @@
 -	  tagname=""
 -	fi
 -	;;
-+# LT_SYS_DLOPEN_SELF
-+# ------------------
-+AC_DEFUN([LT_SYS_DLOPEN_SELF],
-+[m4_require([_LT_HEADER_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=
- 
+-
 -      F77)
 -	if test -n "$F77" && test "X$F77" != "Xno"; then
 -	  AC_LIBTOOL_LANG_F77_CONFIG
@@ -3712,13 +2025,7 @@
 -	  tagname=""
 -	fi
 -	;;
-+  case $host_os in
-+  beos*)
-+    lt_cv_dlopen="load_add_on"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
-+    ;;
- 
+-
 -      GCJ)
 -	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
 -	  AC_LIBTOOL_LANG_GCJ_CONFIG
@@ -3726,33 +2033,16 @@
 -	  tagname=""
 -	fi
 -	;;
-+  mingw* | pw32*)
-+    lt_cv_dlopen="LoadLibrary"
-+    lt_cv_dlopen_libs=
-+    ;;
- 
+-
 -      RC)
 -	AC_LIBTOOL_LANG_RC_CONFIG
 -	;;
-+  cygwin*)
-+    lt_cv_dlopen="dlopen"
-+    lt_cv_dlopen_libs=
-+    ;;
- 
+-
 -      *)
 -	AC_MSG_ERROR([Unsupported tag name: $tagname])
 -	;;
 -      esac
-+  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
-+    ])
-+    ;;
- 
+-
 -      # Append the new tag name to the list of available tags.
 -      if test -n "$tagname" ; then
 -      available_tags="$available_tags $tagname"
@@ -3760,81 +2050,35 @@
 -    fi
 -  done
 -  IFS="$lt_save_ifs"
-+  *)
-+    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
- 
+-
 -  # 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"
-+  if test "x$lt_cv_dlopen" != xno; then
-+    enable_dlopen=yes
-   else
+-  else
 -    rm -f "${ofile}T"
 -    AC_MSG_ERROR([unable to update list of available tagged configurations.])
-+    enable_dlopen=no
-   fi
+-  fi
 -fi
 -])# _LT_AC_TAGCONFIG
- 
-+  case $lt_cv_dlopen in
-+  dlopen)
-+    save_CPPFLAGS="$CPPFLAGS"
-+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
- 
+-
+-
 -# AC_LIBTOOL_DLOPEN
 -# -----------------
 -# enable checks for dlopen support
 -AC_DEFUN([AC_LIBTOOL_DLOPEN],
 - [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
 -])# AC_LIBTOOL_DLOPEN
-+    save_LDFLAGS="$LDFLAGS"
-+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
- 
-+    save_LIBS="$LIBS"
-+    LIBS="$lt_cv_dlopen_libs $LIBS"
- 
+-
+-
 -# AC_LIBTOOL_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_CACHE_CHECK([whether a program can dlopen itself],
-+	  lt_cv_dlopen_self, [dnl
-+	  _LT_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_TRY_DLOPEN_SELF(
-+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-+      ])
-+    fi
- 
+-
+-
 -# AC_ENABLE_SHARED([DEFAULT])
 -# ---------------------------
 -# implement the --enable-shared flag
@@ -3863,17 +2107,8 @@
 -    esac],
 -    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
 -])# AC_ENABLE_SHARED
-+    CPPFLAGS="$save_CPPFLAGS"
-+    LDFLAGS="$save_LDFLAGS"
-+    LIBS="$save_LIBS"
-+    ;;
-+  esac
- 
-+  case $lt_cv_dlopen_self in
-+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-+  *) enable_dlopen_self=unknown ;;
-+  esac
- 
+-
+-
 -# AC_DISABLE_SHARED
 -# -----------------
 -# set the default shared flag to --disable-shared
@@ -3881,28 +2116,10 @@
 -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 -AC_ENABLE_SHARED(no)
 -])# AC_DISABLE_SHARED
-+  case $lt_cv_dlopen_self_static in
-+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-+  *) enable_dlopen_self_static=unknown ;;
-+  esac
-+fi
-+_LT_DECL([dlopen_support], [enable_dlopen], [0],
-+	 [Whether dlopen is supported])
-+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
-+	 [Whether dlopen of programs is supported])
-+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
-+	 [Whether dlopen of statically linked programs is supported])
-+])# LT_SYS_DLOPEN_SELF
-+
-+# Old name:
-+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
- 
- 
+-
+-
 -# AC_ENABLE_STATIC([DEFAULT])
-+# _LT_COMPILER_C_O([TAGNAME])
- # ---------------------------
+-# ---------------------------
 -# implement the --enable-static flag
 -# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
 -AC_DEFUN([AC_ENABLE_STATIC],
@@ -3987,59 +2204,8 @@
 -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 -pic_mode=ifelse($#,1,$1,default)
 -])# AC_LIBTOOL_PICMODE
-+# Check to see if options -c and -o are simultaneously supported by compiler.
-+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
-+m4_defun([_LT_COMPILER_C_O],
-+[m4_require([_LT_DECL_SED])dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_TAG_COMPILER])dnl
-+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-+  [_LT_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_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 ..
-+   $RM -r conftest
-+   $RM conftest*
-+])
-+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
-+	[Does compiler simultaneously support -c and -o options?])
-+])# _LT_COMPILER_C_O
- 
+-
+-
 -# AC_PROG_EGREP
 -# -------------
 -# This is predefined starting with Autoconf 2.54, so this conditional
@@ -4053,15 +2219,8 @@
 - EGREP=$ac_cv_prog_egrep
 - AC_SUBST([EGREP])
 -])])
- 
-+# _LT_COMPILER_FILE_LOCKS([TAGNAME])
-+# ----------------------------------
-+# Check to see if we can do hard links to lock some files if needed
-+m4_defun([_LT_COMPILER_FILE_LOCKS],
-+[m4_require([_LT_ENABLE_LOCK])dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+_LT_COMPILER_C_O([$1])
- 
+-
+-
 -# AC_PATH_TOOL_PREFIX
 -# -------------------
 -# find a file program which can recognize shared library
@@ -4095,27 +2254,7 @@
 -	    :
 -	  else
 -	    cat <<EOF 1>&2
-+hard_links="nottested"
-+if test "$_LT_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
-+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
-+])# _LT_COMPILER_FILE_LOCKS
- 
+-
 -*** 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
@@ -4124,7 +2263,7 @@
 -*** libraries will work regardless of this problem.  Nevertheless, you
 -*** may want to report the problem to your system manager and/or to
 -*** bug-libtool@gnu.org
- 
+-
 -EOF
 -	  fi ;;
 -	esac
@@ -4139,30 +2278,12 @@
 -MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 -if test -n "$MAGIC_CMD"; then
 -  AC_MSG_RESULT($MAGIC_CMD)
-+# _LT_CHECK_OBJDIR
-+# ----------------
-+m4_defun([_LT_CHECK_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
+-else
 -  AC_MSG_RESULT(no)
-+  # MS-DOS does not allow filenames that begin with a dot.
-+  lt_cv_objdir=_libs
- fi
+-fi
 -])# AC_PATH_TOOL_PREFIX
-+rmdir .libs 2>/dev/null])
-+objdir=$lt_cv_objdir
-+_LT_DECL([], [objdir], [0],
-+         [The name of the directory that contains temporary libtool files])dnl
-+m4_pattern_allow([LT_OBJDIR])dnl
-+AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
-+  [Define to the sub-directory in which libtool stores uninstalled libraries.])
-+])# _LT_CHECK_OBJDIR
- 
- 
+-
+-
 -# AC_PATH_MAGIC
 -# -------------
 -# find a file program which can recognize a shared library
@@ -4171,52 +2292,13 @@
 -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)
-+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
-+# --------------------------------------
-+# Check hardcoding attributes.
-+m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
-+[AC_MSG_CHECKING([how to hardcode library paths into programs])
-+_LT_TAGVAR(hardcode_action, $1)=
-+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
-+   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
-+   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-+
-+  # We can hardcode non-existent directories.
-+  if test "$_LT_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_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-+     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
-+    # Linking always hardcodes the temporary library directory.
-+    _LT_TAGVAR(hardcode_action, $1)=relink
-   else
+-  else
 -    MAGIC_CMD=:
-+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+    _LT_TAGVAR(hardcode_action, $1)=immediate
-   fi
-+else
-+  # We cannot hardcode anything, or else we can only hardcode existing
-+  # directories.
-+  _LT_TAGVAR(hardcode_action, $1)=unsupported
-+fi
-+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
-+
-+if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
-+   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; 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
+-  fi
+-fi
 -])# AC_PATH_MAGIC
-+_LT_TAGDECL([], [hardcode_action], [0],
-+    [How to hardcode a shared library path into an executable])
-+])# _LT_LINKER_HARDCODE_LIBPATH
- 
- 
+-
+-
 -# AC_PROG_LD
 -# ----------
 -# find the pathname to the GNU or non-GNU linker
@@ -4255,35 +2337,12 @@
 -  "")
 -    # If it fails, then pretend we aren't using GCC.
 -    ac_prog=ld
-+# _LT_CMD_STRIPLIB
-+# ----------------
-+m4_defun([_LT_CMD_STRIPLIB],
-+[m4_require([_LT_DECL_EGREP])
-+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
-     ;;
-   *)
+-    ;;
+-  *)
 -    # If it is relative, then search for the first ld in PATH.
 -    with_gnu_ld=unknown
-+    AC_MSG_RESULT([no])
-     ;;
-   esac
+-    ;;
+-  esac
 -elif test "$with_gnu_ld" = yes; then
 -  AC_MSG_CHECKING([for GNU ld])
 -else
@@ -4319,7 +2378,7 @@
 -  AC_MSG_RESULT($LD)
 -else
 -  AC_MSG_RESULT(no)
- fi
+-fi
 -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
 -AC_PROG_LD_GNU
 -])# AC_PROG_LD
@@ -4341,11 +2400,8 @@
 -esac])
 -with_gnu_ld=$lt_cv_prog_gnu_ld
 -])# AC_PROG_LD_GNU
-+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
-+_LT_DECL([], [striplib], [1])
-+])# _LT_CMD_STRIPLIB
- 
- 
+-
+-
 -# AC_PROG_LD_RELOAD_FLAG
 -# ----------------------
 -# find reload flag for linker
@@ -4364,89 +2420,14 @@
 -  darwin*)
 -    if test "$GCC" = yes; then
 -      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-+# _LT_SYS_DYNAMIC_LINKER([TAG])
-+# -----------------------------
-+# PORTME Fill in your ld.so characteristics
-+m4_defun([_LT_SYS_DYNAMIC_LINKER],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+m4_require([_LT_DECL_EGREP])dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_DECL_SED])dnl
-+AC_MSG_CHECKING([dynamic linker characteristics])
-+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
+-    else
 -      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+      test -d "$lt_sys_path" && \
-+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-     fi
+-    fi
 -    ;;
 -esac
 -])# AC_PROG_LD_RELOAD_FLAG
 -
-+  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])
-+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"
-+need_lib_prefix=unknown
-+hardcode_into_libs=no
- 
+-
 -# AC_DEPLIBS_CHECK_METHOD
 -# -----------------------
 -# how to check for library dependencies
@@ -4467,11 +2448,8 @@
 -# 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.
-+# 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
+-
+-case $host_os in
 -aix[[4-9]]*)
 -  lt_cv_deplibs_check_method=pass_all
 -  ;;
@@ -4485,19 +2463,13 @@
 -  lt_cv_file_magic_cmd='/usr/bin/file -L'
 -  lt_cv_file_magic_test_file=/shlib/libc.so
 -  ;;
-+aix3*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-+  shlibpath_var=LIBPATH
- 
+-
 -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'
-+  # AIX 3 has no versioning support, so we append a major version to the name.
-+  soname_spec='${libname}${release}${shared_ext}$major'
-   ;;
- 
+-  ;;
+-
 -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',
@@ -4505,16 +2477,7 @@
 -  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'
-+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
+-  else
 -    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
 -    lt_cv_file_magic_cmd='$OBJDUMP -f'
 -  fi
@@ -4533,50 +2496,20 @@
 -      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.*`
-+    # 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
+-      ;;
+-    esac
 -  else
 -    lt_cv_deplibs_check_method=pass_all
-+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-+    # soname into executable. Probably we can add versioning support to
-+    # collect2, so additional links can be useful in future.
-+    if test "$aix_use_runtimelinking" = yes; then
-+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+      # instead of lib<name>.a to let people know that these are not
-+      # typical AIX shared libraries.
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    else
-+      # We preserve .a as extension for shared libraries through AIX4.2
-+      # and later when we are not doing run time linking.
-+      library_names_spec='${libname}${release}.a $libname.a'
-+      soname_spec='${libname}${release}${shared_ext}$major'
-+    fi
-+    shlibpath_var=LIBPATH
-   fi
-   ;;
- 
+-  fi
+-  ;;
+-
 -gnu*)
 -  lt_cv_deplibs_check_method=pass_all
 -  ;;
 -
 -hpux10.20* | hpux11*)
 -  lt_cv_file_magic_cmd=/usr/bin/file
-+amigaos*)
-   case $host_cpu in
+-  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
@@ -4584,22 +2517,14 @@
 -  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
-+  powerpc)
-+    # Since July 2007 AmigaOS4 officially supports .so libraries.
-+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     ;;
+-    ;;
 -  *)
 -    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
-+  m68k)
-+    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'
-     ;;
-   esac
-   ;;
- 
+-    ;;
+-  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)$'
@@ -4618,317 +2543,84 @@
 -# This must be Linux ELF.
 -linux* | k*bsd*-gnu)
 -  lt_cv_deplibs_check_method=pass_all
-+beos*)
-+  library_names_spec='${libname}${shared_ext}'
-+  dynamic_linker="$host_os ld.so"
-+  shlibpath_var=LIBRARY_PATH
-   ;;
- 
+-  ;;
+-
 -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
-+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
-   ;;
- 
+-  ;;
+-
 -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
 -  ;;
-+cygwin* | mingw* | pw32*)
-+  version_type=windows
-+  shrext_cmds=".dll"
-+  need_version=no
-+  need_lib_prefix=no
- 
+-
 -nto-qnx*)
 -  lt_cv_deplibs_check_method=unknown
 -  ;;
-+  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~
-+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-+      fi'
-+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+      dlpath=$dir/\$dldll~
-+       $RM \$dlpath'
-+    shlibpath_overrides_runpath=yes
- 
+-
 -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
-+    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
-   ;;
- 
+-  ;;
+-
 -osf3* | osf4* | osf5*)
 -  lt_cv_deplibs_check_method=pass_all
-+darwin* | rhapsody*)
-+  dynamic_linker="$host_os dyld"
-+  version_type=darwin
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${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'
-   ;;
- 
+-  ;;
+-
 -rdos*)
 -  lt_cv_deplibs_check_method=pass_all
-+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
-   ;;
- 
+-  ;;
+-
 -solaris*)
 -  lt_cv_deplibs_check_method=pass_all
-+freebsd1*)
-+  dynamic_linker=no
-   ;;
- 
+-  ;;
+-
 -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*`
-+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
-     ;;
+-    ;;
 -  ncr)
 -    lt_cv_deplibs_check_method=pass_all
-+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-+    shlibpath_overrides_runpath=yes
-+    hardcode_into_libs=yes
-     ;;
+-    ;;
 -  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 )'
-+  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
-     ;;
+-    ;;
 -  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
-+  *) # from 4.6 on, and DragonFly
-+    shlibpath_overrides_runpath=yes
-+    hardcode_into_libs=yes
-     ;;
+-    ;;
 -  siemens)
 -    lt_cv_deplibs_check_method=pass_all
-+  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
-     ;;
+-    ;;
 -  pc)
 -    lt_cv_deplibs_check_method=pass_all
-+  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'
-   ;;
- 
+-    ;;
+-  esac
+-  ;;
+-
 -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 -  lt_cv_deplibs_check_method=pass_all
-+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
-   ;;
+-  ;;
 -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
- 
-+irix5* | irix6* | nonstopux*)
-+  case $host_os in
-+    nonstopux*) version_type=nonstopux ;;
-+    *)
-+	if test "$lt_cv_prog_gnu_ld" = yes; then
-+		version_type=linux
-+	else
-+		version_type=irix
-+	fi ;;
-+  esac
-+  need_lib_prefix=no
-+  need_version=no
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  case $host_os in
-+  irix5* | nonstopux*)
-+    libsuff= shlibsuff=
-+    ;;
-+  *)
-+    case $LD in # libtool.m4 will add one of these switches to LD
-+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-+      libsuff= shlibsuff= libmagic=32-bit;;
-+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-+      libsuff=32 shlibsuff=N32 libmagic=N32;;
-+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-+    *) libsuff= shlibsuff= libmagic=never-match;;
-+    esac
-+    ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-+  shlibpath_overrides_runpath=no
-+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+  hardcode_into_libs=yes
-+  ;;
- 
+-
+-
 -# AC_PROG_NM
 -# ----------
 -# find the pathname to a BSD-compatible name lister
@@ -4979,32 +2671,8 @@
 -fi])
 -NM="$lt_cv_path_NM"
 -])# AC_PROG_NM
-+# 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
-+  # Some binutils ld are patched to set DT_RUNPATH
-+  save_LDFLAGS=$LDFLAGS
-+  save_libdir=$libdir
-+  eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-+       LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
-+  AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-+    [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
-+       [shlibpath_overrides_runpath=yes])])
-+  LDFLAGS=$save_LDFLAGS
-+  libdir=$save_libdir
- 
+-
+-
 -# AC_CHECK_LIBM
 -# -------------
 -# check for math library
@@ -5024,17 +2692,8 @@
 -  ;;
 -esac
 -])# AC_CHECK_LIBM
-+  # This implies no fast_install, which is unacceptable.
-+  # Some rework will be needed to allow for fast_install
-+  # before this can be enabled.
-+  hardcode_into_libs=yes
- 
-+  # Append ld.so.conf contents to the search path
-+  if test -f /etc/ld.so.conf; then
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+  fi
- 
+-
+-
 -# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
 -# -----------------------------------
 -# sets LIBLTDL to the link flags for the libltdl convenience library and
@@ -5058,27 +2717,8 @@
 -  # For backwards non-gettext consistent compatibility...
 -  INCLTDL="$LTDLINCL"
 -])# AC_LIBLTDL_CONVENIENCE
-+  # 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'
-+  ;;
- 
+-
+-
 -# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
 -# -----------------------------------
 -# sets LIBLTDL to the link flags for the libltdl installable library and
@@ -5105,81 +2745,24 @@
 -    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'])
-+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
+-  else
 -    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
 -    LIBLTDL="-lltdl"
 -    LTDLINCL=
-+    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
+-  fi
 -  # For backwards non-gettext consistent compatibility...
 -  INCLTDL="$LTDLINCL"
 -])# AC_LIBLTDL_INSTALLABLE
-+  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
-+  ;;
- 
+-
+-
 -# AC_LIBTOOL_CXX
 -# --------------
 -# enable support for C++ libraries
 -AC_DEFUN([AC_LIBTOOL_CXX],
 -[AC_REQUIRE([_LT_AC_LANG_CXX])
 -])# AC_LIBTOOL_CXX
-+*nto* | *qnx*)
-+  version_type=qnx
-+  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='ldqnx.so'
-+  ;;
- 
-+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
-+  ;;
- 
+-
+-
 -# _LT_AC_LANG_CXX
 -# ---------------
 -AC_DEFUN([_LT_AC_LANG_CXX],
@@ -5187,15 +2770,7 @@
 -AC_REQUIRE([_LT_AC_PROG_CXXCPP])
 -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
 -])# _LT_AC_LANG_CXX
-+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
-+  ;;
- 
+-
 -# _LT_AC_PROG_CXXCPP
 -# ------------------
 -AC_DEFUN([_LT_AC_PROG_CXXCPP],
@@ -5207,118 +2782,31 @@
 -  AC_PROG_CXXCPP
 -fi
 -])# _LT_AC_PROG_CXXCPP
-+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"
-+  ;;
- 
+-
 -# AC_LIBTOOL_F77
 -# --------------
 -# enable support for Fortran 77 libraries
 -AC_DEFUN([AC_LIBTOOL_F77],
 -[AC_REQUIRE([_LT_AC_LANG_F77])
 -])# AC_LIBTOOL_F77
-+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'
-+  ;;
- 
+-
+-
 -# _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
-+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
-+      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
-+  ;;
- 
+-
+-
 -# AC_LIBTOOL_GCJ
 -# --------------
 -# enable support for GCJ libraries
 -AC_DEFUN([AC_LIBTOOL_GCJ],
 -[AC_REQUIRE([_LT_AC_LANG_GCJ])
 -])# AC_LIBTOOL_GCJ
-+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
-+  shlibpath_overrides_runpath=yes
-+  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'
-+  else
-+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-+    case $host_os in
-+      sco3.2v5*)
-+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-+	;;
-+    esac
-+  fi
-+  sys_lib_dlsearch_path_spec='/usr/lib'
-+  ;;
- 
+-
+-
 -# _LT_AC_LANG_GCJ
 -# ---------------
 -AC_DEFUN([_LT_AC_LANG_GCJ],
@@ -5330,24 +2818,8 @@
 -	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
 -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
 -])# _LT_AC_LANG_GCJ
-+tpf*)
-+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  ;;
- 
-+uts4*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
- 
+-
+-
 -# AC_LIBTOOL_RC
 -# -------------
 -# enable support for Windows resource files
@@ -5412,16 +2884,14 @@
 -    archive_cmds="$archive_cmds~\$RANLIB \$lib"
 -    postinstall_cmds='$RANLIB $lib'
 -  fi
-+*)
-+  dynamic_linker=no
-   ;;
+-  ;;
 -
 -aix[[4-9]]*)
 -  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
 -    test "$enable_shared" = yes && enable_static=no
 -  fi
 -    ;;
- esac
+-esac
 -AC_MSG_RESULT([$enable_shared])
 -
 -AC_MSG_CHECKING([whether to build static libraries])
@@ -5430,62 +2900,14 @@
 -AC_MSG_RESULT([$enable_static])
 -
 -AC_LIBTOOL_CONFIG($1)
-+AC_MSG_RESULT([$dynamic_linker])
-+test "$dynamic_linker" = no && can_build_shared=no
- 
+-
 -AC_LANG_POP
 -CC="$lt_save_CC"
 -])# AC_LIBTOOL_LANG_C_CONFIG
-+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
-+ 
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+fi
-+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-+fi
-+
-+_LT_DECL([], [variables_saved_for_relink], [1],
-+    [Variables whose values should be saved in libtool wrapper scripts and
-+    restored at link time])
-+_LT_DECL([], [need_lib_prefix], [0],
-+    [Do we need the "lib" prefix for modules?])
-+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
-+_LT_DECL([], [version_type], [0], [Library versioning type])
-+_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
-+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
-+_LT_DECL([], [shlibpath_overrides_runpath], [0],
-+    [Is shlibpath searched before the hard-coded library search path?])
-+_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
-+_LT_DECL([], [library_names_spec], [1],
-+    [[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]])
-+_LT_DECL([], [soname_spec], [1],
-+    [[The coded name of the library, if different from the real name]])
-+_LT_DECL([], [postinstall_cmds], [2],
-+    [Command to use after installation of a shared archive])
-+_LT_DECL([], [postuninstall_cmds], [2],
-+    [Command to use after uninstallation of a shared archive])
-+_LT_DECL([], [finish_cmds], [2],
-+    [Commands used to finish a libtool library installation in a directory])
-+_LT_DECL([], [finish_eval], [1],
-+    [[As "finish_cmds", except a single script fragment to be evaled but
-+    not shown]])
-+_LT_DECL([], [hardcode_into_libs], [0],
-+    [Whether we should hardcode library paths into libraries])
-+_LT_DECL([], [sys_lib_search_path_spec], [2],
-+    [Compile-time system search path for libraries])
-+_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
-+    [Run-time system search path for libraries])
-+])# _LT_SYS_DYNAMIC_LINKER
- 
- 
+-
+-
 -# AC_LIBTOOL_LANG_CXX_CONFIG
-+# _LT_PATH_TOOL_PREFIX(TOOL)
- # --------------------------
+-# --------------------------
 -# 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'.
@@ -5514,38 +2936,7 @@
 -_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
-+# find a file program which can recognize shared library
-+AC_DEFUN([_LT_PATH_TOOL_PREFIX],
-+[m4_require([_LT_DECL_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="m4_if([$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 <<_LT_EOF 1>&2
- 
+-
 -# Dependencies to place before and after the object being linked:
 -_LT_AC_TAGVAR(predep_objects, $1)=
 -_LT_AC_TAGVAR(postdep_objects, $1)=
@@ -5553,81 +2944,27 @@
 -_LT_AC_TAGVAR(postdeps, $1)=
 -_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
 -_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such.  This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem.  Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool@gnu.org
- 
+-
 -# Source file extension for C++ test sources.
 -ac_ext=cpp
-+_LT_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
-+_LT_DECL([], [MAGIC_CMD], [0],
-+	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
-+])# _LT_PATH_TOOL_PREFIX
- 
+-
 -# Object file extension for compiled C++ test sources.
 -objext=o
 -_LT_AC_TAGVAR(objext, $1)=$objext
-+# Old name:
-+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
- 
+-
 -# 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); }'
-+# _LT_PATH_MAGIC
-+# --------------
-+# find a file program which can recognize a shared library
-+m4_defun([_LT_PATH_MAGIC],
-+[_LT_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
-+    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-+  else
-+    MAGIC_CMD=:
-+  fi
-+fi
-+])# _LT_PATH_MAGIC
- 
+-
 -# 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
-+# LT_PATH_LD
-+# ----------
-+# find the pathname to the GNU or non-GNU linker
-+AC_DEFUN([LT_PATH_LD],
-+[AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+m4_require([_LT_DECL_SED])dnl
-+m4_require([_LT_DECL_EGREP])dnl
- 
+-
 -# Allow CC to be a program name with arguments.
 -lt_save_CC=$CC
 -lt_save_LD=$LD
@@ -5637,74 +2974,12 @@
 -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
-+AC_ARG_WITH([gnu-ld],
-+    [AS_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])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
+-else
 -  $as_unset lt_cv_prog_gnu_ld
-+  AC_MSG_CHECKING([for non-GNU ld])
- fi
+-fi
 -if test -n "${lt_cv_path_LDCXX+set}"; then
 -  lt_cv_path_LD=$lt_cv_path_LDCXX
-+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
+-else
 -  $as_unset lt_cv_path_LD
 -fi
 -test -z "${LDCXX+set}" || LD=$LDCXX
@@ -5717,19 +2992,10 @@
 -# no_builtin_flag separately
 -if test "$GXX" = yes; then
 -  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-+  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
+-else
 -  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-+  AC_MSG_RESULT(no)
- fi
-+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-+_LT_PATH_LD_GNU
-+AC_SUBST([LD])
- 
+-fi
+-
 -if test "$GXX" = yes; then
 -  # Set up default GNU C++ configuration
 -
@@ -5740,66 +3006,22 @@
 -  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_TAGDECL([], [LD], [1], [The linker used to build libraries])
-+])# LT_PATH_LD
- 
+-
 -    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
 -    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+# Old names:
-+AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
-+AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AM_PROG_LD], [])
-+dnl AC_DEFUN([AC_PROG_LD], [])
-+
-+
-+# _LT_PATH_LD_GNU
-+#- --------------
-+m4_defun([_LT_PATH_LD_GNU],
-+[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
-+])# _LT_PATH_LD_GNU
- 
+-
 -    # 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'
-+# _LT_CMD_RELOAD
-+# --------------
-+# find reload flag for linker
-+#   -- PORTME Some linkers may need a different reload flag.
-+m4_defun([_LT_CMD_RELOAD],
-+[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
+-    else
 -      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-     fi
+-    fi
 -  else
 -    with_gnu_ld=no
 -    wlarc=
@@ -5811,48 +3033,22 @@
 -    # 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
-+    ;;
-+esac
-+_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-+_LT_DECL([], [reload_cmds], [2])dnl
-+])# _LT_CMD_RELOAD
- 
+-
 -  # 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
-+# _LT_CHECK_MAGIC_METHOD
-+# ----------------------
-+# how to check for library dependencies
-+#  -- PORTME fill in with the dynamic library characteristics
-+m4_defun([_LT_CHECK_MAGIC_METHOD],
-+[m4_require([_LT_DECL_EGREP])
-+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.
- 
+-
 -# 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
+-case $host_os in
 -  aix3*)
 -    # FIXME: insert proper C++ library support
 -    _LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -5866,10 +3062,7 @@
 -      no_entry_flag=""
 -    else
 -      aix_use_runtimelinking=no
-+aix[[4-9]]*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
- 
+-
 -      # 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.
@@ -5974,10 +3167,7 @@
 -      fi
 -    fi
 -    ;;
-+beos*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
- 
+-
 -  beos*)
 -    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 -      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -5988,12 +3178,7 @@
 -      _LT_AC_TAGVAR(ld_shlibs, $1)=no
 -    fi
 -    ;;
-+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
-+  ;;
- 
+-
 -  chorus*)
 -    case $cc_basename in
 -      *)
@@ -6002,12 +3187,7 @@
 -	;;
 -    esac
 -    ;;
-+cygwin*)
-+  # func_win32_libid is a shell function defined in ltmain.sh
-+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+  lt_cv_file_magic_cmd='func_win32_libid'
-+  ;;
- 
+-
 -  cygwin* | mingw* | pw32*)
 -    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
 -    # as there is no search path for DLLs.
@@ -6030,18 +3210,7 @@
 -    else
 -      _LT_AC_TAGVAR(ld_shlibs, $1)=no
 -    fi
-+mingw* | pw32*)
-+  # Base MSYS/MinGW do not provide the 'file' command needed by
-+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-+  # 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_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 -      _LT_AC_TAGVAR(hardcode_direct, $1)=no
@@ -6076,7 +3245,7 @@
 -      esac
 -      fi
 -        ;;
- 
+-
 -  dgux*)
 -    case $cc_basename in
 -      ec++*)
@@ -6148,10 +3317,7 @@
 -    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)=:
-+darwin* | rhapsody*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
- 
+-
 -      case $host_cpu in
 -      hppa*64*|ia64*) ;;
 -      *)
@@ -6159,9 +3325,7 @@
 -        ;;
 -      esac
 -    fi
-+freebsd* | dragonfly*)
-+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-     case $host_cpu in
+-    case $host_cpu in
 -    hppa*64*|ia64*)
 -      _LT_AC_TAGVAR(hardcode_direct, $1)=no
 -      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -6171,19 +3335,9 @@
 -      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
 -					      # but as the default
 -					      # location of the library.
-+    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
-+  ;;
- 
+-      ;;
+-    esac
+-
 -    case $cc_basename in
 -      CC*)
 -	# FIXME: insert proper C++ library support
@@ -6342,10 +3496,7 @@
 -	runpath_var=LD_RUN_PATH
 -	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
 -	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+gnu*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
- 
+-
 -	# Commands to make compiler produce verbose output that lists
 -	# what "hidden" libraries, object files and flags are used when
 -	# linking a shared library.
@@ -6415,13 +3566,7 @@
 -  openbsd2*)
 -    # C++ shared libraries are fairly broken
 -    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+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
-     ;;
+-    ;;
 -  openbsd*)
 -    if test -f /usr/libexec/ld.so; then
 -      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
@@ -6437,10 +3582,7 @@
 -    else
 -      _LT_AC_TAGVAR(ld_shlibs, $1)=no
 -    fi
-+  hppa*64*)
-+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
-+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-     ;;
+-    ;;
 -  osf3*)
 -    case $cc_basename in
 -      KCC*)
@@ -6500,10 +3642,7 @@
 -	fi
 -	;;
 -    esac
-+  *)
-+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-     ;;
+-    ;;
 -  osf4* | osf5*)
 -    case $cc_basename in
 -      KCC*)
@@ -6559,9 +3698,7 @@
 -	  # 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"'
-+  esac
-+  ;;
- 
+-
 -	else
 -	  # FIXME: insert proper C++ library support
 -	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -6613,22 +3750,9 @@
 -	    ;;
 -	esac
 -	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+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)$'
-+  ;;
- 
+-
 -	output_verbose_link_cmd='echo'
-+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
-+  ;;
- 
+-
 -	# 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
@@ -6638,11 +3762,7 @@
 -      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'
-+# This must be Linux ELF.
-+linux* | k*bsd*-gnu)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
- 
+-
 -	# The C++ compiler must be used to create the archive.
 -	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
 -	;;
@@ -6654,14 +3774,7 @@
 -	    _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'
-+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
-+  ;;
- 
+-
 -	    # Commands to make compiler produce verbose output that lists
 -	    # what "hidden" libraries, object files and flags are used when
 -	    # linking a shared library.
@@ -6672,21 +3785,13 @@
 -	    _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'
-+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
-+  ;;
- 
+-
 -	    # 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
-+*nto* | *qnx*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
- 
+-
 -	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
 -	  case $host_os in
 -	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
@@ -6697,36 +3802,7 @@
 -	fi
 -	;;
 -    esac
-+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
-+  ;;
-+
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+  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*`
-     ;;
+-    ;;
 -  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
@@ -6743,9 +3819,7 @@
 -	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 -	;;
 -    esac
-+  ncr)
-+    lt_cv_deplibs_check_method=pass_all
-     ;;
+-    ;;
 -  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
@@ -6782,10 +3856,7 @@
 -	_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
-+  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 )'
-     ;;
+-    ;;
 -  tandem*)
 -    case $cc_basename in
 -      NCC*)
@@ -6798,40 +3869,22 @@
 -	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 -	;;
 -    esac
-+  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
-     ;;
+-    ;;
 -  vxworks*)
 -    # FIXME: insert proper C++ library support
 -    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+  siemens)
-+    lt_cv_deplibs_check_method=pass_all
-     ;;
+-    ;;
 -  *)
 -    # FIXME: insert proper C++ library support
 -    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+  pc)
-+    lt_cv_deplibs_check_method=pass_all
-     ;;
+-    ;;
 -esac
 -AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
 -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-+  esac
-+  ;;
- 
+-
 -_LT_AC_TAGVAR(GCC, $1)="$GXX"
 -_LT_AC_TAGVAR(LD, $1)="$LD"
-+tpf*)
-+  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_LIBTOOL_POSTDEP_PREDEP($1)
 -AC_LIBTOOL_PROG_COMPILER_PIC($1)
 -AC_LIBTOOL_PROG_CC_C_O($1)
@@ -6839,14 +3892,9 @@
 -AC_LIBTOOL_PROG_LD_SHLIBS($1)
 -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
 -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-+_LT_DECL([], [deplibs_check_method], [1],
-+    [Method to check whether dependent libraries are shared objects])
-+_LT_DECL([], [file_magic_cmd], [1],
-+    [Command to use when deplibs_check_method == "file_magic"])
-+])# _LT_CHECK_MAGIC_METHOD
- 
+-
 -AC_LIBTOOL_CONFIG($1)
- 
+-
 -AC_LANG_POP
 -CC=$lt_save_CC
 -LDCXX=$LD
@@ -6859,69 +3907,7 @@
 -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
-+# LT_PATH_NM
-+# ----------
-+# find the pathname to a BSD- or MS-compatible name lister
-+AC_DEFUN([LT_PATH_NM],
-+[AC_REQUIRE([AC_PROG_CC])dnl
-+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (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
-+  : ${lt_cv_path_NM=no}
-+fi])
-+if test "$lt_cv_path_NM" != "no"; then
-+  NM="$lt_cv_path_NM"
-+else
-+  # Didn't find any BSD compatible name lister, look for dumpbin.
-+  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
-+  AC_SUBST([DUMPBIN])
-+  if test "$DUMPBIN" != ":"; then
-+    NM="$DUMPBIN"
-+  fi
-+fi
-+test -z "$NM" && NM=nm
-+AC_SUBST([NM])
-+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
- 
+-
 -# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
 -# ------------------------------------
 -# Figure out "hidden" library dependencies from verbose
@@ -6970,66 +3956,19 @@
 -if AC_TRY_EVAL(ac_compile); then
 -  # Parse the compiler output and extract the necessary
 -  # objects, libraries and library flags.
-+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
-+  [lt_cv_nm_interface="BSD nm"
-+  echo "int some_variable = 0;" > conftest.$ac_ext
-+  (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
-+  (eval "$ac_compile" 2>conftest.err)
-+  cat conftest.err >&AS_MESSAGE_LOG_FD
-+  (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
-+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-+  cat conftest.err >&AS_MESSAGE_LOG_FD
-+  (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
-+  cat conftest.out >&AS_MESSAGE_LOG_FD
-+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-+    lt_cv_nm_interface="MS dumpbin"
-+  fi
-+  rm -f conftest*])
-+])# LT_PATH_NM
-+
-+# Old names:
-+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
-+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AM_PROG_NM], [])
-+dnl AC_DEFUN([AC_PROG_NM], [])
- 
+-
 -  # 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"`
-+# LT_LIB_M
-+# --------
-+# check for math library
-+AC_DEFUN([LT_LIB_M],
-+[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_SUBST([LIBM])
-+])# LT_LIB_M
- 
+-
 -  for p in `eval $output_verbose_link_cmd`; do
 -    case $p in
-+# Old name:
-+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_CHECK_LIBM], [])
- 
+-
 -    -L* | -R* | -l*)
 -       # Some compilers place space between "-{L,R}" and the path.
 -       # Remove the space.
@@ -7040,7 +3979,7 @@
 -       else
 -	 prev=
 -       fi
- 
+-
 -       if test "$pre_test_object_deps_done" = no; then
 -	 case $p in
 -	 -L* | -R*)
@@ -7064,11 +4003,7 @@
 -	 fi
 -       fi
 -       ;;
-+# _LT_COMPILER_NO_RTTI([TAGNAME])
-+# -------------------------------
-+m4_defun([_LT_COMPILER_NO_RTTI],
-+[m4_require([_LT_TAG_COMPILER])dnl
- 
+-
 -    *.$objext)
 -       # This assumes that the test object file only shows up
 -       # once in the compiler output.
@@ -7076,8 +4011,7 @@
 -	 pre_test_object_deps_done=yes
 -	 continue
 -       fi
-+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
- 
+-
 -       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"
@@ -7092,53 +4026,25 @@
 -	 fi
 -       fi
 -       ;;
-+if test "$GCC" = yes; then
-+  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
- 
+-
 -    *) ;; # Ignore the rest.
-+  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-+    lt_cv_prog_compiler_rtti_exceptions,
-+    [-fno-rtti -fno-exceptions], [],
-+    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-+fi
-+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
-+	[Compiler flag to turn off builtin functions])
-+])# _LT_COMPILER_NO_RTTI
- 
+-
 -    esac
 -  done
- 
+-
 -  # Clean up.
 -  rm -f a.out a.exe
 -else
 -  echo "libtool.m4: error: problem compiling $1 test program"
 -fi
-+# _LT_CMD_GLOBAL_SYMBOLS
-+# ----------------------
-+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([LT_PATH_NM])dnl
-+AC_REQUIRE([LT_PATH_LD])dnl
-+m4_require([_LT_DECL_SED])dnl
-+m4_require([_LT_DECL_EGREP])dnl
-+m4_require([_LT_TAG_COMPILER])dnl
- 
+-
 -$rm -f confest.$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?!! ;)]
- 
+-
 -_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
-+# Character class describing NM global symbol codes.
-+symcode='[[BCDEGRST]]'
- 
+-
 -# PORTME: override above test on systems where it is broken
 -ifelse([$1],[CXX],
 -[case $host_os in
@@ -7149,9 +4055,7 @@
 -  _LT_AC_TAGVAR(postdep_objects,$1)=
 -  _LT_AC_TAGVAR(postdeps,$1)=
 -  ;;
-+# Regexp to match symbols that can be accessed directly from C.
-+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
- 
+-
 -linux*)
 -  case `$CC -V 2>&1 | sed 5q` in
 -  *Sun\ C*)
@@ -7171,27 +4075,9 @@
 -    fi
 -    ;;
 -  esac
-+# Define system-specific variables.
-+case $host_os in
-+aix*)
-+  symcode='[[BCDT]]'
-+  ;;
-+cygwin* | mingw* | pw32*)
-+  symcode='[[ABCDGISTW]]'
-+  ;;
-+hpux*)
-+  if test "$host_cpu" = ia64; then
-+    symcode='[[ABCDEGRST]]'
-+  fi
-+  ;;
-+irix* | nonstopux*)
-+  symcode='[[BCDEGRST]]'
-+  ;;
-+osf*)
-+  symcode='[[BCDEGQRST]]'
-   ;;
+-  ;;
 -
- solaris*)
+-solaris*)
 -  case $cc_basename in
 -  CC*)
 -    # The more standards-conforming stlport4 library is
@@ -7212,21 +4098,8 @@
 -    fi
 -    ;;
 -  esac
-+  symcode='[[BDRT]]'
-+  ;;
-+sco3.2v5*)
-+  symcode='[[DT]]'
-+  ;;
-+sysv4.2uw2*)
-+  symcode='[[DT]]'
-+  ;;
-+sysv5* | sco5v6* | unixware* | OpenUNIX*)
-+  symcode='[[ABDT]]'
-+  ;;
-+sysv4)
-+  symcode='[[DFNSTU]]'
-   ;;
- esac
+-  ;;
+-esac
 -])
 -case " $_LT_AC_TAGVAR(postdeps, $1) " in
 -*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
@@ -7288,32 +4161,20 @@
 -# 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])
-+# If we're using GNU nm, then use its standard symbol codes.
-+case `$NM -V 2>&1` in
-+*GNU* | *'with BFD'*)
-+  symcode='[[ABCDGIRSTW]]' ;;
-+esac
- 
+-
 -AC_MSG_CHECKING([if libtool supports shared libraries])
 -AC_MSG_RESULT([$can_build_shared])
-+# Transform an extracted symbol line into a proper C declaration.
-+# Some systems (esp. on ia64) link data and code symbols differently,
-+# so use this general approach.
-+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
- 
+-
 -AC_MSG_CHECKING([whether to build shared libraries])
 -test "$can_build_shared" = "no" && enable_shared=no
-+# 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\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
-+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
- 
+-
 -# On AIX, shared libraries and static libraries use the same namespace, and
 -# are all built from PIC.
 -case $host_os in
@@ -7328,15 +4189,10 @@
 -  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
 -    test "$enable_shared" = yes && enable_static=no
 -  fi
-+# 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
+-  ;;
+-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
@@ -7353,36 +4209,12 @@
 -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
 -
 -AC_LIBTOOL_CONFIG($1)
-+# Try without a prefix underscore, then with it.
-+for ac_symprfx in "" "_"; do
- 
+-
 -AC_LANG_POP
 -CC="$lt_save_CC"
 -])# AC_LIBTOOL_LANG_F77_CONFIG
-+  # 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.
-+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-+    # Fake it for dumpbin and say T for any non-static function
-+    # and D for any global variable.
-+    # Also find C++ and __fastcall symbols from MSVC++,
-+    # which start with @ or ?.
-+    lt_cv_sys_global_symbol_pipe="$AWK ['"\
-+"     {last_section=section; section=\$ 3};"\
-+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-+"     \$ 0!~/External *\|/{next};"\
-+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-+"     {if(hide[section]) next};"\
-+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-+"     ' prfx=^$ac_symprfx]"
-+  else
-+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-+  fi
- 
+-
+-
 -# AC_LIBTOOL_LANG_GCJ_CONFIG
 -# --------------------------
 -# Ensure that the configuration vars for the C compiler are
@@ -7391,139 +4223,39 @@
 -AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
 -AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
 -[AC_LANG_SAVE
-+  # Check to see that the pipe works correctly.
-+  pipe_works=no
- 
+-
 -# Source file extension for Java test sources.
 -ac_ext=java
-+  rm -f conftest*
-+  cat > conftest.$ac_ext <<_LT_EOF
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+char nm_test_var;
-+void nm_test_func(void);
-+void nm_test_func(void){}
-+#ifdef __cplusplus
-+}
-+#endif
-+int main(){nm_test_var='a';nm_test_func();return(0);}
-+_LT_EOF
- 
+-
 -# Object file extension for compiled Java test sources.
 -objext=o
 -_LT_AC_TAGVAR(objext, $1)=$objext
-+  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
- 
+-
 -# Code to be used in simple compile tests
 -lt_simple_compile_test_code="class foo {}"
-+      # 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 <<_LT_EOF > conftest.$ac_ext
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- 
+-
 -# Code to be used in simple link tests
 -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-+_LT_EOF
-+	  # Now generate the symbol file.
-+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
- 
+-
 -# ltmain only uses $CC for tagged configurations so make sure $CC is set.
 -_LT_AC_SYS_COMPILER
-+	  cat <<_LT_EOF >> conftest.$ac_ext
- 
+-
 -# save warnings/boilerplate of simple test code
 -_LT_COMPILER_BOILERPLATE
 -_LT_LINKER_BOILERPLATE
-+/* The mapping between symbol names and symbols.  */
-+const struct {
-+  const char *name;
-+  void       *address;
-+}
-+lt__PROGRAM__LTX_preloaded_symbols[[]] =
-+{
-+  { "@PROGRAM@", (void *) 0 },
-+_LT_EOF
-+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-+	  cat <<\_LT_EOF >> conftest.$ac_ext
-+  {0, (void *) 0}
-+};
- 
+-
 -# 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])
-+/* This works around a problem in FreeBSD linker */
-+#ifdef FREEBSD_WORKAROUND
-+static const void *lt_preloaded_setup() {
-+  return lt__PROGRAM__LTX_preloaded_symbols;
-+}
-+#endif
- 
+-
 -# GCJ did not exist at the time GCC didn't implicitly link libc in.
 -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+#ifdef __cplusplus
-+}
-+#endif
-+_LT_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_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*
- 
+-
 -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+  # 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_PROG_COMPILER_NO_RTTI($1)
 -AC_LIBTOOL_PROG_COMPILER_PIC($1)
 -AC_LIBTOOL_PROG_CC_C_O($1)
@@ -7531,38 +4263,14 @@
 -AC_LIBTOOL_PROG_LD_SHLIBS($1)
 -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
 -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
-+    [Take the output of nm and produce a listing of raw symbols and C names])
-+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
-+    [Transform the output of nm in a proper C declaration])
-+_LT_DECL([global_symbol_to_c_name_address],
-+    [lt_cv_sys_global_symbol_to_c_name_address], [1],
-+    [Transform the output of nm in a C name address pair])
-+_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
-+    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
-+    [Transform the output of nm in a C name address pair when lib prefix is needed])
-+]) # _LT_CMD_GLOBAL_SYMBOLS
- 
+-
 -AC_LIBTOOL_CONFIG($1)
- 
+-
 -AC_LANG_RESTORE
 -CC="$lt_save_CC"
 -])# AC_LIBTOOL_LANG_GCJ_CONFIG
-+# _LT_COMPILER_PIC([TAGNAME])
-+# ---------------------------
-+m4_defun([_LT_COMPILER_PIC],
-+[m4_require([_LT_TAG_COMPILER])dnl
-+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
-+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-+_LT_TAGVAR(lt_prog_compiler_static, $1)=
- 
-+AC_MSG_CHECKING([for $compiler option to produce PIC])
-+m4_if([$1], [CXX], [
-+  # C++ specific cases for pic, static, wl, etc.
-+  if test "$GXX" = yes; then
-+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
- 
+-
+-
 -# AC_LIBTOOL_LANG_RC_CONFIG
 -# -------------------------
 -# Ensure that the configuration vars for the Windows resource compiler are
@@ -7571,896 +4279,27 @@
 -AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
 -AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
 -[AC_LANG_SAVE
-+    case $host_os in
-+    aix*)
-+      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      fi
-+      ;;
- 
+-
 -# Source file extension for RC test sources.
 -ac_ext=rc
-+    amigaos*)
-+      case $host_cpu in
-+      powerpc)
-+            # see comment about AmigaOS4 .so support
-+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+        ;;
-+      m68k)
-+            # 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_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-+        ;;
-+      esac
-+      ;;
- 
+-
 -# Object file extension for compiled RC test sources.
 -objext=o
 -_LT_AC_TAGVAR(objext, $1)=$objext
-+    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_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_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-+      ;;
-+    *djgpp*)
-+      # DJGPP does not support shared libraries at all
-+      _LT_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_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_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+	;;
-+      esac
-+      ;;
-+    *qnx* | *nto*)
-+      # QNX uses GNU C++, but need to define -shared option too, otherwise
-+      # it will coredump.
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-+      ;;
-+    *)
-+      _LT_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_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	else
-+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-+	fi
-+	;;
-+      chorus*)
-+	case $cc_basename in
-+	cxch68*)
-+	  # Green Hills C++ Compiler
-+	  # _LT_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
-+	;;
-+      dgux*)
-+	case $cc_basename in
-+	  ec++*)
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	    ;;
-+	  ghcx*)
-+	    # Green Hills C++ Compiler
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      freebsd* | dragonfly*)
-+	# FreeBSD uses GNU C++
-+	;;
-+      hpux9* | hpux10* | hpux11*)
-+	case $cc_basename in
-+	  CC*)
-+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-+	    if test "$host_cpu" != ia64; then
-+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-+	    fi
-+	    ;;
-+	  aCC*)
-+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-+	    case $host_cpu in
-+	    hppa*64*|ia64*)
-+	      # +Z the default
-+	      ;;
-+	    *)
-+	      _LT_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_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_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_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+	    ;;
-+	  icpc* | ecpc* )
-+	    # Intel C++
-+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+	    ;;
-+	  pgCC* | pgcpp*)
-+	    # Portland Group C++ compiler
-+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-+	    _LT_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_TAGVAR(lt_prog_compiler_pic, $1)=
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+	    ;;
-+	  xlc* | xlC*)
-+	    # IBM XL 8.0 on PPC
-+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-+	    ;;
-+	  *)
-+	    case `$CC -V 2>&1 | sed 5q` in
-+	    *Sun\ C*)
-+	      # Sun C++ 5.9
-+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-+	      ;;
-+	    esac
-+	    ;;
-+	esac
-+	;;
-+      lynxos*)
-+	;;
-+      m88k*)
-+	;;
-+      mvs*)
-+	case $cc_basename in
-+	  cxx*)
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      netbsd* | netbsdelf*-gnu)
-+	;;
-+      *qnx* | *nto*)
-+        # QNX uses GNU C++, but need to define -shared option too, otherwise
-+        # it will coredump.
-+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-+        ;;
-+      osf3* | osf4* | osf5*)
-+	case $cc_basename in
-+	  KCC*)
-+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-+	    ;;
-+	  RCC*)
-+	    # Rational C++ 2.4.1
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+	    ;;
-+	  cxx*)
-+	    # Digital/Compaq C++
-+	    _LT_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_TAGVAR(lt_prog_compiler_pic, $1)=
-+	    _LT_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_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-+	    ;;
-+	  gcx*)
-+	    # Green Hills C++ Compiler
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      sunos4*)
-+	case $cc_basename in
-+	  CC*)
-+	    # Sun C++ 4.x
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	    ;;
-+	  lcc*)
-+	    # Lucid
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-+	case $cc_basename in
-+	  CC*)
-+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	    ;;
-+	esac
-+	;;
-+      tandem*)
-+	case $cc_basename in
-+	  NCC*)
-+	    # NonStop-UX NCC 3.20
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      vxworks*)
-+	;;
-+      *)
-+	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+	;;
-+    esac
-+  fi
-+],
-+[
-+  if test "$GCC" = yes; then
-+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+    _LT_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_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      fi
-+      ;;
-+
-+    amigaos*)
-+      case $host_cpu in
-+      powerpc)
-+            # see comment about AmigaOS4 .so support
-+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+        ;;
-+      m68k)
-+            # 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_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-+        ;;
-+      esac
-+      ;;
-+
-+    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_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_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-+      ;;
-+
-+    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_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+	;;
-+      esac
-+      ;;
-+
-+    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_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+      enable_shared=no
-+      ;;
-+
-+    *nto* | *qnx*)
-+      # QNX uses GNU C++, but need to define -shared option too, otherwise
-+      # it will coredump.
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-+      fi
-+      ;;
-+
-+    *)
-+      _LT_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_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      else
-+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-+      fi
-+      ;;
-+
-+    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_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-+      ;;
-+
-+    hpux9* | hpux10* | hpux11*)
-+      _LT_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_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-+	;;
-+      esac
-+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-+      ;;
-+
-+    irix5* | irix6* | nonstopux*)
-+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      # PIC (with -KPIC) is the default.
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+      ;;
-+
-+    linux* | k*bsd*-gnu)
-+      case $cc_basename in
-+      icc* | ecc* | ifort*)
-+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	_LT_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_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+        ;;
-+      ccc*)
-+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+        # All Alpha code is PIC.
-+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+        ;;
-+      xl*)
-+	# IBM XL C 8.0/Fortran 10.1 on PPC
-+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-+	;;
-+      *)
-+	case `$CC -V 2>&1 | sed 5q` in
-+	*Sun\ C*)
-+	  # Sun C 5.9
-+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	  ;;
-+	*Sun\ F*)
-+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
-+	  ;;
-+	esac
-+	;;
-+      esac
-+      ;;
-+
-+    newsos6)
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      ;;
-+
-+    *nto* | *qnx*)
-+      # QNX uses GNU C++, but need to define -shared option too, otherwise
-+      # it will coredump.
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-+      ;;
-+
-+    osf3* | osf4* | osf5*)
-+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      # All OSF/1 code is PIC.
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+      ;;
-+
-+    rdos*)
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+      ;;
-+
-+    solaris*)
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      case $cc_basename in
-+      f77* | f90* | f95*)
-+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-+      *)
-+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-+      esac
-+      ;;
-+
-+    sunos4*)
-+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      ;;
-+
-+    sysv4 | sysv4.2uw2* | sysv4.3*)
-+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec ;then
-+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      fi
-+      ;;
-+
-+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      ;;
-+
-+    unicos*)
-+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+      ;;
-+
-+    uts4*)
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      ;;
-+
-+    *)
-+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+      ;;
-+    esac
-+  fi
-+])
-+case $host_os in
-+  # For platforms which do not support PIC, -DPIC is meaningless:
-+  *djgpp*)
-+    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-+    ;;
-+  *)
-+    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
-+    ;;
-+esac
-+AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-+	[How to pass a linker flag through the compiler])
-+
-+#
-+# Check to make sure the PIC flag actually works.
-+#
-+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-+  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
-+    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
-+    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
-+    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
-+     "" | " "*) ;;
-+     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-+     esac],
-+    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-+     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-+fi
-+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
-+	[Additional compiler flags for building library objects])
-+
-+#
-+# Check to make sure the static flag actually works.
-+#
-+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
-+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-+  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
-+  $lt_tmp_static_flag,
-+  [],
-+  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
-+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
-+	[Compiler flag to prevent dynamic linking])
-+])# _LT_COMPILER_PIC
-+
-+
-+# _LT_LINKER_SHLIBS([TAGNAME])
-+# ----------------------------
-+# See if the linker supports building shared libraries.
-+m4_defun([_LT_LINKER_SHLIBS],
-+[AC_REQUIRE([LT_PATH_LD])dnl
-+AC_REQUIRE([LT_PATH_NM])dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_DECL_EGREP])dnl
-+m4_require([_LT_DECL_SED])dnl
-+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-+m4_require([_LT_TAG_COMPILER])dnl
-+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-+m4_if([$1], [CXX], [
-+  _LT_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_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_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_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-+  ;;
-+  cygwin* | mingw*)
-+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-+  ;;
-+  linux* | k*bsd*-gnu)
-+    _LT_TAGVAR(link_all_deplibs, $1)=no
-+  ;;
-+  *)
-+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  ;;
-+  esac
-+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-+], [
-+  runpath_var=
-+  _LT_TAGVAR(allow_undefined_flag, $1)=
-+  _LT_TAGVAR(always_export_symbols, $1)=no
-+  _LT_TAGVAR(archive_cmds, $1)=
-+  _LT_TAGVAR(archive_expsym_cmds, $1)=
-+  _LT_TAGVAR(compiler_needs_object, $1)=no
-+  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  _LT_TAGVAR(hardcode_automatic, $1)=no
-+  _LT_TAGVAR(hardcode_direct, $1)=no
-+  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
-+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-+  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-+  _LT_TAGVAR(hardcode_minus_L, $1)=no
-+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+  _LT_TAGVAR(inherit_rpath, $1)=no
-+  _LT_TAGVAR(link_all_deplibs, $1)=unknown
-+  _LT_TAGVAR(module_cmds, $1)=
-+  _LT_TAGVAR(module_expsym_cmds, $1)=
-+  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
-+  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-+  _LT_TAGVAR(thread_safe_flag_spec, $1)=
-+  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-+  # include_expsyms should be a list of space-separated symbols to be *always*
-+  # included in the symbol list
-+  _LT_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_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=
-+
-+  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_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_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+    _LT_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_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+    else
-+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-+    fi
-+    supports_anon_versioning=no
-+    case `$LD -v 2>&1` 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_TAGVAR(ld_shlibs, $1)=no
-+	cat <<_LT_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.
-+
-+_LT_EOF
-+      fi
-+      ;;
-+
-+    amigaos*)
-+      case $host_cpu in
-+      powerpc)
-+            # see comment about AmigaOS4 .so support
-+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-+        ;;
-+      m68k)
-+            _LT_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_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+        ;;
-+      esac
-+      ;;
-+
-+    beos*)
-+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-+	# support --undefined.  This deserves some investigation.  FIXME
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      else
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+
-+    cygwin* | mingw* | pw32*)
-+      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-+      # as there is no search path for DLLs.
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+      _LT_TAGVAR(always_export_symbols, $1)=no
-+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-+
-+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-+        _LT_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_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_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+
-+    interix[[3-9]]*)
-+      _LT_TAGVAR(hardcode_direct, $1)=no
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+      _LT_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_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_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* | tpf* | k*bsd*-gnu)
-+      tmp_diet=no
-+      if test "$host_os" = linux-dietlibc; then
-+	case $cc_basename in
-+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-+	esac
-+      fi
-+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-+	 && test "$tmp_diet" = no
-+      then
-+	tmp_addflag=
-+	tmp_sharedflag='-shared'
-+	case $cc_basename,$host_cpu in
-+        pgcc*)				# Portland Group C compiler
-+	  _LT_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_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' ;;
-+	xl[[cC]]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
-+	  tmp_sharedflag='-qmkshrobj'
-+	  tmp_addflag= ;;
-+	esac
-+	case `$CC -V 2>&1 | sed 5q` in
-+	*Sun\ C*)			# Sun C 5.9
-+	  _LT_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'
-+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
-+	  tmp_sharedflag='-G' ;;
-+	*Sun\ F*)			# Sun Fortran 8.3
-+	  tmp_sharedflag='-G' ;;
-+	esac
-+	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- 
+-
 -# Code to be used in simple compile tests
 -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-+        if test "x$supports_anon_versioning" = xyes; then
-+          _LT_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
- 
+-
 -# Code to be used in simple link tests
 -lt_simple_link_test_code="$lt_simple_compile_test_code"
-+	case $cc_basename in
-+	xlf*)
-+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
-+	  if test "x$supports_anon_versioning" = xyes; then
-+	    _LT_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~
-+	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-+	  fi
-+	  ;;
-+	esac
-+      else
-+        _LT_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
- 
+-
 -# ltmain only uses $CC for tagged configurations so make sure $CC is set.
 -_LT_AC_SYS_COMPILER
-+    netbsd* | netbsdelf*-gnu)
-+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-+	wlarc=
-+      else
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	_LT_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
-+      ;;
- 
+-
 -# save warnings/boilerplate of simple test code
 -_LT_COMPILER_BOILERPLATE
 -_LT_LINKER_BOILERPLATE
-+    solaris*)
-+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+	cat <<_LT_EOF 1>&2
- 
+-
 -# Allow CC to be a program name with arguments.
 -lt_save_CC="$CC"
 -CC=${RC-"windres"}
@@ -8468,385 +4307,14 @@
 -_LT_AC_TAGVAR(compiler, $1)=$CC
 -_LT_CC_BASENAME([$compiler])
 -_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-+*** 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.
-+
-+_LT_EOF
-+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	_LT_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_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_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
-+	;;
-+	*)
-+	  # 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.
-+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	    _LT_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_TAGVAR(ld_shlibs, $1)=no
-+	  fi
-+	;;
-+      esac
-+      ;;
-+
-+    sunos4*)
-+      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      wlarc=
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    *)
-+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	_LT_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_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+    esac
-+
-+    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
-+      runpath_var=
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-+      _LT_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_TAGVAR(allow_undefined_flag, $1)=unsupported
-+      _LT_TAGVAR(always_export_symbols, $1)=yes
-+      _LT_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_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_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_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_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_TAGVAR(archive_cmds, $1)=''
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-+      _LT_TAGVAR(link_all_deplibs, $1)=yes
-+      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-+
-+      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_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_TAGVAR(hardcode_minus_L, $1)=yes
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-+	  fi
-+	  ;;
-+	esac
-+	shared_flag='-shared'
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag="$shared_flag "'${wl}-G'
-+	fi
-+	_LT_TAGVAR(link_all_deplibs, $1)=no
-+      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_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_TAGVAR(allow_undefined_flag, $1)='-berok'
-+        # Determine the default libpath from the value encoded in an
-+        # empty executable.
-+        _LT_SYS_MODULE_PATH_AIX
-+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+        _LT_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 "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+      else
-+	if test "$host_cpu" = ia64; then
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-+	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-+	  _LT_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_SYS_MODULE_PATH_AIX
-+	 _LT_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_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-+	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-+	  # Exported symbols can be pulled into shared objects from archives
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-+	  # This is similar to how AIX traditionally builds its shared libraries.
-+	  _LT_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*)
-+      case $host_cpu in
-+      powerpc)
-+            # see comment about AmigaOS4 .so support
-+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-+        ;;
-+      m68k)
-+            _LT_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_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+        ;;
-+      esac
-+      ;;
-+
-+    bsdi[[45]]*)
-+      _LT_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_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-+      _LT_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_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-+      # The linker will automatically build a .lib file if we build a DLL.
-+      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-+      # FIXME: Should let the user specify the lib program.
-+      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-+      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+      ;;
-+
-+    darwin* | rhapsody*)
-+      _LT_DARWIN_LINKER_FEATURES($1)
-+      ;;
-+
-+    dgux*)
-+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    freebsd1*)
-+      _LT_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_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+    freebsd2*)
-+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+    freebsd* | dragonfly*)
-+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    hpux9*)
-+      if test "$GCC" = yes; then
-+	_LT_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_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_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+
-+      # hardcode_minus_L: Not really in the search PATH,
-+      # but as the default location of the library.
-+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+      ;;
-+
-+    hpux10*)
-+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	_LT_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_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+	_LT_TAGVAR(hardcode_direct, $1)=yes
-+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+	_LT_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_TAGVAR(hardcode_minus_L, $1)=yes
-+      fi
-+      ;;
- 
+-
 -AC_LIBTOOL_CONFIG($1)
-+    hpux11*)
-+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+	case $host_cpu in
-+	hppa*64*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	ia64*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	*)
-+	  _LT_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_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	ia64*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	*)
-+	  _LT_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_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
- 
+-
 -AC_LANG_RESTORE
 -CC="$lt_save_CC"
 -])# AC_LIBTOOL_LANG_RC_CONFIG
-+	case $host_cpu in
-+	hppa*64*|ia64*)
-+	  _LT_TAGVAR(hardcode_direct, $1)=no
-+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	  ;;
-+	*)
-+	  _LT_TAGVAR(hardcode_direct, $1)=yes
-+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+	  _LT_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_TAGVAR(hardcode_minus_L, $1)=yes
-+	  ;;
-+	esac
-+      fi
-+      ;;
- 
+-
+-
 -# AC_LIBTOOL_CONFIG([TAGNAME])
 -# ----------------------------
 -# If TAGNAME is not passed, then create an initial libtool script
@@ -8929,57 +4397,19 @@
 -    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\"\`\\\""
-+    irix5* | irix6* | nonstopux*)
-+      if test "$GCC" = yes; then
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	# Try to use the -exported_symbol ld option, if it does not
-+	# work, assume that -exports_file does not work either and
-+	# implicitly export all symbols.
-+        save_LDFLAGS="$LDFLAGS"
-+        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-+        AC_LINK_IFELSE(int foo(void) {},
-+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-+        )
-+        LDFLAGS="$save_LDFLAGS"
-+      else
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-+      fi
-+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+      _LT_TAGVAR(inherit_rpath, $1)=yes
-+      _LT_TAGVAR(link_all_deplibs, $1)=yes
-       ;;
+-      ;;
 -    *)
 -      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+
-+    netbsd* | netbsdelf*-gnu)
-+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-+      else
-+	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-+      fi
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-       ;;
+-      ;;
 -    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
-+    newsos6)
-+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
- 
+-
 -ifelse([$1], [],
 -  [cfgfile="${ofile}T"
 -  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
@@ -8990,9 +4420,7 @@
 -  cat <<__EOF__ >> "$cfgfile"
 -ifelse([$1], [],
 -[#! $SHELL
-+    *nto* | *qnx*)
-+      ;;
- 
+-
 -# `$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.
@@ -9021,1721 +4449,339 @@
 -# 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.
-+    openbsd*)
-+      if test -f /usr/libexec/ld.so; then
-+	_LT_TAGVAR(hardcode_direct, $1)=yes
-+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+	else
-+	  case $host_os in
-+	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-+	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+	     ;;
-+	   *)
-+	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	     ;;
-+	  esac
-+	fi
-+      else
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
- 
+-
 -# A sed program that does not truncate output.
 -SED=$lt_SED
-+    os2*)
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+      _LT_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_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-+      ;;
- 
+-
 -# Sed that helps us avoid accidentally triggering echo(1) options like -n.
 -Xsed="$SED -e 1s/^X//"
-+    osf3*)
-+      if test "$GCC" = yes; then
-+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+      else
-+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+      fi
-+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+      ;;
- 
+-
 -# 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
-+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-+      if test "$GCC" = yes; then
-+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+      else
-+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
- 
+-
 -# The names of the tagged configurations supported by this script.
 -available_tags=
-+	# Both c and cxx compiler support -rpath directly
-+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+      fi
-+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+      ;;
- 
+-
 -# ### BEGIN LIBTOOL CONFIG],
 -[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
-+    solaris*)
-+      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
-+      if test "$GCC" = yes; then
-+	wlarc='${wl}'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_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}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-+      else
-+	case `$CC -V 2>&1` in
-+	*"Compilers 5.0"*)
-+	  wlarc=''
-+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  _LT_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'
-+	  ;;
-+	*)
-+	  wlarc='${wl}'
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  _LT_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} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-+	  ;;
-+	esac
-+      fi
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+      _LT_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_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+	else
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-+	fi
-+	;;
-+      esac
-+      _LT_TAGVAR(link_all_deplibs, $1)=yes
-+      ;;
- 
+-
 -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+    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_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-+      fi
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
- 
+-
 -# Shell to use when invoking shell scripts.
 -SHELL=$lt_SHELL
-+    sysv4)
-+      case $host_vendor in
-+	sni)
-+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-+	;;
-+	siemens)
-+	  ## LD is ld it makes a PLAMLIB
-+	  ## CC just makes a GrossModule.
-+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-+	  _LT_TAGVAR(hardcode_direct, $1)=no
-+        ;;
-+	motorola)
-+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-+	;;
-+      esac
-+      runpath_var='LD_RUN_PATH'
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
- 
+-
 -# Whether or not to build shared libraries.
 -build_libtool_libs=$enable_shared
-+    sysv4.3*)
-+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-+      ;;
- 
+-
 -# Whether or not to build static libraries.
 -build_old_libs=$enable_static
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	runpath_var=LD_RUN_PATH
-+	hardcode_runpath_var=yes
-+	_LT_TAGVAR(ld_shlibs, $1)=yes
-+      fi
-+      ;;
- 
+-
 -# Whether or not to add -lc for building shared libraries.
 -build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
-+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      runpath_var='LD_RUN_PATH'
- 
+-
 -# 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)
-+      if test "$GCC" = yes; then
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      fi
-+      ;;
- 
+-
 -# Whether or not to optimize for fast installation.
 -fast_install=$enable_fast_install
-+    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_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-+      _LT_TAGVAR(link_all_deplibs, $1)=yes
-+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-+      runpath_var='LD_RUN_PATH'
- 
+-
 -# The host system.
 -host_alias=$host_alias
 -host=$host
 -host_os=$host_os
-+      if test "$GCC" = yes; then
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      fi
-+      ;;
- 
+-
 -# The build system.
 -build_alias=$build_alias
 -build=$build
 -build_os=$build_os
-+    uts4*)
-+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
- 
+-
 -# An echo program that does not interpret backslashes.
 -echo=$lt_echo
-+    *)
-+      _LT_TAGVAR(ld_shlibs, $1)=no
-+      ;;
-+    esac
- 
+-
 -# The archiver.
 -AR=$lt_AR
 -AR_FLAGS=$lt_AR_FLAGS
-+    if test x$host_vendor = xsni; then
-+      case $host in
-+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
-+	;;
-+      esac
-+    fi
-+  fi
-+])
-+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-+test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
- 
+-
 -# A C compiler.
 -LTCC=$lt_LTCC
-+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
- 
+-
 -# LTCC compiler flags.
 -LTCFLAGS=$lt_LTCFLAGS
-+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
-+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
-+_LT_DECL([], [extract_expsyms_cmds], [2],
-+    [The commands to extract the exported symbol list from a shared archive])
- 
+-
 -# A language-specific compiler.
 -CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-+#
-+# Do we need to explicitly link libc?
-+#
-+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
-+x|xyes)
-+  # Assume -lc should be added
-+  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- 
+-
 -# Is the compiler the GNU C compiler?
 -with_gcc=$_LT_AC_TAGVAR(GCC, $1)
-+  if test "$enable_shared" = yes && test "$GCC" = yes; then
-+    case $_LT_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
- 
+-
 -# An ERE matcher.
 -EGREP=$lt_EGREP
-+      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-+        soname=conftest
-+        lib=conftest
-+        libobjs=conftest.$ac_objext
-+        deplibs=
-+        wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
-+	pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-+        compiler_flags=-v
-+        linker_flags=-v
-+        verstring=
-+        output_objdir=.
-+        libname=conftest
-+        lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-+        _LT_TAGVAR(allow_undefined_flag, $1)=
-+        if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-+        then
-+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+        else
-+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-+        fi
-+        _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-+      else
-+        cat conftest.err 1>&5
-+      fi
-+      $RM conftest*
-+      AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
-+      ;;
-+    esac
-+  fi
-+  ;;
-+esac
- 
+-
 -# The linker used to build libraries.
 -LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
-+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
-+    [Whether or not to add -lc for building shared libraries])
-+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
-+    [enable_shared_with_static_runtimes], [0],
-+    [Whether or not to disallow shared libs when runtime libs are static])
-+_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
-+    [Compiler flag to allow reflexive dlopens])
-+_LT_TAGDECL([], [whole_archive_flag_spec], [1],
-+    [Compiler flag to generate shared objects directly from archives])
-+_LT_TAGDECL([], [compiler_needs_object], [1],
-+    [Whether the compiler copes with passing no objects directly])
-+_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
-+    [Create an old-style archive from a shared archive])
-+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
-+    [Create a temporary old-style archive to link instead of a shared archive])
-+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
-+_LT_TAGDECL([], [archive_expsym_cmds], [2])
-+_LT_TAGDECL([], [module_cmds], [2],
-+    [Commands used to build a loadable module if different from building
-+    a shared archive.])
-+_LT_TAGDECL([], [module_expsym_cmds], [2])
-+_LT_TAGDECL([], [with_gnu_ld], [1],
-+    [Whether we are building with GNU ld or not])
-+_LT_TAGDECL([], [allow_undefined_flag], [1],
-+    [Flag that allows shared libraries with undefined symbols to be built])
-+_LT_TAGDECL([], [no_undefined_flag], [1],
-+    [Flag that enforces no undefined symbols])
-+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
-+    [Flag to hardcode $libdir into a binary during linking.
-+    This must work even if $libdir does not exist])
-+_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [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]])
-+_LT_TAGDECL([], [hardcode_libdir_separator], [1],
-+    [Whether we need a single "-rpath" flag with a separated argument])
-+_LT_TAGDECL([], [hardcode_direct], [0],
-+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-+    DIR into the resulting binary])
-+_LT_TAGDECL([], [hardcode_direct_absolute], [0],
-+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-+    DIR into the resulting binary and the resulting library dependency is
-+    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
-+    library is relocated])
-+_LT_TAGDECL([], [hardcode_minus_L], [0],
-+    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-+    into the resulting binary])
-+_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
-+    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-+    into the resulting binary])
-+_LT_TAGDECL([], [hardcode_automatic], [0],
-+    [Set to "yes" if building a shared library automatically hardcodes DIR
-+    into the library and all subsequent libraries and executables linked
-+    against it])
-+_LT_TAGDECL([], [inherit_rpath], [0],
-+    [Set to yes if linker adds runtime paths of dependent libraries
-+    to runtime path list])
-+_LT_TAGDECL([], [link_all_deplibs], [0],
-+    [Whether libtool must link a program against all its dependency libraries])
-+_LT_TAGDECL([], [fix_srcfile_path], [1],
-+    [Fix the shell variable $srcfile for the compiler])
-+_LT_TAGDECL([], [always_export_symbols], [0],
-+    [Set to "yes" if exported symbols are required])
-+_LT_TAGDECL([], [export_symbols_cmds], [2],
-+    [The commands to list exported symbols])
-+_LT_TAGDECL([], [exclude_expsyms], [1],
-+    [Symbols that should not be listed in the preloaded symbols])
-+_LT_TAGDECL([], [include_expsyms], [1],
-+    [Symbols that must always be exported])
-+_LT_TAGDECL([], [prelink_cmds], [2],
-+    [Commands necessary for linking programs (against libraries) with templates])
-+_LT_TAGDECL([], [file_list_spec], [1],
-+    [Specify filename containing input files])
-+dnl FIXME: Not yet implemented
-+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
-+dnl    [Compiler flag to generate thread safe objects])
-+])# _LT_LINKER_SHLIBS
- 
+-
 -# Whether we need hard or soft links.
 -LN_S=$lt_LN_S
- 
+-
 -# A BSD-compatible nm program.
 -NM=$lt_NM
-+# _LT_LANG_C_CONFIG([TAG])
-+# ------------------------
-+# Ensure that the configuration variables for a C compiler are suitably
-+# defined.  These variables are subsequently used by _LT_CONFIG to write
-+# the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_C_CONFIG],
-+[m4_require([_LT_DECL_EGREP])dnl
-+lt_save_CC="$CC"
-+AC_LANG_PUSH(C)
- 
+-
 -# A symbol stripping program
 -STRIP=$lt_STRIP
-+# Source file extension for C test sources.
-+ac_ext=c
- 
+-
 -# Used to examine libraries when file_magic_cmd begins "file"
 -MAGIC_CMD=$MAGIC_CMD
-+# Object file extension for compiled C test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
- 
+-
 -# Used on cygwin: DLL creation program.
 -DLLTOOL="$DLLTOOL"
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="int some_variable = 0;"
- 
+-
 -# Used on cygwin: object dumper.
 -OBJDUMP="$OBJDUMP"
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='int main(){return(0);}'
- 
+-
 -# Used on cygwin: assembler.
 -AS="$AS"
-+_LT_TAG_COMPILER
-+# Save the default compiler, since it gets overwritten when the other
-+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-+compiler_DEFAULT=$CC
- 
+-
 -# The name of the directory that contains temporary libtool files.
 -objdir=$objdir
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
- 
+-
 -# How to create reloadable object files.
 -reload_flag=$lt_reload_flag
 -reload_cmds=$lt_reload_cmds
-+if test -n "$compiler"; then
-+  _LT_COMPILER_NO_RTTI($1)
-+  _LT_COMPILER_PIC($1)
-+  _LT_COMPILER_C_O($1)
-+  _LT_COMPILER_FILE_LOCKS($1)
-+  _LT_LINKER_SHLIBS($1)
-+  _LT_SYS_DYNAMIC_LINKER($1)
-+  _LT_LINKER_HARDCODE_LIBPATH($1)
-+  LT_SYS_DLOPEN_SELF
-+  _LT_CMD_STRIPLIB
-+
-+  # Report which library types will actually be built
-+  AC_MSG_CHECKING([if libtool supports shared libraries])
-+  AC_MSG_RESULT([$can_build_shared])
- 
+-
 -# How to pass a linker flag through the compiler.
 -wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-+  AC_MSG_CHECKING([whether to build shared libraries])
-+  test "$can_build_shared" = "no" && enable_shared=no
- 
+-
 -# Object file suffix (normally "o").
 -objext="$ac_objext"
-+  # 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
-+    ;;
- 
+-
 -# Old archive suffix (normally "a").
 -libext="$libext"
-+  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])
- 
+-
 -# Shared library suffix (normally ".so").
 -shrext_cmds='$shrext_cmds'
-+  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])
- 
+-
 -# Executable file suffix (normally "").
 -exeext="$exeext"
-+  _LT_CONFIG($1)
-+fi
-+AC_LANG_POP
-+CC="$lt_save_CC"
-+])# _LT_LANG_C_CONFIG
- 
+-
 -# 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
-+# _LT_PROG_CXX
-+# ------------
-+# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
-+# compiler, we have our own version here.
-+m4_defun([_LT_PROG_CXX],
-+[
-+pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
-+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
-+else
-+  _lt_caught_CXX_error=yes
-+fi
-+popdef([AC_MSG_ERROR])
-+])# _LT_PROG_CXX
- 
+-
 -# Does compiler simultaneously support -c and -o options?
 -compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([_LT_PROG_CXX], [])
- 
+-
 -# 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
-+# _LT_LANG_CXX_CONFIG([TAG])
-+# --------------------------
-+# Ensure that the configuration variables for a C++ compiler are suitably
-+# defined.  These variables are subsequently used by _LT_CONFIG to write
-+# the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_CXX_CONFIG],
-+[AC_REQUIRE([_LT_PROG_CXX])dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_DECL_EGREP])dnl
-+
-+AC_LANG_PUSH(C++)
-+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+_LT_TAGVAR(allow_undefined_flag, $1)=
-+_LT_TAGVAR(always_export_symbols, $1)=no
-+_LT_TAGVAR(archive_expsym_cmds, $1)=
-+_LT_TAGVAR(compiler_needs_object, $1)=no
-+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_direct, $1)=no
-+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-+_LT_TAGVAR(hardcode_libdir_separator, $1)=
-+_LT_TAGVAR(hardcode_minus_L, $1)=no
-+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+_LT_TAGVAR(hardcode_automatic, $1)=no
-+_LT_TAGVAR(inherit_rpath, $1)=no
-+_LT_TAGVAR(module_cmds, $1)=
-+_LT_TAGVAR(module_expsym_cmds, $1)=
-+_LT_TAGVAR(link_all_deplibs, $1)=unknown
-+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_TAGVAR(no_undefined_flag, $1)=
-+_LT_TAGVAR(whole_archive_flag_spec, $1)=
-+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
- 
+-
 -# Do we need a version for libraries?
 -need_version=$need_version
-+# Source file extension for C++ test sources.
-+ac_ext=cpp
- 
+-
 -# Whether dlopen is supported.
 -dlopen_support=$enable_dlopen
-+# Object file extension for compiled C++ test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
- 
+-
 -# Whether dlopen of programs is supported.
 -dlopen_self=$enable_dlopen_self
-+# No sense in running all these tests if we already determined that
-+# the CXX compiler isn't working.  Some variables (like enable_shared)
-+# are currently assumed to apply to all compilers on this platform,
-+# and will be corrupted by setting them based on a non-working compiler.
-+if test "$_lt_caught_CXX_error" != yes; then
-+  # 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_TAG_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_TAGVAR(compiler, $1)=$CC
-+  _LT_CC_BASENAME([$compiler])
- 
+-
 -# Whether dlopen of statically linked programs is supported.
 -dlopen_self_static=$enable_dlopen_self_static
-+  if test -n "$compiler"; then
-+    # We don't want -fno-exception when compiling C++ code, so set the
-+    # no_builtin_flag separately
-+    if test "$GXX" = yes; then
-+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-+    else
-+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-+    fi
- 
+-
 -# Compiler flag to prevent dynamic linking.
 -link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
-+    if test "$GXX" = yes; then
-+      # Set up default GNU C++ configuration
- 
+-
 -# Compiler flag to turn off builtin functions.
 -no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
-+      LT_PATH_LD
- 
+-
 -# Compiler flag to allow reflexive dlopens.
 -export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
-+      # 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_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+        _LT_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_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+        _LT_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_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+        else
-+          _LT_TAGVAR(whole_archive_flag_spec, $1)=
-+        fi
-+      else
-+        with_gnu_ld=no
-+        wlarc=
- 
+-
 -# Compiler flag to generate shared objects directly from archives.
 -whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
-+        # 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_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+      fi
- 
+-
 -# Compiler flag to generate thread-safe objects.
 -thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $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"'
- 
+-
 -# Library versioning type.
 -version_type=$version_type
-+    else
-+      GXX=no
-+      with_gnu_ld=no
-+      wlarc=
-+    fi
- 
+-
 -# Format of library name prefix.
 -libname_spec=$lt_libname_spec
-+    # PORTME: fill in a description of your system's C++ link characteristics
-+    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-+    _LT_TAGVAR(ld_shlibs, $1)=yes
-+    case $host_os in
-+      aix3*)
-+        # FIXME: insert proper C++ library support
-+        _LT_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
- 
+-
 -# 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
-+          # 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
- 
+-
 -# The coded name of the library, if different from the real name.
 -soname_spec=$lt_soname_spec
-+          exp_sym_flag='-bexport'
-+          no_entry_flag='-bnoentry'
-+        fi
- 
+-
 -# 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
-+        # 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_TAGVAR(archive_cmds, $1)=''
-+        _LT_TAGVAR(hardcode_direct, $1)=yes
-+        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-+        _LT_TAGVAR(link_all_deplibs, $1)=yes
-+        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-+
-+        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_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_TAGVAR(hardcode_minus_L, $1)=yes
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+	    _LT_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
- 
+-
 -# Create an old-style archive from a shared archive.
 -old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
-+        # It seems that -bexpall does not export symbols beginning with
-+        # underscore (_), so it is better to generate a list of symbols to
-+	# export.
-+        _LT_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_TAGVAR(allow_undefined_flag, $1)='-berok'
-+          # Determine the default libpath from the value encoded in an empty
-+          # executable.
-+          _LT_SYS_MODULE_PATH_AIX
-+          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- 
+-
 -# 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)
-+          _LT_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 "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+        else
-+          if test "$host_cpu" = ia64; then
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-+	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-+	    _LT_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_SYS_MODULE_PATH_AIX
-+	    _LT_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_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-+	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-+	    # Exported symbols can be pulled into shared objects from archives
-+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-+	    # This is similar to how AIX traditionally builds its shared
-+	    # libraries.
-+	    _LT_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
-+        ;;
- 
+-
 -# 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
-+      beos*)
-+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-+	  # support --undefined.  This deserves some investigation.  FIXME
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	else
-+	  _LT_TAGVAR(ld_shlibs, $1)=no
-+	fi
-+	;;
- 
+-
 -# 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)
-+      chorus*)
-+        case $cc_basename in
-+          *)
-+	  # FIXME: insert proper C++ library support
-+	  _LT_TAGVAR(ld_shlibs, $1)=no
-+	  ;;
-+        esac
-+        ;;
- 
+-
 -# Commands to strip libraries.
 -old_striplib=$lt_old_striplib
 -striplib=$lt_striplib
-+      cygwin* | mingw* | pw32*)
-+        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-+        # as there is no search path for DLLs.
-+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+        _LT_TAGVAR(always_export_symbols, $1)=no
-+        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+
-+        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-+          _LT_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_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_TAGVAR(ld_shlibs, $1)=no
-+        fi
-+        ;;
-+      darwin* | rhapsody*)
-+        _LT_DARWIN_LINKER_FEATURES($1)
-+	;;
- 
+-
 -# Dependencies to place before the objects being linked to create a
 -# shared library.
 -predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
-+      dgux*)
-+        case $cc_basename in
-+          ec++*)
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+          ghcx*)
-+	    # Green Hills C++ Compiler
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+          *)
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+        esac
-+        ;;
- 
+-
 -# Dependencies to place after the objects being linked to create a
 -# shared library.
 -postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
-+      freebsd[[12]]*)
-+        # C++ shared libraries reported to be fairly broken before
-+	# switch to ELF
-+        _LT_TAGVAR(ld_shlibs, $1)=no
-+        ;;
- 
+-
 -# Dependencies to place before the objects being linked to create a
 -# shared library.
 -predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
-+      freebsd-elf*)
-+        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+        ;;
- 
+-
 -# Dependencies to place after the objects being linked to create a
 -# shared library.
 -postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
-+      freebsd* | dragonfly*)
-+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-+        # conventions
-+        _LT_TAGVAR(ld_shlibs, $1)=yes
-+        ;;
- 
+-
 -# The directories searched by this compiler when creating a shared
 -# library
 -compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
-+      gnu*)
-+        ;;
- 
+-
 -# 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)
-+      hpux9*)
-+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+        _LT_TAGVAR(hardcode_direct, $1)=yes
-+        _LT_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_TAGVAR(ld_shlibs, $1)=no
-+            ;;
-+          aCC*)
-+            _LT_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) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-+            ;;
-+          *)
-+            if test "$GXX" = yes; then
-+              _LT_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_TAGVAR(ld_shlibs, $1)=no
-+            fi
-+            ;;
-+        esac
-+        ;;
- 
+-
 -# Method to check whether dependent libraries are shared objects.
 -deplibs_check_method=$lt_deplibs_check_method
-+      hpux10*|hpux11*)
-+        if test $with_gnu_ld = no; then
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+          case $host_cpu in
-+            hppa*64*|ia64*)
-+              ;;
-+            *)
-+	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+              ;;
-+          esac
-+        fi
-+        case $host_cpu in
-+          hppa*64*|ia64*)
-+            _LT_TAGVAR(hardcode_direct, $1)=no
-+            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+            ;;
-+          *)
-+            _LT_TAGVAR(hardcode_direct, $1)=yes
-+            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+            _LT_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_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+          aCC*)
-+	    case $host_cpu in
-+	      hppa*64*)
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	        ;;
-+	      ia64*)
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	        ;;
-+	      *)
-+	        _LT_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 "X$list" | $Xsed'
-+	    ;;
-+          *)
-+	    if test "$GXX" = yes; then
-+	      if test $with_gnu_ld = no; then
-+	        case $host_cpu in
-+	          hppa*64*)
-+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	            ;;
-+	          ia64*)
-+	            _LT_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_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_TAGVAR(ld_shlibs, $1)=no
-+	    fi
-+	    ;;
-+        esac
-+        ;;
- 
+-
 -# Command to use when deplibs_check_method == file_magic.
 -file_magic_cmd=$lt_file_magic_cmd
-+      interix[[3-9]]*)
-+	_LT_TAGVAR(hardcode_direct, $1)=no
-+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	_LT_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_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_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_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -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_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_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	      else
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
-+	      fi
-+	    fi
-+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-+	    ;;
-+        esac
-+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+        _LT_TAGVAR(inherit_rpath, $1)=yes
-+        ;;
- 
+-
 -# Flag that allows shared libraries with undefined symbols to be built.
 -allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $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_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_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 "X$list" | $Xsed'
-+
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	    _LT_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_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-+	    ;;
-+	  icpc* | ecpc* )
-+	    # 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_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+		_LT_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_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+		_LT_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_TAGVAR(archive_cmds_need_lc, $1)=no
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-+	    ;;
-+          pgCC* | pgcpp*)
-+            # Portland Group C++ compiler
-+	    case `$CC -V` in
-+	    *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
-+	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
-+		rm -rf $tpldir~
-+		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-+		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
-+	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
-+		rm -rf $tpldir~
-+		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
-+		$RANLIB $oldlib'
-+	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
-+		rm -rf $tpldir~
-+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
-+		rm -rf $tpldir~
-+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-+	      ;;
-+	    *) # Version 6 will use weak symbols
-+	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+	      _LT_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'
-+	      ;;
-+	    esac
- 
+-
 -# Flag that forces no undefined symbols.
 -no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+	    _LT_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_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	    _LT_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'
- 
+-
 -# Commands used to finish a libtool library installation in a directory.
 -finish_cmds=$lt_finish_cmds
-+	    runpath_var=LD_RUN_PATH
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
- 
+-
 -# Same as above, but a single script fragment to be evaled but not shown.
 -finish_eval=$lt_finish_eval
-+	    # 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 "X$templist" | $Xsed -e "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 "X$list" | $Xsed'
-+	    ;;
-+	  xl*)
-+	    # IBM XL 8.0 on PPC, with GNU ld
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	    if test "x$supports_anon_versioning" = xyes; then
-+	      _LT_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 -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+	    fi
-+	    ;;
-+	  *)
-+	    case `$CC -V 2>&1 | sed 5q` in
-+	    *Sun\ C*)
-+	      # Sun C++ 5.9
-+	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-+	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	      _LT_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_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+	      _LT_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'
-+	      _LT_TAGVAR(compiler_needs_object, $1)=yes
-+
-+	      # 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_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-+	      ;;
-+	    esac
-+	    ;;
-+	esac
-+	;;
- 
+-
 -# 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
-+      lynxos*)
-+        # FIXME: insert proper C++ library support
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+	;;
- 
+-
 -# Transform the output of nm in a proper C declaration
 -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-+      m88k*)
-+        # FIXME: insert proper C++ library support
-+        _LT_TAGVAR(ld_shlibs, $1)=no
-+	;;
- 
+-
 -# 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
-+      mvs*)
-+        case $cc_basename in
-+          cxx*)
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+	  *)
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+	esac
-+	;;
- 
+-
 -# This is the shared library runtime path variable.
 -runpath_var=$runpath_var
-+      netbsd*)
-+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-+	  wlarc=
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+	  _LT_TAGVAR(hardcode_direct, $1)=yes
-+	  _LT_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::"'
-+	;;
- 
+-
 -# This is the shared library path variable.
 -shlibpath_var=$shlibpath_var
-+      *nto* | *qnx*)
-+        _LT_TAGVAR(ld_shlibs, $1)=yes
-+	;;
- 
+-
 -# Is shlibpath searched before the hard-coded library search path?
 -shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+      openbsd2*)
-+        # C++ shared libraries are fairly broken
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+
-+      openbsd*)
-+	if test -f /usr/libexec/ld.so; then
-+	  _LT_TAGVAR(hardcode_direct, $1)=yes
-+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+	  _LT_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_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_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+	  fi
-+	  output_verbose_link_cmd=echo
-+	else
-+	  _LT_TAGVAR(ld_shlibs, $1)=no
-+	fi
-+	;;
- 
+-
 -# How to hardcode a shared library path into an executable.
 -hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
-+      osf3* | 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_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_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	    # Archives containing C++ object files must be created using
-+	    # the KAI C++ compiler.
-+	    case $host in
-+	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
-+	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
-+	    esac
-+	    ;;
-+          RCC*)
-+	    # Rational C++ 2.4.1
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+          cxx*)
-+	    case $host in
-+	      osf3*)
-+	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+		;;
-+	      *)
-+	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	        _LT_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 "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
-+	          $RM $lib.exp'
-+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+		;;
-+	    esac
- 
+-
 -# Whether we should hardcode library paths into libraries.
 -hardcode_into_libs=$hardcode_into_libs
-+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
- 
+-
 -# 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)
-+	    # 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 "X$templist" | $Xsed -e "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 "X$list" | $Xsed'
-+	    ;;
-+	  *)
-+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+	      case $host in
-+	        osf3*)
-+	          _LT_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 "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+		  ;;
-+	        *)
-+	          _LT_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" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+		  ;;
-+	      esac
-+
-+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+	      _LT_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_TAGVAR(ld_shlibs, $1)=no
-+	    fi
-+	    ;;
-+        esac
-+        ;;
- 
+-
 -# 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)
-+      psos*)
-+        # FIXME: insert proper C++ library support
-+        _LT_TAGVAR(ld_shlibs, $1)=no
-+        ;;
- 
+-
 -# Whether we need a single -rpath flag with a separated argument.
 -hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
-+      sunos4*)
-+        case $cc_basename in
-+          CC*)
-+	    # Sun C++ 4.x
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+          lcc*)
-+	    # Lucid
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+          *)
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+        esac
-+        ;;
- 
+-
 -# 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)
-+      solaris*)
-+        case $cc_basename in
-+          CC*)
-+	    # Sun C++ 4.2, 5.x and Centerline C++
-+            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
-+	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	    _LT_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_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+	    _LT_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_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-+	        ;;
-+	    esac
-+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
- 
+-
 -# 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)
-+	    output_verbose_link_cmd='echo'
- 
+-
 -# 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)
-+	    # 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_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-+	    ;;
-+          gcx*)
-+	    # Green Hills C++ Compiler
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- 
+-
 -# 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)
-+	    # The C++ compiler must be used to create the archive.
-+	    _LT_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_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+	        _LT_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_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+	        _LT_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_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-+	      case $host_os in
-+		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+		*)
-+		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+		  ;;
-+	      esac
-+	    fi
-+	    ;;
-+        esac
-+        ;;
- 
+-
 -# Variables whose values should be saved in libtool wrapper scripts and
 -# restored at relink time.
 -variables_saved_for_relink="$variables_saved_for_relink"
-+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      runpath_var='LD_RUN_PATH'
- 
+-
 -# Whether libtool must link a program against all its dependency libraries.
 -link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
-+      case $cc_basename in
-+        CC*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+      esac
-+      ;;
- 
+-
 -# Compile-time system search path for libraries
 -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+      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_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-+	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-+	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-+	_LT_TAGVAR(link_all_deplibs, $1)=yes
-+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-+	runpath_var='LD_RUN_PATH'
- 
+-
 -# Run-time system search path for libraries
 -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+	case $cc_basename in
-+          CC*)
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	    ;;
-+	  *)
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	    ;;
-+	esac
-+      ;;
- 
+-
 -# Fix the shell variable \$srcfile for the compiler.
 -fix_srcfile_path=$lt_fix_srcfile_path
-+      tandem*)
-+        case $cc_basename in
-+          NCC*)
-+	    # NonStop-UX NCC 3.20
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+          *)
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+        esac
-+        ;;
- 
+-
 -# Set to yes if exported symbols are required.
 -always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-+      vxworks*)
-+        # FIXME: insert proper C++ library support
-+        _LT_TAGVAR(ld_shlibs, $1)=no
-+        ;;
- 
+-
 -# The commands to list exported symbols.
 -export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
-+      *)
-+        # FIXME: insert proper C++ library support
-+        _LT_TAGVAR(ld_shlibs, $1)=no
-+        ;;
-+    esac
- 
+-
 -# The commands to extract the exported symbol list from a shared archive.
 -extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-+    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
- 
+-
 -# Symbols that should not be listed in the preloaded symbols.
 -exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
-+    _LT_TAGVAR(GCC, $1)="$GXX"
-+    _LT_TAGVAR(LD, $1)="$LD"
- 
+-
 -# Symbols that must always be exported.
 -include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
-+    ## CAVEAT EMPTOR:
-+    ## There is no encapsulation within the following macros, do not change
-+    ## the running order or otherwise move them around unless you know exactly
-+    ## what you are doing...
-+    _LT_SYS_HIDDEN_LIBDEPS($1)
-+    _LT_COMPILER_PIC($1)
-+    _LT_COMPILER_C_O($1)
-+    _LT_COMPILER_FILE_LOCKS($1)
-+    _LT_LINKER_SHLIBS($1)
-+    _LT_SYS_DYNAMIC_LINKER($1)
-+    _LT_LINKER_HARDCODE_LIBPATH($1)
-+
-+    _LT_CONFIG($1)
-+  fi # test -n "$compiler"
-+
-+  CC=$lt_save_CC
-+  LDCXX=$LD
-+  LD=$lt_save_LD
-+  GCC=$lt_save_GCC
-+  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
-+fi # test "$_lt_caught_CXX_error" != yes
- 
+-
 -ifelse([$1],[],
 -[# ### END LIBTOOL CONFIG],
 -[# ### END LIBTOOL TAG CONFIG: $tagname])
-+AC_LANG_POP
-+])# _LT_LANG_CXX_CONFIG
- 
+-
 -__EOF__
- 
+-
 -ifelse([$1],[], [
 -  case $host_os in
 -  aix3*)
 -    cat <<\EOF >> "$cfgfile"
-+# _LT_SYS_HIDDEN_LIBDEPS([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.
-+m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
-+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+# Dependencies to place before and after the object being linked:
-+_LT_TAGVAR(predep_objects, $1)=
-+_LT_TAGVAR(postdep_objects, $1)=
-+_LT_TAGVAR(predeps, $1)=
-+_LT_TAGVAR(postdeps, $1)=
-+_LT_TAGVAR(compiler_lib_search_path, $1)=
- 
+-
 -# 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.
@@ -10746,64 +4792,13 @@
 -EOF
 -    ;;
 -  esac
-+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...
-+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
-+int a;
-+void foo (void) { a = 0; }
-+_LT_EOF
-+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
-+class Foo
-+{
-+public:
-+  Foo (void) { a = 0; }
-+private:
-+  int a;
-+};
-+_LT_EOF
-+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
-+      subroutine foo
-+      implicit none
-+      integer*4 a
-+      a=0
-+      return
-+      end
-+_LT_EOF
-+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
-+      subroutine foo
-+      implicit none
-+      integer a
-+      a=0
-+      return
-+      end
-+_LT_EOF
-+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
-+public class foo {
-+  private int a;
-+  public void bar (void) {
-+    a = 0;
-+  }
-+};
-+_LT_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.
- 
+-
 -  # 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)
-+  # Sentinel used to keep track of whether or not we are before
-+  # the conftest object file.
-+  pre_test_object_deps_done=no
- 
+-
 -  mv -f "$cfgfile" "$ofile" || \
 -    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
 -  chmod +x "$ofile"
@@ -10818,85 +4813,26 @@
 -  fi
 -fi
 -])# AC_LIBTOOL_CONFIG
-+  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
- 
+-
+-
 -# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
 -# -------------------------------------------
 -AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
 -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-+       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_TAGVAR(compiler_lib_search_path, $1)"; then
-+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-+	   else
-+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_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_TAGVAR(postdeps, $1)"; then
-+	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
-+	 else
-+	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
-+	 fi
-+       fi
-+       ;;
- 
+-
 -_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-+    *.$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 "$GCC" = yes; then
 -  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-+       if test "$pre_test_object_deps_done" = no; then
-+	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
-+	   _LT_TAGVAR(predep_objects, $1)="$p"
-+	 else
-+	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
-+	 fi
-+       else
-+	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
-+	   _LT_TAGVAR(postdep_objects, $1)="$p"
-+	 else
-+	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
-+	 fi
-+       fi
-+       ;;
- 
+-
 -  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
-+    *) ;; # Ignore the rest.
- 
-+    esac
-+  done
- 
+-
+-
 -# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
 -# ---------------------------------
 -AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
@@ -10910,48 +4846,19 @@
 -[
 -# These are sane defaults that work on at least a few old systems.
 -# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-+  # Clean up.
-+  rm -f a.out a.exe
-+else
-+  echo "libtool.m4: error: problem compiling $1 test program"
-+fi
- 
+-
 -# Character class describing NM global symbol codes.
 -symcode='[[BCDEGRST]]'
-+$RM -f confest.$objext
- 
+-
 -# Regexp to match symbols that can be accessed directly from C.
 -sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-+# PORTME: override above test on systems where it is broken
-+m4_if([$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_TAGVAR(predep_objects,$1)=
-+  _LT_TAGVAR(postdep_objects,$1)=
-+  _LT_TAGVAR(postdeps,$1)=
-+  ;;
- 
+-
 -# 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'"
-+linux*)
-+  case `$CC -V 2>&1 | sed 5q` in
-+  *Sun\ C*)
-+    # Sun C++ 5.9
- 
+-
 -# 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'"
-+    # 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
- 
+-
 -# Define system-specific variables.
 -case $host_os in
 -aix*)
@@ -10979,14 +4886,8 @@
 -  ;;
 -osf*)
 -  symcode='[[BCDEGQRST]]'
-+    if test "$solaris_use_stlport4" != yes; then
-+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-+    fi
-+    ;;
-+  esac
-   ;;
-+
- solaris*)
+-  ;;
+-solaris*)
 -  symcode='[[BDRT]]'
 -  ;;
 -sco3.2v5*)
@@ -11002,86 +4903,33 @@
 -  symcode='[[DFNSTU]]'
 -  ;;
 -esac
-+  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
- 
+-
 -# 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
-+    # 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_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-+    fi
-+    ;;
-+  esac
-   ;;
- esac
-+])
- 
+-  ;;
+-esac
+-
 -# If we're using GNU nm, then use its standard symbol codes.
 -case `$NM -V 2>&1` in
 -*GNU* | *'with BFD'*)
 -  symcode='[[ABCDGIRSTW]]' ;;
-+case " $_LT_TAGVAR(postdeps, $1) " in
-+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
- esac
-+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
-+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
-+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-+fi
-+_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
-+    [The directories searched by this compiler when creating a shared library])
-+_LT_TAGDECL([], [predep_objects], [1],
-+    [Dependencies to place before and after the objects being linked to
-+    create a shared library])
-+_LT_TAGDECL([], [postdep_objects], [1])
-+_LT_TAGDECL([], [predeps], [1])
-+_LT_TAGDECL([], [postdeps], [1])
-+_LT_TAGDECL([], [compiler_lib_search_path], [1],
-+    [The library search path used internally by the compiler when linking
-+    a shared library])
-+])# _LT_SYS_HIDDEN_LIBDEPS
- 
+-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"
-+# _LT_PROG_F77
-+# ------------
-+# Since AC_PROG_F77 is broken, in that it returns the empty string
-+# if there is no fortran compiler, we have our own version here.
-+m4_defun([_LT_PROG_F77],
-+[
-+pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
-+AC_PROG_F77
-+if test -z "$F77" || test "X$F77" = "Xno"; then
-+  _lt_disable_F77=yes
-+fi
-+popdef([AC_MSG_ERROR])
-+])# _LT_PROG_F77
- 
+-
 -  # 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'"
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([_LT_PROG_F77], [])
- 
+-
 -  # Check to see that the pipe works correctly.
 -  pipe_works=no
- 
+-
 -  rm -f conftest*
 -  cat > conftest.$ac_ext <<EOF
 -#ifdef __cplusplus
@@ -11094,15 +4942,7 @@
 -#endif
 -int main(){nm_test_var='a';nm_test_func();return(0);}
 -EOF
-+# _LT_LANG_F77_CONFIG([TAG])
-+# --------------------------
-+# Ensure that the configuration variables for a Fortran 77 compiler are
-+# suitably defined.  These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_F77_CONFIG],
-+[AC_REQUIRE([_LT_PROG_F77])dnl
-+AC_LANG_PUSH(Fortran 77)
- 
+-
 -  if AC_TRY_EVAL(ac_compile); then
 -    # Now try to grab the symbols.
 -    nlist=conftest.nm
@@ -11113,27 +4953,7 @@
 -      else
 -	rm -f "$nlist"T
 -      fi
-+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+_LT_TAGVAR(allow_undefined_flag, $1)=
-+_LT_TAGVAR(always_export_symbols, $1)=no
-+_LT_TAGVAR(archive_expsym_cmds, $1)=
-+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_direct, $1)=no
-+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-+_LT_TAGVAR(hardcode_libdir_separator, $1)=
-+_LT_TAGVAR(hardcode_minus_L, $1)=no
-+_LT_TAGVAR(hardcode_automatic, $1)=no
-+_LT_TAGVAR(inherit_rpath, $1)=no
-+_LT_TAGVAR(module_cmds, $1)=
-+_LT_TAGVAR(module_expsym_cmds, $1)=
-+_LT_TAGVAR(link_all_deplibs, $1)=unknown
-+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_TAGVAR(no_undefined_flag, $1)=
-+_LT_TAGVAR(whole_archive_flag_spec, $1)=
-+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
- 
+-
 -      # 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
@@ -11141,16 +4961,11 @@
 -#ifdef __cplusplus
 -extern "C" {
 -#endif
-+# Source file extension for f77 test sources.
-+ac_ext=f
- 
+-
 -EOF
 -	  # Now generate the symbol file.
 -	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
-+# Object file extension for compiled f77 test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
- 
+-
 -	  cat <<EOF >> conftest.$ac_ext
 -#if defined (__STDC__) && __STDC__
 -# define lt_ptr_t void *
@@ -11158,18 +4973,7 @@
 -# define lt_ptr_t char *
 -# define const
 -#endif
-+# No sense in running all these tests if we already determined that
-+# the F77 compiler isn't working.  Some variables (like enable_shared)
-+# are currently assumed to apply to all compilers on this platform,
-+# and will be corrupted by setting them based on a non-working compiler.
-+if test "$_lt_disable_F77" != yes; then
-+  # Code to be used in simple compile tests
-+  lt_simple_compile_test_code="\
-+      subroutine t
-+      return
-+      end
-+"
- 
+-
 -/* The mapping between symbol names and symbols. */
 -const struct {
 -  const char *name;
@@ -11182,12 +4986,7 @@
 -	  cat <<\EOF >> conftest.$ac_ext
 -  {0, (lt_ptr_t) 0}
 -};
-+  # Code to be used in simple link tests
-+  lt_simple_link_test_code="\
-+      program t
-+      end
-+"
- 
+-
 -#ifdef __cplusplus
 -}
 -#endif
@@ -11217,9 +5016,7 @@
 -    cat conftest.$ac_ext >&5
 -  fi
 -  rm -rf conftest* conftst*
-+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+  _LT_TAG_COMPILER
- 
+-
 -  # Do not use the global_symbol_pipe unless it works.
 -  if test "$pipe_works" = yes; then
 -    break
@@ -11235,186 +5032,25 @@
 -  AC_MSG_RESULT(failed)
 -else
 -  AC_MSG_RESULT(ok)
-+  # 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_GCC=$GCC
-+  CC=${F77-"f77"}
-+  compiler=$CC
-+  _LT_TAGVAR(compiler, $1)=$CC
-+  _LT_CC_BASENAME([$compiler])
-+  GCC=$G77
-+  if test -n "$compiler"; then
-+    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_TAGVAR(GCC, $1)="$G77"
-+    _LT_TAGVAR(LD, $1)="$LD"
-+
-+    ## CAVEAT EMPTOR:
-+    ## There is no encapsulation within the following macros, do not change
-+    ## the running order or otherwise move them around unless you know exactly
-+    ## what you are doing...
-+    _LT_COMPILER_PIC($1)
-+    _LT_COMPILER_C_O($1)
-+    _LT_COMPILER_FILE_LOCKS($1)
-+    _LT_LINKER_SHLIBS($1)
-+    _LT_SYS_DYNAMIC_LINKER($1)
-+    _LT_LINKER_HARDCODE_LIBPATH($1)
-+
-+    _LT_CONFIG($1)
-+  fi # test -n "$compiler"
-+
-+  GCC=$lt_save_GCC
-+  CC="$lt_save_CC"
-+fi # test "$_lt_disable_F77" != yes
-+
-+AC_LANG_POP
-+])# _LT_LANG_F77_CONFIG
-+
-+
-+# _LT_PROG_FC
-+# -----------
-+# Since AC_PROG_FC is broken, in that it returns the empty string
-+# if there is no fortran compiler, we have our own version here.
-+m4_defun([_LT_PROG_FC],
-+[
-+pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
-+AC_PROG_FC
-+if test -z "$FC" || test "X$FC" = "Xno"; then
-+  _lt_disable_FC=yes
- fi
+-fi
 -]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-+popdef([AC_MSG_ERROR])
-+])# _LT_PROG_FC
- 
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([_LT_PROG_FC], [])
- 
+-
+-
 -# 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'
-+# _LT_LANG_FC_CONFIG([TAG])
-+# -------------------------
-+# Ensure that the configuration variables for a Fortran compiler are
-+# suitably defined.  These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_FC_CONFIG],
-+[AC_REQUIRE([_LT_PROG_FC])dnl
-+AC_LANG_PUSH(Fortran)
-+
-+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+_LT_TAGVAR(allow_undefined_flag, $1)=
-+_LT_TAGVAR(always_export_symbols, $1)=no
-+_LT_TAGVAR(archive_expsym_cmds, $1)=
-+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_direct, $1)=no
-+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-+_LT_TAGVAR(hardcode_libdir_separator, $1)=
-+_LT_TAGVAR(hardcode_minus_L, $1)=no
-+_LT_TAGVAR(hardcode_automatic, $1)=no
-+_LT_TAGVAR(inherit_rpath, $1)=no
-+_LT_TAGVAR(module_cmds, $1)=
-+_LT_TAGVAR(module_expsym_cmds, $1)=
-+_LT_TAGVAR(link_all_deplibs, $1)=unknown
-+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_TAGVAR(no_undefined_flag, $1)=
-+_LT_TAGVAR(whole_archive_flag_spec, $1)=
-+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
- 
-+# Source file extension for fc test sources.
-+ac_ext=${ac_fc_srcext-f}
-+
-+# Object file extension for compiled fc test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
-+
-+# No sense in running all these tests if we already determined that
-+# the FC compiler isn't working.  Some variables (like enable_shared)
-+# are currently assumed to apply to all compilers on this platform,
-+# and will be corrupted by setting them based on a non-working compiler.
-+if test "$_lt_disable_FC" != yes; then
-+  # 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_TAG_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_GCC=$GCC
-+  CC=${FC-"f95"}
-+  compiler=$CC
-+  GCC=$ac_cv_fc_compiler_gnu
-+
-+  _LT_TAGVAR(compiler, $1)=$CC
-+  _LT_CC_BASENAME([$compiler])
-+
-+  if test -n "$compiler"; then
-+    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
+-
+-    case $host_os in
 -    aix*)
 -      # All AIX code is PIC.
 -      if test "$host_cpu" = ia64; then
@@ -11474,23 +5110,14 @@
 -    esac
 -  else
 -    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]]*)
+-      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'
-+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+	  test "$enable_shared" = yes && enable_static=no
- 	fi
+-	fi
 -	;;
 -      chorus*)
 -	case $cc_basename in
@@ -11697,63 +5324,14 @@
 -      *)
 -	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
 -	;;
-+        ;;
-     esac
+-    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'
-+    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_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
-+    _LT_TAGVAR(LD, $1)="$LD"
-+
-+    ## CAVEAT EMPTOR:
-+    ## There is no encapsulation within the following macros, do not change
-+    ## the running order or otherwise move them around unless you know exactly
-+    ## what you are doing...
-+    _LT_SYS_HIDDEN_LIBDEPS($1)
-+    _LT_COMPILER_PIC($1)
-+    _LT_COMPILER_C_O($1)
-+    _LT_COMPILER_FILE_LOCKS($1)
-+    _LT_LINKER_SHLIBS($1)
-+    _LT_SYS_DYNAMIC_LINKER($1)
-+    _LT_LINKER_HARDCODE_LIBPATH($1)
-+
-+    _LT_CONFIG($1)
-+  fi # test -n "$compiler"
-+
-+  GCC=$lt_save_GCC
-+  CC="$lt_save_CC"
-+fi # test "$_lt_disable_FC" != yes
-+
-+AC_LANG_POP
-+])# _LT_LANG_FC_CONFIG
-+
-+
-+# _LT_LANG_GCJ_CONFIG([TAG])
-+# --------------------------
-+# Ensure that the configuration variables for the GNU Java Compiler compiler
-+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_GCJ_CONFIG],
-+[AC_REQUIRE([LT_PROG_GCJ])dnl
-+AC_LANG_SAVE
-+
-+# Source file extension for Java test sources.
-+ac_ext=java
-+
-+# Object file extension for compiled Java test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
- 
+-
 -    case $host_os in
 -      aix*)
 -      # All AIX code is PIC.
@@ -11762,24 +5340,18 @@
 -	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 -      fi
 -      ;;
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="class foo {}"
- 
+-
 -    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'
 -      ;;
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
- 
+-
 -    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
 -      # PIC is the default for these OSes.
 -      ;;
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_TAG_COMPILER
- 
+-
 -    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).
@@ -11788,53 +5360,31 @@
 -      m4_if([$1], [GCJ], [],
 -	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
 -      ;;
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
- 
+-
 -    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'
 -      ;;
-+# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
-+lt_save_GCC=$GCC
-+GCC=yes
-+CC=${GCJ-"gcj"}
-+compiler=$CC
-+_LT_TAGVAR(compiler, $1)=$CC
-+_LT_TAGVAR(LD, $1)="$LD"
-+_LT_CC_BASENAME([$compiler])
- 
+-
 -    interix[[3-9]]*)
 -      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
 -      # Instead, we relocate shared libraries at runtime.
 -      ;;
-+# GCJ did not exist at the time GCC didn't implicitly link libc in.
-+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
- 
+-
 -    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
 -      ;;
-+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
- 
+-
 -    sysv4*MP*)
 -      if test -d /usr/nec; then
 -	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
 -      fi
 -      ;;
-+if test -n "$compiler"; then
-+  _LT_COMPILER_NO_RTTI($1)
-+  _LT_COMPILER_PIC($1)
-+  _LT_COMPILER_C_O($1)
-+  _LT_COMPILER_FILE_LOCKS($1)
-+  _LT_LINKER_SHLIBS($1)
-+  _LT_LINKER_HARDCODE_LIBPATH($1)
- 
+-
 -    hpux*)
 -      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
 -      # not for PA HP-UX.
@@ -11847,9 +5397,7 @@
 -	;;
 -      esac
 -      ;;
-+  _LT_CONFIG($1)
-+fi
- 
+-
 -    *)
 -      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 -      ;;
@@ -11864,141 +5412,7 @@
 -	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 -      else
 -	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-+AC_LANG_RESTORE
-+
-+GCC=$lt_save_GCC
-+CC="$lt_save_CC"
-+])# _LT_LANG_GCJ_CONFIG
-+
-+
-+# _LT_LANG_RC_CONFIG([TAG])
-+# -------------------------
-+# Ensure that the configuration variables for the Windows resource compiler
-+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_RC_CONFIG],
-+[AC_REQUIRE([LT_PROG_RC])dnl
-+AC_LANG_SAVE
-+
-+# Source file extension for RC test sources.
-+ac_ext=rc
-+
-+# Object file extension for compiled RC test sources.
-+objext=o
-+_LT_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_TAG_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_GCC=$GCC
-+GCC=
-+CC=${RC-"windres"}
-+compiler=$CC
-+_LT_TAGVAR(compiler, $1)=$CC
-+_LT_CC_BASENAME([$compiler])
-+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-+
-+if test -n "$compiler"; then
-+  :
-+  _LT_CONFIG($1)
-+fi
-+
-+GCC=$lt_save_GCC
-+AC_LANG_RESTORE
-+CC="$lt_save_CC"
-+])# _LT_LANG_RC_CONFIG
-+
-+
-+# LT_PROG_GCJ
-+# -----------
-+AC_DEFUN([LT_PROG_GCJ],
-+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
-+  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
-+    [AC_CHECK_TOOL(GCJ, gcj,)
-+      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-+      AC_SUBST(GCJFLAGS)])])[]dnl
-+])
-+
-+# Old name:
-+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
-+
-+
-+# LT_PROG_RC
-+# ----------
-+AC_DEFUN([LT_PROG_RC],
-+[AC_CHECK_TOOL(RC, windres,)
-+])
-+
-+# Old name:
-+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([LT_AC_PROG_RC], [])
-+
-+
-+# _LT_DECL_EGREP
-+# --------------
-+# If we don't have a new enough Autoconf to choose the best grep
-+# available, choose the one first in the user's PATH.
-+m4_defun([_LT_DECL_EGREP],
-+[AC_REQUIRE([AC_PROG_EGREP])dnl
-+AC_REQUIRE([AC_PROG_FGREP])dnl
-+test -z "$GREP" && GREP=grep
-+_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
-+_LT_DECL([], [EGREP], [1], [An ERE matcher])
-+_LT_DECL([], [FGREP], [1], [A literal string matcher])
-+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
-+AC_SUBST([GREP])
-+])
-+
-+
-+# _LT_DECL_SED
-+# ------------
-+# Check for a fully-functional sed program, that truncates
-+# as few characters as possible.  Prefer GNU sed if found.
-+m4_defun([_LT_DECL_SED],
-+[AC_PROG_SED
-+test -z "$SED" && SED=sed
-+Xsed="$SED -e 1s/^X//"
-+_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
-+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
-+    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
-+])# _LT_DECL_SED
-+
-+m4_ifndef([AC_PROG_SED], [
-+# 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.                               #
-+
-+m4_defun([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
+-      fi
 -      ;;
 -      darwin*)
 -        # PIC is the default on this platform
@@ -12010,58 +5424,14 @@
 -         ;;
 -       esac
 -       ;;
-+    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])
-+])#AC_PROG_SED
-+])#m4_ifndef
- 
+-
 -    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'])
 -      ;;
-+# Old name:
-+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([LT_AC_PROG_SED], [])
- 
+-
 -    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
@@ -12077,48 +5447,18 @@
 -      # 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'
 -      ;;
-+# _LT_CHECK_SHELL_FEATURES
-+# ------------------------
-+# Find out whether the shell is Bourne or XSI compatible,
-+# or has some other useful features.
-+m4_defun([_LT_CHECK_SHELL_FEATURES],
-+[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
-+# Try some XSI features
-+xsi_shell=no
-+( _lt_dummy="a/b/c"
-+  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-+      = c,a/b,, \
-+    && eval 'test $(( 1 + 1 )) -eq 2 \
-+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-+  && xsi_shell=yes
-+AC_MSG_RESULT([$xsi_shell])
-+_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
-+
-+AC_MSG_CHECKING([whether the shell understands "+="])
-+lt_shell_append=no
-+( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
-+    >/dev/null 2>&1 \
-+  && lt_shell_append=yes
-+AC_MSG_RESULT([$lt_shell_append])
-+_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
- 
+-
 -    newsos6)
 -      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 -      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 -      ;;
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+  lt_unset=unset
-+else
-+  lt_unset=false
-+fi
-+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
- 
+-
 -    linux* | k*bsd*-gnu)
 -      case $cc_basename in
 -      icc* | ecc*)
@@ -12156,50 +5496,17 @@
 -	;;
 -      esac
 -      ;;
-+# 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
-+  lt_SP2NL='tr \040 \012'
-+  lt_NL2SP='tr \015\012 \040\040'
-+  ;;
-+ *) # EBCDIC based system
-+  lt_SP2NL='tr \100 \n'
-+  lt_NL2SP='tr \r\n \100\100'
-+  ;;
-+esac
-+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
-+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
-+])# _LT_CHECK_SHELL_FEATURES
- 
+-
 -    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'
 -      ;;
-+# _LT_PROG_XSI_SHELLFNS
-+# ---------------------
-+# Bourne and XSI compatible variants of some useful shell functions.
-+m4_defun([_LT_PROG_XSI_SHELLFNS],
-+[case $xsi_shell in
-+  yes)
-+    cat << \_LT_EOF >> "$cfgfile"
-+
-+# func_dirname file append nondir_replacement
-+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-+# otherwise set result to NONDIR_REPLACEMENT.
-+func_dirname ()
-+{
-+  case ${1} in
-+    */*) func_dirname_result="${1%/*}${2}" ;;
-+    *  ) func_dirname_result="${3}" ;;
-+  esac
-+}
- 
+-
 -    solaris*)
 -      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 -      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -12210,104 +5517,42 @@
 -	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
 -      esac
 -      ;;
-+# func_basename file
-+func_basename ()
-+{
-+  func_basename_result="${1##*/}"
-+}
- 
+-
 -    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'
 -      ;;
-+# 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 ()
-+{
-+  case ${1} in
-+    */*) func_dirname_result="${1%/*}${2}" ;;
-+    *  ) func_dirname_result="${3}" ;;
-+  esac
-+  func_basename_result="${1##*/}"
-+}
- 
+-
 -    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'
 -      ;;
-+# func_stripname prefix suffix name
-+# strip PREFIX and SUFFIX off of NAME.
-+# PREFIX and SUFFIX must not contain globbing or regex special
-+# characters, hashes, percent signs, but SUFFIX may contain a leading
-+# dot (in which case that matches only a dot).
-+func_stripname ()
-+{
-+  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-+  # positional parameters, so assign one to ordinary parameter first.
-+  func_stripname_result=${3}
-+  func_stripname_result=${func_stripname_result#"${1}"}
-+  func_stripname_result=${func_stripname_result%"${2}"}
-+}
- 
+-
 -    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
 -      ;;
-+# func_opt_split
-+func_opt_split ()
-+{
-+  func_opt_split_opt=${1%%=*}
-+  func_opt_split_arg=${1#*=}
-+}
- 
+-
 -    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'
 -      ;;
-+# func_lo2o object
-+func_lo2o ()
-+{
-+  case ${1} in
-+    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-+    *)    func_lo2o_result=${1} ;;
-+  esac
-+}
- 
+-
 -    unicos*)
 -      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 -      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
 -      ;;
-+# func_xform libobj-or-source
-+func_xform ()
-+{
-+  func_xform_result=${1%.*}.lo
-+}
- 
+-
 -    uts4*)
 -      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 -      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 -      ;;
-+# func_arith arithmetic-term...
-+func_arith ()
-+{
-+  func_arith_result=$(( $[*] ))
-+}
- 
+-
 -    *)
 -      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
 -      ;;
@@ -12315,13 +5560,7 @@
 -  fi
 -])
 -AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
-+# func_len string
-+# STRING may not start with a hyphen.
-+func_len ()
-+{
-+  func_len_result=${#1}
-+}
- 
+-
 -#
 -# Check to make sure the PIC flag actually works.
 -#
@@ -12343,12 +5582,9 @@
 -    ;;
 -  *)
 -    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
-+_LT_EOF
-     ;;
+-    ;;
 -esac
-+  *) # Bourne compatible functions.
-+    cat << \_LT_EOF >> "$cfgfile"
- 
+-
 -#
 -# Check to make sure the static flag actually works.
 -#
@@ -12359,26 +5595,8 @@
 -  [],
 -  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
 -])
-+# func_dirname file append nondir_replacement
-+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-+# otherwise set result to NONDIR_REPLACEMENT.
-+func_dirname ()
-+{
-+  # 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 file
-+func_basename ()
-+{
-+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-+}
- 
+-
+-
 -# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
 -# ------------------------------------
 -# See if the linker supports building shared libraries.
@@ -12468,26 +5686,8 @@
 -  openbsd*)
 -    with_gnu_ld=no
 -    ;;
-+dnl func_dirname_and_basename
-+dnl A portable version of this function is already defined in general.m4sh
-+dnl so there is no need for it here.
-+
-+# func_stripname prefix suffix name
-+# strip PREFIX and SUFFIX off of NAME.
-+# PREFIX and SUFFIX must not contain globbing or regex special
-+# characters, hashes, percent signs, but SUFFIX may contain a leading
-+# dot (in which case that matches only a dot).
-+# func_strip_suffix prefix name
-+func_stripname ()
-+{
-+  case ${2} in
-+    .*) func_stripname_result=`$ECHO "X${3}" \
-+           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
-+    *)  func_stripname_result=`$ECHO "X${3}" \
-+           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
-   esac
-+}
- 
+-  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
@@ -12521,31 +5721,17 @@
 -      if test "$host_cpu" != ia64; then
 -	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 -	cat <<EOF 1>&2
-+# sed scripts:
-+my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
-+my_sed_long_arg='1s/^-[[^=]]*=//'
- 
+-
 -*** 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.
-+# func_opt_split
-+func_opt_split ()
-+{
-+  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
-+  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-+}
- 
+-
 -EOF
 -      fi
 -      ;;
-+# func_lo2o object
-+func_lo2o ()
-+{
-+  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-+}
- 
+-
 -    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'
@@ -12559,12 +5745,7 @@
 -      # them.
 -      _LT_AC_TAGVAR(ld_shlibs, $1)=no
 -      ;;
-+# func_xform libobj-or-source
-+func_xform ()
-+{
-+  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
-+}
- 
+-
 -    beos*)
 -      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 -	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -12575,12 +5756,7 @@
 -	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 -      fi
 -      ;;
-+# func_arith arithmetic-term...
-+func_arith ()
-+{
-+  func_arith_result=`expr "$[@]"`
-+}
- 
+-
 -    cygwin* | mingw* | pw32*)
 -      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
 -      # as there is no search path for DLLs.
@@ -12589,13 +5765,7 @@
 -      _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'
-+# func_len string
-+# STRING may not start with a hyphen.
-+func_len ()
-+{
-+  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
-+}
- 
+-
 -      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
@@ -12611,9 +5781,7 @@
 -	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 -      fi
 -      ;;
-+_LT_EOF
-+esac
- 
+-
 -    interix[[3-9]]*)
 -      _LT_AC_TAGVAR(hardcode_direct, $1)=no
 -      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -12628,21 +5796,7 @@
 -      _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'
 -      ;;
-+case $lt_shell_append in
-+  yes)
-+    cat << \_LT_EOF >> "$cfgfile"
-+
-+# func_append var value
-+# Append VALUE to the end of shell variable VAR.
-+func_append ()
-+{
-+  eval "$[1]+=\$[2]"
-+}
-+_LT_EOF
-+    ;;
-+  *)
-+    cat << \_LT_EOF >> "$cfgfile"
- 
+-
 -    gnu* | linux* | k*bsd*-gnu)
 -      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 -	tmp_addflag=
@@ -12671,13 +5825,7 @@
 -	  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'
-+# func_append var value
-+# Append VALUE to the end of shell variable VAR.
-+func_append ()
-+{
-+  eval "$[1]=\$$[1]\$[2]"
-+}
- 
+-
 -	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~
@@ -12689,11 +5837,7 @@
 -	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 -      fi
 -      ;;
-+_LT_EOF
-+    ;;
-+  esac
-+])
- 
+-
 -    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'
@@ -12703,30 +5847,19 @@
 -	_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
 -      ;;
-+# Helper functions for option handling.                    -*- Autoconf -*-
-+#
-+#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-+#   Written by Gary V. Vaughan, 2004
-+#
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to copy and/or distribute it, with or without
-+# modifications, as long as this notice is preserved.
- 
+-
 -    solaris*)
 -      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
 -	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 -	cat <<EOF 1>&2
-+# serial 6 ltoptions.m4
- 
+-
 -*** 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.
-+# This is to help aclocal find these macros, as it can't see m4_define.
-+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
- 
+-
 -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'
@@ -12735,24 +5868,20 @@
 -	_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
-+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
-+# ------------------------------------------
-+m4_define([_LT_MANGLE_OPTION],
-+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
- 
+-
 -*** 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
 -	;;
 -	*)
@@ -12766,25 +5895,14 @@
 -	;;
 -      esac
 -      ;;
-+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
-+# ---------------------------------------
-+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
-+# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
-+# saved as a flag.
-+m4_define([_LT_SET_OPTION],
-+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
-+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
-+        _LT_MANGLE_DEFUN([$1], [$2]),
-+    [m4_warning([Unknown $1 option `$2'])])[]dnl
-+])
- 
+-
 -    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'
@@ -12794,12 +5912,7 @@
 -      fi
 -      ;;
 -    esac
-+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
-+# ------------------------------------------------------------
-+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-+m4_define([_LT_IF_OPTION],
-+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
- 
+-
 -    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
 -      runpath_var=
 -      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
@@ -12822,7 +5935,7 @@
 -	_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
@@ -12839,18 +5952,7 @@
 -	  _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
-+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
-+# -------------------------------------------------------
-+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
-+# are set.
-+m4_define([_LT_UNLESS_OPTIONS],
-+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-+	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
-+		      [m4_define([$0_found])])])[]dnl
-+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
-+])[]dnl
-+])
- 
+-
 -	# 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.
@@ -12863,53 +5965,22 @@
 -	  done
 -	  ;;
 -	esac
- 
+-
 -	exp_sym_flag='-bexport'
 -	no_entry_flag='-bnoentry'
 -      fi
-+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
-+# ----------------------------------------
-+# OPTION-LIST is a space-separated list of Libtool options associated
-+# with MACRO-NAME.  If any OPTION has a matching handler declared with
-+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
-+# the unknown option and exit.
-+m4_defun([_LT_SET_OPTIONS],
-+[# Set options
-+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-+    [_LT_SET_OPTION([$1], _LT_Option)])
-+
-+m4_if([$1],[LT_INIT],[
-+  dnl
-+  dnl Simply set some default values (i.e off) if boolean options were not
-+  dnl specified:
-+  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
-+  ])
-+  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
-+  ])
-+  dnl
-+  dnl If no reference was made to various pairs of opposing options, then
-+  dnl we run the default mode handler for the pair.  For example, if neither
-+  dnl `shared' nor `disable-shared' was passed, we enable building of shared
-+  dnl archives by default:
-+  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
-+  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
-+  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
-+  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
-+  		   [_LT_ENABLE_FAST_INSTALL])
-+  ])
-+])# _LT_SET_OPTIONS
- 
+-
 -      # 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
@@ -12950,11 +6021,7 @@
 -	  fi
 -	fi
 -      fi
-+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
-+# -----------------------------------------
-+m4_define([_LT_MANGLE_DEFUN],
-+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
- 
+-
 -      # 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
@@ -12987,7 +6054,7 @@
 -	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'
@@ -12995,16 +6062,11 @@
 -      # see comment about different semantics on the GNU ld section
 -      _LT_AC_TAGVAR(ld_shlibs, $1)=no
 -      ;;
-+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
-+# -----------------------------------------------
-+m4_define([LT_OPTION_DEFINE],
-+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
-+])# LT_OPTION_DEFINE
- 
+-
 -    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++.
@@ -13025,11 +6087,7 @@
 -      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
 -      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 -      ;;
-+# dlopen
-+# ------
-+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
-+])
- 
+-
 -    darwin* | rhapsody*)
 -      case $host_os in
 -        rhapsody* | darwin1.[[012]])
@@ -13078,25 +6136,17 @@
 -      esac
 -    fi
 -      ;;
-+AU_DEFUN([AC_LIBTOOL_DLOPEN],
-+[_LT_SET_OPTION([LT_INIT], [dlopen])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you
-+put the `dlopen' option into LT_INIT's first parameter.])
-+])
- 
+-
 -    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
 -      ;;
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
- 
+-
 -    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
@@ -13107,12 +6157,7 @@
 -      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
 -      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 -      ;;
-+# win32-dll
-+# ---------
-+# Declare package support for building win32 dll's.
-+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
-+[enable_win32_dll=yes
- 
+-
 -    # 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'
@@ -13120,14 +6165,7 @@
 -      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
 -      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 -      ;;
-+case $host in
-+*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-+  AC_CHECK_TOOL(AS, as, false)
-+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-+  ;;
-+esac
- 
+-
 -    # 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'
@@ -13135,9 +6173,7 @@
 -      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
 -      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 -      ;;
-+test -z "$AS" && AS=as
-+_LT_DECL([], [AS],      [0], [Assembler program])dnl
- 
+-
 -    hpux9*)
 -      if test "$GCC" = yes; then
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
@@ -13147,18 +6183,13 @@
 -      _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
-+test -z "$DLLTOOL" && DLLTOOL=dlltool
-+_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
- 
+-
 -      # 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'
 -      ;;
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
-+])# win32-dll
- 
+-
 -    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'
@@ -13168,53 +6199,16 @@
 -      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)=:
-+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+_LT_SET_OPTION([LT_INIT], [win32-dll])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you
-+put the `win32-dll' option into LT_INIT's first parameter.])
-+])
- 
+-
 -	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
 -	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
- 
+-
 -	# 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
-+
-+# _LT_ENABLE_SHARED([DEFAULT])
-+# ----------------------------
-+# implement the --enable-shared flag, and supports the `shared' and
-+# `disable-shared' LT_INIT options.
-+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-+m4_define([_LT_ENABLE_SHARED],
-+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
-+AC_ARG_ENABLE([shared],
-+    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-+	[build shared libraries @<:@default=]_LT_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=]_LT_ENABLE_SHARED_DEFAULT)
- 
+-      ;;
+-
 -    hpux11*)
 -      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
 -	case $host_cpu in
@@ -13244,10 +6238,7 @@
 -      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_DECL([build_libtool_libs], [enable_shared], [0],
-+	[Whether or not to build shared libraries])
-+])# _LT_ENABLE_SHARED
- 
+-
 -	case $host_cpu in
 -	hppa*64*|ia64*)
 -	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
@@ -13257,9 +6248,7 @@
 -	*)
 -	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
 -	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
- 
+-
 -	  # 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
@@ -13267,11 +6256,7 @@
 -	esac
 -      fi
 -      ;;
-+# Old names:
-+AC_DEFUN([AC_ENABLE_SHARED],
-+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
-+])
- 
+-
 -    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'
@@ -13283,10 +6268,7 @@
 -      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 -      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 -      ;;
-+AC_DEFUN([AC_DISABLE_SHARED],
-+[_LT_SET_OPTION([LT_INIT], [disable-shared])
-+])
- 
+-
 -    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
@@ -13296,44 +6278,8 @@
 -      _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
-+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
-+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
-+
-+
-+
-+# _LT_ENABLE_STATIC([DEFAULT])
-+# ----------------------------
-+# implement the --enable-static flag, and support the `static' and
-+# `disable-static' LT_INIT options.
-+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-+m4_define([_LT_ENABLE_STATIC],
-+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
-+AC_ARG_ENABLE([static],
-+    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-+	[build static libraries @<:@default=]_LT_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=]_LT_ENABLE_STATIC_DEFAULT)
- 
+-      ;;
+-
 -    newsos6)
 -      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 -      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
@@ -13341,10 +6287,7 @@
 -      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 -      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 -      ;;
-+    _LT_DECL([build_old_libs], [enable_static], [0],
-+	[Whether or not to build static libraries])
-+])# _LT_ENABLE_STATIC
- 
+-
 -    openbsd*)
 -      if test -f /usr/libexec/ld.so; then
 -	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
@@ -13370,9 +6313,7 @@
 -	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 -      fi
 -      ;;
-+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
- 
+-
 -    os2*)
 -      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
 -      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
@@ -13380,11 +6321,7 @@
 -      _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'
 -      ;;
-+# Old names:
-+AC_DEFUN([AC_ENABLE_STATIC],
-+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
-+])
- 
+-
 -    osf3*)
 -      if test "$GCC" = yes; then
 -	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -13396,10 +6333,7 @@
 -      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 -      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 -      ;;
-+AC_DEFUN([AC_DISABLE_STATIC],
-+[_LT_SET_OPTION([LT_INIT], [disable-static])
-+])
- 
+-
 -    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}\*'
@@ -13410,18 +6344,13 @@
 -	_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'
-+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
- 
+-
 -	# 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)=:
 -      ;;
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
-+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
- 
+-
 -    solaris*)
 -      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
 -      if test "$GCC" = yes; then
@@ -13453,7 +6382,7 @@
 -      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
@@ -13467,7 +6396,7 @@
 -      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
 -      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 -      ;;
- 
+-
 -    sysv4)
 -      case $host_vendor in
 -	sni)
@@ -13488,55 +6417,14 @@
 -      esac
 -      runpath_var='LD_RUN_PATH'
 -      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
-+# ----------------------------------
-+# implement the --enable-fast-install flag, and support the `fast-install'
-+# and `disable-fast-install' LT_INIT options.
-+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-+m4_define([_LT_ENABLE_FAST_INSTALL],
-+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
-+AC_ARG_ENABLE([fast-install],
-+    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-+    [optimize for fast installation @<:@default=]_LT_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=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
- 
+-      ;;
+-
 -    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'
 -      ;;
-+_LT_DECL([fast_install], [enable_fast_install], [0],
-+	 [Whether or not to optimize for fast installation])dnl
-+])# _LT_ENABLE_FAST_INSTALL
-+
-+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
-+
-+# Old names:
-+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
-+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-+the `fast-install' option into LT_INIT's first parameter.])
-+])
- 
+-
 -    sysv4*MP*)
 -      if test -d /usr/nec; then
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
@@ -13546,22 +6434,13 @@
 -	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
 -      fi
 -      ;;
-+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
-+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-+the `disable-fast-install' option into LT_INIT's first parameter.])
-+])
- 
+-
 -    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'
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
-+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
- 
+-
 -      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'
@@ -13570,7 +6449,7 @@
 -	_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
@@ -13587,18 +6466,7 @@
 -      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 -      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
 -      runpath_var='LD_RUN_PATH'
-+# _LT_WITH_PIC([MODE])
-+# --------------------
-+# implement the --with-pic flag, and support the `pic-only' and `no-pic'
-+# LT_INIT options.
-+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-+m4_define([_LT_WITH_PIC],
-+[AC_ARG_WITH([pic],
-+    [AS_HELP_STRING([--with-pic],
-+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-+    [pic_mode="$withval"],
-+    [pic_mode=default])
- 
+-
 -      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'
@@ -13607,58 +6475,25 @@
 -	_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
 -      ;;
-+test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
- 
+-
 -    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_DECL([], [pic_mode], [0], [What type of objects to build])dnl
-+])# _LT_WITH_PIC
- 
+-
 -    *)
 -      _LT_AC_TAGVAR(ld_shlibs, $1)=no
 -      ;;
 -    esac
 -  fi
-+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
-+
-+# Old name:
-+AU_DEFUN([AC_LIBTOOL_PICMODE],
-+[_LT_SET_OPTION([LT_INIT], [pic-only])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you
-+put the `pic-only' option into LT_INIT's first parameter.])
- ])
+-])
 -AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
 -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
- 
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
-+
-+
-+m4_define([_LTDL_MODE], [])
-+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
-+		 [m4_define([_LTDL_MODE], [nonrecursive])])
-+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
-+		 [m4_define([_LTDL_MODE], [recursive])])
-+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
-+		 [m4_define([_LTDL_MODE], [subproject])])
-+
-+m4_define([_LTDL_TYPE], [])
-+LT_OPTION_DEFINE([LTDL_INIT], [installable],
-+		 [m4_define([_LTDL_TYPE], [installable])])
-+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
-+		 [m4_define([_LTDL_TYPE], [convenience])])
-+
-+# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
- #
+-
+-#
 -# Do we need to explicitly link libc?
-+#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
-+#   Written by Gary V. Vaughan, 2004
- #
+-#
 -case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
 -x|xyes)
 -  # Assume -lc should be added
@@ -13676,10 +6511,7 @@
 -      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
 -      $rm conftest*
 -      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to copy and/or distribute it, with or without
-+# modifications, as long as this notice is preserved.
- 
+-
 -      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
 -        soname=conftest
 -        lib=conftest
@@ -13712,11 +6544,8 @@
 -  ;;
 -esac
 -])# AC_LIBTOOL_PROG_LD_SHLIBS
-+# serial 5 ltsugar.m4
- 
-+# This is to help aclocal find these macros, as it can't see m4_define.
-+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
- 
+-
+-
 -# _LT_AC_FILE_LTDLL_C
 -# -------------------
 -# Be careful that the start marker always follows a newline.
@@ -13755,53 +6584,13 @@
 -# }
 -# /* ltdll.c ends here */
 -])# _LT_AC_FILE_LTDLL_C
- 
-+# lt_join(SEP, ARG1, [ARG2...])
-+# -----------------------------
-+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
-+# associated separator.
-+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
-+# versions in m4sugar had bugs.
-+m4_define([lt_join],
-+[m4_if([$#], [1], [],
-+       [$#], [2], [[$2]],
-+       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
-+m4_define([_lt_join],
-+[m4_if([$#$2], [2], [],
-+       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
- 
+-
+-
 -# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
 -# ---------------------------------
 -AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
- 
-+# lt_car(LIST)
-+# lt_cdr(LIST)
-+# ------------
-+# Manipulate m4 lists.
-+# These macros are necessary as long as will still need to support
-+# Autoconf-2.59 which quotes differently.
-+m4_define([lt_car], [[$1]])
-+m4_define([lt_cdr],
-+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
-+       [$#], 1, [],
-+       [m4_dquote(m4_shift($@))])])
-+m4_define([lt_unquote], $1)
-+
-+
-+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
-+# ------------------------------------------
-+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
-+# Note that neither SEPARATOR nor STRING are expanded; they are appended
-+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
-+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
-+# than defined and empty).
-+#
-+# This macro is needed until we can rely on Autoconf 2.62, since earlier
-+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
-+m4_define([lt_append],
-+[m4_define([$1],
-+	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
- 
+-
+-
 -# old names
 -AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
 -AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
@@ -13810,92 +6599,41 @@
 -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)
-+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
-+# ----------------------------------------------------------
-+# Produce a SEP delimited list of all paired combinations of elements of
-+# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
-+# has the form PREFIXmINFIXSUFFIXn.
-+m4_define([lt_combine],
-+[m4_if([$2], [], [],
-+  [m4_if([$4], [], [],
-+    [lt_join(m4_quote(m4_default([$1], [[, ]])),
-+      lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_prefix, [$2],
-+		   [m4_foreach(_Lt_suffix, lt_car([m4_shiftn(3, $@)]),
-+			       [_Lt_prefix[]$3[]_Lt_suffix ])])))))])])dnl
- ])
- 
+-])
+-
 -AC_DEFUN([LT_AC_PROG_RC],
 -[AC_CHECK_TOOL(RC, windres, no)
-+
-+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
-+# -----------------------------------------------------------------------
-+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
-+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
-+m4_define([lt_if_append_uniq],
-+[m4_ifdef([$1],
-+	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
-+		 [lt_append([$1], [$2], [$3])$4],
-+		 [$5])],
-+	  [lt_append([$1], [$2], [$3])$4])])
-+
-+
-+# lt_dict_add(DICT, KEY, VALUE)
-+# -----------------------------
-+m4_define([lt_dict_add],
-+[m4_define([$1($2)], [$3])])
-+
-+
-+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
-+# --------------------------------------------
-+m4_define([lt_dict_add_subkey],
-+[m4_define([$1($2:$3)], [$4])])
-+
-+
-+# lt_dict_fetch(DICT, KEY, [SUBKEY])
-+# ----------------------------------
-+m4_define([lt_dict_fetch],
-+[m4_ifval([$3],
-+	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
-+    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
-+
-+
-+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
-+# -----------------------------------------------------------------
-+m4_define([lt_if_dict_fetch],
-+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
-+	[$5],
-+    [$6])])
-+
-+
-+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
-+# --------------------------------------------------------------
-+m4_define([lt_dict_filter],
-+[m4_if([$5], [], [],
-+  [lt_join(m4_quote(m4_default([$4], [[, ]])),
-+           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
-+		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
- ])
- 
-+# ltversion.m4 -- version numbers			-*- Autoconf -*-
-+#
-+#   Copyright (C) 2004 Free Software Foundation, Inc.
-+#   Written by Scott James Remnant, 2004
-+#
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to copy and/or distribute it, with or without
-+# modifications, as long as this notice is preserved.
- 
+-])
+-
+-
 -# Cheap backport of AS_EXECUTABLE_P and required macros
 -# from Autoconf 2.59; we should not use $as_executable_p directly.
-+# Generated from ltversion.in.
++# 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
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++dnl
++dnl This file can can be used in projects which are not available under
++dnl the GNU General Public License or the GNU Library General Public
++dnl License but which still want to provide support for the GNU gettext
++dnl functionality.
++dnl Please note that the actual code of the GNU gettext library is covered
++dnl by the GNU Library General Public License, and the rest of the GNU
++dnl gettext package package is covered by the GNU General Public License.
++dnl They are *not* in the public domain.
++
++dnl Authors:
++dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
++dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
  
 -# _AS_TEST_PREPARE
 -# ----------------
@@ -13907,8 +6645,7 @@
 -  as_executable_p='test -f'
 -fi
 -])])# _AS_TEST_PREPARE
-+# serial 2976 ltversion.m4
-+# This file is part of GNU Libtool
++AC_PREREQ(2.50)
  
 -# AS_EXECUTABLE_P
 -# ---------------
@@ -13918,9 +6655,7 @@
 -[AS_REQUIRE([_AS_TEST_PREPARE])dnl
 -$as_executable_p $1[]dnl
 -])])# AS_EXECUTABLE_P
-+m4_define([LT_PACKAGE_VERSION], [2.2.4])
-+m4_define([LT_PACKAGE_REVISION], [1.2976])
- 
+-
 -# 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    #
@@ -13978,130 +6713,10 @@
 -    fi
 -  done
 -done
-+AC_DEFUN([LTVERSION_VERSION],
-+[macro_version='2.2.4'
-+macro_revision='1.2976'
-+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-+_LT_DECL(, macro_revision, 0)
- ])
+-])
 -SED=$lt_cv_path_SED
 -AC_SUBST([SED])
 -AC_MSG_RESULT([$SED])
-+
-+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
-+#
-+#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
-+#   Written by Scott James Remnant, 2004.
-+#
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to copy and/or distribute it, with or without
-+# modifications, as long as this notice is preserved.
-+
-+# serial 4 lt~obsolete.m4
-+
-+# These exist entirely to fool aclocal when bootstrapping libtool.
-+#
-+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
-+# which have later been changed to m4_define as they aren't part of the
-+# exported API, or moved to Autoconf or Automake where they belong.
-+#
-+# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
-+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
-+# using a macro with the same name in our local m4/libtool.m4 it'll
-+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
-+# and doesn't know about Autoconf macros at all.)
-+#
-+# So we provide this file, which has a silly filename so it's always
-+# included after everything else.  This provides aclocal with the
-+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
-+# because those macros already exist, or will be overwritten later.
-+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
-+#
-+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
-+# Yes, that means every name once taken will need to remain here until
-+# we give up compatibility with versions before 1.7, at which point
-+# we need to keep only those names which we still refer to.
-+
-+# This is to help aclocal find these macros, as it can't see m4_define.
-+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
-+
-+m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
-+m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
-+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
-+m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
-+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
-+m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
-+m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
-+m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
-+m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
-+m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
-+m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
-+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
-+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
-+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
-+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
-+m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
-+m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
-+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
-+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
-+m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
-+m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
-+m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
-+m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
-+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
-+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
-+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
-+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
-+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
-+m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
-+m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
-+m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
-+m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
-+m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
-+m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
-+m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
-+m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
-+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
-+m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
-+m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
-+m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
-+m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
-+m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
-+m4_ifndef([AC_LIBTOOL_RC],		[AC_DEFUN([AC_LIBTOOL_RC])])
-+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
-+m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
-+m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
-+m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
-+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
-+m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
-+m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-+
-+# 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
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+dnl
-+dnl This file can can be used in projects which are not available under
-+dnl the GNU General Public License or the GNU Library General Public
-+dnl License but which still want to provide support for the GNU gettext
-+dnl functionality.
-+dnl Please note that the actual code of the GNU gettext library is covered
-+dnl by the GNU Library General Public License, and the rest of the GNU
-+dnl gettext package package is covered by the GNU General Public License.
-+dnl They are *not* in the public domain.
-+
-+dnl Authors:
-+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-+
-+AC_PREREQ(2.50)
-+
 +AC_DEFUN([AM_NLS],
 +[
 +  AC_MSG_CHECKING([whether NLS is requested])
@@ -14114,15 +6729,109 @@
  ])
  
  # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-@@ -8332,5 +9861,3 @@
- AC_SUBST([am__untar])
- ]) # _AM_PROG_TAR
- 
--m4_include([m4/gnome-doc-utils.m4])
--m4_include([m4/intltool.m4])
+@@ -7444,7 +828,7 @@
+ fi[]dnl
+ ])# PKG_CHECK_MODULES
+ 
+-# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
++# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -7459,7 +843,7 @@
+ [am__api_version='1.10'
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version.  Point them to the right macro.
+-m4_if([$1], [1.10.1], [],
++m4_if([$1], [1.10.2], [],
+       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+ 
+@@ -7473,12 +857,12 @@
+ # AM_SET_CURRENT_AUTOMAKE_VERSION
+ # -------------------------------
+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
++# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.10.1])dnl
++[AM_AUTOMAKE_VERSION([1.10.2])dnl
+ m4_ifndef([AC_AUTOCONF_VERSION],
+   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
++_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+ 
+ # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+ 
+@@ -7728,19 +1112,28 @@
+ 
+ # Generate code to set up dependency tracking.              -*- Autoconf -*-
+ 
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+ # Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
+-#serial 3
++#serial 4
+ 
+ # _AM_OUTPUT_DEPENDENCY_COMMANDS
+ # ------------------------------
+ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+-[for mf in $CONFIG_FILES; do
++[# Autoconf 2.62 quotes --file arguments for eval, but not when files
++# are listed without --file.  Let's play safe and only enable the eval
++# if we detect the quoting.
++case $CONFIG_FILES in
++*\'*) eval set x "$CONFIG_FILES" ;;
++*)   set x $CONFIG_FILES ;;
++esac
++shift
++for mf
++do
+   # Strip MF so we end up with the name of the file.
+   mf=`echo "$mf" | sed -e 's/:.*$//'`
+   # Check whether this is an Automake generated Makefile or not.
+@@ -8113,13 +1506,13 @@
+ 
+ # Helper functions for option handling.                     -*- Autoconf -*-
+ 
+-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
++# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
+-# serial 3
++# serial 4
+ 
+ # _AM_MANGLE_OPTION(NAME)
+ # -----------------------
+@@ -8136,7 +1529,7 @@
+ # ----------------------------------
+ # OPTIONS is a space-separated list of Automake options.
+ AC_DEFUN([_AM_SET_OPTIONS],
+-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
++[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+ 
+ # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+ # -------------------------------------------
+@@ -8334,3 +1727,8 @@
+ 
+ m4_include([m4/gnome-doc-utils.m4])
+ m4_include([m4/intltool.m4])
++m4_include([m4/libtool.m4])
++m4_include([m4/ltoptions.m4])
++m4_include([m4/ltsugar.m4])
++m4_include([m4/ltversion.m4])
++m4_include([m4/lt~obsolete.m4])
 diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/config.h.in fast-user-switch-applet-2.24.0.new/config.h.in
---- fast-user-switch-applet-2.24.0/config.h.in	2008-09-22 15:25:37.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/config.h.in	2009-02-09 19:52:08.000000000 +0000
+--- fast-user-switch-applet-2.24.0/config.h.in	2008-09-22 09:25:37.000000000 -0500
++++ fast-user-switch-applet-2.24.0.new/config.h.in	2009-03-04 17:19:44.000000000 -0600
 @@ -75,6 +75,10 @@
  /* system configuration dir */
  #undef LIBDIR
@@ -14135,9 +6844,254 @@
  #undef PACKAGE
  
 diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/configure fast-user-switch-applet-2.24.0.new/configure
---- fast-user-switch-applet-2.24.0/configure	2008-09-22 15:25:36.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/configure	2009-02-09 19:52:06.000000000 +0000
-@@ -553,22 +553,22 @@
+--- fast-user-switch-applet-2.24.0/configure	2008-09-22 09:25:36.000000000 -0500
++++ fast-user-switch-applet-2.24.0.new/configure	2009-03-04 17:19:44.000000000 -0600
+@@ -1,9 +1,9 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.61.
++# Generated by GNU Autoconf 2.63.
+ #
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+ ## --------------------- ##
+@@ -15,7 +15,7 @@
+ 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
++  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+@@ -37,17 +37,45 @@
+ as_cr_digits='0123456789'
+ as_cr_alnum=$as_cr_Letters$as_cr_digits
+ 
++as_nl='
++'
++export as_nl
++# Printing a long string crashes Solaris 7 /usr/bin/printf.
++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
++if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
++  as_echo='printf %s\n'
++  as_echo_n='printf %s'
++else
++  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
++    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
++    as_echo_n='/usr/ucb/echo -n'
++  else
++    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
++    as_echo_n_body='eval
++      arg=$1;
++      case $arg in
++      *"$as_nl"*)
++	expr "X$arg" : "X\\(.*\\)$as_nl";
++	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
++      esac;
++      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
++    '
++    export as_echo_n_body
++    as_echo_n='sh -c $as_echo_n_body as_echo'
++  fi
++  export as_echo_body
++  as_echo='sh -c $as_echo_body as_echo'
++fi
++
+ # The user is always right.
+ if test "${PATH_SEPARATOR+set}" != set; then
+-  echo "#! /bin/sh" >conf$$.sh
+-  echo  "exit 0"   >>conf$$.sh
+-  chmod +x conf$$.sh
+-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+-    PATH_SEPARATOR=';'
+-  else
+-    PATH_SEPARATOR=:
+-  fi
+-  rm -f conf$$.sh
++  PATH_SEPARATOR=:
++  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
++    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
++      PATH_SEPARATOR=';'
++  }
+ fi
+ 
+ # Support unset when possible.
+@@ -63,8 +91,6 @@
+ # there to prevent editors from complaining about space-tab.
+ # (If _AS_PATH_WALK were called with IFS unset, it would disable word
+ # splitting by setting IFS to empty value.)
+-as_nl='
+-'
+ IFS=" ""	$as_nl"
+ 
+ # Find who we are.  Look in the path if we contain no directory separator.
+@@ -87,7 +113,7 @@
+   as_myself=$0
+ fi
+ if test ! -f "$as_myself"; then
+-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+   { (exit 1); exit 1; }
+ fi
+ 
+@@ -100,17 +126,10 @@
+ PS4='+ '
+ 
+ # NLS nuisances.
+-for as_var in \
+-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+-  LC_TELEPHONE LC_TIME
+-do
+-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+-    eval $as_var=C; export $as_var
+-  else
+-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+-  fi
+-done
++LC_ALL=C
++export LC_ALL
++LANGUAGE=C
++export LANGUAGE
+ 
+ # Required to use basename.
+ if expr a : '\(a\)' >/dev/null 2>&1 &&
+@@ -132,7 +151,7 @@
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+ 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+-echo X/"$0" |
++$as_echo X/"$0" |
+     sed '/^.*\/\([^/][^/]*\)\/*$/{
+ 	    s//\1/
+ 	    q
+@@ -158,7 +177,7 @@
+   as_have_required=no
+ fi
+ 
+-  if test $as_have_required = yes && 	 (eval ":
++  if test $as_have_required = yes &&	 (eval ":
+ (as_func_return () {
+   (exit \$1)
+ }
+@@ -240,7 +259,7 @@
+ 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
++  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+@@ -261,7 +280,7 @@
+ 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
++  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+@@ -341,10 +360,10 @@
+ 
+       if test "x$CONFIG_SHELL" != x; then
+   for as_var in BASH_ENV ENV
+-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+-        done
+-        export CONFIG_SHELL
+-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
++	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++	done
++	export CONFIG_SHELL
++	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+ fi
+ 
+ 
+@@ -413,9 +432,10 @@
+ 
+ test \$exitcode = 0") || {
+   echo No shell found that supports shell functions.
+-  echo Please tell autoconf@gnu.org about your system,
+-  echo including any error possibly output before this
+-  echo message
++  echo Please tell bug-autoconf@gnu.org about your system,
++  echo including any error possibly output before this message.
++  echo This can help us improve future autoconf versions.
++  echo Configuration will now proceed without shell functions.
+ }
+ 
+ 
+@@ -451,7 +471,7 @@
+       s/-\n.*//
+     ' >$as_me.lineno &&
+   chmod +x "$as_me.lineno" ||
+-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
++    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { (exit 1); exit 1; }; }
+ 
+   # Don't try to exec as it changes $[0], causing all sort of problems
+@@ -479,7 +499,6 @@
+ *)
+   ECHO_N='-n';;
+ esac
+-
+ if expr a : '\(a\)' >/dev/null 2>&1 &&
+    test "X`expr 00001 : '.*\(...\)'`" = X001; then
+   as_expr=expr
+@@ -492,19 +511,22 @@
+   rm -f conf$$.dir/conf$$.file
+ else
+   rm -f conf$$.dir
+-  mkdir conf$$.dir
++  mkdir conf$$.dir 2>/dev/null
+ fi
+-echo >conf$$.file
+-if ln -s conf$$.file conf$$ 2>/dev/null; then
+-  as_ln_s='ln -s'
+-  # ... but there are two gotchas:
+-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+-  # In both cases, we have to default to `cp -p'.
+-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
++if (echo >conf$$.file) 2>/dev/null; then
++  if ln -s conf$$.file conf$$ 2>/dev/null; then
++    as_ln_s='ln -s'
++    # ... but there are two gotchas:
++    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
++    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
++    # In both cases, we have to default to `cp -p'.
++    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
++      as_ln_s='cp -p'
++  elif ln conf$$.file conf$$ 2>/dev/null; then
++    as_ln_s=ln
++  else
+     as_ln_s='cp -p'
+-elif ln conf$$.file conf$$ 2>/dev/null; then
+-  as_ln_s=ln
++  fi
+ else
+   as_ln_s='cp -p'
+ fi
+@@ -529,10 +551,10 @@
+   as_test_x='
+     eval sh -c '\''
+       if test -d "$1"; then
+-        test -d "$1/.";
++	test -d "$1/.";
+       else
+ 	case $1 in
+-        -*)set "./$1";;
++	-*)set "./$1";;
+ 	esac;
+ 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+ 	???[sx]*):;;*)false;;esac;fi
+@@ -553,22 +575,22 @@
  # Check that we are running under the correct shell.
  SHELL=${CONFIG_SHELL-/bin/sh}
  
@@ -14165,7 +7119,7 @@
    :
  else
    # Restart under the correct shell.
-@@ -578,9 +578,9 @@
+@@ -578,9 +600,9 @@
  if test "X$1" = X--fallback-echo; then
    # used as fallback echo
    shift
@@ -14177,7 +7131,7 @@
    exit 0
  fi
  
-@@ -588,121 +588,116 @@
+@@ -588,121 +610,116 @@
  # if CDPATH is set.
  (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
  
@@ -14287,6 +7241,8 @@
 -      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"
 +    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' &&
@@ -14302,16 +7258,14 @@
 +        CONFIG_SHELL=/bin/ksh
 +        export CONFIG_SHELL
 +        exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
-+      else
+       else
+-	# maybe with a smaller string...
+-	prev=:
 +        # 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
--	echo="$CONFIG_SHELL $0 --fallback-echo"
--      else
--	# maybe with a smaller string...
--	prev=:
++	   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` &&
@@ -14390,52 +7344,249 @@
  exec 7<&0 </dev/null 6>&1
  
  # Name of the host.
-@@ -829,6 +824,10 @@
- MAINTAINER_MODE_TRUE
- MAINTAINER_MODE_FALSE
- MAINT
-+USE_NLS
-+INTLTOOL_UPDATE
-+INTLTOOL_MERGE
-+INTLTOOL_EXTRACT
- INTLTOOL_DESKTOP_RULE
- INTLTOOL_DIRECTORY_RULE
- INTLTOOL_KEYS_RULE
-@@ -851,9 +850,7 @@
- XGETTEXT
- MSGMERGE
+@@ -767,190 +784,216 @@
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL
+-PATH_SEPARATOR
+-PACKAGE_NAME
+-PACKAGE_TARNAME
+-PACKAGE_VERSION
+-PACKAGE_STRING
+-PACKAGE_BUGREPORT
+-exec_prefix
+-prefix
+-program_transform_name
+-bindir
+-sbindir
+-libexecdir
+-datarootdir
+-datadir
+-sysconfdir
+-sharedstatedir
+-localstatedir
+-includedir
+-oldincludedir
+-docdir
+-infodir
+-htmldir
+-dvidir
+-pdfdir
+-psdir
+-libdir
+-localedir
+-mandir
+-DEFS
+-ECHO_C
+-ECHO_N
+-ECHO_T
+-LIBS
+-build_alias
+-host_alias
+-target_alias
+-INSTALL_PROGRAM
+-INSTALL_SCRIPT
+-INSTALL_DATA
+-am__isrc
+-CYGPATH_W
+-PACKAGE
+-VERSION
+-ACLOCAL
+-AUTOCONF
+-AUTOMAKE
+-AUTOHEADER
+-MAKEINFO
+-install_sh
+-STRIP
+-INSTALL_STRIP_PROGRAM
+-mkdir_p
+-AWK
+-SET_MAKE
+-am__leading_dot
+-AMTAR
+-am__tar
+-am__untar
+-MAINTAINER_MODE_TRUE
+-MAINTAINER_MODE_FALSE
+-MAINT
+-INTLTOOL_DESKTOP_RULE
+-INTLTOOL_DIRECTORY_RULE
+-INTLTOOL_KEYS_RULE
+-INTLTOOL_PROP_RULE
+-INTLTOOL_OAF_RULE
+-INTLTOOL_PONG_RULE
+-INTLTOOL_SERVER_RULE
+-INTLTOOL_SHEET_RULE
+-INTLTOOL_SOUNDLIST_RULE
+-INTLTOOL_UI_RULE
+-INTLTOOL_XAM_RULE
+-INTLTOOL_KBD_RULE
+-INTLTOOL_XML_RULE
+-INTLTOOL_XML_NOMERGE_RULE
+-INTLTOOL_CAVES_RULE
+-INTLTOOL_SCHEMAS_RULE
+-INTLTOOL_THEME_RULE
+-INTLTOOL_SERVICE_RULE
+-INTLTOOL_POLICY_RULE
+-XGETTEXT
+-MSGMERGE
++ac_subst_vars='LTLIBOBJS
++LIBOBJS
++LIBDIR
++SYSCONFDIR
++PREFIX
++EXPANDED_SYSCONFDIR
++HAVE_GNOME_DOC_UTILS_FALSE
++HAVE_GNOME_DOC_UTILS_TRUE
++DISTCHECK_CONFIGURE_FLAGS
++ENABLE_SK_FALSE
++ENABLE_SK_TRUE
++DOC_USER_FORMATS
++OMF_DIR
++HELP_DIR
++MKINSTALLDIRS
++POSUB
++POFILES
++PO_IN_DATADIR_FALSE
++PO_IN_DATADIR_TRUE
++INTLLIBS
++INSTOBJEXT
++GMOFILES
++CATOBJEXT
++CATALOGS
++MSGFMT_OPTS
++GNOMELOCALEDIR
++GETTEXT_PACKAGE
++WARN_CFLAGS
++GDMCONFIGFILE
++gdm_setup
++users_admin
++X_EXTRA_LIBS
++X_LIBS
++X_PRE_LIBS
++X_CFLAGS
++XMKMF
++GCONF_SCHEMAS_INSTALL_FALSE
++GCONF_SCHEMAS_INSTALL_TRUE
++GCONF_SCHEMA_FILE_DIR
++GCONF_SCHEMA_CONFIG_SOURCE
++GCONFTOOL
++GLIB_GENMARSHAL
++GLIB_MKENUMS
++APPLET_LIBS
++APPLET_CFLAGS
++PKG_CONFIG
++OTOOL64
++OTOOL
++LIPO
++NMEDIT
++DSYMUTIL
++lt_ECHO
++RANLIB
++AR
++OBJDUMP
++LN_S
++NM
++ac_ct_DUMPBIN
++DUMPBIN
++LD
++FGREP
++SED
++host_os
++host_vendor
++host_cpu
++host
++build_os
++build_vendor
++build_cpu
++build
++LIBTOOL
++EGREP
++GREP
++CPP
++DATADIRNAME
++am__fastdepCC_FALSE
++am__fastdepCC_TRUE
++CCDEPMODE
++AMDEPBACKSLASH
++AMDEP_FALSE
++AMDEP_TRUE
++am__quote
++am__include
++DEPDIR
++OBJEXT
++EXEEXT
++ac_ct_CC
++CPPFLAGS
++LDFLAGS
++CFLAGS
++CC
++ALL_LINGUAS
++INTLTOOL_PERL
++GMSGFMT
  MSGFMT
--INTLTOOL_EXTRACT
--INTLTOOL_MERGE
--INTLTOOL_UPDATE
-+GMSGFMT
- INTLTOOL_PERL
- ALL_LINGUAS
- CC
-@@ -876,6 +873,7 @@
- CPP
- GREP
- EGREP
-+LIBTOOL
- build
- build_cpu
- build_vendor
-@@ -885,23 +883,20 @@
- host_vendor
- host_os
- SED
-+FGREP
-+LD
-+DUMPBIN
-+ac_ct_DUMPBIN
-+NM
- LN_S
++MSGMERGE
++XGETTEXT
++INTLTOOL_POLICY_RULE
++INTLTOOL_SERVICE_RULE
++INTLTOOL_THEME_RULE
++INTLTOOL_SCHEMAS_RULE
++INTLTOOL_CAVES_RULE
++INTLTOOL_XML_NOMERGE_RULE
++INTLTOOL_XML_RULE
++INTLTOOL_KBD_RULE
++INTLTOOL_XAM_RULE
++INTLTOOL_UI_RULE
++INTLTOOL_SOUNDLIST_RULE
++INTLTOOL_SHEET_RULE
++INTLTOOL_SERVER_RULE
++INTLTOOL_PONG_RULE
++INTLTOOL_OAF_RULE
++INTLTOOL_PROP_RULE
++INTLTOOL_KEYS_RULE
++INTLTOOL_DIRECTORY_RULE
++INTLTOOL_DESKTOP_RULE
+ INTLTOOL_EXTRACT
+ INTLTOOL_MERGE
+ INTLTOOL_UPDATE
+-INTLTOOL_PERL
+-ALL_LINGUAS
+-CC
+-CFLAGS
+-LDFLAGS
+-CPPFLAGS
+-ac_ct_CC
+-EXEEXT
+-OBJEXT
+-DEPDIR
+-am__include
+-am__quote
+-AMDEP_TRUE
+-AMDEP_FALSE
+-AMDEPBACKSLASH
+-CCDEPMODE
+-am__fastdepCC_TRUE
+-am__fastdepCC_FALSE
+-DATADIRNAME
+-CPP
+-GREP
+-EGREP
+-build
+-build_cpu
+-build_vendor
+-build_os
+-host
+-host_cpu
+-host_vendor
+-host_os
+-SED
+-LN_S
 -ECHO
- AR
- RANLIB
-+lt_ECHO
- DSYMUTIL
- NMEDIT
+-AR
+-RANLIB
+-DSYMUTIL
+-NMEDIT
 -CXX
 -CXXFLAGS
 -ac_ct_CXX
@@ -14447,23 +7598,148 @@
 -FFLAGS
 -ac_ct_F77
 -LIBTOOL
-+LIPO
-+OTOOL
-+OTOOL64
- PKG_CONFIG
- APPLET_CFLAGS
- APPLET_LIBS
-@@ -923,9 +918,7 @@
- WARN_CFLAGS
- GETTEXT_PACKAGE
- GNOMELOCALEDIR
--USE_NLS
- MSGFMT_OPTS
+-PKG_CONFIG
+-APPLET_CFLAGS
+-APPLET_LIBS
+-GLIB_MKENUMS
+-GLIB_GENMARSHAL
+-GCONFTOOL
+-GCONF_SCHEMA_CONFIG_SOURCE
+-GCONF_SCHEMA_FILE_DIR
+-GCONF_SCHEMAS_INSTALL_TRUE
+-GCONF_SCHEMAS_INSTALL_FALSE
+-XMKMF
+-X_CFLAGS
+-X_PRE_LIBS
+-X_LIBS
+-X_EXTRA_LIBS
+-users_admin
+-gdm_setup
+-GDMCONFIGFILE
+-WARN_CFLAGS
+-GETTEXT_PACKAGE
+-GNOMELOCALEDIR
+ USE_NLS
+-MSGFMT_OPTS
 -GMSGFMT
- CATALOGS
- CATOBJEXT
- GMOFILES
-@@ -960,12 +953,6 @@
+-CATALOGS
+-CATOBJEXT
+-GMOFILES
+-INSTOBJEXT
+-INTLLIBS
+-PO_IN_DATADIR_TRUE
+-PO_IN_DATADIR_FALSE
+-POFILES
+-POSUB
+-MKINSTALLDIRS
+-HELP_DIR
+-OMF_DIR
+-DOC_USER_FORMATS
+-ENABLE_SK_TRUE
+-ENABLE_SK_FALSE
+-DISTCHECK_CONFIGURE_FLAGS
+-HAVE_GNOME_DOC_UTILS_TRUE
+-HAVE_GNOME_DOC_UTILS_FALSE
+-EXPANDED_SYSCONFDIR
+-PREFIX
+-SYSCONFDIR
+-LIBDIR
+-LIBOBJS
+-LTLIBOBJS'
++MAINT
++MAINTAINER_MODE_FALSE
++MAINTAINER_MODE_TRUE
++am__untar
++am__tar
++AMTAR
++am__leading_dot
++SET_MAKE
++AWK
++mkdir_p
++MKDIR_P
++INSTALL_STRIP_PROGRAM
++STRIP
++install_sh
++MAKEINFO
++AUTOHEADER
++AUTOMAKE
++AUTOCONF
++ACLOCAL
++VERSION
++PACKAGE
++CYGPATH_W
++am__isrc
++INSTALL_DATA
++INSTALL_SCRIPT
++INSTALL_PROGRAM
++target_alias
++host_alias
++build_alias
++LIBS
++ECHO_T
++ECHO_N
++ECHO_C
++DEFS
++mandir
++localedir
++libdir
++psdir
++pdfdir
++dvidir
++htmldir
++infodir
++docdir
++oldincludedir
++includedir
++localstatedir
++sharedstatedir
++sysconfdir
++datadir
++datarootdir
++libexecdir
++sbindir
++bindir
++program_transform_name
++prefix
++exec_prefix
++PACKAGE_BUGREPORT
++PACKAGE_STRING
++PACKAGE_VERSION
++PACKAGE_TARNAME
++PACKAGE_NAME
++PATH_SEPARATOR
++SHELL'
+ ac_subst_files=''
++ac_user_opts='
++enable_option_checking
++enable_maintainer_mode
++enable_nls
++enable_dependency_tracking
++enable_shared
++enable_static
++with_pic
++enable_fast_install
++with_gnu_ld
++enable_libtool_lock
++with_gconf_source
++with_gconf_schema_file_dir
++enable_schemas_install
++with_x
++with_users_admin
++with_gdm_setup
++with_gdm_config
++enable_compile_warnings
++enable_iso_c
++enable_more_warnings
++with_help_dir
++with_omf_dir
++with_help_formats
++enable_scrollkeeper
++'
+       ac_precious_vars='build_alias
+ host_alias
+ target_alias
+@@ -960,12 +1003,6 @@
  LIBS
  CPPFLAGS
  CPP
@@ -14476,7 +7752,308 @@
  PKG_CONFIG
  APPLET_CFLAGS
  APPLET_LIBS
-@@ -1553,6 +1540,7 @@
+@@ -975,6 +1012,8 @@
+ # Initialize some variables set by options.
+ ac_init_help=
+ ac_init_version=false
++ac_unrecognized_opts=
++ac_unrecognized_sep=
+ # The variables have the same names as the options, with
+ # dashes changed to underlines.
+ cache_file=/dev/null
+@@ -1073,13 +1112,21 @@
+     datarootdir=$ac_optarg ;;
+ 
+   -disable-* | --disable-*)
+-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
++    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
++    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
++      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+    { (exit 1); exit 1; }; }
+-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+-    eval enable_$ac_feature=no ;;
++    ac_useropt_orig=$ac_useropt
++    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
++    case $ac_user_opts in
++      *"
++"enable_$ac_useropt"
++"*) ;;
++      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
++	 ac_unrecognized_sep=', ';;
++    esac
++    eval enable_$ac_useropt=no ;;
+ 
+   -docdir | --docdir | --docdi | --doc | --do)
+     ac_prev=docdir ;;
+@@ -1092,13 +1139,21 @@
+     dvidir=$ac_optarg ;;
+ 
+   -enable-* | --enable-*)
+-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
++    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
++    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
++      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+    { (exit 1); exit 1; }; }
+-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+-    eval enable_$ac_feature=\$ac_optarg ;;
++    ac_useropt_orig=$ac_useropt
++    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
++    case $ac_user_opts in
++      *"
++"enable_$ac_useropt"
++"*) ;;
++      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
++	 ac_unrecognized_sep=', ';;
++    esac
++    eval enable_$ac_useropt=\$ac_optarg ;;
+ 
+   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+@@ -1289,22 +1344,38 @@
+     ac_init_version=: ;;
+ 
+   -with-* | --with-*)
+-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
++    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+-      { echo "$as_me: error: invalid package name: $ac_package" >&2
++    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
++      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+    { (exit 1); exit 1; }; }
+-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+-    eval with_$ac_package=\$ac_optarg ;;
++    ac_useropt_orig=$ac_useropt
++    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
++    case $ac_user_opts in
++      *"
++"with_$ac_useropt"
++"*) ;;
++      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
++	 ac_unrecognized_sep=', ';;
++    esac
++    eval with_$ac_useropt=\$ac_optarg ;;
+ 
+   -without-* | --without-*)
+-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
++    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+-      { echo "$as_me: error: invalid package name: $ac_package" >&2
++    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
++      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+    { (exit 1); exit 1; }; }
+-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+-    eval with_$ac_package=no ;;
++    ac_useropt_orig=$ac_useropt
++    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
++    case $ac_user_opts in
++      *"
++"with_$ac_useropt"
++"*) ;;
++      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
++	 ac_unrecognized_sep=', ';;
++    esac
++    eval with_$ac_useropt=no ;;
+ 
+   --x)
+     # Obsolete; use --with-x.
+@@ -1324,7 +1395,7 @@
+   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+     x_libraries=$ac_optarg ;;
+ 
+-  -*) { echo "$as_me: error: unrecognized option: $ac_option
++  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
+ Try \`$0 --help' for more information." >&2
+    { (exit 1); exit 1; }; }
+     ;;
+@@ -1333,16 +1404,16 @@
+     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+     # Reject names that are not valid shell variable names.
+     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
++      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+    { (exit 1); exit 1; }; }
+     eval $ac_envvar=\$ac_optarg
+     export $ac_envvar ;;
+ 
+   *)
+     # FIXME: should be removed in autoconf 3.0.
+-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
++    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
++      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+     ;;
+ 
+@@ -1351,22 +1422,38 @@
+ 
+ if test -n "$ac_prev"; then
+   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+-  { echo "$as_me: error: missing argument to $ac_option" >&2
++  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-# Be sure to have absolute directory names.
++if test -n "$ac_unrecognized_opts"; then
++  case $enable_option_checking in
++    no) ;;
++    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
++   { (exit 1); exit 1; }; } ;;
++    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
++  esac
++fi
++
++# Check all directory arguments for consistency.
+ for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+ 		datadir sysconfdir sharedstatedir localstatedir includedir \
+ 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+ 		libdir localedir mandir
+ do
+   eval ac_val=\$$ac_var
++  # Remove trailing slashes.
++  case $ac_val in
++    */ )
++      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
++      eval $ac_var=\$ac_val;;
++  esac
++  # Be sure to have absolute directory names.
+   case $ac_val in
+     [\\/$]* | ?:[\\/]* )  continue;;
+     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+   esac
+-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
++  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+    { (exit 1); exit 1; }; }
+ done
+ 
+@@ -1381,7 +1468,7 @@
+ if test "x$host_alias" != x; then
+   if test "x$build_alias" = x; then
+     cross_compiling=maybe
+-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
++    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+     If a cross compiler is detected then cross compile mode will be used." >&2
+   elif test "x$build_alias" != "x$host_alias"; then
+     cross_compiling=yes
+@@ -1397,10 +1484,10 @@
+ ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ ac_ls_di=`ls -di .` &&
+ ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+-  { echo "$as_me: error: Working directory cannot be determined" >&2
++  { $as_echo "$as_me: error: working directory cannot be determined" >&2
+    { (exit 1); exit 1; }; }
+ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+-  { echo "$as_me: error: pwd does not report name of working directory" >&2
++  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
+    { (exit 1); exit 1; }; }
+ 
+ 
+@@ -1408,12 +1495,12 @@
+ if test -z "$srcdir"; then
+   ac_srcdir_defaulted=yes
+   # Try the directory containing this script, then the parent directory.
+-  ac_confdir=`$as_dirname -- "$0" ||
+-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	 X"$0" : 'X\(//\)[^/]' \| \
+-	 X"$0" : 'X\(//\)$' \| \
+-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+-echo X"$0" |
++  ac_confdir=`$as_dirname -- "$as_myself" ||
++$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$as_myself" : 'X\(//\)[^/]' \| \
++	 X"$as_myself" : 'X\(//\)$' \| \
++	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X"$as_myself" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ 	    s//\1/
+ 	    q
+@@ -1440,12 +1527,12 @@
+ fi
+ if test ! -r "$srcdir/$ac_unique_file"; then
+   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
++  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+    { (exit 1); exit 1; }; }
+ fi
+ ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ ac_abs_confdir=`(
+-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
++	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
+    { (exit 1); exit 1; }; }
+ 	pwd)`
+ # When building in place, set srcdir=.
+@@ -1494,9 +1581,9 @@
+ 
+ Installation directories:
+   --prefix=PREFIX         install architecture-independent files in PREFIX
+-			  [$ac_default_prefix]
++                          [$ac_default_prefix]
+   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+-			  [PREFIX]
++                          [PREFIX]
+ 
+ By default, \`make install' will install all the files in
+ \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+@@ -1506,25 +1593,25 @@
+ For better control, use the options below.
+ 
+ Fine tuning of the installation directories:
+-  --bindir=DIR           user executables [EPREFIX/bin]
+-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
+-  --libexecdir=DIR       program executables [EPREFIX/libexec]
+-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+-  --libdir=DIR           object code libraries [EPREFIX/lib]
+-  --includedir=DIR       C header files [PREFIX/include]
+-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
+-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
+-  --infodir=DIR          info documentation [DATAROOTDIR/info]
+-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
+-  --mandir=DIR           man documentation [DATAROOTDIR/man]
+-  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
+-  --htmldir=DIR          html documentation [DOCDIR]
+-  --dvidir=DIR           dvi documentation [DOCDIR]
+-  --pdfdir=DIR           pdf documentation [DOCDIR]
+-  --psdir=DIR            ps documentation [DOCDIR]
++  --bindir=DIR            user executables [EPREFIX/bin]
++  --sbindir=DIR           system admin executables [EPREFIX/sbin]
++  --libexecdir=DIR        program executables [EPREFIX/libexec]
++  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
++  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
++  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
++  --libdir=DIR            object code libraries [EPREFIX/lib]
++  --includedir=DIR        C header files [PREFIX/include]
++  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
++  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
++  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
++  --infodir=DIR           info documentation [DATAROOTDIR/info]
++  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
++  --mandir=DIR            man documentation [DATAROOTDIR/man]
++  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
++  --htmldir=DIR           html documentation [DOCDIR]
++  --dvidir=DIR            dvi documentation [DOCDIR]
++  --pdfdir=DIR            pdf documentation [DOCDIR]
++  --psdir=DIR             ps documentation [DOCDIR]
+ _ACEOF
+ 
+   cat <<\_ACEOF
+@@ -1549,10 +1636,12 @@
+   cat <<\_ACEOF
+ 
+ Optional Features:
++  --disable-option-checking  ignore unrecognized --enable/--with options
+   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
    --enable-maintainer-mode  enable make rules and dependencies not useful
  			  (and sometimes confusing) to the casual installer
@@ -14484,7 +8061,7 @@
    --disable-dependency-tracking  speeds up one-time build
    --enable-dependency-tracking   do not reject slow dependency extractors
    --enable-shared[=PKGS]  build shared libraries [default=yes]
-@@ -1570,12 +1558,13 @@
+@@ -1570,12 +1659,13 @@
  Optional Packages:
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
    --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
@@ -14502,7 +8079,7 @@
    --with-x                use the X Window System
    --with-users-admin=program
                            The command line to run a users and groups
-@@ -1597,11 +1586,6 @@
+@@ -1597,11 +1687,6 @@
    CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
                you have headers in a nonstandard directory <include dir>
    CPP         C preprocessor
@@ -14514,13 +8091,613 @@
    PKG_CONFIG  path to pkg-config utility
    APPLET_CFLAGS
                C compiler flags for APPLET, overriding pkg-config
-@@ -2547,6 +2531,20 @@
+@@ -1618,15 +1703,17 @@
+ if test "$ac_init_help" = "recursive"; then
+   # If there are subdirs, report their specific --help.
+   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+-    test -d "$ac_dir" || continue
++    test -d "$ac_dir" ||
++      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
++      continue
+     ac_builddir=.
+ 
+ case "$ac_dir" in
+ .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *)
+-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
++  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+   # A ".." for each directory in $ac_dir_suffix.
+-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
++  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+   case $ac_top_builddir_sub in
+   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+@@ -1662,7 +1749,7 @@
+       echo &&
+       $SHELL "$ac_srcdir/configure" --help=recursive
+     else
+-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
++      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+     fi || ac_status=$?
+     cd "$ac_pwd" || { ac_status=$?; break; }
+   done
+@@ -1672,10 +1759,10 @@
+ if $ac_init_version; then
+   cat <<\_ACEOF
+ configure
+-generated by GNU Autoconf 2.61
++generated by GNU Autoconf 2.63
+ 
+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+@@ -1686,7 +1773,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.61.  Invocation command line was
++generated by GNU Autoconf 2.63.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -1722,7 +1809,7 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  echo "PATH: $as_dir"
++  $as_echo "PATH: $as_dir"
+ done
+ IFS=$as_save_IFS
+ 
+@@ -1757,7 +1844,7 @@
+     | -silent | --silent | --silen | --sile | --sil)
+       continue ;;
+     *\'*)
+-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
++      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+     esac
+     case $ac_pass in
+     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+@@ -1809,11 +1896,12 @@
+     case $ac_val in #(
+     *${as_nl}*)
+       case $ac_var in #(
+-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
++      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+       esac
+       case $ac_var in #(
+       _ | IFS | as_nl) ;; #(
++      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+       *) $as_unset $ac_var ;;
+       esac ;;
+     esac
+@@ -1843,9 +1931,9 @@
+     do
+       eval ac_val=\$$ac_var
+       case $ac_val in
+-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
++      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+       esac
+-      echo "$ac_var='\''$ac_val'\''"
++      $as_echo "$ac_var='\''$ac_val'\''"
+     done | sort
+     echo
+ 
+@@ -1860,9 +1948,9 @@
+       do
+ 	eval ac_val=\$$ac_var
+ 	case $ac_val in
+-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
++	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ 	esac
+-	echo "$ac_var='\''$ac_val'\''"
++	$as_echo "$ac_var='\''$ac_val'\''"
+       done | sort
+       echo
+     fi
+@@ -1878,8 +1966,8 @@
+       echo
+     fi
+     test "$ac_signal" != 0 &&
+-      echo "$as_me: caught signal $ac_signal"
+-    echo "$as_me: exit $exit_status"
++      $as_echo "$as_me: caught signal $ac_signal"
++    $as_echo "$as_me: exit $exit_status"
+   } >&5
+   rm -f core *.core core.conftest.* &&
+     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+@@ -1921,21 +2009,24 @@
+ 
+ 
+ # Let the site file select an alternate cache file if it wants to.
+-# Prefer explicitly selected file to automatically selected ones.
++# Prefer an explicitly selected file to automatically selected ones.
++ac_site_file1=NONE
++ac_site_file2=NONE
+ if test -n "$CONFIG_SITE"; then
+-  set x "$CONFIG_SITE"
++  ac_site_file1=$CONFIG_SITE
+ elif test "x$prefix" != xNONE; then
+-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
++  ac_site_file1=$prefix/share/config.site
++  ac_site_file2=$prefix/etc/config.site
+ else
+-  set x "$ac_default_prefix/share/config.site" \
+-	"$ac_default_prefix/etc/config.site"
++  ac_site_file1=$ac_default_prefix/share/config.site
++  ac_site_file2=$ac_default_prefix/etc/config.site
+ fi
+-shift
+-for ac_site_file
++for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+ do
++  test "x$ac_site_file" = xNONE && continue
+   if test -r "$ac_site_file"; then
+-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+-echo "$as_me: loading site script $ac_site_file" >&6;}
++    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
++$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+     sed 's/^/| /' "$ac_site_file" >&5
+     . "$ac_site_file"
+   fi
+@@ -1945,16 +2036,16 @@
+   # Some versions of bash will fail to source /dev/null (special
+   # files actually), so we avoid doing that.
+   if test -f "$cache_file"; then
+-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
+-echo "$as_me: loading cache $cache_file" >&6;}
++    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
++$as_echo "$as_me: loading cache $cache_file" >&6;}
+     case $cache_file in
+       [\\/]* | ?:[\\/]* ) . "$cache_file";;
+       *)                      . "./$cache_file";;
+     esac
+   fi
+ else
+-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
+-echo "$as_me: creating cache $cache_file" >&6;}
++  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
++$as_echo "$as_me: creating cache $cache_file" >&6;}
+   >$cache_file
+ fi
+ 
+@@ -1968,29 +2059,38 @@
+   eval ac_new_val=\$ac_env_${ac_var}_value
+   case $ac_old_set,$ac_new_set in
+     set,)
+-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
++      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,set)
+-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
++      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
++$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,);;
+     *)
+       if test "x$ac_old_val" != "x$ac_new_val"; then
+-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
+-echo "$as_me:   former value:  $ac_old_val" >&2;}
+-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
+-echo "$as_me:   current value: $ac_new_val" >&2;}
+-	ac_cache_corrupted=:
++	# differences in whitespace do not lead to failure.
++	ac_old_val_w=`echo x $ac_old_val`
++	ac_new_val_w=`echo x $ac_new_val`
++	if test "$ac_old_val_w" != "$ac_new_val_w"; then
++	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
++$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
++	  ac_cache_corrupted=:
++	else
++	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
++$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
++	  eval $ac_var=\$ac_old_val
++	fi
++	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
++$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
++	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
++$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+       fi;;
+   esac
+   # Pass precious variables to config.status.
+   if test "$ac_new_set" = set; then
+     case $ac_new_val in
+-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
++    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+     *) ac_arg=$ac_var=$ac_new_val ;;
+     esac
+     case " $ac_configure_args " in
+@@ -2000,10 +2100,12 @@
+   fi
+ done
+ if $ac_cache_corrupted; then
+-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
++  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
++$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
++  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+@@ -2054,8 +2156,8 @@
+   fi
+ done
+ if test -z "$ac_aux_dir"; then
+-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
++  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
++$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+@@ -2081,11 +2183,12 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # OS/2's system install, which has a completely different semantic
+ # ./install, which can be erroneously created by make from ./install.sh.
+-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
++# Reject install programs that cannot install multiple files.
++{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
++$as_echo_n "checking for a BSD-compatible install... " >&6; }
+ if test -z "$INSTALL"; then
+ if test "${ac_cv_path_install+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+@@ -2114,17 +2217,29 @@
+ 	    # program-specific install script used by HP pwplus--don't use.
+ 	    :
+ 	  else
+-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+-	    break 3
++	    rm -rf conftest.one conftest.two conftest.dir
++	    echo one > conftest.one
++	    echo two > conftest.two
++	    mkdir conftest.dir
++	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
++	      test -s conftest.one && test -s conftest.two &&
++	      test -s conftest.dir/conftest.one &&
++	      test -s conftest.dir/conftest.two
++	    then
++	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
++	      break 3
++	    fi
+ 	  fi
+ 	fi
+       done
+     done
+     ;;
+ esac
++
+ done
+ IFS=$as_save_IFS
+ 
++rm -rf conftest.one conftest.two conftest.dir
+ 
+ fi
+   if test "${ac_cv_path_install+set}" = set; then
+@@ -2137,8 +2252,8 @@
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
+-echo "${ECHO_T}$INSTALL" >&6; }
++{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
++$as_echo "$INSTALL" >&6; }
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+ # It thinks the first close brace ends the variable substitution.
+@@ -2148,8 +2263,8 @@
+ 
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
++$as_echo_n "checking whether build environment is sane... " >&6; }
+ # Just in case
+ sleep 1
+ echo timestamp > conftest.file
+@@ -2172,9 +2287,9 @@
+       # if, for instance, CONFIG_SHELL is bash and it inherits a
+       # broken ls alias from the environment.  This has actually
+       # happened.  Such a system could not be considered "sane".
+-      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
++      { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
+ alias in your environment" >&5
+-echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
++$as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
+ alias in your environment" >&2;}
+    { (exit 1); exit 1; }; }
+    fi
+@@ -2185,26 +2300,23 @@
+    # Ok.
+    :
+ else
+-   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
++   { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+ Check your system clock" >&5
+-echo "$as_me: error: newly created file is older than distributed files!
++$as_echo "$as_me: error: newly created file is older than distributed files!
+ Check your system clock" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+-{ echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
++{ $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
+ test "$program_prefix" != NONE &&
+   program_transform_name="s&^&$program_prefix&;$program_transform_name"
+ # Use a double $ so make ignores it.
+ test "$program_suffix" != NONE &&
+   program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+-# Double any \ or $.  echo might interpret backslashes.
++# Double any \ or $.
+ # By default was `s,x,x', remove it if useless.
+-cat <<\_ACEOF >conftest.sed
+-s/[\\$]/&&/g;s/;s,x,x,$//
+-_ACEOF
+-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+-rm -f conftest.sed
++ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
++program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+ 
+ # expand $ac_aux_dir to an absolute path
+ am_aux_dir=`cd $ac_aux_dir && pwd`
+@@ -2215,15 +2327,15 @@
+   am_missing_run="$MISSING --run "
+ else
+   am_missing_run=
+-  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
++  { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
++$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ fi
+ 
+-{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+-echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
++$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+ if test -z "$MKDIR_P"; then
+   if test "${ac_cv_path_mkdir+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+@@ -2258,8 +2370,8 @@
+     MKDIR_P="$ac_install_sh -d"
+   fi
+ fi
+-{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+-echo "${ECHO_T}$MKDIR_P" >&6; }
++{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
++$as_echo "$MKDIR_P" >&6; }
+ 
+ mkdir_p="$MKDIR_P"
+ case $mkdir_p in
+@@ -2271,10 +2383,10 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_prog_AWK+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$AWK"; then
+   ac_cv_prog_AWK="$AWK" # Let the user override the test.
+@@ -2287,7 +2399,7 @@
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_AWK="$ac_prog"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -2298,22 +2410,23 @@
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+-  { echo "$as_me:$LINENO: result: $AWK" >&5
+-echo "${ECHO_T}$AWK" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
++$as_echo "$AWK" >&6; }
+ else
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
+ 
+   test -n "$AWK" && break
+ done
+ 
+-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
+-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
++{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
++$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
++set x ${MAKE-make}
++ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+ if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   cat >conftest.make <<\_ACEOF
+ SHELL = /bin/sh
+@@ -2330,12 +2443,12 @@
+ rm -f conftest.make
+ fi
+ if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+-  { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
++  { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
+   SET_MAKE=
+ else
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+ 
+@@ -2354,8 +2467,8 @@
+   am__isrc=' -I$(srcdir)'
+   # test to see if srcdir already configured
+   if test -f $srcdir/config.status; then
+-    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
++    { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
++$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+    { (exit 1); exit 1; }; }
+   fi
+ fi
+@@ -2410,10 +2523,10 @@
+   if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_prog_STRIP+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$STRIP"; then
+   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+@@ -2426,7 +2539,7 @@
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -2437,11 +2550,11 @@
+ fi
+ STRIP=$ac_cv_prog_STRIP
+ if test -n "$STRIP"; then
+-  { echo "$as_me:$LINENO: result: $STRIP" >&5
+-echo "${ECHO_T}$STRIP" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
++$as_echo "$STRIP" >&6; }
+ else
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
+ 
+@@ -2450,10 +2563,10 @@
+   ac_ct_STRIP=$STRIP
+   # Extract the first word of "strip", so it can be a program name with args.
+ set dummy strip; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_STRIP"; then
+   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+@@ -2466,7 +2579,7 @@
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_STRIP="strip"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -2477,11 +2590,11 @@
+ fi
+ ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+ if test -n "$ac_ct_STRIP"; then
+-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++$as_echo "$ac_ct_STRIP" >&6; }
+ else
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
+   if test "x$ac_ct_STRIP" = x; then
+@@ -2489,12 +2602,8 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet.  If you think this
+-configuration is useful to you, please write to autoconf@gnu.org." >&5
+-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet.  If you think this
+-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+     STRIP=$ac_ct_STRIP
+@@ -2519,8 +2628,8 @@
+ 
+ 
+ 
+-{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+-echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
++$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+     # Check whether --enable-maintainer-mode was given.
+ if test "${enable_maintainer_mode+set}" = set; then
+   enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+@@ -2528,8 +2637,8 @@
+   USE_MAINTAINER_MODE=no
+ fi
+ 
+-  { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+-echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
++$as_echo "$USE_MAINTAINER_MODE" >&6; }
+    if test $USE_MAINTAINER_MODE = yes; then
+   MAINTAINER_MODE_TRUE=
+   MAINTAINER_MODE_FALSE='#'
+@@ -2547,6 +2656,20 @@
  # Standard Junk
  ##############################
  
 +
-+  { echo "$as_me:$LINENO: checking whether NLS is requested" >&5
-+echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; }
++  { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
++$as_echo_n "checking whether NLS is requested... " >&6; }
 +    # Check whether --enable-nls was given.
 +if test "${enable_nls+set}" = set; then
 +  enableval=$enable_nls; USE_NLS=$enableval
@@ -14528,23 +8705,871 @@
 +  USE_NLS=yes
 +fi
 +
-+  { echo "$as_me:$LINENO: result: $USE_NLS" >&5
-+echo "${ECHO_T}$USE_NLS" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
++$as_echo "$USE_NLS" >&6; }
 +
 +
  DEPDIR="${am__leading_dot}deps"
  
  ac_config_commands="$ac_config_commands depfiles"
-@@ -3638,6 +3636,7 @@
+@@ -2559,8 +2682,8 @@
+ .PHONY: am__doit
+ END
+ # If we don't find an include directive, just comment out the code.
+-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
++$as_echo_n "checking for style of include used by $am_make... " >&6; }
+ am__include="#"
+ am__quote=
+ _am_result=none
+@@ -2587,8 +2710,8 @@
+ fi
+ 
+ 
+-{ echo "$as_me:$LINENO: result: $_am_result" >&5
+-echo "${ECHO_T}$_am_result" >&6; }
++{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
++$as_echo "$_am_result" >&6; }
+ rm -f confinc confmf
+ 
+ # Check whether --enable-dependency-tracking was given.
+@@ -2617,10 +2740,10 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -2633,7 +2756,7 @@
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="${ac_tool_prefix}gcc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -2644,11 +2767,11 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  { echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $CC" >&5
++$as_echo "$CC" >&6; }
+ else
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
+ 
+@@ -2657,10 +2780,10 @@
+   ac_ct_CC=$CC
+   # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+@@ -2673,7 +2796,7 @@
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CC="gcc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -2684,11 +2807,11 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++$as_echo "$ac_ct_CC" >&6; }
+ else
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
+   if test "x$ac_ct_CC" = x; then
+@@ -2696,12 +2819,8 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet.  If you think this
+-configuration is useful to you, please write to autoconf@gnu.org." >&5
+-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet.  If you think this
+-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+     CC=$ac_ct_CC
+@@ -2714,10 +2833,10 @@
+           if test -n "$ac_tool_prefix"; then
+     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -2730,7 +2849,7 @@
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="${ac_tool_prefix}cc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -2741,11 +2860,11 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  { echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $CC" >&5
++$as_echo "$CC" >&6; }
+ else
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
+ 
+@@ -2754,10 +2873,10 @@
+ if test -z "$CC"; then
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -2775,7 +2894,7 @@
+        continue
+      fi
+     ac_cv_prog_CC="cc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -2798,11 +2917,11 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  { echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $CC" >&5
++$as_echo "$CC" >&6; }
+ else
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
+ 
+@@ -2813,10 +2932,10 @@
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -2829,7 +2948,7 @@
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -2840,11 +2959,11 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  { echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $CC" >&5
++$as_echo "$CC" >&6; }
+ else
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
+ 
+@@ -2857,10 +2976,10 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+@@ -2873,7 +2992,7 @@
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CC="$ac_prog"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -2884,11 +3003,11 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++$as_echo "$ac_ct_CC" >&6; }
+ else
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
+ 
+@@ -2900,12 +3019,8 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet.  If you think this
+-configuration is useful to you, please write to autoconf@gnu.org." >&5
+-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet.  If you think this
+-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+     CC=$ac_ct_CC
+@@ -2915,44 +3030,50 @@
+ fi
+ 
+ 
+-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
++test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: no acceptable C compiler found in \$PATH
++$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
+ 
+ # Provide some information about the compiler.
+-echo "$as_me:$LINENO: checking for C compiler version" >&5
+-ac_compiler=`set X $ac_compile; echo $2`
++$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
++set X $ac_compile
++ac_compiler=$2
+ { (ac_try="$ac_compiler --version >&5"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_compiler --version >&5") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ { (ac_try="$ac_compiler -v >&5"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_compiler -v >&5") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ { (ac_try="$ac_compiler -V >&5"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_compiler -V >&5") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -2971,27 +3092,22 @@
+ }
+ _ACEOF
+ ac_clean_files_save=$ac_clean_files
+-ac_clean_files="$ac_clean_files a.out a.exe b.out"
++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+ # Try to create an executable without -o first, disregard a.out.
+ # It will help us diagnose broken compilers, and finding out an intuition
+ # of exeext.
+-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
+-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+-#
+-# List of possible output files, starting from the most likely.
+-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
+-# only as a last resort.  b.out is created by i960 compilers.
+-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
+-#
+-# The IRIX 6 linker writes into existing files which may not be
+-# executable, retaining their permissions.  Remove them first so a
+-# subsequent execution test works.
++{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
++$as_echo_n "checking for C compiler default output file name... " >&6; }
++ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
++
++# The possible output files:
++ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
++
+ ac_rmfiles=
+ for ac_file in $ac_files
+ do
+   case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+   esac
+ done
+@@ -3002,10 +3118,11 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_link_default") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+ # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+@@ -3016,7 +3133,7 @@
+ do
+   test -f "$ac_file" || continue
+   case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+ 	;;
+     [ab].out )
+ 	# We found the default executable, but exeext='' is most
+@@ -3043,25 +3160,27 @@
+   ac_file=''
+ fi
+ 
+-{ echo "$as_me:$LINENO: result: $ac_file" >&5
+-echo "${ECHO_T}$ac_file" >&6; }
++{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
++$as_echo "$ac_file" >&6; }
+ if test -z "$ac_file"; then
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
++{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: C compiler cannot create executables
++$as_echo "$as_me: error: C compiler cannot create executables
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }
++   { (exit 77); exit 77; }; }; }
+ fi
+ 
+ ac_exeext=$ac_cv_exeext
+ 
+ # Check that the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
++$as_echo_n "checking whether the C compiler works... " >&6; }
+ # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+ # If not cross compiling, check that we can run a simple program.
+ if test "$cross_compiling" != yes; then
+@@ -3070,49 +3189,53 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+     cross_compiling=no
+   else
+     if test "$cross_compiling" = maybe; then
+ 	cross_compiling=yes
+     else
+-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
++	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'.
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run C compiled programs.
++$as_echo "$as_me: error: cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'.
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
+     fi
+   fi
+ fi
+-{ echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
++{ $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
+ 
+-rm -f a.out a.exe conftest$ac_cv_exeext b.out
++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ ac_clean_files=$ac_clean_files_save
+ # Check that the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
+-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
+-echo "${ECHO_T}$cross_compiling" >&6; }
++{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
++$as_echo_n "checking whether we are cross compiling... " >&6; }
++{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
++$as_echo "$cross_compiling" >&6; }
+ 
+-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
+-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
++$as_echo_n "checking for suffix of executables... " >&6; }
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   # If both `conftest.exe' and `conftest' are `present' (well, observable)
+ # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+@@ -3121,31 +3244,33 @@
+ for ac_file in conftest.exe conftest conftest.*; do
+   test -f "$ac_file" || continue
+   case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ 	  break;;
+     * ) break;;
+   esac
+ done
+ else
+-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
++  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
++$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
+ fi
+ 
+ rm -f conftest$ac_cv_exeext
+-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+-echo "${ECHO_T}$ac_cv_exeext" >&6; }
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
++$as_echo "$ac_cv_exeext" >&6; }
+ 
+ rm -f conftest.$ac_ext
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
+-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
+-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
++$as_echo_n "checking for suffix of object files... " >&6; }
+ if test "${ac_cv_objext+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -3168,40 +3293,43 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_compile") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   for ac_file in conftest.o conftest.obj conftest.*; do
+   test -f "$ac_file" || continue;
+   case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+        break;;
+   esac
+ done
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
++{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute suffix of object files: cannot compile
++$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
+ fi
+ 
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+-echo "${ECHO_T}$ac_cv_objext" >&6; }
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
++$as_echo "$ac_cv_objext" >&6; }
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
++$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+ if test "${ac_cv_c_compiler_gnu+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -3227,20 +3355,21 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_compiler_gnu=yes
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_compiler_gnu=no
+@@ -3250,15 +3379,19 @@
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
+-GCC=`test $ac_compiler_gnu = yes && echo yes`
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
++$as_echo "$ac_cv_c_compiler_gnu" >&6; }
++if test $ac_compiler_gnu = yes; then
++  GCC=yes
++else
++  GCC=
++fi
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
++$as_echo_n "checking whether $CC accepts -g... " >&6; }
+ if test "${ac_cv_prog_cc_g+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   ac_save_c_werror_flag=$ac_c_werror_flag
+    ac_c_werror_flag=yes
+@@ -3285,20 +3418,21 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_prog_cc_g=yes
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	CFLAGS=""
+@@ -3323,20 +3457,21 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   :
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_c_werror_flag=$ac_save_c_werror_flag
+@@ -3362,20 +3497,21 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_prog_cc_g=yes
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+@@ -3390,8 +3526,8 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    ac_c_werror_flag=$ac_save_c_werror_flag
+ fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
++$as_echo "$ac_cv_prog_cc_g" >&6; }
+ if test "$ac_test_CFLAGS" = set; then
+   CFLAGS=$ac_save_CFLAGS
+ elif test $ac_cv_prog_cc_g = yes; then
+@@ -3407,10 +3543,10 @@
+     CFLAGS=
+   fi
+ fi
+-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
++$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+ if test "${ac_cv_prog_cc_c89+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   ac_cv_prog_cc_c89=no
+ ac_save_CC=$CC
+@@ -3481,20 +3617,21 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_prog_cc_c89=$ac_arg
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+@@ -3510,15 +3647,15 @@
+ # AC_CACHE_VAL
+ case "x$ac_cv_prog_cc_c89" in
+   x)
+-    { echo "$as_me:$LINENO: result: none needed" >&5
+-echo "${ECHO_T}none needed" >&6; } ;;
++    { $as_echo "$as_me:$LINENO: result: none needed" >&5
++$as_echo "none needed" >&6; } ;;
+   xno)
+-    { echo "$as_me:$LINENO: result: unsupported" >&5
+-echo "${ECHO_T}unsupported" >&6; } ;;
++    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
++$as_echo "unsupported" >&6; } ;;
+   *)
+     CC="$CC $ac_cv_prog_cc_c89"
+-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
++    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
++$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+ esac
+ 
+ 
+@@ -3530,10 +3667,10 @@
+ 
+ depcc="$CC"   am_compiler_list=
+ 
+-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
++$as_echo_n "checking dependency style of $depcc... " >&6; }
+ if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+   # We make a subdir and do the tests there.  Otherwise we can end up
+@@ -3621,8 +3758,8 @@
+ fi
+ 
+ fi
+-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
++{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
++$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+ 
+  if
+@@ -3638,10 +3775,11 @@
  
  
  
 +
  case "$am__api_version" in
      1.01234)
- 	{ { echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
-@@ -3653,8 +3652,8 @@
- echo $ECHO_N "checking for intltool >= 0.35.0... $ECHO_C" >&6; }
+-	{ { echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
+-echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
++	{ { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
++$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
+    { (exit 1); exit 1; }; }
+     ;;
+     *)
+@@ -3649,72 +3787,31 @@
+ esac
+ 
+ if test -n "0.35.0"; then
+-    { echo "$as_me:$LINENO: checking for intltool >= 0.35.0" >&5
+-echo $ECHO_N "checking for intltool >= 0.35.0... $ECHO_C" >&6; }
++    { $as_echo "$as_me:$LINENO: checking for intltool >= 0.35.0" >&5
++$as_echo_n "checking for intltool >= 0.35.0... " >&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`
@@ -14552,151 +9577,401 @@
 +    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; }
-@@ -3664,6 +3663,132 @@
+-    { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
+-echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }
++    { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
++$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
+     test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+-	{ { echo "$as_me:$LINENO: error: Your intltool is too old.  You need intltool 0.35.0 or later." >&5
+-echo "$as_me: error: Your intltool is too old.  You need intltool 0.35.0 or later." >&2;}
++	{ { $as_echo "$as_me:$LINENO: error: Your intltool is too old.  You need intltool 0.35.0 or later." >&5
++$as_echo "$as_me: error: Your intltool is too old.  You need intltool 0.35.0 or later." >&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 $< $@'
+-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
+-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
+-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-# Check the gettext tools to make sure they are GNU
+-# Extract the first word of "xgettext", so it can be a program name with args.
+-set dummy xgettext; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_XGETTEXT+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
 +# 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; }
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
 +if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
++  $as_echo_n "(cached) " >&6
+ else
+-  case $XGETTEXT in
 +  case $INTLTOOL_UPDATE in
-+  [\\/]* | ?:[\\/]*)
+   [\\/]* | ?:[\\/]*)
+-  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
 +  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
+   ;;
+   *)
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -3724,8 +3821,8 @@
+   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_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    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
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -3735,26 +3832,26 @@
+   ;;
+ esac
+ fi
+-XGETTEXT=$ac_cv_path_XGETTEXT
+-if test -n "$XGETTEXT"; then
+-  { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+-echo "${ECHO_T}$XGETTEXT" >&6; }
 +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
-+
-+
++  { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
++$as_echo "$INTLTOOL_UPDATE" >&6; }
+ else
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
+ 
+-# Extract the first word of "msgmerge", so it can be a program name with args.
+-set dummy msgmerge; 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_MSGMERGE+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
 +# 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; }
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
 +if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
++  $as_echo_n "(cached) " >&6
+ else
+-  case $MSGMERGE in
 +  case $INTLTOOL_MERGE in
-+  [\\/]* | ?:[\\/]*)
+   [\\/]* | ?:[\\/]*)
+-  ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
 +  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
+   ;;
+   *)
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -3764,8 +3861,8 @@
+   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_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    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
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -3775,26 +3872,26 @@
+   ;;
+ esac
+ fi
+-MSGMERGE=$ac_cv_path_MSGMERGE
+-if test -n "$MSGMERGE"; then
+-  { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
+-echo "${ECHO_T}$MSGMERGE" >&6; }
 +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
-+
-+
++  { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
++$as_echo "$INTLTOOL_MERGE" >&6; }
+ else
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
+ 
+-# Extract the first word of "msgfmt", so it can be a program name with args.
+-set dummy msgfmt; 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_MSGFMT+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
 +# 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; }
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
 +if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
++  $as_echo_n "(cached) " >&6
+ else
+-  case $MSGFMT in
 +  case $INTLTOOL_EXTRACT in
-+  [\\/]* | ?:[\\/]*)
+   [\\/]* | ?:[\\/]*)
+-  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
 +  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
+   ;;
+   *)
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -3804,8 +3901,8 @@
+   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_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    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
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -3815,44 +3912,244 @@
+   ;;
+ esac
+ fi
+-MSGFMT=$ac_cv_path_MSGFMT
+-if test -n "$MSGFMT"; then
+-  { echo "$as_me:$LINENO: result: $MSGFMT" >&5
+-echo "${ECHO_T}$MSGFMT" >&6; }
 +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
-+
-+
++  { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
++$as_echo "$INTLTOOL_EXTRACT" >&6; }
+ else
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
+ 
+-if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+-    { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
+-echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
+-mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
+-mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
+-if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
+-    { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
+-echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
 +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 $< $@'
-@@ -3825,6 +3950,47 @@
++    { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
++$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
+    { (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_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
++     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
++      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++# Check the gettext tools to make sure they are GNU
++# Extract the first word of "xgettext", so it can be a program name with args.
++set dummy xgettext; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_XGETTEXT+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  case $XGETTEXT in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_XGETTEXT="$XGETTEXT" # 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_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
++
++  ;;
++esac
++fi
++XGETTEXT=$ac_cv_path_XGETTEXT
++if test -n "$XGETTEXT"; then
++  { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
++$as_echo "$XGETTEXT" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++# Extract the first word of "msgmerge", so it can be a program name with args.
++set dummy msgmerge; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_MSGMERGE+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  case $MSGMERGE in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_MSGMERGE="$MSGMERGE" # 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_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
++
++  ;;
++esac
++fi
++MSGMERGE=$ac_cv_path_MSGMERGE
++if test -n "$MSGMERGE"; then
++  { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
++$as_echo "$MSGMERGE" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++# Extract the first word of "msgfmt", so it can be a program name with args.
++set dummy msgfmt; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_MSGFMT+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  case $MSGFMT in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_MSGFMT="$MSGFMT" # 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_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
++
++  ;;
++esac
++fi
++MSGFMT=$ac_cv_path_MSGFMT
++if test -n "$MSGFMT"; then
++  { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
++$as_echo "$MSGFMT" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
 +# Extract the first word of "gmsgfmt", so it can be a program name with args.
 +set dummy gmsgfmt; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
 +if test "${ac_cv_path_GMSGFMT+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
 +else
 +  case $GMSGFMT in
 +  [\\/]* | ?:[\\/]*)
@@ -14711,46 +9986,207 @@
 +  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_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_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_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-+  ;;
-+esac
-+fi
-+GMSGFMT=$ac_cv_path_GMSGFMT
-+if test -n "$GMSGFMT"; then
-+  { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-+echo "${ECHO_T}$GMSGFMT" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
- if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-     { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
- echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
-@@ -3839,14 +4005,6 @@
-    { (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'
--
++  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
++  ;;
++esac
++fi
++GMSGFMT=$ac_cv_path_GMSGFMT
++if test -n "$GMSGFMT"; then
++  { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
++$as_echo "$GMSGFMT" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
+ 
 -INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
--
--
+ 
++if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
++    { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
++$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
++mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
++mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
++if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
++    { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
++$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
++   { (exit 1); exit 1; }; }
++fi
+ 
  # 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
-@@ -4059,10 +4217,6 @@
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   case $INTLTOOL_PERL in
+   [\\/]* | ?:[\\/]*)
+@@ -3867,7 +4164,7 @@
+   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_PERL="$as_dir/$ac_word$ac_exec_ext"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -3879,33 +4176,33 @@
+ fi
+ INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
+ if test -n "$INTLTOOL_PERL"; then
+-  { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
+-echo "${ECHO_T}$INTLTOOL_PERL" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
++$as_echo "$INTLTOOL_PERL" >&6; }
+ else
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
+ 
+ if test -z "$INTLTOOL_PERL"; then
+-   { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
+-echo "$as_me: error: perl not found; required for intltool" >&2;}
++   { { $as_echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
++$as_echo "$as_me: error: perl not found; required for intltool" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
+-   { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
+-echo "$as_me: error: perl 5.x required for intltool" >&2;}
++   { { $as_echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
++$as_echo "$as_me: error: perl 5.x required for intltool" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ if test "x" != "xno-xml"; then
+-   { echo "$as_me:$LINENO: checking for XML::Parser" >&5
+-echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; }
++   { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
++$as_echo_n "checking for XML::Parser... " >&6; }
+    if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+-       { echo "$as_me:$LINENO: result: ok" >&5
+-echo "${ECHO_T}ok" >&6; }
++       { $as_echo "$as_me:$LINENO: result: ok" >&5
++$as_echo "ok" >&6; }
+    else
+-       { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
+-echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
++       { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
++$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
+    { (exit 1); exit 1; }; }
+    fi
+ fi
+@@ -3938,29 +4235,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
+   DATADIRNAME=share
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	case $host in
+     *-*-solaris*)
+-                        { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+-echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
++                        { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
++$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
+ if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -4013,32 +4313,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
+   ac_cv_func_bind_textdomain_codeset=yes
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_bind_textdomain_codeset=no
+ fi
+ 
++rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+-echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
+-if test $ac_cv_func_bind_textdomain_codeset = yes; then
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
++$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
+   DATADIRNAME=share
+ else
+   DATADIRNAME=lib
+@@ -4051,6 +4355,7 @@
+     esac
+ fi
+ 
++rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+@@ -4059,14 +4364,10 @@
  
  
  
@@ -14758,10 +10194,1047 @@
 -
 -
 -
- { echo "$as_me:$LINENO: checking for library containing strerror" >&5
- echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; }
+-{ echo "$as_me:$LINENO: checking for library containing strerror" >&5
+-echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5
++$as_echo_n "checking for library containing strerror... " >&6; }
  if test "${ac_cv_search_strerror+set}" = set; then
-@@ -5497,78 +5651,31 @@
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -4104,26 +4405,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
+   ac_cv_search_strerror=$ac_res
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+ fi
+ 
++rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext
+   if test "${ac_cv_search_strerror+set}" = set; then
+@@ -4138,8 +4443,8 @@
+ rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
+-echo "${ECHO_T}$ac_cv_search_strerror" >&6; }
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
++$as_echo "$ac_cv_search_strerror" >&6; }
+ ac_res=$ac_cv_search_strerror
+ if test "$ac_res" != no; then
+   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+@@ -4154,10 +4459,10 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -4170,7 +4475,7 @@
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="${ac_tool_prefix}gcc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -4181,11 +4486,11 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  { echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $CC" >&5
++$as_echo "$CC" >&6; }
+ else
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
+ 
+@@ -4194,10 +4499,10 @@
+   ac_ct_CC=$CC
+   # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+@@ -4210,7 +4515,7 @@
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CC="gcc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -4221,11 +4526,11 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++$as_echo "$ac_ct_CC" >&6; }
+ else
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
+   if test "x$ac_ct_CC" = x; then
+@@ -4233,12 +4538,8 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet.  If you think this
+-configuration is useful to you, please write to autoconf@gnu.org." >&5
+-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet.  If you think this
+-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+     CC=$ac_ct_CC
+@@ -4251,10 +4552,10 @@
+           if test -n "$ac_tool_prefix"; then
+     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -4267,7 +4568,7 @@
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="${ac_tool_prefix}cc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -4278,11 +4579,11 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  { echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $CC" >&5
++$as_echo "$CC" >&6; }
+ else
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
+ 
+@@ -4291,10 +4592,10 @@
+ if test -z "$CC"; then
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -4312,7 +4613,7 @@
+        continue
+      fi
+     ac_cv_prog_CC="cc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -4335,11 +4636,11 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  { echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $CC" >&5
++$as_echo "$CC" >&6; }
+ else
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
+ 
+@@ -4350,10 +4651,10 @@
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -4366,7 +4667,7 @@
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -4377,11 +4678,11 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  { echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $CC" >&5
++$as_echo "$CC" >&6; }
+ else
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
+ 
+@@ -4394,10 +4695,10 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+@@ -4410,7 +4711,7 @@
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CC="$ac_prog"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -4421,11 +4722,11 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++$as_echo "$ac_ct_CC" >&6; }
+ else
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
+ 
+@@ -4437,12 +4738,8 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet.  If you think this
+-configuration is useful to you, please write to autoconf@gnu.org." >&5
+-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet.  If you think this
+-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+     CC=$ac_ct_CC
+@@ -4452,50 +4749,56 @@
+ fi
+ 
+ 
+-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
++test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: no acceptable C compiler found in \$PATH
++$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
+ 
+ # Provide some information about the compiler.
+-echo "$as_me:$LINENO: checking for C compiler version" >&5
+-ac_compiler=`set X $ac_compile; echo $2`
++$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
++set X $ac_compile
++ac_compiler=$2
+ { (ac_try="$ac_compiler --version >&5"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_compiler --version >&5") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ { (ac_try="$ac_compiler -v >&5"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_compiler -v >&5") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ { (ac_try="$ac_compiler -V >&5"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_compiler -V >&5") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 
+-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
++$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+ if test "${ac_cv_c_compiler_gnu+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -4521,20 +4824,21 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_compiler_gnu=yes
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_compiler_gnu=no
+@@ -4544,15 +4848,19 @@
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
+-GCC=`test $ac_compiler_gnu = yes && echo yes`
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
++$as_echo "$ac_cv_c_compiler_gnu" >&6; }
++if test $ac_compiler_gnu = yes; then
++  GCC=yes
++else
++  GCC=
++fi
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
++$as_echo_n "checking whether $CC accepts -g... " >&6; }
+ if test "${ac_cv_prog_cc_g+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   ac_save_c_werror_flag=$ac_c_werror_flag
+    ac_c_werror_flag=yes
+@@ -4579,20 +4887,21 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_prog_cc_g=yes
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	CFLAGS=""
+@@ -4617,20 +4926,21 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   :
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_c_werror_flag=$ac_save_c_werror_flag
+@@ -4656,20 +4966,21 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_prog_cc_g=yes
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+@@ -4684,8 +4995,8 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    ac_c_werror_flag=$ac_save_c_werror_flag
+ fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
++$as_echo "$ac_cv_prog_cc_g" >&6; }
+ if test "$ac_test_CFLAGS" = set; then
+   CFLAGS=$ac_save_CFLAGS
+ elif test $ac_cv_prog_cc_g = yes; then
+@@ -4701,10 +5012,10 @@
+     CFLAGS=
+   fi
+ fi
+-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
++$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+ if test "${ac_cv_prog_cc_c89+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   ac_cv_prog_cc_c89=no
+ ac_save_CC=$CC
+@@ -4775,20 +5086,21 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_prog_cc_c89=$ac_arg
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+@@ -4804,15 +5116,15 @@
+ # AC_CACHE_VAL
+ case "x$ac_cv_prog_cc_c89" in
+   x)
+-    { echo "$as_me:$LINENO: result: none needed" >&5
+-echo "${ECHO_T}none needed" >&6; } ;;
++    { $as_echo "$as_me:$LINENO: result: none needed" >&5
++$as_echo "none needed" >&6; } ;;
+   xno)
+-    { echo "$as_me:$LINENO: result: unsupported" >&5
+-echo "${ECHO_T}unsupported" >&6; } ;;
++    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
++$as_echo "unsupported" >&6; } ;;
+   *)
+     CC="$CC $ac_cv_prog_cc_c89"
+-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
++    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
++$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+ esac
+ 
+ 
+@@ -4824,10 +5136,10 @@
+ 
+ depcc="$CC"   am_compiler_list=
+ 
+-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
++$as_echo_n "checking dependency style of $depcc... " >&6; }
+ if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+   # We make a subdir and do the tests there.  Otherwise we can end up
+@@ -4915,8 +5227,8 @@
+ fi
+ 
+ fi
+-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
++{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
++$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+ 
+  if
+@@ -4935,15 +5247,15 @@
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
++$as_echo_n "checking how to run the C preprocessor... " >&6; }
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+ fi
+ if test -z "$CPP"; then
+   if test "${ac_cv_prog_CPP+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+       # Double quotes because CPP needs to be expanded
+     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+@@ -4975,20 +5287,21 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   :
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   # Broken: fails on valid input.
+@@ -5012,13 +5325,14 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -5026,7 +5340,7 @@
+   # Broken: success on invalid input.
+ continue
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   # Passes both tests.
+@@ -5051,8 +5365,8 @@
+ else
+   ac_cv_prog_CPP=$CPP
+ fi
+-{ echo "$as_me:$LINENO: result: $CPP" >&5
+-echo "${ECHO_T}$CPP" >&6; }
++{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
++$as_echo "$CPP" >&6; }
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+ do
+@@ -5080,20 +5394,21 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   :
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   # Broken: fails on valid input.
+@@ -5117,13 +5432,14 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -5131,7 +5447,7 @@
+   # Broken: success on invalid input.
+ continue
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   # Passes both tests.
+@@ -5147,11 +5463,13 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
++  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
++$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
+ fi
+ 
+ ac_ext=c
+@@ -5161,42 +5479,37 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
+-if test "${ac_cv_path_GREP+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  # Extract the first word of "grep ggrep" to use in msg output
+-if test -z "$GREP"; then
+-set dummy grep ggrep; ac_prog_name=$2
++{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
++$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+ if test "${ac_cv_path_GREP+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
++  if test -z "$GREP"; then
+   ac_path_GREP_found=false
+-# Loop through the user's path and test for each of PROGNAME-LIST
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++  # Loop through the user's path and test for each of PROGNAME-LIST
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_prog in grep ggrep; do
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+-    # Check for GNU ac_path_GREP and select it if it is found.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
++      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
++# Check for GNU ac_path_GREP and select it if it is found.
+   # Check for GNU $ac_path_GREP
+ case `"$ac_path_GREP" --version 2>&1` in
+ *GNU*)
+   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+ *)
+   ac_count=0
+-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
++  $as_echo_n 0123456789 >"conftest.in"
+   while :
+   do
+     cat "conftest.in" "conftest.in" >"conftest.tmp"
+     mv "conftest.tmp" "conftest.in"
+     cp "conftest.in" "conftest.nl"
+-    echo 'GREP' >> "conftest.nl"
++    $as_echo 'GREP' >> "conftest.nl"
+     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+     ac_count=`expr $ac_count + 1`
+@@ -5211,74 +5524,60 @@
+   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+ esac
+ 
+-
+-    $ac_path_GREP_found && break 3
++      $ac_path_GREP_found && break 3
++    done
+   done
+ done
+-
+-done
+ IFS=$as_save_IFS
+-
+-
+-fi
+-
+-GREP="$ac_cv_path_GREP"
+-if test -z "$GREP"; then
+-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
++  if test -z "$ac_cv_path_GREP"; then
++    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
++$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+    { (exit 1); exit 1; }; }
+-fi
+-
++  fi
+ else
+   ac_cv_path_GREP=$GREP
+ fi
+ 
+-
+ fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
++$as_echo "$ac_cv_path_GREP" >&6; }
+  GREP="$ac_cv_path_GREP"
+ 
+ 
+-{ echo "$as_me:$LINENO: checking for egrep" >&5
+-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
++$as_echo_n "checking for egrep... " >&6; }
+ if test "${ac_cv_path_EGREP+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+    then ac_cv_path_EGREP="$GREP -E"
+    else
+-     # Extract the first word of "egrep" to use in msg output
+-if test -z "$EGREP"; then
+-set dummy egrep; ac_prog_name=$2
+-if test "${ac_cv_path_EGREP+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
++     if test -z "$EGREP"; then
+   ac_path_EGREP_found=false
+-# Loop through the user's path and test for each of PROGNAME-LIST
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++  # Loop through the user's path and test for each of PROGNAME-LIST
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_prog in egrep; do
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+-    # Check for GNU ac_path_EGREP and select it if it is found.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
++      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
++# Check for GNU ac_path_EGREP and select it if it is found.
+   # Check for GNU $ac_path_EGREP
+ case `"$ac_path_EGREP" --version 2>&1` in
+ *GNU*)
+   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+ *)
+   ac_count=0
+-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
++  $as_echo_n 0123456789 >"conftest.in"
+   while :
+   do
+     cat "conftest.in" "conftest.in" >"conftest.tmp"
+     mv "conftest.tmp" "conftest.in"
+     cp "conftest.in" "conftest.nl"
+-    echo 'EGREP' >> "conftest.nl"
++    $as_echo 'EGREP' >> "conftest.nl"
+     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+     ac_count=`expr $ac_count + 1`
+@@ -5293,40 +5592,31 @@
+   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+ esac
+ 
+-
+-    $ac_path_EGREP_found && break 3
++      $ac_path_EGREP_found && break 3
++    done
+   done
+ done
+-
+-done
+ IFS=$as_save_IFS
+-
+-
+-fi
+-
+-EGREP="$ac_cv_path_EGREP"
+-if test -z "$EGREP"; then
+-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
++  if test -z "$ac_cv_path_EGREP"; then
++    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
++$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+    { (exit 1); exit 1; }; }
+-fi
+-
++  fi
+ else
+   ac_cv_path_EGREP=$EGREP
+ fi
+ 
+-
+    fi
+ fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
++$as_echo "$ac_cv_path_EGREP" >&6; }
+  EGREP="$ac_cv_path_EGREP"
+ 
+ 
+-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
++$as_echo_n "checking for ANSI C header files... " >&6; }
+ if test "${ac_cv_header_stdc+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -5353,20 +5643,21 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_header_stdc=yes
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_header_stdc=no
+@@ -5458,37 +5749,40 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: program exited with status $ac_status" >&5
++$as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ ac_cv_header_stdc=no
+ fi
++rm -rf conftest.dSYM
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+ 
+ fi
+ fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
++$as_echo "$ac_cv_header_stdc" >&6; }
+ if test $ac_cv_header_stdc = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -5497,108 +5791,61 @@
  
  fi
  
@@ -14789,8 +11262,8 @@
 -fi
 +case `pwd` in
 +  *\ * | *\	*)
-+    { echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-+echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
++    { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
++$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
 +esac
  
  
@@ -14817,9 +11290,8 @@
 -  enable_static=yes
 -fi
 +
-+macro_version='2.2.4'
-+macro_revision='1.2976'
-+
++macro_version='2.2.6'
++macro_revision='1.3012'
  
  
 -# Check whether --enable-fast-install was given.
@@ -14854,64 +11326,145 @@
 +
 +
 +
++
 +ltmain="$ac_aux_dir/ltmain.sh"
 +
  # Make sure we can run config.sub.
  $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-   { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-@@ -5654,62 +5761,202 @@
- 
- { echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
- echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
+-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
++  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
++$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-{ echo "$as_me:$LINENO: checking build system type" >&5
+-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking build system type" >&5
++$as_echo_n "checking build system type... " >&6; }
+ if test "${ac_cv_build+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   ac_build_alias=$build_alias
+ test "x$ac_build_alias" = x &&
+   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+ test "x$ac_build_alias" = x &&
+-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
++  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
++$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+    { (exit 1); exit 1; }; }
+ ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
++  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
++$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+-echo "${ECHO_T}$ac_cv_build" >&6; }
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
++$as_echo "$ac_cv_build" >&6; }
+ case $ac_cv_build in
+ *-*-*) ;;
+-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+-echo "$as_me: error: invalid value of canonical build" >&2;}
++*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
++$as_echo "$as_me: error: invalid value of canonical build" >&2;}
+    { (exit 1); exit 1; }; };;
+ esac
+ build=$ac_cv_build
+@@ -5615,27 +5862,27 @@
+ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+ 
+ 
+-{ echo "$as_me:$LINENO: checking host system type" >&5
+-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking host system type" >&5
++$as_echo_n "checking host system type... " >&6; }
+ if test "${ac_cv_host+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if test "x$host_alias" = x; then
+   ac_cv_host=$ac_cv_build
+ else
+   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
++    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
++$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+-echo "${ECHO_T}$ac_cv_host" >&6; }
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
++$as_echo "$ac_cv_host" >&6; }
+ case $ac_cv_host in
+ *-*-*) ;;
+-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+-echo "$as_me: error: invalid value of canonical host" >&2;}
++*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
++$as_echo "$as_me: error: invalid value of canonical host" >&2;}
+    { (exit 1); exit 1; }; };;
+ esac
+ host=$ac_cv_host
+@@ -5652,64 +5899,177 @@
+ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+ 
+ 
+-{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
 -if test "${lt_cv_path_SED+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  # 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
++{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
++$as_echo_n "checking for a sed that does not truncate output... " >&6; }
 +if test "${ac_cv_path_SED+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
 +else
 +            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
 +     for ac_i in 1 2 3 4 5 6 7; do
 +       ac_script="$ac_script$as_nl$ac_script"
 +     done
-+     echo "$ac_script" | sed 99q >conftest.sed
++     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
 +     $as_unset ac_script || ac_script=
-+     # Extract the first word of "sed gsed" to use in msg output
-+if test -z "$SED"; then
-+set dummy sed gsed; ac_prog_name=$2
-+if test "${ac_cv_path_SED+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  # 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.
++     if test -z "$SED"; then
 +  ac_path_SED_found=false
-+# Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++  # Loop through the user's path and test for each of PROGNAME-LIST
++  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
++  for ac_prog in sed gsed; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
 -      if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
 -        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
 -      fi
--    done
-+  for ac_prog in sed gsed; do
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+    ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-+    { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-+    # Check for GNU ac_path_SED and select it if it is found.
++      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
++      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
++# Check for GNU ac_path_SED and select it if it is found.
 +  # Check for GNU $ac_path_SED
 +case `"$ac_path_SED" --version 2>&1` in
 +*GNU*)
 +  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
 +*)
 +  ac_count=0
-+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
++  $as_echo_n 0123456789 >"conftest.in"
 +  while :
 +  do
 +    cat "conftest.in" "conftest.in" >"conftest.tmp"
 +    mv "conftest.tmp" "conftest.in"
 +    cp "conftest.in" "conftest.nl"
-+    echo '' >> "conftest.nl"
++    $as_echo '' >> "conftest.nl"
 +    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
 +    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
 +    ac_count=`expr $ac_count + 1`
@@ -14926,12 +11479,10 @@
 +  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 +esac
 +
-+
-+    $ac_path_SED_found && break 3
++      $ac_path_SED_found && break 3
+     done
    done
  done
-+
-+done
  IFS=$as_save_IFS
 -lt_ac_max=0
 -lt_ac_count=0
@@ -14946,7 +11497,11 @@
 -  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
 -    lt_cv_path_SED=$lt_ac_sed
 -    break
--  fi
++  if test -z "$ac_cv_path_SED"; then
++    { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
++$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
++   { (exit 1); exit 1; }; }
+   fi
 -  while true; do
 -    cat conftest.in conftest.in >conftest.tmp
 -    mv conftest.tmp conftest.in
@@ -14960,24 +11515,13 @@
 -    if test $lt_ac_count -gt $lt_ac_max; then
 -      lt_ac_max=$lt_ac_count
 -      lt_cv_path_SED=$lt_ac_sed
-+
-+
-+fi
-+
-+SED="$ac_cv_path_SED"
-+if test -z "$SED"; then
-+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in \$PATH" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in \$PATH" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
 +else
 +  ac_cv_path_SED=$SED
 +fi
 +
 +fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
-+echo "${ECHO_T}$ac_cv_path_SED" >&6; }
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
++$as_echo "$ac_cv_path_SED" >&6; }
 + SED="$ac_cv_path_SED"
 +  rm -f conftest.sed
 +
@@ -14994,45 +11538,40 @@
 +
 +
 +
-+{ echo "$as_me:$LINENO: checking for fgrep" >&5
-+echo $ECHO_N "checking for fgrep... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5
++$as_echo_n "checking for fgrep... " >&6; }
 +if test "${ac_cv_path_FGREP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
 +else
 +  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
 +   then ac_cv_path_FGREP="$GREP -F"
 +   else
-+     # Extract the first word of "fgrep" to use in msg output
-+if test -z "$FGREP"; then
-+set dummy fgrep; ac_prog_name=$2
-+if test "${ac_cv_path_FGREP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
++     if test -z "$FGREP"; then
 +  ac_path_FGREP_found=false
-+# Loop through the user's path and test for each of PROGNAME-LIST
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++  # Loop through the user's path and test for each of PROGNAME-LIST
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_prog in fgrep; do
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+    ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-+    { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-+    # Check for GNU ac_path_FGREP and select it if it is found.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
++      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
++# Check for GNU ac_path_FGREP and select it if it is found.
 +  # Check for GNU $ac_path_FGREP
 +case `"$ac_path_FGREP" --version 2>&1` in
 +*GNU*)
 +  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
 +*)
 +  ac_count=0
-+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
++  $as_echo_n 0123456789 >"conftest.in"
 +  while :
 +  do
 +    cat "conftest.in" "conftest.in" >"conftest.tmp"
 +    mv "conftest.tmp" "conftest.in"
 +    cp "conftest.in" "conftest.nl"
-+    echo 'FGREP' >> "conftest.nl"
++    $as_echo 'FGREP' >> "conftest.nl"
 +    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
 +    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
 +    ac_count=`expr $ac_count + 1`
@@ -15047,33 +11586,24 @@
 +  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 +esac
 +
-+
-+    $ac_path_FGREP_found && break 3
++      $ac_path_FGREP_found && break 3
++    done
    done
  done
- 
-+done
 +IFS=$as_save_IFS
-+
-+
-+fi
-+
-+FGREP="$ac_cv_path_FGREP"
-+if test -z "$FGREP"; then
-+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
++  if test -z "$ac_cv_path_FGREP"; then
++    { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
++$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
 +   { (exit 1); exit 1; }; }
-+fi
-+
++  fi
 +else
 +  ac_cv_path_FGREP=$FGREP
 +fi
-+
-+
+ 
 +   fi
  fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
-+echo "${ECHO_T}$ac_cv_path_FGREP" >&6; }
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
++$as_echo "$ac_cv_path_FGREP" >&6; }
 + FGREP="$ac_cv_path_FGREP"
 +
 +
@@ -15101,7 +11631,18 @@
  
  
  # Check whether --with-gnu-ld was given.
-@@ -5736,9 +5983,9 @@
+@@ -5722,8 +6082,8 @@
+ ac_prog=ld
+ if test "$GCC" = yes; then
+   # Check if gcc -print-prog-name=ld gives a path.
+-  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
++  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
++$as_echo_n "checking for ld used by $CC... " >&6; }
+   case $host in
+   *-*-mingw*)
+     # gcc leaves a trailing carriage return which upsets mingw
+@@ -5736,9 +6096,9 @@
      [\\/]* | ?:[\\/]*)
        re_direlt='/[^/][^/]*/\.\./'
        # Canonicalize the pathname of ld
@@ -15114,7 +11655,63 @@
        done
        test -z "$LD" && LD="$ac_prog"
        ;;
-@@ -5818,33 +6065,15 @@
+@@ -5752,14 +6112,14 @@
+     ;;
+   esac
+ elif test "$with_gnu_ld" = yes; then
+-  { echo "$as_me:$LINENO: checking for GNU ld" >&5
+-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
++  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
++$as_echo_n "checking for GNU ld... " >&6; }
+ else
+-  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
++  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
++$as_echo_n "checking for non-GNU ld... " >&6; }
+ fi
+ if test "${lt_cv_path_LD+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if test -z "$LD"; then
+   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+@@ -5789,19 +6149,19 @@
+ 
+ LD="$lt_cv_path_LD"
+ if test -n "$LD"; then
+-  { echo "$as_me:$LINENO: result: $LD" >&5
+-echo "${ECHO_T}$LD" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $LD" >&5
++$as_echo "$LD" >&6; }
+ else
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
++test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
++$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+    { (exit 1); exit 1; }; }
+-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
++$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+ if test "${lt_cv_prog_gnu_ld+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   # I'd rather use --version here, but apparently some GNU lds only accept -v.
+ case `$LD -v 2>&1 </dev/null` in
+@@ -5813,40 +6173,22 @@
+   ;;
+ esac
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
++{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
++$as_echo "$lt_cv_prog_gnu_ld" >&6; }
  with_gnu_ld=$lt_cv_prog_gnu_ld
  
  
@@ -15151,12 +11748,15 @@
 +
 +
 +
-+{ echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
-+echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
++$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
  if test "${lt_cv_path_NM+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
  else
-@@ -5889,51 +6118,419 @@
+   if test -n "$NM"; then
+   # Let the user override the test.
+@@ -5889,450 +6231,378 @@
      done
      IFS="$lt_save_ifs"
    done
@@ -15164,9 +11764,11 @@
 +  : ${lt_cv_path_NM=no}
  fi
  fi
- { echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
- echo "${ECHO_T}$lt_cv_path_NM" >&6; }
+-{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+-echo "${ECHO_T}$lt_cv_path_NM" >&6; }
 -NM="$lt_cv_path_NM"
++{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
++$as_echo "$lt_cv_path_NM" >&6; }
 +if test "$lt_cv_path_NM" != "no"; then
 +  NM="$lt_cv_path_NM"
 +else
@@ -15176,10 +11778,10 @@
 +  do
 +    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
 +if test "${ac_cv_prog_DUMPBIN+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$DUMPBIN"; then
 +  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
@@ -15192,7 +11794,7 @@
 +  for ac_exec_ext in '' $ac_executable_extensions; do
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
@@ -15209,19 +11811,38 @@
 +fi
 +DUMPBIN=$ac_cv_prog_DUMPBIN
 +if test -n "$DUMPBIN"; then
-+  { echo "$as_me:$LINENO: result: $DUMPBIN" >&5
-+echo "${ECHO_T}$DUMPBIN" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
++$as_echo "$DUMPBIN" >&6; }
  else
 -  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
 -echo "${ECHO_T}no, using $LN_S" >&6; }
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
  fi
  
 -{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
 -echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
 -if test "${lt_cv_deplibs_check_method+set}" = set; then
-+
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  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
+-  ;;
 +    test -n "$DUMPBIN" && break
 +  done
 +fi
@@ -15231,29 +11852,11 @@
 +do
 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 +set dummy $ac_prog; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
 +if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  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
--  ;;
++  $as_echo_n "(cached) " >&6
++else
 +  if test -n "$ac_ct_DUMPBIN"; then
 +  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
 +else
@@ -15265,100 +11868,194 @@
 +  for ac_exec_ext in '' $ac_executable_extensions; do
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +done
 +IFS=$as_save_IFS
-+
+ 
+-beos*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
 +fi
 +fi
 +ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
 +if test -n "$ac_ct_DUMPBIN"; then
-+  { echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
-+echo "${ECHO_T}$ac_ct_DUMPBIN" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
++$as_echo "$ac_ct_DUMPBIN" >&6; }
 +else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
 +fi
-+
-+
+ 
+-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'
+-  ;;
 +  test -n "$ac_ct_DUMPBIN" && break
 +done
-+
+ 
+-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'
 +  if test "x$ac_ct_DUMPBIN" = x; then
 +    DUMPBIN=":"
-+  else
+   else
+-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+-    lt_cv_file_magic_cmd='$OBJDUMP -f'
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +ac_tool_warned=yes ;;
 +esac
 +    DUMPBIN=$ac_ct_DUMPBIN
-+  fi
+   fi
+-  ;;
 +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
 +  if test "$DUMPBIN" != ":"; then
 +    NM="$DUMPBIN"
-+  fi
+   fi
+-  ;;
 +fi
 +test -z "$NM" && NM=nm
-+
-+
-+
-+
-+
-+
-+{ echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
-+echo $ECHO_N "checking the name lister ($NM) interface... $ECHO_C" >&6; }
+ 
+-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)$'
++{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
++$as_echo_n "checking the name lister ($NM) interface... " >&6; }
 +if test "${lt_cv_nm_interface+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
 +else
 +  lt_cv_nm_interface="BSD nm"
 +  echo "int some_variable = 0;" > conftest.$ac_ext
-+  (eval echo "\"\$as_me:6253: $ac_compile\"" >&5)
++  (eval echo "\"\$as_me:6362: $ac_compile\"" >&5)
 +  (eval "$ac_compile" 2>conftest.err)
 +  cat conftest.err >&5
-+  (eval echo "\"\$as_me:6256: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++  (eval echo "\"\$as_me:6365: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
 +  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
 +  cat conftest.err >&5
-+  (eval echo "\"\$as_me:6259: output\"" >&5)
++  (eval echo "\"\$as_me:6368: output\"" >&5)
 +  cat conftest.out >&5
 +  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
 +    lt_cv_nm_interface="MS dumpbin"
-+  fi
+   fi
+-  ;;
 +  rm -f conftest*
 +fi
-+{ echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
-+echo "${ECHO_T}$lt_cv_nm_interface" >&6; }
-+
-+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
++$as_echo "$lt_cv_nm_interface" >&6; }
+ 
+-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
+-  ;;
++{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
++$as_echo_n "checking whether ln -s works... " >&6; }
 +LN_S=$as_ln_s
 +if test "$LN_S" = "ln -s"; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
++  { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
 +else
-+  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-+echo "${ECHO_T}no, using $LN_S" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
++$as_echo "no, using $LN_S" >&6; }
 +fi
-+
+ 
+-nto-qnx*)
+-  lt_cv_deplibs_check_method=unknown
+-  ;;
 +# find the maximum length of command line arguments
-+{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-+echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
++$as_echo_n "checking the maximum length of command line arguments... " >&6; }
 +if test "${lt_cv_sys_max_cmd_len+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
 +else
 +    i=0
 +  teststring="ABCD"
-+
+ 
+-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
+-  ;;
 +  case $build_os in
 +  msdosdjgpp*)
 +    # On DJGPP, this test can blow up pretty badly due to problems in libc
@@ -15367,15 +12064,21 @@
 +    # check would be larger than it should be.
 +    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
 +    ;;
-+
+ 
+-osf3* | osf4* | osf5*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
 +  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*)
+ 
+-rdos*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
++  cygwin* | mingw* | cegcc*)
 +    # 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,
@@ -15385,13 +12088,21 @@
 +    # all of the supported platforms: 8192 (on NT/2K/XP).
 +    lt_cv_sys_max_cmd_len=8192;
 +    ;;
-+
+ 
+-solaris*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
 +  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;
 +    ;;
-+
+ 
+-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*`
 +  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
 +    # This has been around since 386BSD, at least.  Likely further.
 +    if test -x /sbin/sysctl; then
@@ -15404,12 +12115,17 @@
 +    # 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`
-+    ;;
+     ;;
+-  ncr)
+-    lt_cv_deplibs_check_method=pass_all
 +
 +  interix*)
 +    # We know the value 262144 and hardcode it with a safety zone (like BSD)
 +    lt_cv_sys_max_cmd_len=196608
-+    ;;
+     ;;
+-  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 )'
 +
 +  osf*)
 +    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
@@ -15423,10 +12139,16 @@
 +        *1*) lt_cv_sys_max_cmd_len=-1 ;;
 +      esac
 +    fi
-+    ;;
+     ;;
+-  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
 +  sco3.2v5*)
 +    lt_cv_sys_max_cmd_len=102400
-+    ;;
+     ;;
+-  siemens)
+-    lt_cv_deplibs_check_method=pass_all
 +  sysv5* | sco5v6* | sysv4.2uw2*)
 +    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
 +    if test -n "$kargmax"; then
@@ -15434,7 +12156,9 @@
 +    else
 +      lt_cv_sys_max_cmd_len=32768
 +    fi
-+    ;;
+     ;;
+-  pc)
+-    lt_cv_deplibs_check_method=pass_all
 +  *)
 +    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
 +    if test -n "$lt_cv_sys_max_cmd_len"; then
@@ -15465,31 +12189,47 @@
 +      # 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
-+
+     ;;
+   esac
+-  ;;
+ 
+-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-esac
 +fi
-+
+ 
 +if test -n $lt_cv_sys_max_cmd_len ; then
-+  { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-+echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
++$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
 +else
-+  { echo "$as_me:$LINENO: result: none" >&5
-+echo "${ECHO_T}none" >&6; }
-+fi
++  { $as_echo "$as_me:$LINENO: result: none" >&5
++$as_echo "none" >&6; }
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
+-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
 +max_cmd_len=$lt_cv_sys_max_cmd_len
-+
-+
-+
-+
-+
-+
+ 
+ 
+ 
+ 
+-# 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
 +: ${CP="cp -f"}
 +: ${MV="mv -f"}
 +: ${RM="rm -f"}
 +
-+{ echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
-+echo $ECHO_N "checking whether the shell understands some XSI constructs... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
++$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
 +# Try some XSI features
 +xsi_shell=no
 +( _lt_dummy="a/b/c"
@@ -15498,195 +12238,28 @@
 +    && eval 'test $(( 1 + 1 )) -eq 2 \
 +    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
 +  && xsi_shell=yes
-+{ echo "$as_me:$LINENO: result: $xsi_shell" >&5
-+echo "${ECHO_T}$xsi_shell" >&6; }
-+
-+
-+{ echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
-+echo $ECHO_N "checking whether the shell understands \"+=\"... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
++$as_echo "$xsi_shell" >&6; }
++
++
++{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
++$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
 +lt_shell_append=no
 +( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
 +    >/dev/null 2>&1 \
 +  && lt_shell_append=yes
-+{ echo "$as_me:$LINENO: result: $lt_shell_append" >&5
-+echo "${ECHO_T}$lt_shell_append" >&6; }
-+
++{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
++$as_echo "$lt_shell_append" >&6; }
+ 
+-# Check whether --enable-libtool-lock was given.
+-if test "${enable_libtool_lock+set}" = set; then
+-  enableval=$enable_libtool_lock;
 +
 +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
 +  lt_unset=unset
 +else
 +  lt_unset=false
-+fi
-+
-+
-+
-+
-+
-+# 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
-+  lt_SP2NL='tr \040 \012'
-+  lt_NL2SP='tr \015\012 \040\040'
-+  ;;
-+ *) # EBCDIC based system
-+  lt_SP2NL='tr \100 \n'
-+  lt_NL2SP='tr \r\n \100\100'
-+  ;;
-+esac
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-+echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
-+if test "${lt_cv_ld_reload_flag+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_cv_ld_reload_flag='-r'
-+fi
-+{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
-+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
-+
-+
-+
-+
-+
-+
-+
-+
- 
--beos*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
-+
-+{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
-+echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
-+if test "${lt_cv_deplibs_check_method+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  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)'
-@@ -5965,7 +6562,7 @@
-   ;;
- 
- freebsd* | dragonfly*)
--  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+  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.
-@@ -6023,7 +6620,7 @@
-   ;;
- 
- netbsd* | netbsdelf*-gnu)
--  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+  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)$'
-@@ -6036,12 +6633,12 @@
-   lt_cv_file_magic_test_file=/usr/lib/libnls.so
-   ;;
- 
--nto-qnx*)
--  lt_cv_deplibs_check_method=unknown
-+*nto* | *qnx*)
-+  lt_cv_deplibs_check_method=pass_all
-   ;;
- 
- openbsd*)
--  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+  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)$'
-@@ -6060,9 +6657,13 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--sysv4 | sysv4.3*)
--  case $host_vendor in
--  motorola)
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+  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*`
-     ;;
-@@ -6087,7 +6688,7 @@
-   esac
-   ;;
- 
--sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+tpf*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- esac
-@@ -6102,237 +6703,114 @@
- 
- 
- 
--# 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
- 
--# Check whether --enable-libtool-lock was given.
--if test "${enable_libtool_lock+set}" = set; then
--  enableval=$enable_libtool_lock;
--fi
+ fi
  
 -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
  
@@ -15711,7 +12284,16 @@
 -    esac
 -  fi
 -  rm -rf conftest*
--  ;;
++
++
++
++# 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
++  lt_SP2NL='tr \040 \012'
++  lt_NL2SP='tr \015\012 \040\040'
+   ;;
 -*-*-irix6*)
 -  # Find out which ABI we are using.
 -  echo '#line 6145 "configure"' > conftest.$ac_ext
@@ -15747,7 +12329,11 @@
 -   fi
 -  fi
 -  rm -rf conftest*
--  ;;
++ *) # EBCDIC based system
++  lt_SP2NL='tr \100 \n'
++  lt_NL2SP='tr \r\n \100\100'
+   ;;
++esac
  
 -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
 -s390*-*linux*|sparc*-*linux*)
@@ -15801,7 +12387,7 @@
 -  fi
 -  rm -rf conftest*
 -  ;;
- 
+-
 -*-*-sco3.2v5*)
 -  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
 -  SAVE_CFLAGS="$CFLAGS"
@@ -15809,32 +12395,25 @@
 -  { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
 -echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
 -if test "${lt_cv_cc_needs_belf+set}" = set; then
-+
-+if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}ar; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_AR+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
 -  ac_ext=c
 -ac_cpp='$CPP $CPPFLAGS'
 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
+ 
 -     cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
+ 
 -int
 -main ()
 -{
--
+ 
 -  ;
 -  return 0;
 -}
@@ -15858,37 +12437,12 @@
 -       } && test -s conftest$ac_exeext &&
 -       $as_test_x conftest$ac_exeext; then
 -  lt_cv_cc_needs_belf=yes
-+  if test -n "$AR"; then
-+  ac_cv_prog_AR="$AR" # Let the user override the test.
- else
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_AR="${ac_tool_prefix}ar"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
  
 -	lt_cv_cc_needs_belf=no
-+fi
-+fi
-+AR=$ac_cv_prog_AR
-+if test -n "$AR"; then
-+  { echo "$as_me:$LINENO: result: $AR" >&5
-+echo "${ECHO_T}$AR" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
+-fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
@@ -15898,7 +12452,7 @@
 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
- fi
+-fi
 -{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
 -echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
 -  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
@@ -15926,75 +12480,44 @@
 -      esac
 -      ;;
 -    esac
-+if test -z "$ac_cv_prog_AR"; then
-+  ac_ct_AR=$AR
-+  # Extract the first word of "ar", so it can be a program name with args.
-+set dummy ar; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$ac_ct_AR"; then
-+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_AR="ar"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-   fi
+-  fi
 -  rm -rf conftest*
 -  ;;
-+done
-+done
-+IFS=$as_save_IFS
- 
-+fi
-+fi
-+ac_ct_AR=$ac_cv_prog_ac_ct_AR
-+if test -n "$ac_ct_AR"; then
-+  { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-+echo "${ECHO_T}$ac_ct_AR" >&6; }
+ 
+ 
++{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
++$as_echo_n "checking for $LD option to reload object files... " >&6; }
++if test "${lt_cv_ld_reload_flag+set}" = set; then
++  $as_echo_n "(cached) " >&6
 +else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
++  lt_cv_ld_reload_flag='-r'
 +fi
- 
-+  if test "x$ac_ct_AR" = x; then
-+    AR="false"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
++{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
++$as_echo "$lt_cv_ld_reload_flag" >&6; }
++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
-+    AR=$ac_ct_AR
-+  fi
-+else
-+  AR="$ac_cv_prog_AR"
-+fi
- 
+-
 -need_locks="$enable_libtool_lock"
-+test -z "$AR" && AR=ar
-+test -z "$AR_FLAGS" && AR_FLAGS=cru
- 
- 
+-
+-
 -# On IRIX 5.3, sys/types and inttypes.h are conflicting.
  
  
  
-@@ -6342,226 +6820,16 @@
+@@ -6342,226 +6612,331 @@
  
  
  
@@ -16006,7 +12529,14 @@
 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
++set dummy ${ac_tool_prefix}objdump; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_OBJDUMP+set}" = set; then
++  $as_echo_n "(cached) " >&6
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -16035,15 +12565,31 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  eval "$as_ac_Header=yes"
--else
++  if test -n "$OBJDUMP"; then
++  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
+ 
 -	eval "$as_ac_Header=no"
--fi
+ fi
 -
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
+ fi
 -ac_res=`eval echo '${'$as_ac_Header'}'`
 -	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 -echo "${ECHO_T}$ac_res" >&6; }
@@ -16052,12 +12598,19 @@
 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 -_ACEOF
 -
--fi
--
++OBJDUMP=$ac_cv_prog_OBJDUMP
++if test -n "$OBJDUMP"; then
++  { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
++$as_echo "$OBJDUMP" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
 -done
 -
 -
--
+ 
 -for ac_header in dlfcn.h
 -do
 -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -16066,11 +12619,19 @@
 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--fi
+ fi
 -ac_res=`eval echo '${'$as_ac_Header'}'`
 -	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 -echo "${ECHO_T}$ac_res" >&6; }
--else
++if test -z "$ac_cv_prog_OBJDUMP"; then
++  ac_ct_OBJDUMP=$OBJDUMP
++  # Extract the first word of "objdump", so it can be a program name with args.
++set dummy objdump; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
++  $as_echo_n "(cached) " >&6
+ else
 -  # Is the header compilable?
 -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
@@ -16101,13 +12662,38 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_header_compiler=yes
--else
++  if test -n "$ac_ct_OBJDUMP"; then
++  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_OBJDUMP="objdump"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
+ 
 -	ac_header_compiler=no
--fi
--
++fi
++fi
++ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
++if test -n "$ac_ct_OBJDUMP"; then
++  { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
++$as_echo "$ac_ct_OBJDUMP" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -16127,7 +12713,15 @@
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
--esac
++  if test "x$ac_ct_OBJDUMP" = x; then
++    OBJDUMP="false"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
+ esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
 -  ac_status=$?
@@ -16140,17 +12734,21 @@
 -	 test ! -s conftest.err
 -       }; then
 -  ac_header_preproc=yes
--else
++    OBJDUMP=$ac_ct_OBJDUMP
++  fi
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -  ac_header_preproc=no
--fi
--
++  OBJDUMP="$ac_cv_prog_OBJDUMP"
+ fi
+ 
 -rm -f conftest.err conftest.$ac_ext
 -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -echo "${ECHO_T}$ac_header_preproc" >&6; }
--
++test -z "$OBJDUMP" && OBJDUMP=objdump
+ 
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 -  yes:no: )
@@ -16159,7 +12757,104 @@
 -    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
 -    ac_header_preproc=yes
--    ;;
++
++
++
++
++
++
++
++
++{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
++$as_echo_n "checking how to recognize dependent libraries... " >&6; }
++if test "${lt_cv_deplibs_check_method+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  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
++  ;;
++
++cegcc)
++  # use the weaker test based on 'objdump'. See mingw*.
++  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
++  lt_cv_file_magic_cmd='$OBJDUMP -f'
++  ;;
++
++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
+     ;;
 -  no:yes:* )
 -    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
@@ -16173,9 +12868,110 @@
 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
 -    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--
--    ;;
--esac
++  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=pass_all
++  ;;
++
++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
++  ;;
++
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++  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
++  ;;
++
++tpf*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
+ esac
 -{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -16186,17 +12982,22 @@
 -ac_res=`eval echo '${'$as_ac_Header'}'`
 -	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 -echo "${ECHO_T}$ac_res" >&6; }
--
--fi
+ 
+ fi
 -if test `eval echo '${'$as_ac_Header'}'` = yes; then
 -  cat >>confdefs.h <<_ACEOF
 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 -_ACEOF
--
++{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
++$as_echo "$lt_cv_deplibs_check_method" >&6; }
++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
+ 
 -fi
--
+ 
 -done
--
+ 
 -ac_ext=cpp
 -ac_cpp='$CXXCPP $CPPFLAGS'
 -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -16211,32 +13012,46 @@
 -  do
 -    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 -set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-+if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}strip; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 -if test "${ac_cv_prog_CXX+set}" = set; then
-+if test "${ac_cv_prog_STRIP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++
++
++
++
++
++
++
++
++
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ar; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_AR+set}" = set; then
++  $as_echo_n "(cached) " >&6
  else
 -  if test -n "$CXX"; then
 -  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-+  if test -n "$STRIP"; then
-+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
++  if test -n "$AR"; then
++  ac_cv_prog_AR="$AR" # Let the user override the test.
  else
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
-@@ -6570,7 +6838,7 @@
+@@ -6570,8 +6945,8 @@
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 -    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    ac_cv_prog_AR="${ac_tool_prefix}ar"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -6580,32 +6848,28 @@
+ done
+@@ -6580,32 +6955,28 @@
  
  fi
  fi
@@ -16244,13 +13059,15 @@
 -if test -n "$CXX"; then
 -  { echo "$as_me:$LINENO: result: $CXX" >&5
 -echo "${ECHO_T}$CXX" >&6; }
-+STRIP=$ac_cv_prog_STRIP
-+if test -n "$STRIP"; then
-+  { echo "$as_me:$LINENO: result: $STRIP" >&5
-+echo "${ECHO_T}$STRIP" >&6; }
++AR=$ac_cv_prog_AR
++if test -n "$AR"; then
++  { $as_echo "$as_me:$LINENO: result: $AR" >&5
++$as_echo "$AR" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
  fi
  
  
@@ -16263,33 +13080,38 @@
 -do
 -  # Extract the first word of "$ac_prog", so it can be a program name with args.
 -set dummy $ac_prog; ac_word=$2
-+if test -z "$ac_cv_prog_STRIP"; then
-+  ac_ct_STRIP=$STRIP
-+  # Extract the first word of "strip", so it can be a program name with args.
-+set dummy strip; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++if test -z "$ac_cv_prog_AR"; then
++  ac_ct_AR=$AR
++  # Extract the first word of "ar", so it can be a program name with args.
++set dummy ar; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
++  $as_echo_n "(cached) " >&6
  else
 -  if test -n "$ac_ct_CXX"; then
 -  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-+  if test -n "$ac_ct_STRIP"; then
-+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
++  if test -n "$ac_ct_AR"; then
++  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
  else
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
-@@ -6614,7 +6878,7 @@
+@@ -6614,8 +6985,8 @@
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 -    ac_cv_prog_ac_ct_CXX="$ac_prog"
-+    ac_cv_prog_ac_ct_STRIP="strip"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    ac_cv_prog_ac_ct_AR="ar"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -6624,21 +6888,17 @@
+ done
+@@ -6624,645 +6995,152 @@
  
  fi
  fi
@@ -16297,13 +13119,15 @@
 -if test -n "$ac_ct_CXX"; then
 -  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
 -echo "${ECHO_T}$ac_ct_CXX" >&6; }
-+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-+if test -n "$ac_ct_STRIP"; then
-+  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
++ac_ct_AR=$ac_cv_prog_ac_ct_AR
++if test -n "$ac_ct_AR"; then
++  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
++$as_echo "$ac_ct_AR" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
  fi
  
 -
@@ -16312,20 +13136,26 @@
 -
 -  if test "x$ac_ct_CXX" = x; then
 -    CXX="g++"
-+  if test "x$ac_ct_STRIP" = x; then
-+    STRIP=":"
++  if test "x$ac_ct_AR" = x; then
++    AR="false"
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
-@@ -6650,1095 +6910,300 @@
- configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet.  If you think this
+-configuration is useful to you, please write to autoconf@gnu.org." >&5
+-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet.  If you think this
+-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
 -    CXX=$ac_ct_CXX
-+    STRIP=$ac_ct_STRIP
++    AR=$ac_ct_AR
    fi
 +else
-+  STRIP="$ac_cv_prog_STRIP"
++  AR="$ac_cv_prog_AR"
  fi
  
 -  fi
@@ -16363,7 +13193,8 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }
-+test -z "$STRIP" && STRIP=:
++test -z "$AR" && AR=ar
++test -z "$AR_FLAGS" && AR_FLAGS=cru
  
 -{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
@@ -16406,53 +13237,17 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_compiler_gnu=yes
-+
-+
-+
-+if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_RANLIB+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  if test -n "$RANLIB"; then
-+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
  
 -	ac_compiler_gnu=no
-+fi
-+fi
-+RANLIB=$ac_cv_prog_RANLIB
-+if test -n "$RANLIB"; then
-+  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-+echo "${ECHO_T}$RANLIB" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
+-fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
  
- fi
+-fi
 -{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
 -GXX=`test $ac_compiler_gnu = yes && echo yes`
@@ -16473,46 +13268,10 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+if test -z "$ac_cv_prog_RANLIB"; then
-+  ac_ct_RANLIB=$RANLIB
-+  # Extract the first word of "ranlib", so it can be a program name with args.
-+set dummy ranlib; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$ac_ct_RANLIB"; then
-+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_RANLIB="ranlib"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
  
 -int
 -main ()
 -{
-+fi
-+fi
-+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-+if test -n "$ac_ct_RANLIB"; then
-+  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
  
 -  ;
 -  return 0;
@@ -16523,19 +13282,7 @@
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
-+  if test "x$ac_ct_RANLIB" = x; then
-+    RANLIB=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
- esac
+-esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 -  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
@@ -16548,13 +13295,9 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_prog_cxx_g=yes
-+    RANLIB=$ac_ct_RANLIB
-+  fi
- else
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  RANLIB="$ac_cv_prog_RANLIB"
-+fi
  
 -	CXXFLAGS=""
 -      cat >conftest.$ac_ext <<_ACEOF
@@ -16563,7 +13306,6 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+test -z "$RANLIB" && RANLIB=:
  
 -int
 -main ()
@@ -16591,10 +13333,17 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  :
--else
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
++set dummy ${ac_tool_prefix}strip; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_STRIP+set}" = set; then
++  $as_echo_n "(cached) " >&6
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 -	 CXXFLAGS="-g"
 -	 cat >conftest.$ac_ext <<_ACEOF
@@ -16603,10 +13352,27 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
- 
+-
 -int
 -main ()
 -{
++  if test -n "$STRIP"; then
++  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
  
 -  ;
 -  return 0;
@@ -16630,36 +13396,64 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_prog_cxx_g=yes
--else
++fi
++fi
++STRIP=$ac_cv_prog_STRIP
++if test -n "$STRIP"; then
++  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
++$as_echo "$STRIP" >&6; }
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
-+# 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
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
- 
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
+ 
+ 
+ fi
++if test -z "$ac_cv_prog_STRIP"; then
++  ac_ct_STRIP=$STRIP
++  # Extract the first word of "strip", so it can be a program name with args.
++set dummy strip; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$ac_ct_STRIP"; then
++  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_STRIP="strip"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
--fi
++ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
++if test -n "$ac_ct_STRIP"; then
++  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++$as_echo "$ac_ct_STRIP" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
 -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
 -if test "$ac_test_CXXFLAGS" = set; then
@@ -16667,16 +13461,27 @@
 -elif test $ac_cv_prog_cxx_g = yes; then
 -  if test "$GXX" = yes; then
 -    CXXFLAGS="-g -O2"
--  else
++
++  if test "x$ac_ct_STRIP" = x; then
++    STRIP=":"
+   else
 -    CXXFLAGS="-g"
--  fi
--else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    STRIP=$ac_ct_STRIP
+   fi
+ else
 -  if test "$GXX" = yes; then
 -    CXXFLAGS="-O2"
 -  else
 -    CXXFLAGS=
 -  fi
--fi
++  STRIP="$ac_cv_prog_STRIP"
+ fi
 -ac_ext=cpp
 -ac_cpp='$CXXCPP $CPPFLAGS'
 -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -16684,6 +13489,7 @@
 -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
 -depcc="$CXX"  am_compiler_list=
++test -z "$STRIP" && STRIP=:
  
 -{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
@@ -16768,18 +13574,18 @@
 -      fi
 -    fi
 -  done
- 
+-
 -  cd ..
 -  rm -rf conftest.dir
 -else
 -  am_cv_CXX_dependencies_compiler_type=none
 -fi
- 
+-
 -fi
 -{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
 -echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
 -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
- 
+-
 - if
 -  test "x$enable_dependency_tracking" != xno \
 -  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
@@ -16789,10 +13595,10 @@
 -  am__fastdepCXX_TRUE='#'
 -  am__fastdepCXX_FALSE=
 -fi
- 
- 
- 
- 
+-
+-
+-
+-
 -if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
 -    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
 -    (test "X$CXX" != "Xg++"))) ; then
@@ -16852,13 +13658,13 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -  # Broken: fails on valid input.
 -continue
 -fi
- 
+-
 -rm -f conftest.err conftest.$ac_ext
- 
+-
 -  # OK, works on sane cases.  Now check whether nonexistent headers
 -  # can be detected and how.
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -16890,12 +13696,12 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -  # Passes both tests.
 -ac_preproc_ok=:
 -break
 -fi
- 
+-
 -rm -f conftest.err conftest.$ac_ext
  
 -done
@@ -16904,10 +13710,10 @@
 -if $ac_preproc_ok; then
 -  break
 -fi
- 
+-
 -    done
 -    ac_cv_prog_CXXCPP=$CXXCPP
- 
+-
 -fi
 -  CXXCPP=$ac_cv_prog_CXXCPP
 -else
@@ -16957,13 +13763,13 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -  # Broken: fails on valid input.
 -continue
 -fi
- 
+-
 -rm -f conftest.err conftest.$ac_ext
- 
+-
 -  # OK, works on sane cases.  Now check whether nonexistent headers
 -  # can be detected and how.
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -16995,14 +13801,14 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -  # Passes both tests.
 -ac_preproc_ok=:
 -break
 -fi
- 
+-
 -rm -f conftest.err conftest.$ac_ext
- 
+-
 -done
 -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 -rm -f conftest.err conftest.$ac_ext
@@ -17015,13 +13821,13 @@
 -See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }
 -fi
- 
+-
 -ac_ext=cpp
 -ac_cpp='$CXXCPP $CPPFLAGS'
 -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
+-
 -fi
  
  
@@ -17029,7 +13835,7 @@
 -ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
 -ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 -ac_compiler_gnu=$ac_cv_f77_compiler_gnu
--if test -n "$ac_tool_prefix"; then
+ if test -n "$ac_tool_prefix"; then
 -  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
 -  do
 -    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
@@ -17038,42 +13844,54 @@
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 -if test "${ac_cv_prog_F77+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ranlib; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_RANLIB+set}" = set; then
++  $as_echo_n "(cached) " >&6
+ else
 -  if test -n "$F77"; then
 -  ac_cv_prog_F77="$F77" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if test -n "$RANLIB"; then
++  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+@@ -7271,8 +7149,8 @@
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 -    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--IFS=$as_save_IFS
++    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -7281,32 +7159,28 @@
  
--fi
--fi
+ fi
+ fi
 -F77=$ac_cv_prog_F77
 -if test -n "$F77"; then
 -  { echo "$as_me:$LINENO: result: $F77" >&5
 -echo "${ECHO_T}$F77" >&6; }
--else
++RANLIB=$ac_cv_prog_RANLIB
++if test -n "$RANLIB"; then
++  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
++$as_echo "$RANLIB" >&6; }
+ else
 -  { echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6; }
--fi
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
  
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
  
 -    test -n "$F77" && break
 -  done
--fi
+ fi
 -if test -z "$F77"; then
 -  ac_ct_F77=$F77
 -  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
@@ -17083,39 +13901,38 @@
 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 -if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-+
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
-+
-+
-+# Check for command to grab the raw symbol name followed by C symbol from nm.
-+{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-+echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
-+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++if test -z "$ac_cv_prog_RANLIB"; then
++  ac_ct_RANLIB=$RANLIB
++  # Extract the first word of "ranlib", so it can be a program name with args.
++set dummy ranlib; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
++  $as_echo_n "(cached) " >&6
  else
 -  if test -n "$ac_ct_F77"; then
 -  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if test -n "$ac_ct_RANLIB"; then
++  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+@@ -7315,8 +7189,8 @@
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 -    ac_cv_prog_ac_ct_F77="$ac_prog"
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--IFS=$as_save_IFS
++    ac_cv_prog_ac_ct_RANLIB="ranlib"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -7325,320 +7199,102 @@
  
--fi
--fi
+ fi
+ fi
 -ac_ct_F77=$ac_cv_prog_ac_ct_F77
 -if test -n "$ac_ct_F77"; then
 -  { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
@@ -17123,47 +13940,45 @@
 -else
 -  { echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6; }
--fi
-+# 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]'
- 
++ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
++if test -n "$ac_ct_RANLIB"; then
++  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
++$as_echo "$ac_ct_RANLIB" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
+-
 -  test -n "$ac_ct_F77" && break
 -done
-+# Regexp to match symbols that can be accessed directly from C.
-+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
- 
+-
 -  if test "x$ac_ct_F77" = x; then
 -    F77=""
--  else
--    case $cross_compiling:$ac_tool_warned in
--yes:)
++  if test "x$ac_ct_RANLIB" = x; then
++    RANLIB=":"
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 -whose name does not start with the host triplet.  If you think this
 -configuration is useful to you, please write to autoconf@gnu.org." >&5
 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 -whose name does not start with the host triplet.  If you think this
 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
--ac_tool_warned=yes ;;
--esac
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
 -    F77=$ac_ct_F77
-+# Define system-specific variables.
-+case $host_os in
-+aix*)
-+  symcode='[BCDT]'
-+  ;;
-+cygwin* | mingw* | pw32*)
-+  symcode='[ABCDGISTW]'
-+  ;;
-+hpux*)
-+  if test "$host_cpu" = ia64; then
-+    symcode='[ABCDEGRST]'
++    RANLIB=$ac_ct_RANLIB
    fi
--fi
--
--
++else
++  RANLIB="$ac_cv_prog_RANLIB"
+ fi
+ 
++test -z "$RANLIB" && RANLIB=:
+ 
 -# Provide some information about the compiler.
 -echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
 -ac_compiler=`set X $ac_compile; echo $2`
@@ -17191,36 +14006,14 @@
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
-+  ;;
-+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
+-esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 -  (eval "$ac_compiler -V >&5") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }
 -rm -f a.out
--
+ 
 -# If we don't use `.F' as extension, the preprocessor is not run on the
 -# input file.  (Note that this only needs to work for GNU compilers.)
 -ac_save_ext=$ac_ext
@@ -17243,11 +14036,7 @@
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
-+# If we're using GNU nm, then use its standard symbol codes.
-+case `$NM -V 2>&1` in
-+*GNU* | *'with BFD'*)
-+  symcode='[ABCDGIRSTW]' ;;
- esac
+-esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 -  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
@@ -17263,18 +14052,29 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	ac_compiler_gnu=no
 -fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -ac_cv_f77_compiler_gnu=$ac_compiler_gnu
-+# Transform an extracted symbol line into a proper C declaration.
-+# Some systems (esp. on ia64) link data and code symbols differently,
-+# so use this general approach.
-+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  
--fi
++# Determine commands to create old-style static archives.
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
++old_postinstall_cmds='chmod 644 $oldlib'
++old_postuninstall_cmds=
++
++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
 -{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
 -echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
 -ac_ext=$ac_save_ext
@@ -17289,9 +14089,6 @@
 -  FFLAGS=-g
 -cat >conftest.$ac_ext <<_ACEOF
 -      program main
-+# 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\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
-+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
  
 -      end
 -_ACEOF
@@ -17300,13 +14097,7 @@
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
-+# 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
+-esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 -  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
@@ -17325,12 +14116,8 @@
  
 -	ac_cv_prog_f77_g=no
 -fi
-+# Try without a prefix underscore, then with it.
-+for ac_symprfx in "" "_"; do
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-+  symxfrm="\\1 $ac_symprfx\\2 \\2"
  
 -fi
 -{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
@@ -17346,27 +14133,9 @@
 -else
 -  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
 -    FFLAGS="-O2"
-+  # Write the raw and C identifiers.
-+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-+    # Fake it for dumpbin and say T for any non-static function
-+    # and D for any global variable.
-+    # Also find C++ and __fastcall symbols from MSVC++,
-+    # which start with @ or ?.
-+    lt_cv_sys_global_symbol_pipe="$AWK '"\
-+"     {last_section=section; section=\$ 3};"\
-+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-+"     \$ 0!~/External *\|/{next};"\
-+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-+"     {if(hide[section]) next};"\
-+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-+"     ' prfx=^$ac_symprfx"
-   else
+-  else
 -    FFLAGS=
-+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-   fi
+-  fi
 -fi
  
 -G77=`test $ac_compiler_gnu = yes && echo yes`
@@ -17375,9 +14144,9 @@
 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
--
--
+ 
+ 
+ 
 -# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
 -# find the maximum length of command line arguments
 -{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
@@ -17387,7 +14156,7 @@
 -else
 -    i=0
 -  teststring="ABCD"
--
+ 
 -  case $build_os in
 -  msdosdjgpp*)
 -    # On DJGPP, this test can blow up pretty badly due to problems in libc
@@ -17396,14 +14165,14 @@
 -    # 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.
@@ -17414,13 +14183,13 @@
 -    # 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
@@ -17434,12 +14203,12 @@
 -    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
@@ -17488,9 +14257,9 @@
 -    fi
 -    ;;
 -  esac
--
+ 
 -fi
--
+ 
 -if test -n $lt_cv_sys_max_cmd_len ; then
 -  { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
 -echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
@@ -17498,45 +14267,68 @@
 -  { echo "$as_me:$LINENO: result: none" >&5
 -echo "${ECHO_T}none" >&6; }
 -fi
--
--
--
--
--
--# Check for command to grab the raw symbol name followed by C symbol from nm.
+ 
+ 
+ 
+ 
+ 
++
++
++
++
++
++
++
++
++
++
++
++
++# 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
++
++
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
 -{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
 -echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
--if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
++{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
++$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+ if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
--# 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]*\)'
--
++  $as_echo_n "(cached) " >&6
+ else
+ 
+ # These are sane defaults that work on at least a few old systems.
+@@ -7650,33 +7306,18 @@
+ # 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]'
--  ;;
+ # Define system-specific variables.
+ case $host_os in
+ aix*)
+   symcode='[BCDT]'
+   ;;
 -cygwin* | mingw* | pw32*)
--  symcode='[ABCDGISTW]'
--  ;;
++cygwin* | mingw* | pw32* | cegcc*)
+   symcode='[ABCDGISTW]'
+   ;;
 -hpux*) # Its linker distinguishes data from code symbols
--  if test "$host_cpu" = ia64; then
--    symcode='[ABCDEGRST]'
--  fi
++hpux*)
+   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'"
 -  ;;
@@ -17546,38 +14338,37 @@
 -    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*)
+   ;;
+ irix* | nonstopux*)
+   symcode='[BCDEGRST]'
+@@ -7701,56 +7342,84 @@
+   ;;
+ 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
++
++# Transform an extracted symbol line into a proper C declaration.
++# Some systems (esp. on ia64) link data and code symbols differently,
++# so use this general approach.
++lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \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\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
++
+ # 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
--
++  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'*)
@@ -17585,18 +14376,36 @@
 -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.
++# Try without a prefix underscore, 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
-+  # Check to see that the pipe works correctly.
-+  pipe_works=no
++  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
++    # Fake it for dumpbin and say T for any non-static function
++    # and D for any global variable.
++    # Also find C++ and __fastcall symbols from MSVC++,
++    # which start with @ or ?.
++    lt_cv_sys_global_symbol_pipe="$AWK '"\
++"     {last_section=section; section=\$ 3};"\
++"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
++"     \$ 0!~/External *\|/{next};"\
++"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
++"     {if(hide[section]) next};"\
++"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
++"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
++"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
++"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
++"     ' prfx=^$ac_symprfx"
++  else
++    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
++  fi
+ 
+   # Check to see that the pipe works correctly.
+   pipe_works=no
  
    rm -f conftest*
 -  cat > conftest.$ac_ext <<EOF
@@ -17617,7 +14426,21 @@
  
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
-@@ -7760,42 +7225,44 @@
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+     # Now try to grab the symbols.
+     nlist=conftest.nm
+     if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
+   (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && test -s "$nlist"; then
+       # Try sorting and uniquifying the output.
+       if sort "$nlist" | uniq > "$nlist"T; then
+@@ -7760,42 +7429,44 @@
        fi
  
        # Make sure that we snagged all the symbols we need.
@@ -17682,8 +14505,28 @@
  	  # Now try linking the two files.
  	  mv conftest.$ac_objext conftstm.$ac_objext
  	  lt_save_LIBS="$LIBS"
-@@ -7847,80 +7314,258 @@
- echo "${ECHO_T}ok" >&6; }
+@@ -7805,7 +7476,7 @@
+ 	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && test -s conftest${ac_exeext}; then
+ 	    pipe_works=yes
+ 	  fi
+@@ -7840,87 +7511,269 @@
+   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
+-  { echo "$as_me:$LINENO: result: failed" >&5
+-echo "${ECHO_T}failed" >&6; }
++  { $as_echo "$as_me:$LINENO: result: failed" >&5
++$as_echo "failed" >&6; }
+ else
+-  { echo "$as_me:$LINENO: result: ok" >&5
+-echo "${ECHO_T}ok" >&6; }
++  { $as_echo "$as_me:$LINENO: result: ok" >&5
++$as_echo "ok" >&6; }
  fi
  
 -{ echo "$as_me:$LINENO: checking for objdir" >&5
@@ -17717,43 +14560,14 @@
 -  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"
- 
--if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
--set dummy ${ac_tool_prefix}ar; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++
++
++
++
++
++
++
++
 +
 +
 +
@@ -17778,7 +14592,7 @@
 +  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; then
 +    case `/usr/bin/file conftest.$ac_objext` in
 +      *ELF-32*)
@@ -17788,16 +14602,16 @@
 +	HPUX_IA64_MODE="64"
 +	;;
 +    esac
-+  fi
+   fi
 +  rm -rf conftest*
 +  ;;
 +*-*-irix6*)
 +  # Find out which ABI we are using.
-+  echo '#line 7369 "configure"' > conftest.$ac_ext
++  echo '#line 7573 "configure"' > conftest.$ac_ext
 +  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; then
 +    if test "$lt_cv_prog_gnu_ld" = yes; then
 +      case `/usr/bin/file conftest.$ac_objext` in
@@ -17826,8 +14640,13 @@
 +    fi
 +  fi
 +  rm -rf conftest*
-+  ;;
-+
+   ;;
+-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'
 +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
 +s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 +  # Find out which ABI we are using.
@@ -17835,7 +14654,7 @@
 +  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; then
 +    case `/usr/bin/file conftest.o` in
 +      *32-bit*)
@@ -17880,33 +14699,42 @@
 +  fi
 +  rm -rf conftest*
 +  ;;
-+
+ 
+-# Same as above, but do not quote variable references.
+-double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
 +*-*-sco3.2v5*)
 +  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
 +  SAVE_CFLAGS="$CFLAGS"
 +  CFLAGS="$CFLAGS -belf"
-+  { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
++  { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
++$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
 +if test "${lt_cv_cc_needs_belf+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
 +else
 +  ac_ext=c
 +ac_cpp='$CPP $CPPFLAGS'
 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
+ 
+-# Sed substitution to delay expansion of an escaped shell variable in a
+-# double_quote_subst'ed string.
+-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
 +     cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
-+
+ 
+-# Sed substitution to avoid accidental globbing in evaled expressions
+-no_glob_subst='s/\*/\\\*/g'
 +int
 +main ()
 +{
-+
+ 
+-# Constants:
+-rm="rm -f"
 +  ;
 +  return 0;
 +}
@@ -17917,26 +14745,39 @@
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_link") 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
 +  lt_cv_cc_needs_belf=yes
 +else
-+  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
+ 
+-# Global variables:
+-default_ofile=libtool
+-can_build_shared=yes
 +	lt_cv_cc_needs_belf=no
 +fi
-+
+ 
+-# All known linkers require a `.a' archive for static linking (except MSVC,
+-# which needs '.lib').
+-libext=a
+-ltmain="$ac_aux_dir/ltmain.sh"
+-ofile="$default_ofile"
+-with_gnu_ld="$lt_cv_prog_gnu_ld"
++rm -rf conftest.dSYM
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
 +     ac_ext=c
@@ -17944,10 +14785,17 @@
 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
+ 
+-if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}ar; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_prog_AR+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
 +fi
-+{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-+echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
++{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
++$as_echo "$lt_cv_cc_needs_belf" >&6; }
 +  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
 +    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
 +    CFLAGS="$SAVE_CFLAGS"
@@ -17959,7 +14807,7 @@
 +  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; then
 +    case `/usr/bin/file conftest.o` in
 +    *64-bit*)
@@ -17986,11 +14834,10 @@
 +    if test -n "$ac_tool_prefix"; then
 +  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
 +set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_prog_AR+set}" = set; then
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
 +if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
  else
 -  if test -n "$AR"; then
 -  ac_cv_prog_AR="$AR" # Let the user override the test.
@@ -17999,16 +14846,18 @@
  else
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
-@@ -7929,7 +7574,7 @@
+@@ -7929,8 +7782,8 @@
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 -    ac_cv_prog_AR="${ac_tool_prefix}ar"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -7939,10 +7584,10 @@
+ done
+@@ -7939,28 +7792,28 @@
  
  fi
  fi
@@ -18018,12 +14867,14 @@
 -echo "${ECHO_T}$AR" >&6; }
 +DSYMUTIL=$ac_cv_prog_DSYMUTIL
 +if test -n "$DSYMUTIL"; then
-+  { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
-+echo "${ECHO_T}$DSYMUTIL" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
++$as_echo "$DSYMUTIL" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
-@@ -7950,17 +7595,17 @@
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
  
  
  fi
@@ -18031,15 +14882,18 @@
 -  ac_ct_AR=$AR
 -  # Extract the first word of "ar", so it can be a program name with args.
 -set dummy ar; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
 +if test -z "$ac_cv_prog_DSYMUTIL"; then
 +  ac_ct_DSYMUTIL=$DSYMUTIL
 +  # Extract the first word of "dsymutil", so it can be a program name with args.
 +set dummy dsymutil; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
 +if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
  else
 -  if test -n "$ac_ct_AR"; then
 -  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
@@ -18048,16 +14902,18 @@
  else
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
-@@ -7969,7 +7614,7 @@
+@@ -7969,8 +7822,8 @@
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 -    ac_cv_prog_ac_ct_AR="ar"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -7979,17 +7624,17 @@
+ done
+@@ -7979,44 +7832,40 @@
  
  fi
  fi
@@ -18067,11 +14923,13 @@
 -echo "${ECHO_T}$ac_ct_AR" >&6; }
 +ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
 +if test -n "$ac_ct_DSYMUTIL"; then
-+  { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
-+echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
++$as_echo "$ac_ct_DSYMUTIL" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
  fi
  
 -  if test "x$ac_ct_AR" = x; then
@@ -18081,8 +14939,14 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
-@@ -8001,22 +7646,22 @@
- configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet.  If you think this
+-configuration is useful to you, please write to autoconf@gnu.org." >&5
+-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet.  If you think this
+-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
 -    AR=$ac_ct_AR
@@ -18096,14 +14960,17 @@
 -if test -n "$ac_tool_prefix"; then
 -  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 -set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_prog_RANLIB+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
 +    if test -n "$ac_tool_prefix"; then
 +  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
 +set dummy ${ac_tool_prefix}nmedit; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_prog_RANLIB+set}" = set; then
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
 +if test "${ac_cv_prog_NMEDIT+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
  else
 -  if test -n "$RANLIB"; then
 -  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -18112,16 +14979,18 @@
  else
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
-@@ -8025,7 +7670,7 @@
+@@ -8025,8 +7874,8 @@
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 -    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -8035,10 +7680,10 @@
+ done
+@@ -8035,28 +7884,28 @@
  
  fi
  fi
@@ -18131,12 +15000,14 @@
 -echo "${ECHO_T}$RANLIB" >&6; }
 +NMEDIT=$ac_cv_prog_NMEDIT
 +if test -n "$NMEDIT"; then
-+  { echo "$as_me:$LINENO: result: $NMEDIT" >&5
-+echo "${ECHO_T}$NMEDIT" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
++$as_echo "$NMEDIT" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
-@@ -8046,17 +7691,17 @@
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
  
  
  fi
@@ -18144,15 +15015,18 @@
 -  ac_ct_RANLIB=$RANLIB
 -  # Extract the first word of "ranlib", so it can be a program name with args.
 -set dummy ranlib; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
 +if test -z "$ac_cv_prog_NMEDIT"; then
 +  ac_ct_NMEDIT=$NMEDIT
 +  # Extract the first word of "nmedit", so it can be a program name with args.
 +set dummy nmedit; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
 +if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
  else
 -  if test -n "$ac_ct_RANLIB"; then
 -  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -18161,16 +15035,18 @@
  else
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
-@@ -8065,7 +7710,7 @@
+@@ -8065,8 +7914,8 @@
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 -    ac_cv_prog_ac_ct_RANLIB="ranlib"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    ac_cv_prog_ac_ct_NMEDIT="nmedit"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -8075,17 +7720,17 @@
+ done
+@@ -8075,44 +7924,40 @@
  
  fi
  fi
@@ -18180,11 +15056,13 @@
 -echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
 +ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
 +if test -n "$ac_ct_NMEDIT"; then
-+  { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
-+echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
++$as_echo "$ac_ct_NMEDIT" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
  fi
  
 -  if test "x$ac_ct_RANLIB" = x; then
@@ -18194,8 +15072,14 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
-@@ -8097,22 +7742,22 @@
- configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet.  If you think this
+-configuration is useful to you, please write to autoconf@gnu.org." >&5
+-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet.  If you think this
+-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
 -    RANLIB=$ac_ct_RANLIB
@@ -18209,14 +15093,17 @@
 -if test -n "$ac_tool_prefix"; then
 -  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 -set dummy ${ac_tool_prefix}strip; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_prog_STRIP+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
 +    if test -n "$ac_tool_prefix"; then
 +  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
 +set dummy ${ac_tool_prefix}lipo; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_prog_STRIP+set}" = set; then
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
 +if test "${ac_cv_prog_LIPO+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
  else
 -  if test -n "$STRIP"; then
 -  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@ -18225,16 +15112,18 @@
  else
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
-@@ -8121,7 +7766,7 @@
+@@ -8121,8 +7966,8 @@
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 -    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -8131,10 +7776,10 @@
+ done
+@@ -8131,28 +7976,28 @@
  
  fi
  fi
@@ -18244,12 +15133,14 @@
 -echo "${ECHO_T}$STRIP" >&6; }
 +LIPO=$ac_cv_prog_LIPO
 +if test -n "$LIPO"; then
-+  { echo "$as_me:$LINENO: result: $LIPO" >&5
-+echo "${ECHO_T}$LIPO" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
++$as_echo "$LIPO" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
-@@ -8142,17 +7787,17 @@
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
  
  
  fi
@@ -18257,15 +15148,18 @@
 -  ac_ct_STRIP=$STRIP
 -  # Extract the first word of "strip", so it can be a program name with args.
 -set dummy strip; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
 +if test -z "$ac_cv_prog_LIPO"; then
 +  ac_ct_LIPO=$LIPO
 +  # Extract the first word of "lipo", so it can be a program name with args.
 +set dummy lipo; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
 +if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
  else
 -  if test -n "$ac_ct_STRIP"; then
 -  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@ -18274,16 +15168,18 @@
  else
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
-@@ -8161,7 +7806,7 @@
+@@ -8161,8 +8006,8 @@
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 -    ac_cv_prog_ac_ct_STRIP="strip"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    ac_cv_prog_ac_ct_LIPO="lipo"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -8171,17 +7816,17 @@
+ done
+@@ -8171,232 +8016,40 @@
  
  fi
  fi
@@ -18293,11 +15189,13 @@
 -echo "${ECHO_T}$ac_ct_STRIP" >&6; }
 +ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
 +if test -n "$ac_ct_LIPO"; then
-+  { echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
-+echo "${ECHO_T}$ac_ct_LIPO" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
++$as_echo "$ac_ct_LIPO" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
  fi
  
 -  if test "x$ac_ct_STRIP" = x; then
@@ -18307,8 +15205,14 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
-@@ -8193,210 +7838,22 @@
- configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet.  If you think this
+-configuration is useful to you, please write to autoconf@gnu.org." >&5
+-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet.  If you think this
+-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
 -    STRIP=$ac_ct_STRIP
@@ -18492,14 +15396,14 @@
 -else
 -  { echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6; }
+-fi
+-
+-  else
+-    MAGIC_CMD=:
+-  fi
 +  LIPO="$ac_cv_prog_LIPO"
  fi
  
--  else
--    MAGIC_CMD=:
--  fi
--fi
--
 -  fi
 -  ;;
 -esac
@@ -18510,13 +15414,16 @@
      if test -n "$ac_tool_prefix"; then
 -  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
 -set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
 +set dummy ${ac_tool_prefix}otool; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
 +if test "${ac_cv_prog_OTOOL+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
  else
 -  if test -n "$DSYMUTIL"; then
 -  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
@@ -18525,16 +15432,18 @@
  else
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
-@@ -8405,7 +7862,7 @@
+@@ -8405,8 +8058,8 @@
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 -    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -8415,10 +7872,10 @@
+ done
+@@ -8415,28 +8068,28 @@
  
  fi
  fi
@@ -18544,12 +15453,14 @@
 -echo "${ECHO_T}$DSYMUTIL" >&6; }
 +OTOOL=$ac_cv_prog_OTOOL
 +if test -n "$OTOOL"; then
-+  { echo "$as_me:$LINENO: result: $OTOOL" >&5
-+echo "${ECHO_T}$OTOOL" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5
++$as_echo "$OTOOL" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
-@@ -8426,17 +7883,17 @@
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
  
  
  fi
@@ -18557,15 +15468,18 @@
 -  ac_ct_DSYMUTIL=$DSYMUTIL
 -  # Extract the first word of "dsymutil", so it can be a program name with args.
 -set dummy dsymutil; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
 +if test -z "$ac_cv_prog_OTOOL"; then
 +  ac_ct_OTOOL=$OTOOL
 +  # Extract the first word of "otool", so it can be a program name with args.
 +set dummy otool; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
 +if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
  else
 -  if test -n "$ac_ct_DSYMUTIL"; then
 -  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
@@ -18574,16 +15488,18 @@
  else
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
-@@ -8445,7 +7902,7 @@
+@@ -8445,8 +8098,8 @@
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 -    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    ac_cv_prog_ac_ct_OTOOL="otool"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -8455,17 +7912,17 @@
+ done
+@@ -8455,44 +8108,40 @@
  
  fi
  fi
@@ -18593,11 +15509,13 @@
 -echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
 +ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
 +if test -n "$ac_ct_OTOOL"; then
-+  { echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
-+echo "${ECHO_T}$ac_ct_OTOOL" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
++$as_echo "$ac_ct_OTOOL" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
  fi
  
 -  if test "x$ac_ct_DSYMUTIL" = x; then
@@ -18607,8 +15525,14 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
-@@ -8477,22 +7934,22 @@
- configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet.  If you think this
+-configuration is useful to you, please write to autoconf@gnu.org." >&5
+-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet.  If you think this
+-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
 -    DSYMUTIL=$ac_ct_DSYMUTIL
@@ -18622,13 +15546,16 @@
      if test -n "$ac_tool_prefix"; then
 -  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
 -set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_prog_NMEDIT+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
 +set dummy ${ac_tool_prefix}otool64; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_prog_NMEDIT+set}" = set; then
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
 +if test "${ac_cv_prog_OTOOL64+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
  else
 -  if test -n "$NMEDIT"; then
 -  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
@@ -18637,16 +15564,18 @@
  else
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
-@@ -8501,7 +7958,7 @@
+@@ -8501,8 +8150,8 @@
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 -    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -8511,10 +7968,10 @@
+ done
+@@ -8511,28 +8160,28 @@
  
  fi
  fi
@@ -18656,12 +15585,14 @@
 -echo "${ECHO_T}$NMEDIT" >&6; }
 +OTOOL64=$ac_cv_prog_OTOOL64
 +if test -n "$OTOOL64"; then
-+  { echo "$as_me:$LINENO: result: $OTOOL64" >&5
-+echo "${ECHO_T}$OTOOL64" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5
++$as_echo "$OTOOL64" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
-@@ -8522,17 +7979,17 @@
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
  
  
  fi
@@ -18669,15 +15600,18 @@
 -  ac_ct_NMEDIT=$NMEDIT
 -  # Extract the first word of "nmedit", so it can be a program name with args.
 -set dummy nmedit; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
 +if test -z "$ac_cv_prog_OTOOL64"; then
 +  ac_ct_OTOOL64=$OTOOL64
 +  # Extract the first word of "otool64", so it can be a program name with args.
 +set dummy otool64; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
 +if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
  else
 -  if test -n "$ac_ct_NMEDIT"; then
 -  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
@@ -18686,16 +15620,18 @@
  else
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
-@@ -8541,7 +7998,7 @@
+@@ -8541,8 +8190,8 @@
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 -    ac_cv_prog_ac_ct_NMEDIT="nmedit"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    ac_cv_prog_ac_ct_OTOOL64="otool64"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -8551,17 +8008,17 @@
+ done
+@@ -8551,62 +8200,89 @@
  
  fi
  fi
@@ -18705,11 +15641,13 @@
 -echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
 +ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
 +if test -n "$ac_ct_OTOOL64"; then
-+  { echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
-+echo "${ECHO_T}$ac_ct_OTOOL64" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
++$as_echo "$ac_ct_OTOOL64" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
  fi
  
 -  if test "x$ac_ct_NMEDIT" = x; then
@@ -18719,8 +15657,14 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
-@@ -8573,13 +8030,38 @@
- configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet.  If you think this
+-configuration is useful to you, please write to autoconf@gnu.org." >&5
+-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet.  If you think this
+-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
 -    NMEDIT=$ac_ct_NMEDIT
@@ -18732,35 +15676,38 @@
  fi
  
  
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-     { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
- echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
+-    { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
+-echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++    { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
++$as_echo_n "checking for -single_module linker flag... " >&6; }
  if test "${lt_cv_apple_cc_single_mod+set}" = set; then
-@@ -8587,18 +8069,24 @@
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
  else
    lt_cv_apple_cc_single_mod=no
        if test -z "${LT_MULTI_MODULE}"; then
@@ -18796,17 +15743,63 @@
 +	rm -f conftest.*
        fi
  fi
- { echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
-@@ -8655,27 +8143,27 @@
- 
+-{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
+-echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
+-    { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
+-echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
++$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
++    { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
++$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+ if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   lt_cv_ld_exported_symbols_list=no
+       save_LDFLAGS=$LDFLAGS
+@@ -8633,49 +8309,53 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
+   lt_cv_ld_exported_symbols_list=yes
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	lt_cv_ld_exported_symbols_list=no
+ fi
+ 
++rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
 -   LDFLAGS="$save_LDFLAGS"
 +	LDFLAGS="$save_LDFLAGS"
  
  fi
- { echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
- echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
+-{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
+-echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
++{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
++$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
      case $host_os in
 -    rhapsody* | darwin1.[0123])
 +    rhapsody* | darwin1.[012])
@@ -18835,7 +15828,7 @@
        esac
      ;;
    esac
-@@ -8685,5888 +8173,2796 @@
+@@ -8685,10904 +8365,2579 @@
      if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
        _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
      else
@@ -18867,33 +15860,21 @@
 -# Check whether --with-pic was given.
 -if test "${with_pic+set}" = set; then
 -  withval=$with_pic; pic_mode="$withval"
--else
--  pic_mode=default
--fi
- 
--test -z "$pic_mode" && pic_mode=default
- 
--# Use C for the default configuration in the libtool script
--tagname=
--lt_save_CC="$CC"
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
--# Source file extension for C test sources.
--ac_ext=c
++
++
++
++
 +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 +		  inttypes.h stdint.h unistd.h
 +do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
++$as_echo_n "checking for $ac_header... " >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
++  $as_echo_n "(cached) " >&6
+ else
+-  pic_mode=default
+-fi
 +  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
@@ -18902,69 +15883,78 @@
 +/* end confdefs.h.  */
 +$ac_includes_default
  
+-test -z "$pic_mode" && pic_mode=default
++#include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  eval "$as_ac_Header=yes"
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-# Use C for the default configuration in the libtool script
+-tagname=
+-lt_save_CC="$CC"
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
++	eval "$as_ac_Header=no"
++fi
+ 
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++ac_res=`eval 'as_val=${'$as_ac_Header'}
++		 $as_echo "$as_val"'`
++	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++as_val=`eval 'as_val=${'$as_ac_Header'}
++		 $as_echo "$as_val"'`
++   if test "x$as_val" = x""yes; then
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
+ 
+-# Source file extension for C test sources.
+-ac_ext=c
++fi
+ 
 -# Object file extension for compiled C test sources.
 -objext=o
 -objext=$objext
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  eval "$as_ac_Header=yes"
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
++done
  
 -# Code to be used in simple compile tests
 -lt_simple_compile_test_code="int some_variable = 0;"
-+	eval "$as_ac_Header=no"
-+fi
  
 -# Code to be used in simple link tests
 -lt_simple_link_test_code='int main(){return(0);}'
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
- 
-+fi
- 
--# If no C compiler was specified, use CC.
--LTCC=${LTCC-"$CC"}
-+done
- 
--# If no C compiler flags were specified, use CFLAGS.
--LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
- 
--# Allow CC to be a program name with arguments.
--compiler=$CC
  
 +for ac_header in dlfcn.h
 +do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
++$as_echo_n "checking for $ac_header... " >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
 +else
 +  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
@@ -18974,12 +15964,8 @@
 +/* end confdefs.h.  */
 +$ac_includes_default
  
--# save warnings/boilerplate of simple test code
--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*
+-# If no C compiler was specified, use CC.
+-LTCC=${LTCC-"$CC"}
 +#include <$ac_header>
 +_ACEOF
 +rm -f conftest.$ac_objext
@@ -18988,48 +15974,68 @@
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_compile") 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
 +  eval "$as_ac_Header=yes"
 +else
-+  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
  
+-# If no C compiler flags were specified, use CFLAGS.
+-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++	eval "$as_ac_Header=no"
++fi
+ 
+-# Allow CC to be a program name with arguments.
+-compiler=$CC
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++ac_res=`eval 'as_val=${'$as_ac_Header'}
++		 $as_echo "$as_val"'`
++	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++as_val=`eval 'as_val=${'$as_ac_Header'}
++		 $as_echo "$as_val"'`
++   if test "x$as_val" = x""yes; then
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
+ 
++fi
+ 
+-# save warnings/boilerplate of simple test code
+-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*
++done
+ 
 -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*
-+	eval "$as_ac_Header=no"
-+fi
- 
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
- 
-+fi
+ 
+ 
++# Set options
  
 -lt_prog_compiler_no_builtin_flag=
-+done
  
 -if test "$GCC" = yes; then
 -  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
  
++        enable_dlopen=no
  
 -{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
@@ -19064,20 +16070,40 @@
 -     fi
 -   fi
 -   $rm conftest*
-+# Set options
  
 -fi
 -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
++  enable_win32_dll=no
  
 -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
 -    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
--else
++
++            # Check whether --enable-shared was given.
++if test "${enable_shared+set}" = set; then
++  enableval=$enable_shared; 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
+ else
 -    :
--fi
++  enable_shared=yes
+ fi
  
 -fi
-+        enable_dlopen=no
  
 -lt_prog_compiler_wl=
 -lt_prog_compiler_pic=
@@ -19085,7 +16111,6 @@
  
 -{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-+  enable_win32_dll=no
  
 -  if test "$GCC" = yes; then
 -    lt_prog_compiler_wl='-Wl,'
@@ -19098,28 +16123,7 @@
 -	# AIX 5 now supports IA64 processor
 -	lt_prog_compiler_static='-Bstatic'
 -      fi
-+            # Check whether --enable-shared was given.
-+if test "${enable_shared+set}" = set; then
-+  enableval=$enable_shared; 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
-+else
-+  enable_shared=yes
-+fi
+-      ;;
  
 -    amigaos*)
 -      # FIXME: we need at least 68020 code to build shared libraries, but
@@ -19139,7 +16143,7 @@
 -      # (--disable-auto-import) libraries
 -      lt_prog_compiler_pic='-DDLL_EXPORT'
 -      ;;
- 
+-
 -    darwin* | rhapsody*)
 -      # PIC is the default on this platform
 -      # Common symbols not allowed in MH_DYLIB files
@@ -19149,54 +16153,59 @@
 -    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_prog_compiler_can_build_shared=no
--      enable_shared=no
--      ;;
- 
--    sysv4*MP*)
--      if test -d /usr/nec; then
--	lt_prog_compiler_pic=-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_prog_compiler_pic='-fPIC'
--	;;
--      esac
--      ;;
- 
 +  # Check whether --enable-static was given.
 +if test "${enable_static+set}" = set; then
 +  enableval=$enable_static; 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
++else
++  enable_static=yes
++fi
+ 
+-    msdosdjgpp*)
+-      # Just because we use GCC doesn't mean we suddenly get shared libraries
+-      # on systems that don't support them.
+-      lt_prog_compiler_can_build_shared=no
+-      enable_shared=no
+-      ;;
+ 
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	lt_prog_compiler_pic=-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_prog_compiler_pic='-fPIC'
+-	;;
+-      esac
+-      ;;
+ 
+-    *)
 -      lt_prog_compiler_pic='-fPIC'
-+     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
+-      ;;
+-    esac
 -  else
 -    # PORTME Check for flag to pass linker flags through the system compiler.
 -    case $host_os in
@@ -19219,9 +16228,6 @@
 -         ;;
 -       esac
 -       ;;
-+else
-+  enable_static=yes
-+fi
  
 -    mingw* | cygwin* | pw32* | os2*)
 -      # This hack is so that the source file can tell whether it is being
@@ -19299,43 +16305,41 @@
 -      # All OSF/1 code is PIC.
 -      lt_prog_compiler_static='-non_shared'
 -      ;;
- 
--    rdos*)
--      lt_prog_compiler_static='-non_shared'
--      ;;
- 
--    solaris*)
--      lt_prog_compiler_pic='-KPIC'
--      lt_prog_compiler_static='-Bstatic'
--      case $cc_basename in
--      f77* | f90* | f95*)
--	lt_prog_compiler_wl='-Qoption ld ';;
--      *)
--	lt_prog_compiler_wl='-Wl,';;
--      esac
--      ;;
- 
--    sunos4*)
--      lt_prog_compiler_wl='-Qoption ld '
--      lt_prog_compiler_pic='-PIC'
--      lt_prog_compiler_static='-Bstatic'
--      ;;
- 
--    sysv4 | sysv4.2uw2* | sysv4.3*)
--      lt_prog_compiler_wl='-Wl,'
--      lt_prog_compiler_pic='-KPIC'
--      lt_prog_compiler_static='-Bstatic'
--      ;;
 +# Check whether --with-pic was given.
 +if test "${with_pic+set}" = set; then
 +  withval=$with_pic; pic_mode="$withval"
 +else
 +  pic_mode=default
 +fi
-+
-+
+ 
+-    rdos*)
+-      lt_prog_compiler_static='-non_shared'
+-      ;;
+ 
+-    solaris*)
+-      lt_prog_compiler_pic='-KPIC'
+-      lt_prog_compiler_static='-Bstatic'
+-      case $cc_basename in
+-      f77* | f90* | f95*)
+-	lt_prog_compiler_wl='-Qoption ld ';;
+-      *)
+-	lt_prog_compiler_wl='-Wl,';;
+-      esac
+-      ;;
 +test -z "$pic_mode" && pic_mode=default
  
+-    sunos4*)
+-      lt_prog_compiler_wl='-Qoption ld '
+-      lt_prog_compiler_pic='-PIC'
+-      lt_prog_compiler_static='-Bstatic'
+-      ;;
+ 
+-    sysv4 | sysv4.2uw2* | sysv4.3*)
+-      lt_prog_compiler_wl='-Wl,'
+-      lt_prog_compiler_pic='-KPIC'
+-      lt_prog_compiler_static='-Bstatic'
+-      ;;
+ 
 -    sysv4*MP*)
 -      if test -d /usr/nec ;then
 -	lt_prog_compiler_pic='-Kconform_pic'
@@ -19359,8 +16363,6 @@
 -      lt_prog_compiler_static='-Bstatic'
 -      ;;
  
-+
-+
 +  # Check whether --enable-fast-install was given.
 +if test "${enable_fast_install+set}" = set; then
 +  enableval=$enable_fast_install; p=${PACKAGE-default}
@@ -19718,7 +16720,7 @@
 -      always_export_symbols=no
 -      enable_shared_with_static_runtimes=yes
 -      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
--
+ 
 -      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
 -        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 -	# If the export-symbols file already is a .def file (1st line
@@ -19734,7 +16736,7 @@
 -	ld_shlibs=no
 -      fi
 -      ;;
--
+ 
 -    interix[3-9]*)
 -      hardcode_direct=no
 -      hardcode_shlibpath_var=no
@@ -19834,6 +16836,7 @@
 -*** 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.
++test -z "$LN_S" && LN_S="ln -s"
  
 -_LT_EOF
 -	;;
@@ -19855,7 +16858,6 @@
 -      hardcode_direct=yes
 -      hardcode_shlibpath_var=no
 -      ;;
-+test -z "$LN_S" && LN_S="ln -s"
  
 -    *)
 -      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -20029,20 +17031,38 @@
 -# 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
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
 +if test -n "${ZSH_VERSION+set}" ; then
 +   setopt NO_GLOB_SUBST
  fi
++
++{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
++$as_echo_n "checking for objdir... " >&6; }
++if test "${lt_cv_objdir+set}" = set; then
++  $as_echo_n "(cached) " >&6
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  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
++fi
++{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
++$as_echo "$lt_cv_objdir" >&6; }
++objdir=$lt_cv_objdir
+ 
+ 
+-fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
--
+ 
 -       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
 -	archive_expsym_cmds="\$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
@@ -20054,77 +17074,59 @@
 -	 # Determine the default libpath from the value encoded in an empty executable.
 -	 cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
-+{ echo "$as_me:$LINENO: checking for objdir" >&5
-+echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
-+if test "${lt_cv_objdir+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  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
-+fi
-+{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-+echo "${ECHO_T}$lt_cv_objdir" >&6; }
-+objdir=$lt_cv_objdir
- 
--int
--main ()
--{
- 
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
- 
--lt_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
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
--fi
++
 +cat >>confdefs.h <<_ACEOF
 +#define LT_OBJDIR "$lt_cv_objdir/"
-+_ACEOF
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+ 
+-int
+-main ()
+-{
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
+ 
+-lt_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
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
@@ -20151,11 +17153,11 @@
 -      # see comment about different semantics on the GNU ld section
 -      ld_shlibs=no
 -      ;;
- 
+-
 -    bsdi[45]*)
 -      export_dynamic_flag_spec=-rdynamic
 -      ;;
- 
+-
 -    cygwin* | mingw* | pw32*)
 -      # When not using gcc, we currently assume that we are using
 -      # Microsoft Visual C++.
@@ -20288,15 +17290,31 @@
 -      if test "$with_gnu_ld" = no; then
 -	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
 -	hardcode_libdir_separator=:
++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
  
 -	hardcode_direct=yes
 -	export_dynamic_flag_spec='${wl}-E'
++# Sed substitution that helps us do robust quoting.  It backslashifies
++# metacharacters that are still active within double-quoted strings.
++sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
  
 -	# hardcode_minus_L: Not really in the search PATH,
 -	# but as the default location of the library.
 -	hardcode_minus_L=yes
 -      fi
 -      ;;
++# Same as above, but do not quote variable references.
++double_quote_subst='s/\(["`\\]\)/\\\1/g'
  
 -    hpux11*)
 -      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -20327,17 +17345,9 @@
 -      if test "$with_gnu_ld" = no; then
 -	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
 -	hardcode_libdir_separator=:
-+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 to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
  
 -	case $host_cpu in
 -	hppa*64*|ia64*)
@@ -20348,9 +17358,8 @@
 -	*)
 -	  hardcode_direct=yes
 -	  export_dynamic_flag_spec='${wl}-E'
-+# Sed substitution that helps us do robust quoting.  It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
++# Sed substitution to delay expansion of an escaped single quote.
++delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
  
 -	  # hardcode_minus_L: Not really in the search PATH,
 -	  # but as the default location of the library.
@@ -20359,8 +17368,8 @@
 -	esac
 -      fi
 -      ;;
-+# Same as above, but do not quote variable references.
-+double_quote_subst='s/\(["`\\]\)/\\\1/g'
++# Sed substitution to avoid accidental globbing in evaled expressions
++no_glob_subst='s/\*/\\\*/g'
  
 -    irix5* | irix6* | nonstopux*)
 -      if test "$GCC" = yes; then
@@ -20373,9 +17382,9 @@
 -      hardcode_libdir_separator=:
 -      link_all_deplibs=yes
 -      ;;
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++# Global variables:
++ofile=libtool
++can_build_shared=yes
  
 -    netbsd* | netbsdelf*-gnu)
 -      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -20387,8 +17396,9 @@
 -      hardcode_direct=yes
 -      hardcode_shlibpath_var=no
 -      ;;
-+# Sed substitution to delay expansion of an escaped single quote.
-+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
++# All known linkers require a `.a' archive for static linking (except MSVC,
++# which needs '.lib').
++libext=a
  
 -    newsos6)
 -      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
@@ -20397,8 +17407,7 @@
 -      hardcode_libdir_separator=:
 -      hardcode_shlibpath_var=no
 -      ;;
-+# Sed substitution to avoid accidental globbing in evaled expressions
-+no_glob_subst='s/\*/\\\*/g'
++with_gnu_ld="$lt_cv_prog_gnu_ld"
  
 -    openbsd*)
 -      if test -f /usr/libexec/ld.so; then
@@ -20425,9 +17434,8 @@
 -	ld_shlibs=no
 -      fi
 -      ;;
-+# Global variables:
-+ofile=libtool
-+can_build_shared=yes
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
  
 -    os2*)
 -      hardcode_libdir_flag_spec='-L$libdir'
@@ -20436,9 +17444,12 @@
 -      archive_cmds='$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'
 -      old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
 -      ;;
-+# All known linkers require a `.a' archive for static linking (except MSVC,
-+# which needs '.lib').
-+libext=a
++# Set sane defaults for various variables
++test -z "$CC" && CC=cc
++test -z "$LTCC" && LTCC=$CC
++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
++test -z "$LD" && LD=ld
++test -z "$ac_objext" && ac_objext=o
  
 -    osf3*)
 -      if test "$GCC" = yes; then
@@ -20451,7 +17462,15 @@
 -      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
 -      hardcode_libdir_separator=:
 -      ;;
-+with_gnu_ld="$lt_cv_prog_gnu_ld"
++for cc_temp in $compiler""; 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-%%"`
  
 -    osf4* | osf5*)	# as osf3* with the addition of -msym flag
 -      if test "$GCC" = yes; then
@@ -20463,20 +17482,45 @@
 -	archive_cmds='$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'
 -	archive_expsym_cmds='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'
-+old_CC="$CC"
-+old_CFLAGS="$CFLAGS"
  
 -	# Both c and cxx compiler support -rpath directly
 -	hardcode_libdir_flag_spec='-rpath $libdir'
 -      fi
 -      hardcode_libdir_separator=:
 -      ;;
-+# Set sane defaults for various variables
-+test -z "$CC" && CC=cc
-+test -z "$LTCC" && LTCC=$CC
-+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-+test -z "$LD" && LD=ld
-+test -z "$ac_objext" && ac_objext=o
++# Only perform the check for file, if the check method requires it
++test -z "$MAGIC_CMD" && MAGIC_CMD=file
++case $deplibs_check_method in
++file_magic*)
++  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
++    { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
++$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  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
++  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
++  for ac_dir in $ac_dummy; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/${ac_tool_prefix}file; then
++      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
++      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 <<_LT_EOF 1>&2
  
 -    solaris*)
 -      no_undefined_flag=' -z text'
@@ -20509,15 +17553,14 @@
 -      esac
 -      link_all_deplibs=yes
 -      ;;
-+for cc_temp in $compiler""; 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-%%"`
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such.  This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem.  Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool@gnu.org
  
 -    sunos4*)
 -      if test "x$host_vendor" = xsequent; then
@@ -20526,12 +17569,23 @@
 -	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
 -      else
 -	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
--      fi
++_LT_EOF
++	  fi ;;
++	esac
+       fi
 -      hardcode_libdir_flag_spec='-L$libdir'
 -      hardcode_direct=yes
 -      hardcode_minus_L=yes
 -      hardcode_shlibpath_var=no
 -      ;;
++      break
++    fi
++  done
++  IFS="$lt_save_ifs"
++  MAGIC_CMD="$lt_save_MAGIC_CMD"
++  ;;
++esac
++fi
  
 -    sysv4)
 -      case $host_vendor in
@@ -20554,53 +17608,20 @@
 -      runpath_var='LD_RUN_PATH'
 -      hardcode_shlibpath_var=no
 -      ;;
-+# Only perform the check for file, if the check method requires it
-+test -z "$MAGIC_CMD" && MAGIC_CMD=file
-+case $deplibs_check_method in
-+file_magic*)
-+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-+    { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-+echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
-+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
++$as_echo "$MAGIC_CMD" >&6; }
 +else
-+  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
-+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-+  for ac_dir in $ac_dummy; do
-+    IFS="$lt_save_ifs"
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/${ac_tool_prefix}file; then
-+      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-+      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 <<_LT_EOF 1>&2
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
  
 -    sysv4.3*)
 -      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 -      hardcode_shlibpath_var=no
 -      export_dynamic_flag_spec='-Bexport'
 -      ;;
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such.  This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem.  Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool@gnu.org
  
 -    sysv4*MP*)
 -      if test -d /usr/nec; then
@@ -20609,33 +17630,14 @@
 -	runpath_var=LD_RUN_PATH
 -	hardcode_runpath_var=yes
 -	ld_shlibs=yes
-+_LT_EOF
-+	  fi ;;
-+	esac
-       fi
+-      fi
 -      ;;
-+      break
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+  MAGIC_CMD="$lt_save_MAGIC_CMD"
-+  ;;
-+esac
-+fi
  
 -    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
 -      no_undefined_flag='${wl}-z,text'
 -      archive_cmds_need_lc=no
 -      hardcode_shlibpath_var=no
 -      runpath_var='LD_RUN_PATH'
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
-+  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-+echo "${ECHO_T}$MAGIC_CMD" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
  
 -      if test "$GCC" = yes; then
 -	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -20662,6 +17664,36 @@
 -      link_all_deplibs=yes
 -      export_dynamic_flag_spec='${wl}-Bexport'
 -      runpath_var='LD_RUN_PATH'
++if test -z "$lt_cv_path_MAGIC_CMD"; then
++  if test -n "$ac_tool_prefix"; then
++    { $as_echo "$as_me:$LINENO: checking for file" >&5
++$as_echo_n "checking for file... " >&6; }
++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  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
++  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
++  for ac_dir in $ac_dummy; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/file; then
++      lt_cv_path_MAGIC_CMD="$ac_dir/file"
++      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 <<_LT_EOF 1>&2
  
 -      if test "$GCC" = yes; then
 -	archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -20669,25 +17701,60 @@
 -      else
 -	archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 -	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--      fi
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such.  This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem.  Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool@gnu.org
++
++_LT_EOF
++	  fi ;;
++	esac
+       fi
 -      ;;
++      break
++    fi
++  done
++  IFS="$lt_save_ifs"
++  MAGIC_CMD="$lt_save_MAGIC_CMD"
++  ;;
++esac
++fi
  
 -    uts4*)
 -      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 -      hardcode_libdir_flag_spec='-L$libdir'
 -      hardcode_shlibpath_var=no
 -      ;;
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
++$as_echo "$MAGIC_CMD" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
  
 -    *)
 -      ld_shlibs=no
 -      ;;
 -    esac
--  fi
--
++
++  else
++    MAGIC_CMD=:
+   fi
++fi
+ 
 -{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
 -echo "${ECHO_T}$ld_shlibs" >&6; }
 -test "$ld_shlibs" = no && can_build_shared=no
--
++  fi
++  ;;
++esac
+ 
 -#
 -# Do we need to explicitly link libc?
 -#
@@ -20695,36 +17762,7 @@
 -x|xyes)
 -  # Assume -lc should be added
 -  archive_cmds_need_lc=yes
-+if test -z "$lt_cv_path_MAGIC_CMD"; then
-+  if test -n "$ac_tool_prefix"; then
-+    { echo "$as_me:$LINENO: checking for file" >&5
-+echo $ECHO_N "checking for file... $ECHO_C" >&6; }
-+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  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
-+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-+  for ac_dir in $ac_dummy; do
-+    IFS="$lt_save_ifs"
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/file; then
-+      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-+      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 <<_LT_EOF 1>&2
++# Use C for the default configuration in the libtool script
  
 -  if test "$enable_shared" = yes && test "$GCC" = yes; then
 -    case $archive_cmds in
@@ -20739,14 +17777,12 @@
 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
 -      $rm conftest*
 -      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such.  This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem.  Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool@gnu.org
++lt_save_CC="$CC"
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
 -      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
@@ -20779,24 +17815,15 @@
 -        allow_undefined_flag=$lt_save_allow_undefined_flag
 -      else
 -        cat conftest.err 1>&5
-+_LT_EOF
-+	  fi ;;
-+	esac
-       fi
+-      fi
 -      $rm conftest*
 -      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
 -echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
 -      ;;
 -    esac
 -  fi
-+      break
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+  MAGIC_CMD="$lt_save_MAGIC_CMD"
-   ;;
- esac
-+fi
+-  ;;
+-esac
  
 -{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
@@ -20813,7 +17840,9 @@
 -version_type=none
 -dynamic_linker="$host_os ld.so"
 -sys_lib_dlsearch_path_spec="/lib /usr/lib"
--
++# Source file extension for C test sources.
++ac_ext=c
+ 
 -if test "$GCC" = yes; then
 -  case $host_os in
 -    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
@@ -20862,177 +17891,168 @@
 -  if (lt_freq[lt_foo] == 1) { print lt_foo; }
 -}'`
 -  sys_lib_search_path_spec=`echo $lt_search_path_spec`
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
-+  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-+echo "${ECHO_T}$MAGIC_CMD" >&6; }
- else
+-else
 -  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
+-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
-+    MAGIC_CMD=:
-   fi
--  ;;
-+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'
-+  fi
-   ;;
-+esac
- 
--beos*)
--  library_names_spec='${libname}${shared_ext}'
--  dynamic_linker="$host_os ld.so"
--  shlibpath_var=LIBRARY_PATH
--  ;;
-+# Use C for the default configuration in the libtool script
- 
--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
--  ;;
-+lt_save_CC="$CC"
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--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
--    ;;
-+# Source file extension for C test sources.
-+ac_ext=c
- 
--  *)
--    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
--  ;;
 +# Object file extension for compiled C test sources.
 +objext=o
 +objext=$objext
  
+-# when you set need_version to no, make sure it does not cause -set_version
+-# flags to be left without arguments
+-need_version=unknown
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="int some_variable = 0;"
+ 
+-case $host_os in
+-aix3*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+-  shlibpath_var=LIBPATH
++# Code to be used in simple link tests
++lt_simple_link_test_code='int main(){return(0);}'
+ 
+-  # 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
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
+ 
+-    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
+-    ;;
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+ 
+-  *)
+-    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
+-  ;;
++# Allow CC to be a program name with arguments.
++compiler=$CC
+ 
 -darwin* | rhapsody*)
 -  dynamic_linker="$host_os dyld"
 -  version_type=darwin
@@ -21043,14 +18063,19 @@
 -  shlibpath_overrides_runpath=yes
 -  shlibpath_var=DYLD_LIBRARY_PATH
 -  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="int some_variable = 0;"
++# Save the default compiler, since it gets overwritten when the other
++# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
++compiler_DEFAULT=$CC
  
 -  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
 -  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
 -  ;;
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='int main(){return(0);}'
++# save warnings/boilerplate of simple test code
++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*
  
 -dgux*)
 -  version_type=linux
@@ -21060,6 +18085,11 @@
 -  soname_spec='${libname}${release}${shared_ext}$major'
 -  shlibpath_var=LD_LIBRARY_PATH
 -  ;;
++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*
  
 -freebsd1*)
 -  dynamic_linker=no
@@ -21108,7 +18138,7 @@
 -    ;;
 -  esac
 -  ;;
- 
+-
 -gnu*)
 -  version_type=linux
 -  need_lib_prefix=no
@@ -21118,7 +18148,7 @@
 -  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.
@@ -21164,7 +18194,7 @@
 -  # 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
@@ -21176,7 +18206,7 @@
 -  shlibpath_overrides_runpath=no
 -  hardcode_into_libs=yes
 -  ;;
- 
+-
 -irix5* | irix6* | nonstopux*)
 -  case $host_os in
 -    nonstopux*) version_type=nonstopux ;;
@@ -21213,16 +18243,12 @@
 -  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
 -  hardcode_into_libs=yes
 -  ;;
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
- 
+-
 -# No shared lib support for Linux oldld, aout, or coff.
 -linux*oldld* | linux*aout* | linux*coff*)
 -  dynamic_linker=no
 -  ;;
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
- 
+-
 -# This must be Linux ELF.
 -linux* | k*bsd*-gnu)
 -  version_type=linux
@@ -21237,18 +18263,13 @@
 -  # Some rework will be needed to allow for fast_install
 -  # before this can be enabled.
 -  hardcode_into_libs=yes
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
- 
+-
 -  # 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
-+# Save the default compiler, since it gets overwritten when the other
-+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-+compiler_DEFAULT=$CC
- 
+-
 -  # 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,
@@ -21257,13 +18278,7 @@
 -  # assume the GNU/Linux dynamic linker is in use.
 -  dynamic_linker='GNU/Linux ld.so'
 -  ;;
-+# save warnings/boilerplate of simple test code
-+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*
- 
+-
 -netbsdelf*-gnu)
 -  version_type=linux
 -  need_lib_prefix=no
@@ -21275,12 +18290,7 @@
 -  hardcode_into_libs=yes
 -  dynamic_linker='NetBSD ld.elf_so'
 -  ;;
-+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*
- 
+-
 -netbsd*)
 -  version_type=sunos
 -  need_lib_prefix=no
@@ -21298,15 +18308,14 @@
 -  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
 -  ;;
-+if test -n "$compiler"; then
- 
+-
 -nto-qnx*)
 -  version_type=linux
 -  need_lib_prefix=no
@@ -21316,8 +18325,7 @@
 -  shlibpath_var=LD_LIBRARY_PATH
 -  shlibpath_overrides_runpath=yes
 -  ;;
-+lt_prog_compiler_no_builtin_flag=
- 
+-
 -openbsd*)
 -  version_type=sunos
 -  sys_lib_dlsearch_path_spec="/usr/lib"
@@ -21343,9 +18351,7 @@
 -    shlibpath_overrides_runpath=yes
 -  fi
 -  ;;
-+if test "$GCC" = yes; then
-+  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
- 
+-
 -os2*)
 -  libname_spec='$name'
 -  shrext_cmds=".dll"
@@ -21354,40 +18360,7 @@
 -  dynamic_linker='OS/2 ld.exe'
 -  shlibpath_var=LIBPATH
 -  ;;
-+  { echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
-+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_cv_prog_compiler_rtti_exceptions=no
-+   ac_outfile=conftest.$ac_objext
-+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+   lt_compiler_flag="-fno-rtti -fno-exceptions"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # 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:8811: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>conftest.err)
-+   ac_status=$?
-+   cat conftest.err >&5
-+   echo "$as_me:8815: \$? = $ac_status" >&5
-+   if (exit $ac_status) && test -s "$ac_outfile"; then
-+     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings other than the usual output.
-+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-+       lt_cv_prog_compiler_rtti_exceptions=yes
-+     fi
-+   fi
-+   $RM conftest*
- 
+-
 -osf3* | osf4* | osf5*)
 -  version_type=osf
 -  need_lib_prefix=no
@@ -21398,19 +18371,11 @@
 -  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"
 -  ;;
-+fi
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
- 
+-
 -rdos*)
 -  dynamic_linker=no
 -  ;;
-+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-+    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-+else
-+    :
-+fi
- 
+-
 -solaris*)
 -  version_type=linux
 -  need_lib_prefix=no
@@ -21423,8 +18388,7 @@
 -  # ldd complains unless libraries are executable
 -  postinstall_cmds='chmod +x $lib'
 -  ;;
-+fi
- 
+-
 -sunos4*)
 -  version_type=sunos
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
@@ -21436,7 +18400,7 @@
 -  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}'
@@ -21460,7 +18424,7 @@
 -      ;;
 -  esac
 -  ;;
- 
+-
 -sysv4*MP*)
 -  if test -d /usr/nec ;then
 -    version_type=linux
@@ -21469,7 +18433,7 @@
 -    shlibpath_var=LD_LIBRARY_PATH
 -  fi
 -  ;;
- 
+-
 -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 -  version_type=freebsd-elf
 -  need_lib_prefix=no
@@ -21492,14 +18456,14 @@
 -  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
 -  ;;
@@ -21507,67 +18471,34 @@
 -{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
 -echo "${ECHO_T}$dynamic_linker" >&6; }
 -test "$dynamic_linker" = no && can_build_shared=no
-+  lt_prog_compiler_wl=
-+lt_prog_compiler_pic=
-+lt_prog_compiler_static=
- 
+-
 -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
 -  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
 -fi
-+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
- 
+-
 -sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
 -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
 -  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
 -fi
-+  if test "$GCC" = yes; then
-+    lt_prog_compiler_wl='-Wl,'
-+    lt_prog_compiler_static='-static'
- 
+-
 -sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-+    case $host_os in
-+      aix*)
-+      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	lt_prog_compiler_static='-Bstatic'
-+      fi
-+      ;;
- 
+-
 -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
-+    amigaos*)
-+      case $host_cpu in
-+      powerpc)
-+            # see comment about AmigaOS4 .so support
-+            lt_prog_compiler_pic='-fPIC'
-+        ;;
-+      m68k)
-+            # 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_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
-+        ;;
-+      esac
-+      ;;
- 
+-
 -{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
 -hardcode_action=
 -if test -n "$hardcode_libdir_flag_spec" || \
 -   test -n "$runpath_var" || \
 -   test "X$hardcode_automatic" = "Xyes" ; then
-+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+      # PIC is the default for these OSes.
-+      ;;
- 
+-
 -  # We can hardcode non-existant directories.
 -  if test "$hardcode_direct" != no &&
 -     # If the only mechanism to avoid hardcoding is shlibpath_var, we
@@ -21588,14 +18519,7 @@
 -fi
 -{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
 -echo "${ECHO_T}$hardcode_action" >&6; }
-+    mingw* | cygwin* | pw32* | os2*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+      # (--disable-auto-import) libraries
-+      lt_prog_compiler_pic='-DDLL_EXPORT'
-+      ;;
- 
+-
 -if test "$hardcode_action" = relink; then
 -  # Fast installation is not supported
 -  enable_fast_install=no
@@ -21604,12 +18528,7 @@
 -  # Fast installation is not necessary
 -  enable_fast_install=needless
 -fi
-+    darwin* | rhapsody*)
-+      # PIC is the default on this platform
-+      # Common symbols not allowed in MH_DYLIB files
-+      lt_prog_compiler_pic='-fno-common'
-+      ;;
- 
+-
 -striplib=
 -old_striplib=
 -{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
@@ -21639,19 +18558,7 @@
 -    ;;
 -  esac
 -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_prog_compiler_pic='-fPIC'
-+	;;
-+      esac
-+      ;;
- 
+-
 -if test "x$enable_dlopen" != xyes; then
 -  enable_dlopen=unknown
 -  enable_dlopen_self=unknown
@@ -21659,44 +18566,24 @@
 -else
 -  lt_cv_dlopen=no
 -  lt_cv_dlopen_libs=
-+    interix[3-9]*)
-+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-+      # Instead, we relocate shared libraries at runtime.
-+      ;;
- 
+-
 -  case $host_os in
 -  beos*)
 -    lt_cv_dlopen="load_add_on"
 -    lt_cv_dlopen_libs=
 -    lt_cv_dlopen_self=yes
 -    ;;
-+    msdosdjgpp*)
-+      # Just because we use GCC doesn't mean we suddenly get shared libraries
-+      # on systems that don't support them.
-+      lt_prog_compiler_can_build_shared=no
-+      enable_shared=no
-+      ;;
- 
+-
 -  mingw* | pw32*)
 -    lt_cv_dlopen="LoadLibrary"
 -    lt_cv_dlopen_libs=
 -   ;;
-+    *nto* | *qnx*)
-+      # QNX uses GNU C++, but need to define -shared option too, otherwise
-+      # it will coredump.
-+      lt_prog_compiler_pic='-fPIC -shared'
-+      ;;
- 
+-
 -  cygwin*)
 -    lt_cv_dlopen="dlopen"
 -    lt_cv_dlopen_libs=
 -   ;;
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	lt_prog_compiler_pic=-Kconform_pic
-+      fi
-+      ;;
- 
+-
 -  darwin*)
 -  # if libdl is installed we need to link against it
 -    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
@@ -21712,23 +18599,7 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+    *)
-+      lt_prog_compiler_pic='-fPIC'
-+      ;;
-+    esac
-+  else
-+    # PORTME Check for flag to pass linker flags through the system compiler.
-+    case $host_os in
-+    aix*)
-+      lt_prog_compiler_wl='-Wl,'
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	lt_prog_compiler_static='-Bstatic'
-+      else
-+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
-+      fi
-+      ;;
- 
+-
 -/* 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.  */
@@ -21766,30 +18637,10 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+    mingw* | cygwin* | pw32* | os2*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      lt_prog_compiler_pic='-DDLL_EXPORT'
-+      ;;
- 
+-
 -	ac_cv_lib_dl_dlopen=no
 -fi
-+    hpux9* | hpux10* | hpux11*)
-+      lt_prog_compiler_wl='-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_prog_compiler_pic='+Z'
-+	;;
-+      esac
-+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-+      lt_prog_compiler_static='${wl}-a ${wl}archive'
-+      ;;
- 
+-
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
@@ -21799,72 +18650,15 @@
 -if test $ac_cv_lib_dl_dlopen = yes; then
 -  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 -else
-+    irix5* | irix6* | nonstopux*)
-+      lt_prog_compiler_wl='-Wl,'
-+      # PIC (with -KPIC) is the default.
-+      lt_prog_compiler_static='-non_shared'
-+      ;;
- 
+-
 -    lt_cv_dlopen="dyld"
 -    lt_cv_dlopen_libs=
 -    lt_cv_dlopen_self=yes
-+    linux* | k*bsd*-gnu)
-+      case $cc_basename in
-+      icc* | ecc* | ifort*)
-+	lt_prog_compiler_wl='-Wl,'
-+	lt_prog_compiler_pic='-KPIC'
-+	lt_prog_compiler_static='-static'
-+        ;;
-+      pgcc* | pgf77* | pgf90* | pgf95*)
-+        # Portland Group compilers (*not* the Pentium gcc compiler,
-+	# which looks to be a dead project)
-+	lt_prog_compiler_wl='-Wl,'
-+	lt_prog_compiler_pic='-fpic'
-+	lt_prog_compiler_static='-Bstatic'
-+        ;;
-+      ccc*)
-+        lt_prog_compiler_wl='-Wl,'
-+        # All Alpha code is PIC.
-+        lt_prog_compiler_static='-non_shared'
-+        ;;
-+      xl*)
-+	# IBM XL C 8.0/Fortran 10.1 on PPC
-+	lt_prog_compiler_wl='-Wl,'
-+	lt_prog_compiler_pic='-qpic'
-+	lt_prog_compiler_static='-qstaticlink'
-+	;;
-+      *)
-+	case `$CC -V 2>&1 | sed 5q` in
-+	*Sun\ C*)
-+	  # Sun C 5.9
-+	  lt_prog_compiler_pic='-KPIC'
-+	  lt_prog_compiler_static='-Bstatic'
-+	  lt_prog_compiler_wl='-Wl,'
-+	  ;;
-+	*Sun\ F*)
-+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-+	  lt_prog_compiler_pic='-KPIC'
-+	  lt_prog_compiler_static='-Bstatic'
-+	  lt_prog_compiler_wl=''
-+	  ;;
-+	esac
-+	;;
-+      esac
-+      ;;
- 
+-
 -fi
-+    newsos6)
-+      lt_prog_compiler_pic='-KPIC'
-+      lt_prog_compiler_static='-Bstatic'
-+      ;;
- 
+-
 -   ;;
-+    *nto* | *qnx*)
-+      # QNX uses GNU C++, but need to define -shared option too, otherwise
-+      # it will coredump.
-+      lt_prog_compiler_pic='-fPIC -shared'
-+      ;;
- 
+-
 -  *)
 -    { echo "$as_me:$LINENO: checking for shl_load" >&5
 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
@@ -21880,43 +18674,20 @@
 -/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define shl_load innocuous_shl_load
-+    osf3* | osf4* | osf5*)
-+      lt_prog_compiler_wl='-Wl,'
-+      # All OSF/1 code is PIC.
-+      lt_prog_compiler_static='-non_shared'
-+      ;;
- 
+-
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char shl_load (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+    rdos*)
-+      lt_prog_compiler_static='-non_shared'
-+      ;;
- 
+-
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+    solaris*)
-+      lt_prog_compiler_pic='-KPIC'
-+      lt_prog_compiler_static='-Bstatic'
-+      case $cc_basename in
-+      f77* | f90* | f95*)
-+	lt_prog_compiler_wl='-Qoption ld ';;
-+      *)
-+	lt_prog_compiler_wl='-Wl,';;
-+      esac
-+      ;;
- 
+-
 -#undef shl_load
-+    sunos4*)
-+      lt_prog_compiler_wl='-Qoption ld '
-+      lt_prog_compiler_pic='-PIC'
-+      lt_prog_compiler_static='-Bstatic'
-+      ;;
- 
+-
 -/* 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.  */
@@ -21930,12 +18701,7 @@
 -#if defined __stub_shl_load || defined __stub___shl_load
 -choke me
 -#endif
-+    sysv4 | sysv4.2uw2* | sysv4.3*)
-+      lt_prog_compiler_wl='-Wl,'
-+      lt_prog_compiler_pic='-KPIC'
-+      lt_prog_compiler_static='-Bstatic'
-+      ;;
- 
+-
 -int
 -main ()
 -{
@@ -21949,44 +18715,7 @@
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
-+    sysv4*MP*)
-+      if test -d /usr/nec ;then
-+	lt_prog_compiler_pic='-Kconform_pic'
-+	lt_prog_compiler_static='-Bstatic'
-+      fi
-+      ;;
-+
-+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-+      lt_prog_compiler_wl='-Wl,'
-+      lt_prog_compiler_pic='-KPIC'
-+      lt_prog_compiler_static='-Bstatic'
-+      ;;
-+
-+    unicos*)
-+      lt_prog_compiler_wl='-Wl,'
-+      lt_prog_compiler_can_build_shared=no
-+      ;;
-+
-+    uts4*)
-+      lt_prog_compiler_pic='-pic'
-+      lt_prog_compiler_static='-Bstatic'
-+      ;;
-+
-+    *)
-+      lt_prog_compiler_can_build_shared=no
-+      ;;
-+    esac
-+  fi
-+
-+case $host_os in
-+  # For platforms which do not support PIC, -DPIC is meaningless:
-+  *djgpp*)
-+    lt_prog_compiler_pic=
-+    ;;
-+  *)
-+    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-+    ;;
- esac
+-esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 -  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
@@ -22003,12 +18732,10 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
- 
+-
 -	ac_cv_func_shl_load=no
 -fi
- 
+-
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -fi
@@ -22020,19 +18747,8 @@
 -  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
 -if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-+
-+
-+
-+
-+#
-+# Check to make sure the PIC flag actually works.
-+#
-+if test -n "$lt_prog_compiler_pic"; then
-+  { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
-+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-ldld  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
@@ -22041,35 +18757,7 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+  lt_cv_prog_compiler_pic_works=no
-+   ac_outfile=conftest.$ac_objext
-+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # 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:9135: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>conftest.err)
-+   ac_status=$?
-+   cat conftest.err >&5
-+   echo "$as_me:9139: \$? = $ac_status" >&5
-+   if (exit $ac_status) && test -s "$ac_outfile"; then
-+     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings other than the usual output.
-+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-+       lt_cv_prog_compiler_pic_works=yes
-+     fi
-+   fi
-+   $RM conftest*
- 
+-
 -/* 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.  */
@@ -22107,25 +18795,14 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+fi
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
- 
+-
 -	ac_cv_lib_dld_shl_load=no
-+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-+    case $lt_prog_compiler_pic in
-+     "" | " "*) ;;
-+     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-+     esac
-+else
-+    lt_prog_compiler_pic=
-+     lt_prog_compiler_can_build_shared=no
- fi
- 
+-fi
+-
 -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
+-fi
 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
 -if test $ac_cv_lib_dld_shl_load = yes; then
@@ -22145,20 +18822,20 @@
 -/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define dlopen innocuous_dlopen
- 
+-
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char dlopen (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
- 
+-
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
- 
+-
 -#undef dlopen
- 
+-
 -/* 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.  */
@@ -22172,7 +18849,7 @@
 -#if defined __stub_dlopen || defined __stub___dlopen
 -choke me
 -#endif
- 
+-
 -int
 -main ()
 -{
@@ -22200,45 +18877,13 @@
 -       } && test -s conftest$ac_exeext &&
 -       $as_test_x conftest$ac_exeext; then
 -  ac_cv_func_dlopen=yes
-+
-+#
-+# Check to make sure the static flag actually works.
-+#
-+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-+if test "${lt_cv_prog_compiler_static_works+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  lt_cv_prog_compiler_static_works=no
-+   save_LDFLAGS="$LDFLAGS"
-+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-+   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>&5
-+       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+       if diff conftest.exp conftest.er2 >/dev/null; then
-+         lt_cv_prog_compiler_static_works=yes
-+       fi
-+     else
-+       lt_cv_prog_compiler_static_works=yes
-+     fi
-+   fi
-+   $RM -r conftest*
-+   LDFLAGS="$save_LDFLAGS"
- 
+-
 -	ac_cv_func_dlopen=no
- fi
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
- 
+-fi
+-
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -fi
@@ -22251,9 +18896,7 @@
 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-+    :
- else
+-else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-ldl  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
@@ -22262,9 +18905,7 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+    lt_prog_compiler_static=
-+fi
- 
+-
 -/* 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.  */
@@ -22302,10 +18943,10 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -	ac_cv_lib_dl_dlopen=no
 -fi
- 
+-
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
@@ -22328,7 +18969,7 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
- 
+-
 -/* 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.  */
@@ -22366,10 +19007,10 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -	ac_cv_lib_svld_dlopen=no
 -fi
- 
+-
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
@@ -22382,12 +19023,8 @@
 -  { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
 -if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-+
-+  { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-+if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-ldld  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
@@ -22396,13 +19033,7 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+  lt_cv_prog_compiler_c_o=no
-+   $RM -r conftest 2>/dev/null
-+   mkdir conftest
-+   cd conftest
-+   mkdir out
-+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
+-
 -/* 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.  */
@@ -22443,40 +19074,7 @@
 -
 -	ac_cv_lib_dld_dld_link=no
 -fi
-+   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:9240: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>out/conftest.err)
-+   ac_status=$?
-+   cat out/conftest.err >&5
-+   echo "$as_me:9244: \$? = $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
-+     # 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_cv_prog_compiler_c_o=yes
-+     fi
-+   fi
-+   chmod u+w . 2>&5
-+   $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 ..
-+   $RM -r conftest
-+   $RM conftest*
- 
+-
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
@@ -22485,111 +19083,43 @@
 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
 -if test $ac_cv_lib_dld_dld_link = yes; then
 -  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
- fi
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
- 
- 
--fi
- 
- 
--fi
- 
- 
--fi
-+  { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-+if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_cv_prog_compiler_c_o=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:9295: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>out/conftest.err)
-+   ac_status=$?
-+   cat out/conftest.err >&5
-+   echo "$as_me:9299: \$? = $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
-+     # 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_cv_prog_compiler_c_o=yes
-+     fi
-+   fi
-+   chmod u+w . 2>&5
-+   $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 ..
-+   $RM -r conftest
-+   $RM conftest*
- 
- fi
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
- 
- 
--fi
- 
+-fi
+-
+-
+-fi
+-
+-
+-fi
+-
+-
+-fi
+-
+-
+-fi
+-
+-
+-fi
+-
 -    ;;
 -  esac
- 
+-
 -  if test "x$lt_cv_dlopen" != xno; then
 -    enable_dlopen=yes
 -  else
 -    enable_dlopen=no
-+hard_links="nottested"
-+if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
-+  # do not overwrite the value of need_locks provided by the user
-+  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
-+  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
-+  { echo "$as_me:$LINENO: result: $hard_links" >&5
-+echo "${ECHO_T}$hard_links" >&6; }
-+  if test "$hard_links" = no; then
-+    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-+    need_locks=warn
-   fi
-+else
-+  need_locks=no
-+fi
- 
+-  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"
- 
+-
 -    { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
 -if test "${lt_cv_dlopen_self+set}" = set; then
@@ -22603,15 +19133,13 @@
 -  cat > conftest.$ac_ext <<EOF
 -#line 11563 "configure"
 -#include "confdefs.h"
- 
+-
 -#if HAVE_DLFCN_H
 -#include <dlfcn.h>
 -#endif
- 
+-
 -#include <stdio.h>
-+  { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
- 
+-
 -#ifdef RTLD_GLOBAL
 -#  define LT_DLGLOBAL		RTLD_GLOBAL
 -#else
@@ -22621,47 +19149,7 @@
 -#    define LT_DLGLOBAL		0
 -#  endif
 -#endif
-+  runpath_var=
-+  allow_undefined_flag=
-+  always_export_symbols=no
-+  archive_cmds=
-+  archive_expsym_cmds=
-+  compiler_needs_object=no
-+  enable_shared_with_static_runtimes=no
-+  export_dynamic_flag_spec=
-+  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  hardcode_automatic=no
-+  hardcode_direct=no
-+  hardcode_direct_absolute=no
-+  hardcode_libdir_flag_spec=
-+  hardcode_libdir_flag_spec_ld=
-+  hardcode_libdir_separator=
-+  hardcode_minus_L=no
-+  hardcode_shlibpath_var=unsupported
-+  inherit_rpath=no
-+  link_all_deplibs=unknown
-+  module_cmds=
-+  module_expsym_cmds=
-+  old_archive_from_new_cmds=
-+  old_archive_from_expsyms_cmds=
-+  thread_safe_flag_spec=
-+  whole_archive_flag_spec=
-+  # include_expsyms should be a list of space-separated symbols to be *always*
-+  # included in the symbol list
-+  include_expsyms=
-+  # 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'.
-+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-+  # platforms (ab)use it in PIC code, but their linkers get confused if
-+  # the symbol is explicitly referenced.  Since portable code cannot
-+  # rely on this symbol name, it's probably fine to never include it in
-+  # preloaded symbol tables.
-+  # Exclude shared library initialization/finalization symbols.
-+  extract_expsyms_cmds=
- 
+-
 -/* 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
@@ -22683,58 +19171,17 @@
 -#    endif
 -#  endif
 -#endif
-+  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
- 
+-
 -#ifdef __cplusplus
 -extern "C" void exit (int);
 -#endif
-+  ld_shlibs=yes
-+  if test "$with_gnu_ld" = yes; then
-+    # If archive_cmds runs LD, not CC, wlarc should be empty
-+    wlarc='${wl}'
- 
+-
 -void fnord() { int i=42;}
 -int main ()
 -{
 -  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
 -  int status = $lt_dlunknown;
-+    # 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
-+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    export_dynamic_flag_spec='${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
-+      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+    else
-+      whole_archive_flag_spec=
-+    fi
-+    supports_anon_versioning=no
-+    case `$LD -v 2>&1` 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
- 
+-
 -  if (self)
 -    {
 -      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
@@ -22743,14 +19190,7 @@
 -    }
 -  else
 -    puts (dlerror ());
-+    # 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
-+	ld_shlibs=no
-+	cat <<_LT_EOF 1>&2
- 
+-
 -    exit (status);
 -}
 -EOF
@@ -22772,34 +19212,12 @@
 -  fi
 -fi
 -rm -fr conftest*
-+*** 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.
- 
-+_LT_EOF
-+      fi
-+      ;;
- 
+-
+-
 -fi
 -{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
-+    amigaos*)
-+      case $host_cpu in
-+      powerpc)
-+            # see comment about AmigaOS4 .so support
-+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+            archive_expsym_cmds=''
-+        ;;
-+      m68k)
-+            archive_cmds='$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)'
-+            hardcode_libdir_flag_spec='-L$libdir'
-+            hardcode_minus_L=yes
-+        ;;
-+      esac
-+      ;;
- 
+-
 -    if test "x$lt_cv_dlopen_self" = xyes; then
 -      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
 -      { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
@@ -22815,46 +19233,13 @@
 -  cat > conftest.$ac_ext <<EOF
 -#line 11663 "configure"
 -#include "confdefs.h"
-+    beos*)
-+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	allow_undefined_flag=unsupported
-+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-+	# support --undefined.  This deserves some investigation.  FIXME
-+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      else
-+	ld_shlibs=no
-+      fi
-+      ;;
- 
+-
 -#if HAVE_DLFCN_H
 -#include <dlfcn.h>
 -#endif
-+    cygwin* | mingw* | pw32*)
-+      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-+      # as there is no search path for DLLs.
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      allow_undefined_flag=unsupported
-+      always_export_symbols=no
-+      enable_shared_with_static_runtimes=yes
-+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
- 
+-
 -#include <stdio.h>
-+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+	# If the export-symbols file already is a .def file (1st line
-+	# is EXPORTS), use it as is; otherwise, prepend...
-+	archive_expsym_cmds='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
-+	ld_shlibs=no
-+      fi
-+      ;;
- 
+-
 -#ifdef RTLD_GLOBAL
 -#  define LT_DLGLOBAL		RTLD_GLOBAL
 -#else
@@ -22864,21 +19249,7 @@
 -#    define LT_DLGLOBAL		0
 -#  endif
 -#endif
-+    interix[3-9]*)
-+      hardcode_direct=no
-+      hardcode_shlibpath_var=no
-+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+      export_dynamic_flag_spec='${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.
-+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+      ;;
- 
+-
 -/* 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
@@ -22900,81 +19271,17 @@
 -#    endif
 -#  endif
 -#endif
-+    gnu* | linux* | tpf* | k*bsd*-gnu)
-+      tmp_diet=no
-+      if test "$host_os" = linux-dietlibc; then
-+	case $cc_basename in
-+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-+	esac
-+      fi
-+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-+	 && test "$tmp_diet" = no
-+      then
-+	tmp_addflag=
-+	tmp_sharedflag='-shared'
-+	case $cc_basename,$host_cpu in
-+        pgcc*)				# Portland Group C compiler
-+	  whole_archive_flag_spec='${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
-+	  whole_archive_flag_spec='${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' ;;
-+	xl[cC]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
-+	  tmp_sharedflag='-qmkshrobj'
-+	  tmp_addflag= ;;
-+	esac
-+	case `$CC -V 2>&1 | sed 5q` in
-+	*Sun\ C*)			# Sun C 5.9
-+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  compiler_needs_object=yes
-+	  tmp_sharedflag='-G' ;;
-+	*Sun\ F*)			# Sun Fortran 8.3
-+	  tmp_sharedflag='-G' ;;
-+	esac
-+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- 
+-
 -#ifdef __cplusplus
 -extern "C" void exit (int);
 -#endif
-+        if test "x$supports_anon_versioning" = xyes; then
-+          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+	    echo "local: *; };" >> $output_objdir/$libname.ver~
-+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+        fi
- 
+-
 -void fnord() { int i=42;}
 -int main ()
 -{
 -  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
 -  int status = $lt_dlunknown;
-+	case $cc_basename in
-+	xlf*)
-+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-+	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-+	  hardcode_libdir_flag_spec=
-+	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
-+	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
-+	  if test "x$supports_anon_versioning" = xyes; then
-+	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+	      echo "local: *; };" >> $output_objdir/$libname.ver~
-+	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-+	  fi
-+	  ;;
-+	esac
-+      else
-+        ld_shlibs=no
-+      fi
-+      ;;
- 
+-
 -  if (self)
 -    {
 -      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
@@ -22983,16 +19290,7 @@
 -    }
 -  else
 -    puts (dlerror ());
-+    netbsd* | netbsdelf*-gnu)
-+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-+	wlarc=
-+      else
-+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      fi
-+      ;;
- 
+-
 -    exit (status);
 -}
 -EOF
@@ -23014,53 +19312,24 @@
 -  fi
 -fi
 -rm -fr conftest*
-+    solaris*)
-+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-+	ld_shlibs=no
-+	cat <<_LT_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.
- 
+-
+-
 -fi
 -{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
 -    fi
-+_LT_EOF
-+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      else
-+	ld_shlibs=no
-+      fi
-+      ;;
- 
+-
 -    CPPFLAGS="$save_CPPFLAGS"
 -    LDFLAGS="$save_LDFLAGS"
 -    LIBS="$save_LIBS"
 -    ;;
 -  esac
-+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-+      case `$LD -v 2>&1` in
-+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-+	ld_shlibs=no
-+	cat <<_LT_EOF 1>&2
- 
+-
 -  case $lt_cv_dlopen_self in
 -  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
 -  *) enable_dlopen_self=unknown ;;
 -  esac
-+*** 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.
- 
+-
 -  case $lt_cv_dlopen_self_static in
 -  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
 -  *) enable_dlopen_self_static=unknown ;;
@@ -23104,24 +19373,7 @@
 -test "$enable_shared" = yes || enable_static=yes
 -{ echo "$as_me:$LINENO: result: $enable_static" >&5
 -echo "${ECHO_T}$enable_static" >&6; }
-+_LT_EOF
-+	;;
-+	*)
-+	  # 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.
-+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	  else
-+	    ld_shlibs=no
-+	  fi
-+	;;
-+      esac
-+      ;;
- 
+-
 -# 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
@@ -23197,23 +19449,11 @@
 -    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\"\`\\\""
-+    sunos4*)
-+      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      wlarc=
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-       ;;
-+
-     *)
+-      ;;
+-    *)
 -      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      else
-+	ld_shlibs=no
-+      fi
-       ;;
-     esac
+-      ;;
+-    esac
 -  done
 -
 -  case $lt_echo in
@@ -23230,7 +19470,7 @@
 -
 -  cat <<__EOF__ >> "$cfgfile"
 -#! $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.
@@ -23259,986 +19499,202 @@
 -# 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.
-+    if test "$ld_shlibs" = no; then
-+      runpath_var=
-+      hardcode_libdir_flag_spec=
-+      export_dynamic_flag_spec=
-+      whole_archive_flag_spec=
-+    fi
-+  else
-+    # PORTME fill in a description of your system's linker (not GNU ld)
-+    case $host_os in
-+    aix3*)
-+      allow_undefined_flag=unsupported
-+      always_export_symbols=yes
-+      archive_expsym_cmds='$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.
-+      hardcode_minus_L=yes
-+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-+	# Neither direct hardcoding nor static linking is supported with a
-+	# broken collect2.
-+	hardcode_direct=unsupported
-+      fi
-+      ;;
- 
+-
 -# A sed program that does not truncate output.
 -SED=$lt_SED
-+    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
-+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+	else
-+	  export_symbols_cmds='$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
- 
+-
 -# Sed that helps us avoid accidentally triggering echo(1) options like -n.
 -Xsed="$SED -e 1s/^X//"
-+	# 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
- 
+-
 -# 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
-+	exp_sym_flag='-bexport'
-+	no_entry_flag='-bnoentry'
-+      fi
- 
+-
 -# The names of the tagged configurations supported by this script.
 -available_tags=
-+      # 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.
- 
+-
 -# ### BEGIN LIBTOOL CONFIG
-+      archive_cmds=''
-+      hardcode_direct=yes
-+      hardcode_direct_absolute=yes
-+      hardcode_libdir_separator=':'
-+      link_all_deplibs=yes
-+      file_list_spec='${wl}-f,'
- 
+-
 -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+      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
-+	  hardcode_direct=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
-+	  hardcode_minus_L=yes
-+	  hardcode_libdir_flag_spec='-L$libdir'
-+	  hardcode_libdir_separator=
-+	  fi
-+	  ;;
-+	esac
-+	shared_flag='-shared'
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag="$shared_flag "'${wl}-G'
-+	fi
-+	link_all_deplibs=no
-+      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
- 
+-
 -# Shell to use when invoking shell scripts.
 -SHELL=$lt_SHELL
-+      # It seems that -bexpall does not export symbols beginning with
-+      # underscore (_), so it is better to generate a list of symbols to export.
-+      always_export_symbols=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.
-+	allow_undefined_flag='-berok'
-+        # Determine the default libpath from the value encoded in an
-+        # empty executable.
-+        cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
+-
 -# Whether or not to build shared libraries.
 -build_libtool_libs=$enable_shared
-+int
-+main ()
-+{
- 
+-
 -# Whether or not to build static libraries.
 -build_old_libs=$enable_static
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
- 
+-
 -# Whether or not to add -lc for building shared libraries.
 -build_libtool_need_lc=$archive_cmds_need_lc
-+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
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -# Whether or not to disallow shared libs when runtime libs are static
 -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
- 
+-
 -# Whether or not to optimize for fast installation.
 -fast_install=$enable_fast_install
-+fi
- 
+-
 -# The host system.
 -host_alias=$host_alias
 -host=$host
 -host_os=$host_os
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
+-
 -# The build system.
 -build_alias=$build_alias
 -build=$build
 -build_os=$build_os
-+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+      else
-+	if test "$host_cpu" = ia64; then
-+	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-+	  allow_undefined_flag="-z nodefs"
-+	  archive_expsym_cmds="\$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.
-+	 cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
+-
 -# An echo program that does not interpret backslashes.
 -echo=$lt_echo
-+int
-+main ()
-+{
- 
+-
 -# The archiver.
 -AR=$lt_AR
 -AR_FLAGS=$lt_AR_FLAGS
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
- 
+-
 -# A C compiler.
 -LTCC=$lt_LTCC
-+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
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -# LTCC compiler flags.
 -LTCFLAGS=$lt_LTCFLAGS
- 
+-
 -# A language-specific compiler.
 -CC=$lt_compiler
-+fi
- 
+-
 -# Is the compiler the GNU C compiler?
 -with_gcc=$GCC
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
+-
 -# An ERE matcher.
 -EGREP=$lt_EGREP
-+	 hardcode_libdir_flag_spec='${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.
-+	  no_undefined_flag=' ${wl}-bernotok'
-+	  allow_undefined_flag=' ${wl}-berok'
-+	  # Exported symbols can be pulled into shared objects from archives
-+	  whole_archive_flag_spec='$convenience'
-+	  archive_cmds_need_lc=yes
-+	  # This is similar to how AIX traditionally builds its shared libraries.
-+	  archive_expsym_cmds="\$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
-+      ;;
- 
+-
 -# The linker used to build libraries.
 -LD=$lt_LD
-+    amigaos*)
-+      case $host_cpu in
-+      powerpc)
-+            # see comment about AmigaOS4 .so support
-+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+            archive_expsym_cmds=''
-+        ;;
-+      m68k)
-+            archive_cmds='$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)'
-+            hardcode_libdir_flag_spec='-L$libdir'
-+            hardcode_minus_L=yes
-+        ;;
-+      esac
-+      ;;
- 
+-
 -# Whether we need hard or soft links.
 -LN_S=$lt_LN_S
-+    bsdi[45]*)
-+      export_dynamic_flag_spec=-rdynamic
-+      ;;
- 
+-
 -# A BSD-compatible nm program.
 -NM=$lt_NM
-+    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.
-+      hardcode_libdir_flag_spec=' '
-+      allow_undefined_flag=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.
-+      archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-+      # The linker will automatically build a .lib file if we build a DLL.
-+      old_archive_from_new_cmds='true'
-+      # FIXME: Should let the user specify the lib program.
-+      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-+      fix_srcfile_path='`cygpath -w "$srcfile"`'
-+      enable_shared_with_static_runtimes=yes
-+      ;;
- 
+-
 -# A symbol stripping program
 -STRIP=$lt_STRIP
-+    darwin* | rhapsody*)
- 
+-
 -# Used to examine libraries when file_magic_cmd begins "file"
 -MAGIC_CMD=$MAGIC_CMD
- 
+-
 -# Used on cygwin: DLL creation program.
 -DLLTOOL="$DLLTOOL"
-+  archive_cmds_need_lc=no
-+  hardcode_direct=no
-+  hardcode_automatic=yes
-+  hardcode_shlibpath_var=unsupported
-+  whole_archive_flag_spec=''
-+  link_all_deplibs=yes
-+  allow_undefined_flag="$_lt_dar_allow_undefined"
-+  if test "$GCC" = "yes"; then
-+    output_verbose_link_cmd=echo
-+    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+    archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
- 
+-
 -# Used on cygwin: object dumper.
 -OBJDUMP="$OBJDUMP"
-+  else
-+  ld_shlibs=no
-+  fi
- 
+-
 -# Used on cygwin: assembler.
 -AS="$AS"
-+      ;;
- 
+-
 -# The name of the directory that contains temporary libtool files.
 -objdir=$objdir
-+    dgux*)
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_shlibpath_var=no
-+      ;;
- 
+-
 -# How to create reloadable object files.
 -reload_flag=$lt_reload_flag
 -reload_cmds=$lt_reload_cmds
-+    freebsd1*)
-+      ld_shlibs=no
-+      ;;
- 
+-
 -# How to pass a linker flag through the compiler.
 -wl=$lt_lt_prog_compiler_wl
-+    # 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*)
-+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-+      ;;
- 
+-
 -# Object file suffix (normally "o").
 -objext="$ac_objext"
-+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+    freebsd2*)
-+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_direct=yes
-+      hardcode_minus_L=yes
-+      hardcode_shlibpath_var=no
-+      ;;
- 
+-
 -# Old archive suffix (normally "a").
 -libext="$libext"
-+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+    freebsd* | dragonfly*)
-+      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-+      ;;
- 
+-
 -# Shared library suffix (normally ".so").
 -shrext_cmds='$shrext_cmds'
-+    hpux9*)
-+      if test "$GCC" = yes; then
-+	archive_cmds='$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
-+	archive_cmds='$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
-+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      hardcode_direct=yes
-+
-+      # hardcode_minus_L: Not really in the search PATH,
-+      # but as the default location of the library.
-+      hardcode_minus_L=yes
-+      export_dynamic_flag_spec='${wl}-E'
-+      ;;
-+
-+    hpux10*)
-+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-+      fi
-+      if test "$with_gnu_ld" = no; then
-+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+	hardcode_libdir_flag_spec_ld='+b $libdir'
-+	hardcode_libdir_separator=:
-+	hardcode_direct=yes
-+	hardcode_direct_absolute=yes
-+	export_dynamic_flag_spec='${wl}-E'
-+	# hardcode_minus_L: Not really in the search PATH,
-+	# but as the default location of the library.
-+	hardcode_minus_L=yes
-+      fi
-+      ;;
-+
-+    hpux11*)
-+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+	case $host_cpu in
-+	hppa*64*)
-+	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	ia64*)
-+	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	*)
-+	  archive_cmds='$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*)
-+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	ia64*)
-+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	*)
-+	  archive_cmds='$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
-+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+	hardcode_libdir_separator=:
-+
-+	case $host_cpu in
-+	hppa*64*|ia64*)
-+	  hardcode_direct=no
-+	  hardcode_shlibpath_var=no
-+	  ;;
-+	*)
-+	  hardcode_direct=yes
-+	  hardcode_direct_absolute=yes
-+	  export_dynamic_flag_spec='${wl}-E'
-+
-+	  # hardcode_minus_L: Not really in the search PATH,
-+	  # but as the default location of the library.
-+	  hardcode_minus_L=yes
-+	  ;;
-+	esac
-+      fi
-+      ;;
-+
-+    irix5* | irix6* | nonstopux*)
-+      if test "$GCC" = yes; then
-+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	# Try to use the -exported_symbol ld option, if it does not
-+	# work, assume that -exports_file does not work either and
-+	# implicitly export all symbols.
-+        save_LDFLAGS="$LDFLAGS"
-+        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-+        cat >conftest.$ac_ext <<_ACEOF
-+int foo(void) {}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-+
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+        LDFLAGS="$save_LDFLAGS"
-+      else
-+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-+      fi
-+      archive_cmds_need_lc='no'
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      inherit_rpath=yes
-+      link_all_deplibs=yes
-+      ;;
-+
-+    netbsd* | netbsdelf*-gnu)
-+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-+      else
-+	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-+      fi
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    newsos6)
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_direct=yes
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    *nto* | *qnx*)
-+      ;;
-+
-+    openbsd*)
-+      if test -f /usr/libexec/ld.so; then
-+	hardcode_direct=yes
-+	hardcode_shlibpath_var=no
-+	hardcode_direct_absolute=yes
-+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+	  export_dynamic_flag_spec='${wl}-E'
-+	else
-+	  case $host_os in
-+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+	     hardcode_libdir_flag_spec='-R$libdir'
-+	     ;;
-+	   *)
-+	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+	     ;;
-+	  esac
-+	fi
-+      else
-+	ld_shlibs=no
-+      fi
-+      ;;
-+
-+    os2*)
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_minus_L=yes
-+      allow_undefined_flag=unsupported
-+      archive_cmds='$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'
-+      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-+      ;;
-+
-+    osf3*)
-+      if test "$GCC" = yes; then
-+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+      else
-+	allow_undefined_flag=' -expect_unresolved \*'
-+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+      fi
-+      archive_cmds_need_lc='no'
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      ;;
-+
-+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-+      if test "$GCC" = yes; then
-+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      else
-+	allow_undefined_flag=' -expect_unresolved \*'
-+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-+
-+	# Both c and cxx compiler support -rpath directly
-+	hardcode_libdir_flag_spec='-rpath $libdir'
-+      fi
-+      archive_cmds_need_lc='no'
-+      hardcode_libdir_separator=:
-+      ;;
-+
-+    solaris*)
-+      no_undefined_flag=' -z defs'
-+      if test "$GCC" = yes; then
-+	wlarc='${wl}'
-+	archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-+      else
-+	case `$CC -V 2>&1` in
-+	*"Compilers 5.0"*)
-+	  wlarc=''
-+	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  archive_expsym_cmds='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'
-+	  ;;
-+	*)
-+	  wlarc='${wl}'
-+	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-+	  ;;
-+	esac
-+      fi
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_shlibpath_var=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
-+	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+	else
-+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
-+	fi
-+	;;
-+      esac
-+      link_all_deplibs=yes
-+      ;;
-+
-+    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.
-+	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-+      fi
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_direct=yes
-+      hardcode_minus_L=yes
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    sysv4)
-+      case $host_vendor in
-+	sni)
-+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  hardcode_direct=yes # is this really true???
-+	;;
-+	siemens)
-+	  ## LD is ld it makes a PLAMLIB
-+	  ## CC just makes a GrossModule.
-+	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+	  reload_cmds='$CC -r -o $output$reload_objs'
-+	  hardcode_direct=no
-+        ;;
-+	motorola)
-+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-+	;;
-+      esac
-+      runpath_var='LD_RUN_PATH'
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    sysv4.3*)
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_shlibpath_var=no
-+      export_dynamic_flag_spec='-Bexport'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	hardcode_shlibpath_var=no
-+	runpath_var=LD_RUN_PATH
-+	hardcode_runpath_var=yes
-+	ld_shlibs=yes
-+      fi
-+      ;;
-+
-+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-+      no_undefined_flag='${wl}-z,text'
-+      archive_cmds_need_lc=no
-+      hardcode_shlibpath_var=no
-+      runpath_var='LD_RUN_PATH'
-+
-+      if test "$GCC" = yes; then
-+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='$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.
-+      no_undefined_flag='${wl}-z,text'
-+      allow_undefined_flag='${wl}-z,nodefs'
-+      archive_cmds_need_lc=no
-+      hardcode_shlibpath_var=no
-+      hardcode_libdir_flag_spec='${wl}-R,$libdir'
-+      hardcode_libdir_separator=':'
-+      link_all_deplibs=yes
-+      export_dynamic_flag_spec='${wl}-Bexport'
-+      runpath_var='LD_RUN_PATH'
-+
-+      if test "$GCC" = yes; then
-+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      fi
-+      ;;
-+
-+    uts4*)
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    *)
-+      ld_shlibs=no
-+      ;;
-+    esac
-+
-+    if test x$host_vendor = xsni; then
-+      case $host in
-+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+	export_dynamic_flag_spec='${wl}-Blargedynsym'
-+	;;
-+      esac
-+    fi
-+  fi
-+
-+{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-+echo "${ECHO_T}$ld_shlibs" >&6; }
-+test "$ld_shlibs" = no && can_build_shared=no
-+
-+with_gnu_ld=$with_gnu_ld
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+#
-+# Do we need to explicitly link libc?
-+#
-+case "x$archive_cmds_need_lc" in
-+x|xyes)
-+  # Assume -lc should be added
-+  archive_cmds_need_lc=yes
-+
-+  if test "$enable_shared" = yes && test "$GCC" = yes; then
-+    case $archive_cmds 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.
-+      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
-+      $RM conftest*
-+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } 2>conftest.err; then
-+        soname=conftest
-+        lib=conftest
-+        libobjs=conftest.$ac_objext
-+        deplibs=
-+        wl=$lt_prog_compiler_wl
-+	pic_flag=$lt_prog_compiler_pic
-+        compiler_flags=-v
-+        linker_flags=-v
-+        verstring=
-+        output_objdir=.
-+        libname=conftest
-+        lt_save_allow_undefined_flag=$allow_undefined_flag
-+        allow_undefined_flag=
-+        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
-+  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }
-+        then
-+	  archive_cmds_need_lc=no
-+        else
-+	  archive_cmds_need_lc=yes
-+        fi
-+        allow_undefined_flag=$lt_save_allow_undefined_flag
-+      else
-+        cat conftest.err 1>&5
-+      fi
-+      $RM conftest*
-+      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-+echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
-+      ;;
-+    esac
-+  fi
-+  ;;
-+esac
- 
+-
 -# Executable file suffix (normally "").
 -exeext="$exeext"
- 
+-
 -# Additional compiler flags for building library objects.
 -pic_flag=$lt_lt_prog_compiler_pic
 -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_cv_prog_compiler_c_o
- 
+-
 -# 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_prog_compiler_static
- 
+-
 -# Compiler flag to turn off builtin functions.
 -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
- 
+-
 -# Compiler flag to allow reflexive dlopens.
 -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
- 
+-
 -# Compiler flag to generate shared objects directly from archives.
 -whole_archive_flag_spec=$lt_whole_archive_flag_spec
- 
+-
 -# Compiler flag to generate thread-safe objects.
 -thread_safe_flag_spec=$lt_thread_safe_flag_spec
- 
+-
 -# 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_old_archive_cmds
 -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_old_archive_from_new_cmds
- 
+-
 -# Create a temporary old-style archive to link instead of a shared archive.
 -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
- 
+-
 -# Commands used to build and install a shared archive.
 -archive_cmds=$lt_archive_cmds
 -archive_expsym_cmds=$lt_archive_expsym_cmds
 -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_module_cmds
 -module_expsym_cmds=$lt_module_expsym_cmds
- 
+-
 -# 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_predep_objects
@@ -24262,117 +19718,117 @@
 -# The library search path used internally by the compiler when linking
 -# a shared library.
 -compiler_lib_search_path=$lt_compiler_lib_search_path
- 
+-
 -# 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_allow_undefined_flag
- 
+-
 -# Flag that forces no undefined symbols.
 -no_undefined_flag=$lt_no_undefined_flag
- 
+-
 -# 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=$hardcode_action
- 
+-
 -# 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_hardcode_libdir_flag_spec
- 
+-
 -# 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_hardcode_libdir_flag_spec_ld
- 
+-
 -# Whether we need a single -rpath flag with a separated argument.
 -hardcode_libdir_separator=$lt_hardcode_libdir_separator
- 
+-
 -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
 -# resulting binary.
 -hardcode_direct=$hardcode_direct
- 
+-
 -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
 -# resulting binary.
 -hardcode_minus_L=$hardcode_minus_L
- 
+-
 -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
 -# the resulting binary.
 -hardcode_shlibpath_var=$hardcode_shlibpath_var
- 
+-
 -# 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=$hardcode_automatic
- 
+-
 -# 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=$link_all_deplibs
- 
+-
 -# 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=$always_export_symbols
- 
+-
 -# The commands to list exported symbols.
 -export_symbols_cmds=$lt_export_symbols_cmds
- 
+-
 -# 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_exclude_expsyms
- 
+-
 -# Symbols that must always be exported.
 -include_expsyms=$lt_include_expsyms
- 
+-
 -# ### END LIBTOOL CONFIG
- 
+-
 -__EOF__
- 
- 
+-
+-
 -  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.
@@ -24383,17 +19839,17 @@
 -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
@@ -24403,29 +19859,29 @@
 -    test -f Makefile && make "$ltmain"
 -  fi
 -fi
- 
- 
+-
+-
 -ac_ext=c
 -ac_cpp='$CPP $CPPFLAGS'
 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
+-
 -CC="$lt_save_CC"
- 
- 
+-
+-
 -# Check whether --with-tags was given.
 -if test "${with_tags+set}" = set; then
 -  withval=$with_tags; tagnames="$withval"
 -fi
- 
- 
+-
+-
 -if test -f "$ltmain" && test -n "$tagnames"; then
 -  if test ! -f "${ofile}"; then
 -    { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
 -echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
 -  fi
- 
+-
 -  if test -z "$LTCC"; then
 -    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
 -    if test -z "$LTCC"; then
@@ -24439,11 +19895,11 @@
 -  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"
@@ -24455,14 +19911,14 @@
 -   { (exit 1); exit 1; }; }
 -	;;
 -    esac
- 
+-
 -    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
 -    then
 -      { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
 -echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
 -   { (exit 1); exit 1; }; }
 -    fi
- 
+-
 -    # Update the list of available tags.
 -    if test -n "$tagname"; then
 -      echo appending configuration tag \"$tagname\" to $ofile
@@ -24477,10 +19933,10 @@
 -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
- 
- 
- 
+-
+-
+-
+-
 -archive_cmds_need_lc_CXX=no
 -allow_undefined_flag_CXX=
 -always_export_symbols_CXX=no
@@ -24508,46 +19964,46 @@
 -postdeps_CXX=
 -compiler_lib_search_path_CXX=
 -compiler_lib_search_dirs_CXX=
- 
+-
 -# Source file extension for C++ test sources.
 -ac_ext=cpp
- 
+-
 -# Object file extension for compiled C++ test sources.
 -objext=o
 -objext_CXX=$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.
- 
+-
 -# 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
- 
- 
+-
+-
 -# save warnings/boilerplate of simple test code
 -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*
- 
+-
 -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*
- 
- 
+-
+-
 -# Allow CC to be a program name with arguments.
 -lt_save_CC=$CC
 -lt_save_LD=$LD
@@ -24578,8 +20034,8 @@
 -  esac
 -done
 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
- 
+-
+-
 -# We don't want -fno-exception wen compiling C++ code, so set the
 -# no_builtin_flag separately
 -if test "$GXX" = yes; then
@@ -24587,18 +20043,18 @@
 -else
 -  lt_prog_compiler_no_builtin_flag_CXX=
 -fi
- 
+-
 -if test "$GXX" = yes; then
 -  # Set up default GNU C++ configuration
- 
- 
+-
+-
 -# Check whether --with-gnu-ld was given.
 -if test "${with_gnu_ld+set}" = set; then
 -  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
 -else
 -  with_gnu_ld=no
 -fi
- 
+-
 -ac_prog=ld
 -if test "$GCC" = yes; then
 -  # Check if gcc -print-prog-name=ld gives a path.
@@ -24666,7 +20122,7 @@
 -  lt_cv_path_LD="$LD" # Let the user override the test with a path.
 -fi
 -fi
- 
+-
 -LD="$lt_cv_path_LD"
 -if test -n "$LD"; then
 -  { echo "$as_me:$LINENO: result: $LD" >&5
@@ -24696,23 +20152,23 @@
 -{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
 -with_gnu_ld=$lt_cv_prog_gnu_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
 -    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
 -    archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- 
+-
 -    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
 -    export_dynamic_flag_spec_CXX='${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
@@ -24723,7 +20179,7 @@
 -  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
@@ -24731,18 +20187,18 @@
 -    # the platform it is being used on.
 -    archive_cmds_CXX='$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
 -{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
@@ -24761,7 +20217,7 @@
 -      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.
@@ -24776,11 +20232,11 @@
 -	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
@@ -24832,7 +20288,7 @@
 -	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.
 -    always_export_symbols_CXX=yes
@@ -24847,11 +20303,11 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
- 
+-
 -int
 -main ()
 -{
- 
+-
 -  ;
 -  return 0;
 -}
@@ -24874,7 +20330,7 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext &&
 -       $as_test_x conftest$ac_exeext; then
- 
+-
 -lt_aix_libpath_sed='
 -    /Import File Strings/,/^$/ {
 -	/^0/ {
@@ -24890,16 +20346,16 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
+-
+-
 -fi
- 
+-
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
+-
 -      hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
- 
+-
 -      archive_expsym_cmds_CXX="\$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
@@ -24914,11 +20370,11 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
- 
+-
 -int
 -main ()
 -{
- 
+-
 -  ;
 -  return 0;
 -}
@@ -24941,7 +20397,7 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext &&
 -       $as_test_x conftest$ac_exeext; then
- 
+-
 -lt_aix_libpath_sed='
 -    /Import File Strings/,/^$/ {
 -	/^0/ {
@@ -24957,14 +20413,14 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
+-
+-
 -fi
- 
+-
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
+-
 -	hardcode_libdir_flag_spec_CXX='${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.
@@ -24978,7 +20434,7 @@
 -      fi
 -    fi
 -    ;;
- 
+-
 -  beos*)
 -    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 -      allow_undefined_flag_CXX=unsupported
@@ -24989,7 +20445,7 @@
 -      ld_shlibs_CXX=no
 -    fi
 -    ;;
- 
+-
 -  chorus*)
 -    case $cc_basename in
 -      *)
@@ -24998,7 +20454,7 @@
 -	;;
 -    esac
 -    ;;
- 
+-
 -  cygwin* | mingw* | pw32*)
 -    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
 -    # as there is no search path for DLLs.
@@ -25056,7 +20512,7 @@
 -      esac
 -      fi
 -        ;;
- 
+-
 -  dgux*)
 -    case $cc_basename in
 -      ec++*)
@@ -25128,7 +20584,7 @@
 -    if test $with_gnu_ld = no; then
 -      hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
 -      hardcode_libdir_separator_CXX=:
- 
+-
 -      case $host_cpu in
 -      hppa*64*|ia64*) ;;
 -      *)
@@ -25148,7 +20604,7 @@
 -					      # location of the library.
 -      ;;
 -    esac
- 
+-
 -    case $cc_basename in
 -      CC*)
 -	# FIXME: insert proper C++ library support
@@ -25303,11 +20759,11 @@
 -	# Compaq C++
 -	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
 -	archive_expsym_cmds_CXX='$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
 -	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
 -	hardcode_libdir_separator_CXX=:
- 
+-
 -	# Commands to make compiler produce verbose output that lists
 -	# what "hidden" libraries, object files and flags are used when
 -	# linking a shared library.
@@ -25410,7 +20866,7 @@
 -	# Archives containing C++ object files must be created using
 -	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
 -	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
- 
+-
 -	;;
 -      RCC*)
 -	# Rational C++ 2.4.1
@@ -25446,7 +20902,7 @@
 -	  # 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
 -	  ld_shlibs_CXX=no
@@ -25509,7 +20965,7 @@
 -	  # 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
 -	  ld_shlibs_CXX=no
@@ -25561,9 +21017,9 @@
 -	    ;;
 -	esac
 -	link_all_deplibs_CXX=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
@@ -25573,7 +21029,7 @@
 -      gcx*)
 -	# Green Hills C++ Compiler
 -	archive_cmds_CXX='$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.
 -	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
 -	;;
@@ -25602,7 +21058,7 @@
 -	    # linking a shared library.
 -	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
 -	  fi
- 
+-
 -	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
 -	  case $host_os in
 -	  solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -25706,7 +21162,7 @@
 -  int a;
 -};
 -EOF
- 
+-
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 -  ac_status=$?
@@ -25714,7 +21170,7 @@
 -  (exit $ac_status); }; 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
@@ -25737,7 +21193,7 @@
 -       else
 -	 prev=
 -       fi
- 
+-
 -       if test "$pre_test_object_deps_done" = no; then
 -	 case $p in
 -	 -L* | -R*)
@@ -25761,7 +21217,7 @@
 -	 fi
 -       fi
 -       ;;
- 
+-
 -    *.$objext)
 -       # This assumes that the test object file only shows up
 -       # once in the compiler output.
@@ -25769,7 +21225,7 @@
 -	 pre_test_object_deps_done=yes
 -	 continue
 -       fi
- 
+-
 -       if test "$pre_test_object_deps_done" = no; then
 -	 if test -z "$predep_objects_CXX"; then
 -	   predep_objects_CXX="$p"
@@ -25784,116 +21240,35 @@
 -	 fi
 -       fi
 -       ;;
- 
+-
 -    *) ;; # Ignore the rest.
- 
+-
 -    esac
 -  done
- 
+-
 -  # Clean up.
 -  rm -f a.out a.exe
 -else
 -  echo "libtool.m4: error: problem compiling CXX test program"
 -fi
- 
+-
 -$rm -f confest.$objext
- 
+-
 -compiler_lib_search_dirs_CXX=
 -if test -n "$compiler_lib_search_path_CXX"; then
 -  compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-+
-+
-+  { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
-+
-+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
-+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"
-+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
- 
+-fi
+-
 -# PORTME: override above test on systems where it is broken
- case $host_os in
+-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.
 -  predep_objects_CXX=
 -  postdep_objects_CXX=
 -  postdeps_CXX=
-+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'
-   ;;
- 
+-  ;;
+-
 -linux*)
 -  case `$CC -V 2>&1 | sed 5q` in
 -  *Sun\ C*)
@@ -25906,54 +21281,15 @@
 -    case " $CXX $CXXFLAGS " in
 -    *" -library=stlport4 "*)
 -      solaris_use_stlport4=yes
-+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
+-      ;;
+-    esac
 -    if test "$solaris_use_stlport4" != yes; then
 -      postdeps_CXX='-library=Cstd -library=Crun'
-+    # 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
+-    fi
 -    ;;
 -  esac
-+    shlibpath_var=LIBPATH
-+  fi
-   ;;
- 
+-  ;;
+-
 -solaris*)
 -  case $cc_basename in
 -  CC*)
@@ -25973,79 +21309,28 @@
 -    if test "$solaris_use_stlport4" != yes; then
 -      postdeps_CXX='-library=Cstd -library=Crun'
 -    fi
-+amigaos*)
-+  case $host_cpu in
-+  powerpc)
-+    # Since July 2007 AmigaOS4 officially supports .so libraries.
-+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    ;;
-+  m68k)
-+    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'
-     ;;
-   esac
-   ;;
+-    ;;
+-  esac
+-  ;;
 -esac
- 
+-
 -case " $postdeps_CXX " in
 -*" -lc "*) archive_cmds_need_lc_CXX=no ;;
 -esac
-+beos*)
-+  library_names_spec='${libname}${shared_ext}'
-+  dynamic_linker="$host_os ld.so"
-+  shlibpath_var=LIBRARY_PATH
-+  ;;
- 
+-
 -lt_prog_compiler_wl_CXX=
 -lt_prog_compiler_pic_CXX=
 -lt_prog_compiler_static_CXX=
-+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
-+  ;;
- 
+-
 -{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-+cygwin* | mingw* | pw32*)
-+  version_type=windows
-+  shrext_cmds=".dll"
-+  need_version=no
-+  need_lib_prefix=no
- 
+-
 -  # C++ specific cases for pic, static, wl, etc.
 -  if test "$GXX" = yes; then
 -    lt_prog_compiler_wl_CXX='-Wl,'
 -    lt_prog_compiler_static_CXX='-static'
-+  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~
-+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-+      fi'
-+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+      dlpath=$dir/\$dldll~
-+       $RM \$dlpath'
-+    shlibpath_overrides_runpath=yes
- 
-     case $host_os in
+-
+-    case $host_os in
 -    aix*)
 -      # All AIX code is PIC.
 -      if test "$host_cpu" = ia64; then
@@ -26081,30 +21366,12 @@
 -    interix[3-9]*)
 -      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
 -      # Instead, we relocate shared libraries at runtime.
-+    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"
-       ;;
+-      ;;
 -    sysv4*MP*)
 -      if test -d /usr/nec; then
 -	lt_prog_compiler_pic_CXX=-Kconform_pic
-+    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
-       ;;
+-      fi
+-      ;;
 -    hpux*)
 -      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
 -      # not for PA HP-UX.
@@ -26118,11 +21385,8 @@
 -      ;;
 -    *)
 -      lt_prog_compiler_pic_CXX='-fPIC'
-+    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
+-      ;;
+-    esac
 -  else
 -    case $host_os in
 -      aix[4-9]*)
@@ -26344,21 +21608,12 @@
 -
 -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
 -echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
-+    ;;
- 
+-
 -#
 -# Check to make sure the PIC flag actually works.
 -#
 -if test -n "$lt_prog_compiler_pic_CXX"; then
-+  *)
-+    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
-+  ;;
- 
+-
 -{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
 -if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
@@ -26392,24 +21647,11 @@
 -     fi
 -   fi
 -   $rm conftest*
-+darwin* | rhapsody*)
-+  dynamic_linker="$host_os dyld"
-+  version_type=darwin
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${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`'
- 
+-
 -fi
 -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
 -echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
-+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
-+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-+  ;;
- 
+-
 -if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
 -    case $lt_prog_compiler_pic_CXX in
 -     "" | " "*) ;;
@@ -26419,15 +21661,7 @@
 -    lt_prog_compiler_pic_CXX=
 -     lt_prog_compiler_can_build_shared_CXX=no
 -fi
-+dgux*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
- 
+-
 -fi
 -case $host_os in
 -  # For platforms which do not support PIC, -DPIC is meaningless:
@@ -26438,10 +21672,7 @@
 -    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
 -    ;;
 -esac
-+freebsd1*)
-+  dynamic_linker=no
-+  ;;
- 
+-
 -#
 -# Check to make sure the static flag actually works.
 -#
@@ -26552,17 +21783,7 @@
 -    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
 -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
 -    need_locks=warn
-+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
+-  fi
 -else
 -  need_locks=no
 -fi
@@ -26571,20 +21792,7 @@
 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
 -
 -  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  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
+-  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
@@ -26593,22 +21801,7 @@
 -    else
 -      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
 -    fi
-+  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
-     ;;
+-    ;;
 -  pw32*)
 -    export_symbols_cmds_CXX="$ltdll_cmds"
 -  ;;
@@ -26621,7 +21814,7 @@
 -  *)
 -    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
 -  ;;
-   esac
+-  esac
 -  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
 -
 -{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
@@ -26688,7 +21881,7 @@
 -      ;;
 -    esac
 -  fi
-   ;;
+-  ;;
 -esac
 -
 -{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
@@ -26713,31 +21906,21 @@
 -# 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*)
-+gnu*)
-   version_type=linux
+-  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.
-+  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
-   ;;
- 
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  ;;
+-
 -aix[4-9]*)
 -  version_type=linux
-+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
+-  need_lib_prefix=no
+-  need_version=no
 -  hardcode_into_libs=yes
 -  if test "$host_cpu" = ia64; then
 -    # AIX 5 supports IA64
@@ -26955,18 +22138,17 @@
 -    shrext_cmds='.so'
 -    hardcode_into_libs=yes
 -    dynamic_linker="$host_os dld.so"
-+  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}'
-@@ -14578,18 +10974,18 @@
-     fi
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
+-    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
@@ -26979,204 +22161,310 @@
 -     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
-@@ -14666,6 +11062,60 @@
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-   shlibpath_overrides_runpath=no
-+  # Some binutils ld are patched to set DT_RUNPATH
-+  save_LDFLAGS=$LDFLAGS
-+  save_libdir=$libdir
-+  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-+       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
-+  shlibpath_overrides_runpath=yes
-+fi
-+
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  LDFLAGS=$save_LDFLAGS
-+  libdir=$save_libdir
-+
-   # This implies no fast_install, which is unacceptable.
-   # Some rework will be needed to allow for fast_install
-   # before this can be enabled.
-@@ -14673,7 +11123,7 @@
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
+-    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' ' '`
-+    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
- 
-@@ -14702,7 +11152,7 @@
-   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
+-    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
-+  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'
-@@ -14723,14 +11173,16 @@
-   shlibpath_overrides_runpath=yes
-   ;;
- 
+-    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
-+*nto* | *qnx*)
-+  version_type=qnx
-   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
+-  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
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='ldqnx.so'
-   ;;
- 
- openbsd*)
-@@ -14739,13 +11191,13 @@
-   need_lib_prefix=no
-   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-   case $host_os in
+-  ;;
+-
+-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  ;;
-+    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
+-  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
-+  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
-@@ -14817,7 +11269,6 @@
-     sni)
-       shlibpath_overrides_runpath=no
-       need_lib_prefix=no
+-    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)
-@@ -14848,13 +11299,12 @@
-   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
-+  shlibpath_overrides_runpath=yes
-   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'
+-      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'
+-  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"
-@@ -14864,6 +11314,17 @@
-   sys_lib_dlsearch_path_spec='/usr/lib'
-   ;;
- 
-+tpf*)
-+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  ;;
-+
- uts4*)
-   version_type=linux
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14879,4082 +11340,2551 @@
- echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
- 
+-    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
+-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-echo "${ECHO_T}$dynamic_linker" >&6; }
+-test "$dynamic_linker" = no && can_build_shared=no
+-
 -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
 -  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-+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
- 
+-fi
+-
 -sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+fi
- if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
 -  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
-+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
- fi
- 
+-fi
+-
 -sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
- 
+-
 -variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 -if test "$GCC" = yes; then
 -  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -27188,7 +22476,7 @@
 -if test -n "$hardcode_libdir_flag_spec_CXX" || \
 -   test -n "$runpath_var_CXX" || \
 -   test "X$hardcode_automatic_CXX" = "Xyes" ; then
- 
+-
 -  # We can hardcode non-existant directories.
 -  if test "$hardcode_direct_CXX" != no &&
 -     # If the only mechanism to avoid hardcoding is shlibpath_var, we
@@ -27209,7 +22497,7 @@
 -fi
 -{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
 -echo "${ECHO_T}$hardcode_action_CXX" >&6; }
- 
+-
 -if test "$hardcode_action_CXX" = relink; then
 -  # Fast installation is not supported
 -  enable_fast_install=no
@@ -27218,8 +22506,8 @@
 -  # Fast installation is not necessary
 -  enable_fast_install=needless
 -fi
- 
- 
+-
+-
 -# 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
@@ -27301,198 +22589,198 @@
 -      ;;
 -    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
- 
+-
 -cfgfile="$ofile"
- 
+-
 -  cat <<__EOF__ >> "$cfgfile"
 -# ### 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=$archive_cmds_need_lc_CXX
- 
+-
 -# Whether or not to disallow shared libs when runtime libs are static
 -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
- 
+-
 -# 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_compiler_CXX
- 
+-
 -# Is the compiler the GNU C compiler?
 -with_gcc=$GCC_CXX
- 
+-
 -# An ERE matcher.
 -EGREP=$lt_EGREP
- 
+-
 -# The linker used to build libraries.
 -LD=$lt_LD_CXX
- 
+-
 -# 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_prog_compiler_wl_CXX
- 
+-
 -# 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_prog_compiler_pic_CXX
 -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_cv_prog_compiler_c_o_CXX
- 
+-
 -# 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_prog_compiler_static_CXX
- 
+-
 -# Compiler flag to turn off builtin functions.
 -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
- 
+-
 -# Compiler flag to allow reflexive dlopens.
 -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
- 
+-
 -# Compiler flag to generate shared objects directly from archives.
 -whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
- 
+-
 -# Compiler flag to generate thread-safe objects.
 -thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
- 
+-
 -# 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_old_archive_cmds_CXX
 -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_old_archive_from_new_cmds_CXX
- 
+-
 -# Create a temporary old-style archive to link instead of a shared archive.
 -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
- 
+-
 -# Commands used to build and install a shared archive.
 -archive_cmds=$lt_archive_cmds_CXX
 -archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
 -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_module_cmds_CXX
 -module_expsym_cmds=$lt_module_expsym_cmds_CXX
- 
+-
 -# 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_predep_objects_CXX
@@ -27516,53 +22804,53 @@
 -# The library search path used internally by the compiler when linking
 -# a shared library.
 -compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
- 
+-
 -# 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_allow_undefined_flag_CXX
- 
+-
 -# Flag that forces no undefined symbols.
 -no_undefined_flag=$lt_no_undefined_flag_CXX
- 
+-
 -# 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=$hardcode_action_CXX
- 
+-
 -# 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_hardcode_libdir_flag_spec_CXX
- 
+-
 -# If ld is used when linking, flag to hardcode \$libdir into
 -# a binary during linking. This must work even if \$libdir does
 -# not exist.
@@ -27586,83 +22874,44 @@
 -# 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=$hardcode_automatic_CXX
- 
+-
 -# 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=$link_all_deplibs_CXX
- 
+-
 -# 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=$always_export_symbols_CXX
-+  { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
-+hardcode_action=
-+if test -n "$hardcode_libdir_flag_spec" ||
-+   test -n "$runpath_var" ||
-+   test "X$hardcode_automatic" = "Xyes" ; then
- 
+-
 -# The commands to list exported symbols.
 -export_symbols_cmds=$lt_export_symbols_cmds_CXX
-+  # We can hardcode non-existent directories.
-+  if test "$hardcode_direct" != 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_TAGVAR(hardcode_shlibpath_var, )" != no &&
-+     test "$hardcode_minus_L" != no; then
-+    # Linking always hardcodes the temporary library directory.
-+    hardcode_action=relink
-+  else
-+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+    hardcode_action=immediate
-+  fi
-+else
-+  # We cannot hardcode anything, or else we can only hardcode existing
-+  # directories.
-+  hardcode_action=unsupported
-+fi
-+{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
-+echo "${ECHO_T}$hardcode_action" >&6; }
- 
+-
 -# The commands to extract the exported symbol list from a shared archive.
 -extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+if test "$hardcode_action" = relink ||
-+   test "$inherit_rpath" = yes; 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
- 
+-
 -# Symbols that should not be listed in the preloaded symbols.
 -exclude_expsyms=$lt_exclude_expsyms_CXX
- 
+-
 -# Symbols that must always be exported.
 -include_expsyms=$lt_include_expsyms_CXX
- 
+-
 -# ### END LIBTOOL TAG CONFIG: $tagname
- 
+-
 -__EOF__
- 
- 
-+  if test "x$enable_dlopen" != xyes; then
-+  enable_dlopen=unknown
-+  enable_dlopen_self=unknown
-+  enable_dlopen_self_static=unknown
- else
+-
+-
+-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.
@@ -27689,27 +22938,15 @@
 -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
-+  lt_cv_dlopen=no
-+  lt_cv_dlopen_libs=
- 
+-
 -	else
 -	  tagname=""
 -	fi
 -	;;
-+  case $host_os in
-+  beos*)
-+    lt_cv_dlopen="load_add_on"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
-+    ;;
- 
+-
 -      F77)
 -	if test -n "$F77" && test "X$F77" != "Xno"; then
-+  mingw* | pw32*)
-+    lt_cv_dlopen="LoadLibrary"
-+    lt_cv_dlopen_libs=
-+    ;;
- 
+-
 -ac_ext=f
 -ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
 -ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -27734,79 +22971,21 @@
 -no_undefined_flag_F77=
 -whole_archive_flag_spec_F77=
 -enable_shared_with_static_runtimes_F77=no
-+  cygwin*)
-+    lt_cv_dlopen="dlopen"
-+    lt_cv_dlopen_libs=
-+    ;;
- 
+-
 -# Source file extension for f77 test sources.
 -ac_ext=f
-+  darwin*)
-+  # if libdl is installed we need to link against it
-+    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldl  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
+-
 -# Object file extension for compiled f77 test sources.
 -objext=o
 -objext_F77=$objext
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dlopen ();
-+int
-+main ()
-+{
-+return dlopen ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_lib_dl_dlopen=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -# Code to be used in simple compile tests
 -lt_simple_compile_test_code="\
 -      subroutine t
 -      return
 -      end
 -"
-+	ac_cv_lib_dl_dlopen=no
-+fi
- 
+-
 -# Code to be used in simple link tests
 -lt_simple_link_test_code="\
 -      program t
@@ -27814,70 +22993,31 @@
 -"
 -
 -# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-+if test $ac_cv_lib_dl_dlopen = yes; then
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+else
- 
+-
 -# If no C compiler was specified, use CC.
 -LTCC=${LTCC-"$CC"}
-+    lt_cv_dlopen="dyld"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
- 
+-
 -# If no C compiler flags were specified, use CFLAGS.
 -LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-+fi
- 
+-
 -# Allow CC to be a program name with arguments.
 -compiler=$CC
-+    ;;
- 
-+  *)
-+    { echo "$as_me:$LINENO: checking for shl_load" >&5
-+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
-+if test "${ac_cv_func_shl_load+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define shl_load innocuous_shl_load
- 
+-
+-
 -# save warnings/boilerplate of simple test code
 -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*
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char shl_load (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
- 
+-
 -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*
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
- 
-+#undef shl_load
- 
+-
+-
 -# Allow CC to be a program name with arguments.
 -lt_save_CC="$CC"
 -CC=${F77-"f77"}
@@ -27892,83 +23032,17 @@
 -  esac
 -done
 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char shl_load ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined __stub_shl_load || defined __stub___shl_load
-+choke me
-+#endif
- 
-+int
-+main ()
-+{
-+return shl_load ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_func_shl_load=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
+-
 -{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
 -{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
 -echo "${ECHO_T}$can_build_shared" >&6; }
-+	ac_cv_func_shl_load=no
-+fi
- 
+-
 -{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
 -test "$can_build_shared" = "no" && enable_shared=no
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-+echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
-+if test $ac_cv_func_shl_load = yes; then
-+  lt_cv_dlopen="shl_load"
-+else
-+  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldld  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
+-
 -# On AIX, shared libraries and static libraries use the same namespace, and
 -# are all built from PIC.
 -case $host_os in
@@ -27984,27 +23058,7 @@
 -    test "$enable_shared" = yes && enable_static=no
 -  fi
 -  ;;
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char shl_load ();
-+int
-+main ()
-+{
-+return shl_load ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
- esac
+-esac
 -{ echo "$as_me:$LINENO: result: $enable_shared" >&5
 -echo "${ECHO_T}$enable_shared" >&6; }
 -
@@ -28017,63 +23071,18 @@
 -
 -GCC_F77="$G77"
 -LD_F77="$LD"
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_lib_dld_shl_load=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -lt_prog_compiler_wl_F77=
 -lt_prog_compiler_pic_F77=
 -lt_prog_compiler_static_F77=
-+	ac_cv_lib_dld_shl_load=no
-+fi
- 
+-
 -{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
-+if test $ac_cv_lib_dld_shl_load = yes; then
-+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-+else
-+  { echo "$as_me:$LINENO: checking for dlopen" >&5
-+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-+if test "${ac_cv_func_dlopen+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define dlopen innocuous_dlopen
- 
+-
 -  if test "$GCC" = yes; then
 -    lt_prog_compiler_wl_F77='-Wl,'
 -    lt_prog_compiler_static_F77='-static'
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char dlopen (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
- 
+-
 -    case $host_os in
 -      aix*)
 -      # All AIX code is PIC.
@@ -28082,37 +23091,18 @@
 -	lt_prog_compiler_static_F77='-Bstatic'
 -      fi
 -      ;;
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
- 
+-
 -    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_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
 -      ;;
-+#undef dlopen
- 
+-
 -    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
 -      # PIC is the default for these OSes.
 -      ;;
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dlopen ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined __stub_dlopen || defined __stub___dlopen
-+choke me
-+#endif
- 
+-
 -    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).
@@ -28383,20 +23373,7 @@
 -  *)
 -    lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
 -    ;;
-+int
-+main ()
-+{
-+return dlopen ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
- esac
+-esac
 -
 -#
 -# Check to make sure the static flag actually works.
@@ -28406,20 +23383,7 @@
 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
 -if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_func_dlopen=yes
- else
+-else
 -  lt_cv_prog_compiler_static_works_F77=no
 -   save_LDFLAGS="$LDFLAGS"
 -   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -28441,51 +23405,30 @@
 -   fi
 -   $rm -r conftest*
 -   LDFLAGS="$save_LDFLAGS"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
-+	ac_cv_func_dlopen=no
- fi
+-
+-fi
 -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
 -echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }
- 
+-
 -if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
 -    :
 -else
 -    lt_prog_compiler_static_F77=
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
+-fi
 -
 -
 -{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
 -if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
-+if test $ac_cv_func_dlopen = yes; then
-+  lt_cv_dlopen="dlopen"
-+else
-+  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
 -  lt_cv_prog_compiler_c_o_F77=no
 -   $rm -r conftest 2>/dev/null
 -   mkdir conftest
 -   cd conftest
 -   mkdir out
 -   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldl  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
+-
 -   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.
@@ -28519,72 +23462,12 @@
 -   cd ..
 -   rmdir conftest
 -   $rm conftest*
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dlopen ();
-+int
-+main ()
-+{
-+return dlopen ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_lib_dl_dlopen=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
-+	ac_cv_lib_dl_dlopen=no
- fi
+-
+-fi
 -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }
- 
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-+if test $ac_cv_lib_dl_dlopen = yes; then
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+else
-+  { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsvld  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
+-
+-
 -hard_links="nottested"
 -if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
 -  # do not overwrite the value of need_locks provided by the user
@@ -28603,73 +23486,13 @@
 -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
 -    need_locks=warn
 -  fi
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dlopen ();
-+int
-+main ()
-+{
-+return dlopen ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_lib_svld_dlopen=yes
- else
+-else
 -  need_locks=no
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_svld_dlopen=no
- fi
- 
+-fi
+-
 -{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
-+if test $ac_cv_lib_svld_dlopen = yes; then
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-+else
-+  { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldld  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
+-
 -  runpath_var=
 -  allow_undefined_flag_F77=
 -  enable_shared_with_static_runtimes_F77=no
@@ -28717,44 +23540,7 @@
 -  esac
 -done
 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dld_link ();
-+int
-+main ()
-+{
-+return dld_link ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_lib_dld_dld_link=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -  case $host_os in
 -  cygwin* | mingw* | pw32*)
 -    # FIXME: the MSVC++ port hasn't been tested in a loooong time
@@ -28772,23 +23558,12 @@
 -    with_gnu_ld=no
 -    ;;
 -  esac
-+	ac_cv_lib_dld_dld_link=no
-+fi
- 
+-
 -  ld_shlibs_F77=yes
 -  if test "$with_gnu_ld" = yes; then
 -    # If archive_cmds runs LD, not CC, wlarc should be empty
 -    wlarc='${wl}'
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
-+if test $ac_cv_lib_dld_dld_link = yes; then
-+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
-+fi
- 
+-
 -    # 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.
@@ -28809,7 +23584,7 @@
 -      *\ 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]*)
@@ -28817,19 +23592,17 @@
 -      if test "$host_cpu" != ia64; then
 -	ld_shlibs_F77=no
 -	cat <<EOF 1>&2
-+fi
- 
+-
 -*** 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
 -      ;;
-+fi
- 
+-
 -    amigaos*)
 -      archive_cmds_F77='$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)'
 -      hardcode_libdir_flag_spec_F77='-L$libdir'
@@ -28843,7 +23616,7 @@
 -      # them.
 -      ld_shlibs_F77=no
 -      ;;
- 
+-
 -    beos*)
 -      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 -	allow_undefined_flag_F77=unsupported
@@ -28854,8 +23627,7 @@
 -	ld_shlibs_F77=no
 -      fi
 -      ;;
-+fi
- 
+-
 -    cygwin* | mingw* | pw32*)
 -      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
 -      # as there is no search path for DLLs.
@@ -28864,7 +23636,7 @@
 -      always_export_symbols_F77=no
 -      enable_shared_with_static_runtimes_F77=yes
 -      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
- 
+-
 -      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
 -        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 -	# If the export-symbols file already is a .def file (1st line
@@ -28880,8 +23652,7 @@
 -	ld_shlibs_F77=no
 -      fi
 -      ;;
-+fi
- 
+-
 -    interix[3-9]*)
 -      hardcode_direct_F77=no
 -      hardcode_shlibpath_var_F77=no
@@ -28896,7 +23667,7 @@
 -      archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 -      archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 -      ;;
- 
+-
 -    gnu* | linux* | k*bsd*-gnu)
 -      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 -	tmp_addflag=
@@ -28925,8 +23696,7 @@
 -	  tmp_sharedflag='-shared' ;;
 -	esac
 -	archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+fi
- 
+-
 -	if test $supports_anon_versioning = yes; then
 -	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
 -  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
@@ -28938,9 +23708,7 @@
 -	ld_shlibs_F77=no
 -      fi
 -      ;;
-+    ;;
-+  esac
- 
+-
 -    netbsd* | netbsdelf*-gnu)
 -      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 -	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -28950,30 +23718,19 @@
 -	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 -      fi
 -      ;;
-+  if test "x$lt_cv_dlopen" != xno; then
-+    enable_dlopen=yes
-+  else
-+    enable_dlopen=no
-+  fi
- 
+-
 -    solaris*)
 -      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
 -	ld_shlibs_F77=no
 -	cat <<EOF 1>&2
-+  case $lt_cv_dlopen in
-+  dlopen)
-+    save_CPPFLAGS="$CPPFLAGS"
-+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
- 
+-
 -*** 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.
-+    save_LDFLAGS="$LDFLAGS"
-+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
- 
+-
 -EOF
 -      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 -	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -28982,38 +23739,20 @@
 -	ld_shlibs_F77=no
 -      fi
 -      ;;
-+    save_LIBS="$LIBS"
-+    LIBS="$lt_cv_dlopen_libs $LIBS"
- 
+-
 -    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
 -      case `$LD -v 2>&1` in
 -        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
 -	ld_shlibs_F77=no
 -	cat <<_LT_EOF 1>&2
-+    { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
-+if test "${lt_cv_dlopen_self+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  	  if test "$cross_compiling" = yes; then :
-+  lt_cv_dlopen_self=cross
-+else
-+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+  lt_status=$lt_dlunknown
-+  cat > conftest.$ac_ext <<_LT_EOF
-+#line 12056 "configure"
-+#include "confdefs.h"
- 
+-
 -*** 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.
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
- 
+-
 -_LT_EOF
 -	;;
 -	*)
@@ -29027,24 +23766,14 @@
 -	;;
 -      esac
 -      ;;
-+#include <stdio.h>
- 
+-
 -    sunos4*)
 -      archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
 -      wlarc=
 -      hardcode_direct_F77=yes
 -      hardcode_shlibpath_var_F77=no
 -      ;;
-+#ifdef RTLD_GLOBAL
-+#  define LT_DLGLOBAL		RTLD_GLOBAL
-+#else
-+#  ifdef DL_GLOBAL
-+#    define LT_DLGLOBAL		DL_GLOBAL
-+#  else
-+#    define LT_DLGLOBAL		0
-+#  endif
-+#endif
- 
+-
 -    *)
 -      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 -	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -29054,28 +23783,7 @@
 -      fi
 -      ;;
 -    esac
-+/* 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
- 
+-
 -    if test "$ld_shlibs_F77" = no; then
 -      runpath_var=
 -      hardcode_libdir_flag_spec_F77=
@@ -29098,10 +23806,7 @@
 -	hardcode_direct_F77=unsupported
 -      fi
 -      ;;
-+#ifdef __cplusplus
-+extern "C" void exit (int);
-+#endif
- 
+-
 -    aix[4-9]*)
 -      if test "$host_cpu" = ia64; then
 -	# On IA64, the linker does run time linking by default, so we don't
@@ -29118,12 +23823,7 @@
 -	  export_symbols_cmds_F77='$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
-+void fnord() { int i=42;}
-+int main ()
-+{
-+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+  int status = $lt_dlunknown;
- 
+-
 -	# 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.
@@ -29136,54 +23836,22 @@
 -	  done
 -	  ;;
 -	esac
-+  if (self)
-+    {
-+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+      /* dlclose (self); */
-+    }
-+  else
-+    puts (dlerror ());
- 
+-
 -	exp_sym_flag='-bexport'
 -	no_entry_flag='-bnoentry'
 -      fi
-+    exit (status);
-+}
-+_LT_EOF
-+  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-+    (./conftest; exit; ) >&5 2>/dev/null
-+    lt_status=$?
-+    case x$lt_status in
-+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-+      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
-+    esac
-+  else :
-+    # compilation failed
-+    lt_cv_dlopen_self=no
-+  fi
-+fi
-+rm -fr conftest*
- 
+-
 -      # 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.
- 
+-
 -      archive_cmds_F77=''
 -      hardcode_direct_F77=yes
 -      hardcode_libdir_separator_F77=':'
 -      link_all_deplibs_F77=yes
-+fi
-+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-+echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
- 
+-
 -      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
@@ -29224,22 +23892,7 @@
 -	  fi
 -	fi
 -      fi
-+    if test "x$lt_cv_dlopen_self" = xyes; then
-+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-+      { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
-+if test "${lt_cv_dlopen_self_static+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  	  if test "$cross_compiling" = yes; then :
-+  lt_cv_dlopen_self_static=cross
-+else
-+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+  lt_status=$lt_dlunknown
-+  cat > conftest.$ac_ext <<_LT_EOF
-+#line 12156 "configure"
-+#include "confdefs.h"
- 
+-
 -      # It seems that -bexpall does not export symbols beginning with
 -      # underscore (_), so it is better to generate a list of symbols to export.
 -      always_export_symbols_F77=yes
@@ -29250,10 +23903,7 @@
 -       # Determine the default libpath from the value encoded in an empty executable.
 -       cat >conftest.$ac_ext <<_ACEOF
 -      program main
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
- 
+-
 -      end
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
@@ -29274,8 +23924,7 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext &&
 -       $as_test_x conftest$ac_exeext; then
-+#include <stdio.h>
- 
+-
 -lt_aix_libpath_sed='
 -    /Import File Strings/,/^$/ {
 -	/^0/ {
@@ -29291,52 +23940,14 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+#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
- 
+-
+-
 -fi
-+#ifdef __cplusplus
-+extern "C" void exit (int);
-+#endif
- 
+-
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+void fnord() { int i=42;}
-+int main ()
-+{
-+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+  int status = $lt_dlunknown;
- 
+-
 -       hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
 -	archive_expsym_cmds_F77="\$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
@@ -29348,15 +23959,7 @@
 -	 # Determine the default libpath from the value encoded in an empty executable.
 -	 cat >conftest.$ac_ext <<_ACEOF
 -      program main
-+  if (self)
-+    {
-+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+      /* dlclose (self); */
-+    }
-+  else
-+    puts (dlerror ());
- 
+-
 -      end
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
@@ -29367,37 +23970,17 @@
 -esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 -  (eval "$ac_link") 2>conftest.er1
-+    exit (status);
-+}
-+_LT_EOF
-+  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-   ac_status=$?
+-  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && {
 -	 test -z "$ac_f77_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext &&
 -       $as_test_x conftest$ac_exeext; then
-+  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-+    (./conftest; exit; ) >&5 2>/dev/null
-+    lt_status=$?
-+    case x$lt_status in
-+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-+      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
-+    esac
-+  else :
-+    # compilation failed
-+    lt_cv_dlopen_self_static=no
-+  fi
-+fi
-+rm -fr conftest*
-+
- 
+-
 -lt_aix_libpath_sed='
 -    /Import File Strings/,/^$/ {
 -	/^0/ {
@@ -29409,35 +23992,18 @@
 -# 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
+-fi
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
-+    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
- 
+-
+-
+-fi
+-
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
+-
 -	 hardcode_libdir_flag_spec_F77='${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.
@@ -29451,7 +24017,7 @@
 -	fi
 -      fi
 -      ;;
- 
+-
 -    amigaos*)
 -      archive_cmds_F77='$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)'
 -      hardcode_libdir_flag_spec_F77='-L$libdir'
@@ -29459,11 +24025,11 @@
 -      # see comment about different semantics on the GNU ld section
 -      ld_shlibs_F77=no
 -      ;;
- 
+-
 -    bsdi[45]*)
 -      export_dynamic_flag_spec_F77=-rdynamic
 -      ;;
- 
+-
 -    cygwin* | mingw* | pw32*)
 -      # When not using gcc, we currently assume that we are using
 -      # Microsoft Visual C++.
@@ -29484,7 +24050,7 @@
 -      fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
 -      enable_shared_with_static_runtimes_F77=yes
 -      ;;
- 
+-
 -    darwin* | rhapsody*)
 -      case $host_os in
 -        rhapsody* | darwin1.[012])
@@ -29533,17 +24099,17 @@
 -      esac
 -    fi
 -      ;;
- 
+-
 -    dgux*)
 -      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 -      hardcode_libdir_flag_spec_F77='-L$libdir'
 -      hardcode_shlibpath_var_F77=no
 -      ;;
- 
+-
 -    freebsd1*)
 -      ld_shlibs_F77=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
@@ -29554,7 +24120,7 @@
 -      hardcode_direct_F77=yes
 -      hardcode_shlibpath_var_F77=no
 -      ;;
- 
+-
 -    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
 -    freebsd2*)
 -      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
@@ -29562,7 +24128,7 @@
 -      hardcode_minus_L_F77=yes
 -      hardcode_shlibpath_var_F77=no
 -      ;;
- 
+-
 -    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
 -    freebsd* | dragonfly*)
 -      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
@@ -29570,7 +24136,7 @@
 -      hardcode_direct_F77=yes
 -      hardcode_shlibpath_var_F77=no
 -      ;;
- 
+-
 -    hpux9*)
 -      if test "$GCC" = yes; then
 -	archive_cmds_F77='$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'
@@ -29580,13 +24146,13 @@
 -      hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
 -      hardcode_libdir_separator_F77=:
 -      hardcode_direct_F77=yes
- 
+-
 -      # hardcode_minus_L: Not really in the search PATH,
 -      # but as the default location of the library.
 -      hardcode_minus_L_F77=yes
 -      export_dynamic_flag_spec_F77='${wl}-E'
 -      ;;
- 
+-
 -    hpux10*)
 -      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
 -	archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
@@ -29596,15 +24162,23 @@
 -      if test "$with_gnu_ld" = no; then
 -	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
 -	hardcode_libdir_separator_F77=:
++## CAVEAT EMPTOR:
++## There is no encapsulation within the following macros, do not change
++## the running order or otherwise move them around unless you know exactly
++## what you are doing...
++if test -n "$compiler"; then
  
 -	hardcode_direct_F77=yes
 -	export_dynamic_flag_spec_F77='${wl}-E'
++lt_prog_compiler_no_builtin_flag=
  
 -	# hardcode_minus_L: Not really in the search PATH,
 -	# but as the default location of the library.
 -	hardcode_minus_L_F77=yes
 -      fi
 -      ;;
++if test "$GCC" = yes; then
++  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
  
 -    hpux11*)
 -      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -29635,35 +24209,39 @@
 -      if test "$with_gnu_ld" = no; then
 -	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
 -	hardcode_libdir_separator_F77=:
-+striplib=
-+old_striplib=
-+{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
-+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"
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
++  { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
++if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
++  $as_echo_n "(cached) " >&6
 +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"
-+      { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+    else
-+      { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+    fi
-+    ;;
-+  *)
-+    { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+    ;;
-+  esac
-+fi
++  lt_cv_prog_compiler_rtti_exceptions=no
++   ac_outfile=conftest.$ac_objext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="-fno-rtti -fno-exceptions"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # 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:9015: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:9019: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings other than the usual output.
++     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
++       lt_cv_prog_compiler_rtti_exceptions=yes
++     fi
++   fi
++   $RM conftest*
  
 -	case $host_cpu in
 -	hppa*64*|ia64*)
@@ -29674,6 +24252,9 @@
 -	*)
 -	  hardcode_direct_F77=yes
 -	  export_dynamic_flag_spec_F77='${wl}-E'
++fi
++{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
++$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
  
 -	  # hardcode_minus_L: Not really in the search PATH,
 -	  # but as the default location of the library.
@@ -29682,6 +24263,11 @@
 -	esac
 -      fi
 -      ;;
++if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
++    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
++else
++    :
++fi
  
 -    irix5* | irix6* | nonstopux*)
 -      if test "$GCC" = yes; then
@@ -29694,6 +24280,7 @@
 -      hardcode_libdir_separator_F77=:
 -      link_all_deplibs_F77=yes
 -      ;;
++fi
  
 -    netbsd* | netbsdelf*-gnu)
 -      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -29770,12 +24357,17 @@
 -	archive_cmds_F77='$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'
 -	archive_expsym_cmds_F77='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'
++  lt_prog_compiler_wl=
++lt_prog_compiler_pic=
++lt_prog_compiler_static=
  
 -	# Both c and cxx compiler support -rpath directly
 -	hardcode_libdir_flag_spec_F77='-rpath $libdir'
 -      fi
 -      hardcode_libdir_separator_F77=:
 -      ;;
++{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  
 -    solaris*)
 -      no_undefined_flag_F77=' -z text'
@@ -29808,6 +24400,9 @@
 -      esac
 -      link_all_deplibs_F77=yes
 -      ;;
++  if test "$GCC" = yes; then
++    lt_prog_compiler_wl='-Wl,'
++    lt_prog_compiler_static='-static'
  
 -    sunos4*)
 -      if test "x$host_vendor" = xsequent; then
@@ -29816,17 +24411,18 @@
 -	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
 -      else
 -	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
--      fi
++    case $host_os in
++      aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static='-Bstatic'
+       fi
 -      hardcode_libdir_flag_spec_F77='-L$libdir'
 -      hardcode_direct_F77=yes
 -      hardcode_minus_L_F77=yes
 -      hardcode_shlibpath_var_F77=no
--      ;;
-+  # Report which library types will actually be built
-+  { echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-+  { echo "$as_me:$LINENO: result: $can_build_shared" >&5
-+echo "${ECHO_T}$can_build_shared" >&6; }
+       ;;
  
 -    sysv4)
 -      case $host_vendor in
@@ -29840,34 +24436,34 @@
 -	  archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
 -	  reload_cmds_F77='$CC -r -o $output$reload_objs'
 -	  hardcode_direct_F77=no
--        ;;
++    amigaos*)
++      case $host_cpu in
++      powerpc)
++            # see comment about AmigaOS4 .so support
++            lt_prog_compiler_pic='-fPIC'
++        ;;
++      m68k)
++            # 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_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+         ;;
 -	motorola)
 -	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 -	  hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie
 -	;;
--      esac
+       esac
 -      runpath_var='LD_RUN_PATH'
 -      hardcode_shlibpath_var_F77=no
--      ;;
-+  { echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
-+  test "$can_build_shared" = "no" && enable_shared=no
+       ;;
  
 -    sysv4.3*)
 -      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 -      hardcode_shlibpath_var_F77=no
 -      export_dynamic_flag_spec_F77='-Bexport'
--      ;;
-+  # 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
-+    ;;
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
+       ;;
  
 -    sysv4*MP*)
 -      if test -d /usr/nec; then
@@ -29877,28 +24473,20 @@
 -	hardcode_runpath_var=yes
 -	ld_shlibs_F77=yes
 -      fi
--      ;;
-+  aix[4-9]*)
-+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+      test "$enable_shared" = yes && enable_static=no
-+    fi
-+    ;;
-+  esac
-+  { echo "$as_me:$LINENO: result: $enable_shared" >&5
-+echo "${ECHO_T}$enable_shared" >&6; }
++    mingw* | cygwin* | pw32* | os2* | cegcc*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
++      lt_prog_compiler_pic='-DDLL_EXPORT'
+       ;;
  
 -    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
 -      no_undefined_flag_F77='${wl}-z,text'
 -      archive_cmds_need_lc_F77=no
 -      hardcode_shlibpath_var_F77=no
 -      runpath_var='LD_RUN_PATH'
-+  { echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
-+  # Make sure either enable_shared or enable_static is yes.
-+  test "$enable_shared" = yes || enable_static=yes
-+  { echo "$as_me:$LINENO: result: $enable_static" >&5
-+echo "${ECHO_T}$enable_static" >&6; }
- 
+-
 -      if test "$GCC" = yes; then
 -	archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 -	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -29906,7 +24494,11 @@
 -	archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 -	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 -      fi
--      ;;
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      lt_prog_compiler_pic='-fno-common'
+       ;;
  
 -    sysv5* | sco3.2v5* | sco5v6*)
 -      # Note: We can NOT use -z defs as we might desire, because we do not
@@ -29924,7 +24516,7 @@
 -      link_all_deplibs_F77=yes
 -      export_dynamic_flag_spec_F77='${wl}-Bexport'
 -      runpath_var='LD_RUN_PATH'
- 
+-
 -      if test "$GCC" = yes; then
 -	archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 -	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -29932,31 +24524,44 @@
 -	archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 -	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 -      fi
--      ;;
++    hpux*)
++      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
++      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
++      # sets the default TLS model and affects inlining.
++      case $host_cpu in
++      hppa*64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic='-fPIC'
++	;;
++      esac
+       ;;
  
 -    uts4*)
 -      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 -      hardcode_libdir_flag_spec_F77='-L$libdir'
 -      hardcode_shlibpath_var_F77=no
--      ;;
-+fi
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
++    interix[3-9]*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
+       ;;
  
 -    *)
 -      ld_shlibs_F77=no
--      ;;
++    msdosdjgpp*)
++      # Just because we use GCC doesn't mean we suddenly get shared libraries
++      # on systems that don't support them.
++      lt_prog_compiler_can_build_shared=no
++      enable_shared=no
+       ;;
 -    esac
 -  fi
-+CC="$lt_save_CC"
- 
+-
 -{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
 -echo "${ECHO_T}$ld_shlibs_F77" >&6; }
 -test "$ld_shlibs_F77" = no && can_build_shared=no
- 
+-
 -#
 -# Do we need to explicitly link libc?
 -#
@@ -29969,7 +24574,11 @@
 -    case $archive_cmds_F77 in
 -    *'~'*)
 -      # FIXME: we may have to deal with multi-command sequences.
--      ;;
++    *nto* | *qnx*)
++      # QNX uses GNU C++, but need to define -shared option too, otherwise
++      # it will coredump.
++      lt_prog_compiler_pic='-fPIC -shared'
+       ;;
 -    '$CC '*)
 -      # Test whether the compiler implicitly links with -lc since on some
 -      # systems, -lgcc has to come before -lc. If gcc already passes -lc
@@ -30010,16 +24619,19 @@
 -        allow_undefined_flag_F77=$lt_save_allow_undefined_flag
 -      else
 -        cat conftest.err 1>&5
--      fi
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	lt_prog_compiler_pic=-Kconform_pic
+       fi
 -      $rm conftest*
 -      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
 -echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
--      ;;
+       ;;
 -    esac
 -  fi
 -  ;;
 -esac
- 
+-
 -{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
 -library_names_spec=
@@ -30035,10 +24647,10 @@
 -version_type=none
 -dynamic_linker="$host_os ld.so"
 -sys_lib_dlsearch_path_spec="/lib /usr/lib"
- 
+-
 -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
@@ -30048,11 +24660,11 @@
 -  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
@@ -30062,22 +24674,33 @@
 -    # 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
++    *)
++      lt_prog_compiler_pic='-fPIC'
++      ;;
++    esac
+   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
++    # PORTME Check for flag to pass linker flags through the system compiler.
+     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
++    aix*)
++      lt_prog_compiler_wl='-Wl,'
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static='-Bstatic'
+       else
 -	can_build_shared=no
--      fi
--      ;;
++	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+       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
@@ -30096,19 +24719,19 @@
 -    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
@@ -30122,13 +24745,17 @@
 -  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
 -  # libtool to hard-code these into programs
 -  ;;
-+        ac_config_commands="$ac_config_commands libtool"
  
 -cygwin* | mingw* | pw32*)
 -  version_type=windows
 -  shrext_cmds=".dll"
 -  need_version=no
 -  need_lib_prefix=no
++    mingw* | cygwin* | pw32* | os2* | cegcc*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic='-DDLL_EXPORT'
++      ;;
  
 -  case $GCC,$host_os in
 -  yes,cygwin* | yes,mingw* | yes,pw32*)
@@ -30144,13 +24771,32 @@
 -      dlpath=$dir/\$dldll~
 -       $rm \$dlpath'
 -    shlibpath_overrides_runpath=yes
++    hpux9* | hpux10* | hpux11*)
++      lt_prog_compiler_wl='-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_prog_compiler_pic='+Z'
++	;;
++      esac
++      # Is there a better lt_prog_compiler_static that works with the bundled CC?
++      lt_prog_compiler_static='${wl}-a ${wl}archive'
++      ;;
  
 -    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"
--      ;;
++    irix5* | irix6* | nonstopux*)
++      lt_prog_compiler_wl='-Wl,'
++      # PIC (with -KPIC) is the default.
++      lt_prog_compiler_static='-non_shared'
+       ;;
 -    mingw*)
 -      # MinGW DLLs use traditional 'lib' prefix
 -      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
@@ -30166,11 +24812,72 @@
 -      else
 -        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
 -      fi
--      ;;
++
++    linux* | k*bsd*-gnu)
++      case $cc_basename in
++      # old Intel for x86_64 which still supported -KPIC.
++      ecc*)
++	lt_prog_compiler_wl='-Wl,'
++	lt_prog_compiler_pic='-KPIC'
++	lt_prog_compiler_static='-static'
++        ;;
++      # icc used to be incompatible with GCC.
++      # ICC 10 doesn't accept -KPIC any more.
++      icc* | ifort*)
++	lt_prog_compiler_wl='-Wl,'
++	lt_prog_compiler_pic='-fPIC'
++	lt_prog_compiler_static='-static'
++        ;;
++      # Lahey Fortran 8.1.
++      lf95*)
++	lt_prog_compiler_wl='-Wl,'
++	lt_prog_compiler_pic='--shared'
++	lt_prog_compiler_static='--static'
++	;;
++      pgcc* | pgf77* | pgf90* | pgf95*)
++        # Portland Group compilers (*not* the Pentium gcc compiler,
++	# which looks to be a dead project)
++	lt_prog_compiler_wl='-Wl,'
++	lt_prog_compiler_pic='-fpic'
++	lt_prog_compiler_static='-Bstatic'
++        ;;
++      ccc*)
++        lt_prog_compiler_wl='-Wl,'
++        # All Alpha code is PIC.
++        lt_prog_compiler_static='-non_shared'
++        ;;
++      xl*)
++	# IBM XL C 8.0/Fortran 10.1 on PPC
++	lt_prog_compiler_wl='-Wl,'
++	lt_prog_compiler_pic='-qpic'
++	lt_prog_compiler_static='-qstaticlink'
++	;;
++      *)
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C 5.9
++	  lt_prog_compiler_pic='-KPIC'
++	  lt_prog_compiler_static='-Bstatic'
++	  lt_prog_compiler_wl='-Wl,'
++	  ;;
++	*Sun\ F*)
++	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
++	  lt_prog_compiler_pic='-KPIC'
++	  lt_prog_compiler_static='-Bstatic'
++	  lt_prog_compiler_wl=''
++	  ;;
++	esac
++	;;
++      esac
+       ;;
 -    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}'
--      ;;
++
++    newsos6)
++      lt_prog_compiler_pic='-KPIC'
++      lt_prog_compiler_static='-Bstatic'
+       ;;
 -    esac
 -    ;;
  
@@ -30182,7 +24889,11 @@
 -  # FIXME: first we should search . and the directory the executable is in
 -  shlibpath_var=PATH
 -  ;;
-+# Only expand once:
++    *nto* | *qnx*)
++      # QNX uses GNU C++, but need to define -shared option too, otherwise
++      # it will coredump.
++      lt_prog_compiler_pic='-fPIC -shared'
++      ;;
  
 -darwin* | rhapsody*)
 -  dynamic_linker="$host_os dyld"
@@ -30194,9 +24905,17 @@
 -  shlibpath_overrides_runpath=yes
 -  shlibpath_var=DYLD_LIBRARY_PATH
 -  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
++    osf3* | osf4* | osf5*)
++      lt_prog_compiler_wl='-Wl,'
++      # All OSF/1 code is PIC.
++      lt_prog_compiler_static='-non_shared'
++      ;;
  
 -  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
 -  ;;
++    rdos*)
++      lt_prog_compiler_static='-non_shared'
++      ;;
  
 -dgux*)
 -  version_type=linux
@@ -30206,10 +24925,25 @@
 -  soname_spec='${libname}${release}${shared_ext}$major'
 -  shlibpath_var=LD_LIBRARY_PATH
 -  ;;
++    solaris*)
++      lt_prog_compiler_pic='-KPIC'
++      lt_prog_compiler_static='-Bstatic'
++      case $cc_basename in
++      f77* | f90* | f95*)
++	lt_prog_compiler_wl='-Qoption ld ';;
++      *)
++	lt_prog_compiler_wl='-Wl,';;
++      esac
++      ;;
  
 -freebsd1*)
 -  dynamic_linker=no
 -  ;;
++    sunos4*)
++      lt_prog_compiler_wl='-Qoption ld '
++      lt_prog_compiler_pic='-PIC'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
  
 -freebsd* | dragonfly*)
 -  # DragonFly does not have aout.  When/if they implement a new
@@ -30228,11 +24962,21 @@
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
 -      need_version=no
 -      need_lib_prefix=no
--      ;;
++    sysv4 | sysv4.2uw2* | sysv4.3*)
++      lt_prog_compiler_wl='-Wl,'
++      lt_prog_compiler_pic='-KPIC'
++      lt_prog_compiler_static='-Bstatic'
+       ;;
 -    freebsd-*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
 -      need_version=yes
--      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec ;then
++	lt_prog_compiler_pic='-Kconform_pic'
++	lt_prog_compiler_static='-Bstatic'
++      fi
+       ;;
 -  esac
 -  shlibpath_var=LD_LIBRARY_PATH
 -  case $host_os in
@@ -30264,6 +25008,11 @@
 -  shlibpath_var=LD_LIBRARY_PATH
 -  hardcode_into_libs=yes
 -  ;;
++    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++      lt_prog_compiler_wl='-Wl,'
++      lt_prog_compiler_pic='-KPIC'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
  
 -hpux9* | hpux10* | hpux11*)
 -  # Give a soname corresponding to the major version so that dld.sl refuses to
@@ -30310,9 +25059,10 @@
 -  # HP-UX runs *really* slowly unless shared libraries are mode 555.
 -  postinstall_cmds='chmod 555 $lib'
 -  ;;
-+##############################
-+# Custom Junk
-+##############################
++    unicos*)
++      lt_prog_compiler_wl='-Wl,'
++      lt_prog_compiler_can_build_shared=no
++      ;;
  
 -interix[3-9]*)
 -  version_type=linux
@@ -30325,11 +25075,15 @@
 -  shlibpath_overrides_runpath=no
 -  hardcode_into_libs=yes
 -  ;;
++    uts4*)
++      lt_prog_compiler_pic='-pic'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
  
 -irix5* | irix6* | nonstopux*)
 -  case $host_os in
 -    nonstopux*) version_type=nonstopux ;;
--    *)
+     *)
 -	if test "$lt_cv_prog_gnu_ld" = yes; then
 -		version_type=linux
 -	else
@@ -30343,8 +25097,17 @@
 -  case $host_os in
 -  irix5* | nonstopux*)
 -    libsuff= shlibsuff=
--    ;;
--  *)
++      lt_prog_compiler_can_build_shared=no
++      ;;
++    esac
++  fi
++
++case $host_os in
++  # For platforms which do not support PIC, -DPIC is meaningless:
++  *djgpp*)
++    lt_prog_compiler_pic=
+     ;;
+   *)
 -    case $LD in # libtool.m4 will add one of these switches to LD
 -    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
 -      libsuff= shlibsuff= libmagic=32-bit;;
@@ -30354,7 +25117,8 @@
 -      libsuff=64 shlibsuff=64 libmagic=64-bit;;
 -    *) libsuff= shlibsuff= libmagic=never-match;;
 -    esac
--    ;;
++    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+     ;;
 -  esac
 -  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
 -  shlibpath_overrides_runpath=no
@@ -30362,11 +25126,60 @@
 -  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
 -  hardcode_into_libs=yes
 -  ;;
++esac
++{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
++$as_echo "$lt_prog_compiler_pic" >&6; }
++
++
++
++
++
++
++#
++# Check to make sure the PIC flag actually works.
++#
++if test -n "$lt_prog_compiler_pic"; then
++  { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
++$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
++if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  lt_cv_prog_compiler_pic_works=no
++   ac_outfile=conftest.$ac_objext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # 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:9354: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:9358: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings other than the usual output.
++     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
++       lt_cv_prog_compiler_pic_works=yes
++     fi
++   fi
++   $RM conftest*
  
 -# No shared lib support for Linux oldld, aout, or coff.
 -linux*oldld* | linux*aout* | linux*coff*)
 -  dynamic_linker=no
 -  ;;
++fi
++{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
++$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
  
 -# This must be Linux ELF.
 -linux* | k*bsd*-gnu)
@@ -30382,20 +25195,22 @@
 -  # Some rework will be needed to allow for fast_install
 -  # before this can be enabled.
 -  hardcode_into_libs=yes
-+##############################
-+# Dependencies
-+##############################
++if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
++    case $lt_prog_compiler_pic in
++     "" | " "*) ;;
++     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
++     esac
++else
++    lt_prog_compiler_pic=
++     lt_prog_compiler_can_build_shared=no
++fi
  
 -  # Append ld.so.conf contents to the search path
 -  if test -f /etc/ld.so.conf; then
 -    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 -    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 -  fi
-+GTK_REQUIRED_VERSION=2.8.0
-+PANEL_REQUIRED_VERSION=2.0.0
-+GLADE_REQUIRED_VERSION=2.0.0
-+GLIB_REQUIRED_VERSION=2.15.3
-+DBUS_GLIB_REQUIRED_VERSION=0.76
++fi
  
 -  # We used to test for /lib/ld.so.1 and disable shared libraries on
 -  # powerpc, because MkLinux only supported shared libraries with the
@@ -30430,85 +25245,18 @@
 -    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'
-+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-+	if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-+{ 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
-+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
+-  fi
 -  shlibpath_var=LD_LIBRARY_PATH
 -  shlibpath_overrides_runpath=yes
 -  hardcode_into_libs=yes
-+done
-+done
-+IFS=$as_save_IFS
-+
-   ;;
-+esac
-+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; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
+-  ;;
  
 -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
-+
-+fi
-+if test -z "$ac_cv_path_PKG_CONFIG"; then
-+  ac_pt_PKG_CONFIG=$PKG_CONFIG
-+  # Extract the first word of "pkg-config", so it can be a program name with args.
-+set dummy pkg-config; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $ac_pt_PKG_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_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_ac_pt_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
+-  ;;
  
 -nto-qnx*)
 -  version_type=linux
@@ -30518,17 +25266,7 @@
 -  soname_spec='${libname}${release}${shared_ext}$major'
 -  shlibpath_var=LD_LIBRARY_PATH
 -  shlibpath_overrides_runpath=yes
-   ;;
-+esac
-+fi
-+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-+if test -n "$ac_pt_PKG_CONFIG"; then
-+  { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
+-  ;;
  
 -openbsd*)
 -  version_type=sunos
@@ -30551,26 +25289,40 @@
 -	shlibpath_overrides_runpath=yes
 -	;;
 -      esac
-+  if test "x$ac_pt_PKG_CONFIG" = x; then
-+    PKG_CONFIG=""
-   else
+-  else
 -    shlibpath_overrides_runpath=yes
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    PKG_CONFIG=$ac_pt_PKG_CONFIG
-   fi
+-  fi
 -  ;;
++#
++# Check to make sure the static flag actually works.
++#
++wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
++{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
++if test "${lt_cv_prog_compiler_static_works+set}" = set; then
++  $as_echo_n "(cached) " >&6
 +else
-+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-+fi
++  lt_cv_prog_compiler_static_works=no
++   save_LDFLAGS="$LDFLAGS"
++   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
++   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>&5
++       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++       if diff conftest.exp conftest.er2 >/dev/null; then
++         lt_cv_prog_compiler_static_works=yes
++       fi
++     else
++       lt_cv_prog_compiler_static_works=yes
++     fi
++   fi
++   $RM -r conftest*
++   LDFLAGS="$save_LDFLAGS"
  
 -os2*)
 -  libname_spec='$name'
@@ -30581,18 +25333,8 @@
 -  shlibpath_var=LIBPATH
 -  ;;
 +fi
-+if test -n "$PKG_CONFIG"; then
-+	_pkg_min_version=0.9.0
-+	{ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
-+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-+		{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+	else
-+		{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+		PKG_CONFIG=""
-+	fi
++{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
++$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
  
 -osf3* | osf4* | osf5*)
 -  version_type=osf
@@ -30604,14 +25346,15 @@
 -  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"
 -  ;;
++if test x"$lt_cv_prog_compiler_static_works" = xyes; then
++    :
++else
++    lt_prog_compiler_static=
 +fi
  
 -rdos*)
 -  dynamic_linker=no
 -  ;;
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for APPLET" >&5
-+echo $ECHO_N "checking for APPLET... $ECHO_C" >&6; }
  
 -solaris*)
 -  version_type=linux
@@ -30625,7 +25368,7 @@
 -  # 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'
@@ -30637,7 +25380,7 @@
 -  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}'
@@ -30661,7 +25404,7 @@
 -      ;;
 -  esac
 -  ;;
--
+ 
 -sysv4*MP*)
 -  if test -d /usr/nec ;then
 -    version_type=linux
@@ -30670,7 +25413,7 @@
 -    shlibpath_var=LD_LIBRARY_PATH
 -  fi
 -  ;;
--
+ 
 -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 -  version_type=freebsd-elf
 -  need_lib_prefix=no
@@ -30693,14 +25436,63 @@
 -  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
 -  ;;
--
++  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
++if test "${lt_cv_prog_compiler_c_o+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  lt_cv_prog_compiler_c_o=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:9459: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&5
++   echo "$as_me:9463: \$? = $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
++     # 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_cv_prog_compiler_c_o=yes
++     fi
++   fi
++   chmod u+w . 2>&5
++   $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 ..
++   $RM -r conftest
++   $RM conftest*
++
++fi
++{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
++$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+ 
 -*)
 -  dynamic_linker=no
 -  ;;
@@ -30708,97 +25500,82 @@
 -{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
 -echo "${ECHO_T}$dynamic_linker" >&6; }
 -test "$dynamic_linker" = no && can_build_shared=no
--
+ 
 -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$APPLET_CFLAGS"; then
-+        pkg_cv_APPLET_CFLAGS="$APPLET_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
-+	     libpanelapplet-2.0 >= \$PANEL_REQUIRED_VERSION
-+	     libglade-2.0 >= \$GLADE_REQUIRED_VERSION
-+	     gio-2.0 >= \$GLIB_REQUIRED_VERSION
-+	     dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
-+	     polkit-gnome
-+	     libgnomeui-2.0\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
-+	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
-+	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
-+	     gio-2.0 >= $GLIB_REQUIRED_VERSION
-+	     dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-+	     polkit-gnome
-+	     libgnomeui-2.0") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+  pkg_cv_APPLET_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION
-+	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
-+	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
-+	     gio-2.0 >= $GLIB_REQUIRED_VERSION
-+	     dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-+	     polkit-gnome
-+	     libgnomeui-2.0" 2>/dev/null`
- else
+-else
 -  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-+  pkg_failed=yes
- fi
--
+-fi
+ 
 -sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
 -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    fi
++
++
++
++  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
++if test "${lt_cv_prog_compiler_c_o+set}" = set; then
++  $as_echo_n "(cached) " >&6
  else
 -  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
-+	pkg_failed=untried
- fi
--
+-fi
++  lt_cv_prog_compiler_c_o=no
++   $RM -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
 -sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
--
++   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:9514: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&5
++   echo "$as_me:9518: \$? = $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
++     # 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_cv_prog_compiler_c_o=yes
++     fi
++   fi
++   chmod u+w . 2>&5
++   $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 ..
++   $RM -r conftest
++   $RM conftest*
+ 
 -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"
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$APPLET_LIBS"; then
-+        pkg_cv_APPLET_LIBS="$APPLET_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
-+	     libpanelapplet-2.0 >= \$PANEL_REQUIRED_VERSION
-+	     libglade-2.0 >= \$GLADE_REQUIRED_VERSION
-+	     gio-2.0 >= \$GLIB_REQUIRED_VERSION
-+	     dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
-+	     polkit-gnome
-+	     libgnomeui-2.0\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
-+	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
-+	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
-+	     gio-2.0 >= $GLIB_REQUIRED_VERSION
-+	     dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-+	     polkit-gnome
-+	     libgnomeui-2.0") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+  pkg_cv_APPLET_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION
-+	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
-+	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
-+	     gio-2.0 >= $GLIB_REQUIRED_VERSION
-+	     dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-+	     polkit-gnome
-+	     libgnomeui-2.0" 2>/dev/null`
-+else
-+  pkg_failed=yes
  fi
--
++{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
++$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+ 
 -{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
 -hardcode_action_F77=
 -if test -n "$hardcode_libdir_flag_spec_F77" || \
 -   test -n "$runpath_var_F77" || \
 -   test "X$hardcode_automatic_F77" = "Xyes" ; then
--
+ 
 -  # We can hardcode non-existant directories.
 -  if test "$hardcode_direct_F77" != no &&
 -     # If the only mechanism to avoid hardcoding is shlibpath_var, we
@@ -30811,13 +25588,31 @@
 -  else
 -    # We can link without hardcoding, and we can hardcode nonexisting dirs.
 -    hardcode_action_F77=immediate
--  fi
-+    fi
++
++
++hard_links="nottested"
++if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++$as_echo_n "checking if we can lock with hard links... " >&6; }
++  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
++  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
++$as_echo "$hard_links" >&6; }
++  if test "$hard_links" = no; then
++    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++    need_locks=warn
+   fi
  else
 -  # We cannot hardcode anything, or else we can only hardcode existing
 -  # directories.
 -  hardcode_action_F77=unsupported
-+	pkg_failed=untried
++  need_locks=no
  fi
 -{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
 -echo "${ECHO_T}$hardcode_action_F77" >&6; }
@@ -30913,352 +25708,578 @@
 -      ;;
 -    esac
 -  done
-+if test $pkg_failed = yes; then
  
 -  case $lt_echo in
 -  *'\$0 --fallback-echo"')
 -    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
--    ;;
--  esac
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+        _pkg_short_errors_supported=yes
-+else
-+        _pkg_short_errors_supported=no
-+fi
-+        if test $_pkg_short_errors_supported = yes; then
-+	        APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
-+	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
-+	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
-+	     gio-2.0 >= $GLIB_REQUIRED_VERSION
-+	     dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-+	     polkit-gnome
-+	     libgnomeui-2.0"`
-+        else
-+	        APPLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
-+	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
-+	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
-+	     gio-2.0 >= $GLIB_REQUIRED_VERSION
-+	     dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-+	     polkit-gnome
-+	     libgnomeui-2.0"`
-+        fi
-+	# Put the nasty error message in config.log where it belongs
-+	echo "$APPLET_PKG_ERRORS" >&5
++
++
++  { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
++
++  runpath_var=
++  allow_undefined_flag=
++  always_export_symbols=no
++  archive_cmds=
++  archive_expsym_cmds=
++  compiler_needs_object=no
++  enable_shared_with_static_runtimes=no
++  export_dynamic_flag_spec=
++  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  hardcode_automatic=no
++  hardcode_direct=no
++  hardcode_direct_absolute=no
++  hardcode_libdir_flag_spec=
++  hardcode_libdir_flag_spec_ld=
++  hardcode_libdir_separator=
++  hardcode_minus_L=no
++  hardcode_shlibpath_var=unsupported
++  inherit_rpath=no
++  link_all_deplibs=unknown
++  module_cmds=
++  module_expsym_cmds=
++  old_archive_from_new_cmds=
++  old_archive_from_expsyms_cmds=
++  thread_safe_flag_spec=
++  whole_archive_flag_spec=
++  # include_expsyms should be a list of space-separated symbols to be *always*
++  # included in the symbol list
++  include_expsyms=
++  # 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'.
++  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
++  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++  # platforms (ab)use it in PIC code, but their linkers get confused if
++  # the symbol is explicitly referenced.  Since portable code cannot
++  # rely on this symbol name, it's probably fine to never include it in
++  # preloaded symbol tables.
++  # Exclude shared library initialization/finalization symbols.
++  extract_expsyms_cmds=
++
++  case $host_os in
++  cygwin* | mingw* | pw32* | cegcc*)
++    # 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
  
 -cfgfile="$ofile"
-+	{ { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION
-+	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
-+	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
-+	     gio-2.0 >= $GLIB_REQUIRED_VERSION
-+	     dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-+	     polkit-gnome
-+	     libgnomeui-2.0) were not met:
- 
+-
 -  cat <<__EOF__ >> "$cfgfile"
 -# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-+$APPLET_PKG_ERRORS
++  ld_shlibs=yes
++  if test "$with_gnu_ld" = yes; then
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    wlarc='${wl}'
  
 -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
++    # 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
++    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    export_dynamic_flag_spec='${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
++      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    else
++      whole_archive_flag_spec=
++    fi
++    supports_anon_versioning=no
++    case `$LD -v 2>&1` 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
  
 -# Shell to use when invoking shell scripts.
 -SHELL=$lt_SHELL
-+Alternatively, you may set the environment variables APPLET_CFLAGS
-+and APPLET_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&5
-+echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION
-+	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
-+	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
-+	     gio-2.0 >= $GLIB_REQUIRED_VERSION
-+	     dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-+	     polkit-gnome
-+	     libgnomeui-2.0) were not met:
++    # 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
++	ld_shlibs=no
++	cat <<_LT_EOF 1>&2
  
 -# Whether or not to build shared libraries.
 -build_libtool_libs=$enable_shared
-+$APPLET_PKG_ERRORS
++*** 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.
  
 -# Whether or not to build static libraries.
 -build_old_libs=$enable_static
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
++_LT_EOF
++      fi
++      ;;
  
 -# Whether or not to add -lc for building shared libraries.
 -build_libtool_need_lc=$archive_cmds_need_lc_F77
-+Alternatively, you may set the environment variables APPLET_CFLAGS
-+and APPLET_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&2;}
-+   { (exit 1); exit 1; }; }
-+elif test $pkg_failed = untried; then
-+	{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
++    amigaos*)
++      case $host_cpu in
++      powerpc)
++            # see comment about AmigaOS4 .so support
++            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++            archive_expsym_cmds=''
++        ;;
++      m68k)
++            archive_cmds='$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)'
++            hardcode_libdir_flag_spec='-L$libdir'
++            hardcode_minus_L=yes
++        ;;
++      esac
++      ;;
  
 -# Whether or not to disallow shared libs when runtime libs are static
 -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77
-+Alternatively, you may set the environment variables APPLET_CFLAGS
-+and APPLET_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
++    beos*)
++      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
++	allow_undefined_flag=unsupported
++	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++	# support --undefined.  This deserves some investigation.  FIXME
++	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
  
 -# Whether or not to optimize for fast installation.
 -fast_install=$enable_fast_install
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
++    cygwin* | mingw* | pw32* | cegcc*)
++      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
++      # as there is no search path for DLLs.
++      hardcode_libdir_flag_spec='-L$libdir'
++      allow_undefined_flag=unsupported
++      always_export_symbols=no
++      enable_shared_with_static_runtimes=yes
++      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  
 -# The host system.
 -host_alias=$host_alias
 -host=$host
 -host_os=$host_os
-+Alternatively, you may set the environment variables APPLET_CFLAGS
-+and APPLET_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
++      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
++        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++	# If the export-symbols file already is a .def file (1st line
++	# is EXPORTS), use it as is; otherwise, prepend...
++	archive_expsym_cmds='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
++	ld_shlibs=no
++      fi
++      ;;
  
 -# The build system.
 -build_alias=$build_alias
 -build=$build
 -build_os=$build_os
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; }
-+else
-+	APPLET_CFLAGS=$pkg_cv_APPLET_CFLAGS
-+	APPLET_LIBS=$pkg_cv_APPLET_LIBS
-+        { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+	:
-+fi
++    interix[3-9]*)
++      hardcode_direct=no
++      hardcode_shlibpath_var=no
++      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++      export_dynamic_flag_spec='${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.
++      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      ;;
  
 -# An echo program that does not interpret backslashes.
 -echo=$lt_echo
++    gnu* | linux* | tpf* | k*bsd*-gnu)
++      tmp_diet=no
++      if test "$host_os" = linux-dietlibc; then
++	case $cc_basename in
++	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
++	esac
++      fi
++      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
++	 && test "$tmp_diet" = no
++      then
++	tmp_addflag=
++	tmp_sharedflag='-shared'
++	case $cc_basename,$host_cpu in
++        pgcc*)				# Portland Group C compiler
++	  whole_archive_flag_spec='${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
++	  whole_archive_flag_spec='${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' ;;
++	lf95*)				# Lahey Fortran 8.1
++	  whole_archive_flag_spec=
++	  tmp_sharedflag='--shared' ;;
++	xl[cC]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
++	  tmp_sharedflag='-qmkshrobj'
++	  tmp_addflag= ;;
++	esac
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)			# Sun C 5.9
++	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
++	  compiler_needs_object=yes
++	  tmp_sharedflag='-G' ;;
++	*Sun\ F*)			# Sun Fortran 8.3
++	  tmp_sharedflag='-G' ;;
++	esac
++	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  
 -# The archiver.
 -AR=$lt_AR
 -AR_FLAGS=$lt_AR_FLAGS
++        if test "x$supports_anon_versioning" = xyes; then
++          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
++	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++	    echo "local: *; };" >> $output_objdir/$libname.ver~
++	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++        fi
  
 -# A C compiler.
 -LTCC=$lt_LTCC
++	case $cc_basename in
++	xlf*)
++	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
++	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
++	  hardcode_libdir_flag_spec=
++	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
++	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
++	  if test "x$supports_anon_versioning" = xyes; then
++	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
++	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++	      echo "local: *; };" >> $output_objdir/$libname.ver~
++	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
++	  fi
++	  ;;
++	esac
++      else
++        ld_shlibs=no
++      fi
++      ;;
  
 -# LTCC compiler flags.
 -LTCFLAGS=$lt_LTCFLAGS
++    netbsd* | netbsdelf*-gnu)
++      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
++	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
++	wlarc=
++      else
++	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      fi
++      ;;
  
 -# A language-specific compiler.
 -CC=$lt_compiler_F77
++    solaris*)
++      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
++	ld_shlibs=no
++	cat <<_LT_EOF 1>&2
  
 -# Is the compiler the GNU C compiler?
 -with_gcc=$GCC_F77
++*** 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.
  
 -# An ERE matcher.
 -EGREP=$lt_EGREP
--
++_LT_EOF
++      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
++	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
+ 
 -# The linker used to build libraries.
 -LD=$lt_LD_F77
-+for ac_func in setresuid setenv unsetenv clearenv
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
++    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
++      case `$LD -v 2>&1` in
++        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
++	ld_shlibs=no
++	cat <<_LT_EOF 1>&2
  
 -# Whether we need hard or soft links.
 -LN_S=$lt_LN_S
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
++*** 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.
  
 -# A BSD-compatible nm program.
 -NM=$lt_NM
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
++_LT_EOF
++	;;
++	*)
++	  # 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.
++	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
++	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  else
++	    ld_shlibs=no
++	  fi
++	;;
++      esac
++      ;;
  
 -# A symbol stripping program
 -STRIP=$lt_STRIP
-+#undef $ac_func
++    sunos4*)
++      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      wlarc=
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      ;;
  
 -# Used to examine libraries when file_magic_cmd begins "file"
 -MAGIC_CMD=$MAGIC_CMD
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char $ac_func ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined __stub_$ac_func || defined __stub___$ac_func
-+choke me
-+#endif
++    *)
++      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
++	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
++    esac
++
++    if test "$ld_shlibs" = no; then
++      runpath_var=
++      hardcode_libdir_flag_spec=
++      export_dynamic_flag_spec=
++      whole_archive_flag_spec=
++    fi
++  else
++    # PORTME fill in a description of your system's linker (not GNU ld)
++    case $host_os in
++    aix3*)
++      allow_undefined_flag=unsupported
++      always_export_symbols=yes
++      archive_expsym_cmds='$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.
++      hardcode_minus_L=yes
++      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
++	# Neither direct hardcoding nor static linking is supported with a
++	# broken collect2.
++	hardcode_direct=unsupported
++      fi
++      ;;
  
 -# Used on cygwin: DLL creation program.
 -DLLTOOL="$DLLTOOL"
-+int
-+main ()
-+{
-+return $ac_func ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  eval "$as_ac_var=yes"
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
++    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
++	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++	else
++	  export_symbols_cmds='$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
  
 -# Used on cygwin: object dumper.
 -OBJDUMP="$OBJDUMP"
-+	eval "$as_ac_var=no"
-+fi
++	# 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
  
 -# Used on cygwin: assembler.
 -AS="$AS"
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
++	exp_sym_flag='-bexport'
++	no_entry_flag='-bnoentry'
++      fi
  
 -# The name of the directory that contains temporary libtool files.
 -objdir=$objdir
-+fi
-+done
++      # 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.
  
 -# How to create reloadable object files.
 -reload_flag=$lt_reload_flag
 -reload_cmds=$lt_reload_cmds
++      archive_cmds=''
++      hardcode_direct=yes
++      hardcode_direct_absolute=yes
++      hardcode_libdir_separator=':'
++      link_all_deplibs=yes
++      file_list_spec='${wl}-f,'
  
 -# How to pass a linker flag through the compiler.
 -wl=$lt_lt_prog_compiler_wl_F77
-+# Extract the first word of "glib-mkenums", so it can be a program name with args.
-+set dummy glib-mkenums; 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_GLIB_MKENUMS+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $GLIB_MKENUMS in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_GLIB_MKENUMS="$GLIB_MKENUMS" # 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_GLIB_MKENUMS="$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
++      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
++	  hardcode_direct=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
++	  hardcode_minus_L=yes
++	  hardcode_libdir_flag_spec='-L$libdir'
++	  hardcode_libdir_separator=
++	  fi
++	  ;;
++	esac
++	shared_flag='-shared'
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag="$shared_flag "'${wl}-G'
++	fi
++	link_all_deplibs=no
++      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
  
 -# Object file suffix (normally "o").
 -objext="$ac_objext"
-+  ;;
-+esac
-+fi
-+GLIB_MKENUMS=$ac_cv_path_GLIB_MKENUMS
-+if test -n "$GLIB_MKENUMS"; then
-+  { echo "$as_me:$LINENO: result: $GLIB_MKENUMS" >&5
-+echo "${ECHO_T}$GLIB_MKENUMS" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
++      export_dynamic_flag_spec='${wl}-bexpall'
++      # It seems that -bexpall does not export symbols beginning with
++      # underscore (_), so it is better to generate a list of symbols to export.
++      always_export_symbols=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.
++	allow_undefined_flag='-berok'
++        # Determine the default libpath from the value encoded in an
++        # empty executable.
++        cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
  
 -# Old archive suffix (normally "a").
 -libext="$libext"
++int
++main ()
++{
  
 -# Shared library suffix (normally ".so").
 -shrext_cmds='$shrext_cmds'
-+# Extract the first word of "glib-genmarshal", so it can be a program name with args.
-+set dummy glib-genmarshal; 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_GLIB_GENMARSHAL+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $GLIB_GENMARSHAL in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_GLIB_GENMARSHAL="$GLIB_GENMARSHAL" # 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_GLIB_GENMARSHAL="$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
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
  
 -# Executable file suffix (normally "").
 -exeext="$exeext"
-+  ;;
-+esac
++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
-+GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
-+if test -n "$GLIB_GENMARSHAL"; then
-+  { echo "$as_me:$LINENO: result: $GLIB_GENMARSHAL" >&5
-+echo "${ECHO_T}$GLIB_GENMARSHAL" >&6; }
 +else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
  
 -# Additional compiler flags for building library objects.
 -pic_flag=$lt_lt_prog_compiler_pic_F77
@@ -31266,100 +26287,165 @@
  
 -# What is the maximum length of a command?
 -max_cmd_len=$lt_cv_sys_max_cmd_len
-+# Extract the first word of "gconftool-2", so it can be a program name with args.
-+set dummy gconftool-2; 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_GCONFTOOL+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $GCONFTOOL in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_GCONFTOOL="$GCONFTOOL" # 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_GCONFTOOL="$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
++fi
  
 -# Does compiler simultaneously support -c and -o options?
 -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
-+  ;;
-+esac
-+fi
-+GCONFTOOL=$ac_cv_path_GCONFTOOL
-+if test -n "$GCONFTOOL"; then
-+  { echo "$as_me:$LINENO: result: $GCONFTOOL" >&5
-+echo "${ECHO_T}$GCONFTOOL" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
 -# Must we lock files when doing compilation?
 -need_locks=$lt_need_locks
++        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
++        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++      else
++	if test "$host_cpu" = ia64; then
++	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
++	  allow_undefined_flag="-z nodefs"
++	  archive_expsym_cmds="\$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.
++	 cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
  
 -# Do we need the lib prefix for modules?
 -need_lib_prefix=$need_lib_prefix
++int
++main ()
++{
  
 -# Do we need a version for libraries?
 -need_version=$need_version
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
  
 -# Whether dlopen is supported.
 -dlopen_support=$enable_dlopen
-+  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-+    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-+  else
-+    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-+  fi
++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
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
  
 -# 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
-+# Check whether --with-gconf-source was given.
-+if test "${with_gconf_source+set}" = set; then
-+  withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"
 +fi
  
 -# Compiler flag to prevent dynamic linking.
 -link_static_flag=$lt_lt_prog_compiler_static_F77
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
 -# Compiler flag to turn off builtin functions.
 -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
++	 hardcode_libdir_flag_spec='${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.
++	  no_undefined_flag=' ${wl}-bernotok'
++	  allow_undefined_flag=' ${wl}-berok'
++	  # Exported symbols can be pulled into shared objects from archives
++	  whole_archive_flag_spec='$convenience'
++	  archive_cmds_need_lc=yes
++	  # This is similar to how AIX traditionally builds its shared libraries.
++	  archive_expsym_cmds="\$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
++      ;;
  
 -# Compiler flag to allow reflexive dlopens.
 -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
-+  { echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
-+echo "${ECHO_T}Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
++    amigaos*)
++      case $host_cpu in
++      powerpc)
++            # see comment about AmigaOS4 .so support
++            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++            archive_expsym_cmds=''
++        ;;
++      m68k)
++            archive_cmds='$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)'
++            hardcode_libdir_flag_spec='-L$libdir'
++            hardcode_minus_L=yes
++        ;;
++      esac
++      ;;
  
 -# Compiler flag to generate shared objects directly from archives.
 -whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77
-+  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-+    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-+  fi
++    bsdi[45]*)
++      export_dynamic_flag_spec=-rdynamic
++      ;;
  
 -# Compiler flag to generate thread-safe objects.
 -thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77
++    cygwin* | mingw* | pw32* | cegcc*)
++      # 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.
++      hardcode_libdir_flag_spec=' '
++      allow_undefined_flag=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.
++      archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      # The linker will automatically build a .lib file if we build a DLL.
++      old_archive_from_new_cmds='true'
++      # FIXME: Should let the user specify the lib program.
++      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
++      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      enable_shared_with_static_runtimes=yes
++      ;;
  
 -# Library versioning type.
 -version_type=$version_type
-+# Check whether --with-gconf-schema-file-dir was given.
-+if test "${with_gconf_schema_file_dir+set}" = set; then
-+  withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval"
-+fi
++    darwin* | rhapsody*)
  
 -# Format of library name prefix.
 -libname_spec=$lt_libname_spec
@@ -31367,36 +26453,89 @@
 -# 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
++  archive_cmds_need_lc=no
++  hardcode_direct=no
++  hardcode_automatic=yes
++  hardcode_shlibpath_var=unsupported
++  whole_archive_flag_spec=''
++  link_all_deplibs=yes
++  allow_undefined_flag="$_lt_dar_allow_undefined"
++  case $cc_basename in
++     ifort*) _lt_dar_can_shared=yes ;;
++     *) _lt_dar_can_shared=$GCC ;;
++  esac
++  if test "$_lt_dar_can_shared" = "yes"; then
++    output_verbose_link_cmd=echo
++    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++    archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
  
 -# The coded name of the library, if different from the real name.
 -soname_spec=$lt_soname_spec
--
++  else
++  ld_shlibs=no
++  fi
+ 
 -# Commands used to build and install an old-style archive.
 -RANLIB=$lt_RANLIB
 -old_archive_cmds=$lt_old_archive_cmds_F77
 -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_old_archive_from_new_cmds_F77
--
++    dgux*)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_shlibpath_var=no
++      ;;
+ 
 -# Create a temporary old-style archive to link instead of a shared archive.
 -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77
--
++    freebsd1*)
++      ld_shlibs=no
++      ;;
+ 
 -# Commands used to build and install a shared archive.
 -archive_cmds=$lt_archive_cmds_F77
 -archive_expsym_cmds=$lt_archive_expsym_cmds_F77
 -postinstall_cmds=$lt_postinstall_cmds
 -postuninstall_cmds=$lt_postuninstall_cmds
--
++    # 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*)
++      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      ;;
+ 
 -# Commands used to build a loadable module (assumed same as above if empty)
 -module_cmds=$lt_module_cmds_F77
 -module_expsym_cmds=$lt_module_expsym_cmds_F77
--
++    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++    freebsd2*)
++      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct=yes
++      hardcode_minus_L=yes
++      hardcode_shlibpath_var=no
++      ;;
+ 
 -# Commands to strip libraries.
 -old_striplib=$lt_old_striplib
 -striplib=$lt_striplib
--
++    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++    freebsd* | dragonfly*)
++      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      ;;
+ 
 -# Dependencies to place before the objects being linked to create a
 -# shared library.
 -predep_objects=$lt_predep_objects_F77
@@ -31420,53 +26559,233 @@
 -# The library search path used internally by the compiler when linking
 -# a shared library.
 -compiler_lib_search_path=$lt_compiler_lib_search_path_F77
--
++    hpux9*)
++      if test "$GCC" = yes; then
++	archive_cmds='$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
++	archive_cmds='$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
++      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++      hardcode_libdir_separator=:
++      hardcode_direct=yes
+ 
 -# Method to check whether dependent libraries are shared objects.
 -deplibs_check_method=$lt_deplibs_check_method
--
++      # hardcode_minus_L: Not really in the search PATH,
++      # but as the default location of the library.
++      hardcode_minus_L=yes
++      export_dynamic_flag_spec='${wl}-E'
++      ;;
+ 
 -# Command to use when deplibs_check_method == file_magic.
 -file_magic_cmd=$lt_file_magic_cmd
--
++    hpux10*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      if test "$with_gnu_ld" = no; then
++	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++	hardcode_libdir_flag_spec_ld='+b $libdir'
++	hardcode_libdir_separator=:
++	hardcode_direct=yes
++	hardcode_direct_absolute=yes
++	export_dynamic_flag_spec='${wl}-E'
++	# hardcode_minus_L: Not really in the search PATH,
++	# but as the default location of the library.
++	hardcode_minus_L=yes
++      fi
++      ;;
+ 
 -# Flag that allows shared libraries with undefined symbols to be built.
 -allow_undefined_flag=$lt_allow_undefined_flag_F77
--
++    hpux11*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	case $host_cpu in
++	hppa*64*)
++	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	ia64*)
++	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
++	  archive_cmds='$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*)
++	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	ia64*)
++	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
++	  archive_cmds='$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
++	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++	hardcode_libdir_separator=:
+ 
 -# Flag that forces no undefined symbols.
 -no_undefined_flag=$lt_no_undefined_flag_F77
--
++	case $host_cpu in
++	hppa*64*|ia64*)
++	  hardcode_direct=no
++	  hardcode_shlibpath_var=no
++	  ;;
++	*)
++	  hardcode_direct=yes
++	  hardcode_direct_absolute=yes
++	  export_dynamic_flag_spec='${wl}-E'
+ 
 -# Commands used to finish a libtool library installation in a directory.
 -finish_cmds=$lt_finish_cmds
--
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  hardcode_minus_L=yes
++	  ;;
++	esac
++      fi
++      ;;
+ 
 -# Same as above, but a single script fragment to be evaled but not shown.
 -finish_eval=$lt_finish_eval
--
++    irix5* | irix6* | nonstopux*)
++      if test "$GCC" = yes; then
++	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	# Try to use the -exported_symbol ld option, if it does not
++	# work, assume that -exports_file does not work either and
++	# implicitly export all symbols.
++        save_LDFLAGS="$LDFLAGS"
++        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
++        cat >conftest.$ac_ext <<_ACEOF
++int foo(void) {}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+ 
 -# 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
--
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
 -# 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
--
++fi
+ 
 -# This is the shared library runtime path variable.
 -runpath_var=$runpath_var
--
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++        LDFLAGS="$save_LDFLAGS"
++      else
++	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
++      fi
++      archive_cmds_need_lc='no'
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator=:
++      inherit_rpath=yes
++      link_all_deplibs=yes
++      ;;
+ 
 -# This is the shared library path variable.
 -shlibpath_var=$shlibpath_var
--
++    netbsd* | netbsdelf*-gnu)
++      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
++	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
++      else
++	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++      fi
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      ;;
+ 
 -# Is shlibpath searched before the hard-coded library search path?
 -shlibpath_overrides_runpath=$shlibpath_overrides_runpath
--
++    newsos6)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct=yes
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator=:
++      hardcode_shlibpath_var=no
++      ;;
+ 
 -# How to hardcode a shared library path into an executable.
 -hardcode_action=$hardcode_action_F77
--
++    *nto* | *qnx*)
++      ;;
+ 
 -# Whether we should hardcode library paths into libraries.
 -hardcode_into_libs=$hardcode_into_libs
--
++    openbsd*)
++      if test -f /usr/libexec/ld.so; then
++	hardcode_direct=yes
++	hardcode_shlibpath_var=no
++	hardcode_direct_absolute=yes
++	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++	  export_dynamic_flag_spec='${wl}-E'
++	else
++	  case $host_os in
++	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	     hardcode_libdir_flag_spec='-R$libdir'
++	     ;;
++	   *)
++	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++	     ;;
++	  esac
++	fi
++      else
++	ld_shlibs=no
++      fi
++      ;;
+ 
 -# Flag to hardcode \$libdir into a binary during linking.
 -# This must work even if \$libdir does not exist.
 -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
--
++    os2*)
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_minus_L=yes
++      allow_undefined_flag=unsupported
++      archive_cmds='$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'
++      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++      ;;
+ 
 -# If ld is used when linking, flag to hardcode \$libdir into
 -# a binary during linking. This must work even if \$libdir does
 -# not exist.
@@ -31490,259 +26809,269 @@
 -# 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=$hardcode_automatic_F77
--
++    osf3*)
++      if test "$GCC" = yes; then
++	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	allow_undefined_flag=' -expect_unresolved \*'
++	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++      fi
++      archive_cmds_need_lc='no'
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator=:
++      ;;
+ 
 -# Variables whose values should be saved in libtool wrapper scripts and
 -# restored at relink time.
 -variables_saved_for_relink="$variables_saved_for_relink"
--
++    osf4* | osf5*)	# as osf3* with the addition of -msym flag
++      if test "$GCC" = yes; then
++	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      else
++	allow_undefined_flag=' -expect_unresolved \*'
++	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
++	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+ 
 -# Whether libtool must link a program against all its dependency libraries.
 -link_all_deplibs=$link_all_deplibs_F77
--
++	# Both c and cxx compiler support -rpath directly
++	hardcode_libdir_flag_spec='-rpath $libdir'
++      fi
++      archive_cmds_need_lc='no'
++      hardcode_libdir_separator=:
++      ;;
+ 
 -# Compile-time system search path for libraries
 -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
--
++    solaris*)
++      no_undefined_flag=' -z defs'
++      if test "$GCC" = yes; then
++	wlarc='${wl}'
++	archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
++	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
++      else
++	case `$CC -V 2>&1` in
++	*"Compilers 5.0"*)
++	  wlarc=''
++	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  archive_expsym_cmds='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'
++	  ;;
++	*)
++	  wlarc='${wl}'
++	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
++	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
++	  ;;
++	esac
++      fi
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_shlibpath_var=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
++	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	else
++	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
++	fi
++	;;
++      esac
++      link_all_deplibs=yes
++      ;;
+ 
 -# Run-time system search path for libraries
 -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+  { echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
-+echo "${ECHO_T}Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
++    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.
++	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_direct=yes
++      hardcode_minus_L=yes
++      hardcode_shlibpath_var=no
++      ;;
  
 -# Fix the shell variable \$srcfile for the compiler.
 -fix_srcfile_path=$lt_fix_srcfile_path
-+  # Check whether --enable-schemas-install was given.
-+if test "${enable_schemas_install+set}" = set; then
-+  enableval=$enable_schemas_install; case ${enableval} in
-+       yes|no) ;;
-+       *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5
-+echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;}
-+   { (exit 1); exit 1; }; } ;;
++    sysv4)
++      case $host_vendor in
++	sni)
++	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct=yes # is this really true???
++	;;
++	siemens)
++	  ## LD is ld it makes a PLAMLIB
++	  ## CC just makes a GrossModule.
++	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++	  reload_cmds='$CC -r -o $output$reload_objs'
++	  hardcode_direct=no
++        ;;
++	motorola)
++	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
++	;;
 +      esac
-+fi
++      runpath_var='LD_RUN_PATH'
++      hardcode_shlibpath_var=no
++      ;;
  
 -# Set to yes if exported symbols are required.
 -always_export_symbols=$always_export_symbols_F77
-+   if test "$enable_schemas_install" != no; then
-+  GCONF_SCHEMAS_INSTALL_TRUE=
-+  GCONF_SCHEMAS_INSTALL_FALSE='#'
-+else
-+  GCONF_SCHEMAS_INSTALL_TRUE='#'
-+  GCONF_SCHEMAS_INSTALL_FALSE=
-+fi
++    sysv4.3*)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var=no
++      export_dynamic_flag_spec='-Bexport'
++      ;;
  
 -# The commands to list exported symbols.
 -export_symbols_cmds=$lt_export_symbols_cmds_F77
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	hardcode_shlibpath_var=no
++	runpath_var=LD_RUN_PATH
++	hardcode_runpath_var=yes
++	ld_shlibs=yes
++      fi
++      ;;
  
 -# The commands to extract the exported symbol list from a shared archive.
 -extract_expsyms_cmds=$lt_extract_expsyms_cmds
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
++      no_undefined_flag='${wl}-z,text'
++      archive_cmds_need_lc=no
++      hardcode_shlibpath_var=no
++      runpath_var='LD_RUN_PATH'
  
 -# Symbols that should not be listed in the preloaded symbols.
 -exclude_expsyms=$lt_exclude_expsyms_F77
-+#############################
-+# X, Xau, Xmu
-+#############################
-+#
-+# If Pango included the shared library dependencies from X11 in
-+# the pkg-config output, then we use that (to avoid duplicates).
-+# but if they were omitted to avoid binary compatibility problems
-+# then we need to repeat the checks.
-+#
-+if $PKG_CONFIG --exists pangoxft ; then
-+  PANGO_PACKAGES="pangox pangoxft"
-+else
-+  PANGO_PACKAGES="pangox"
-+fi
++      if test "$GCC" = yes; then
++	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
++      ;;
  
 -# Symbols that must always be exported.
 -include_expsyms=$lt_include_expsyms_F77
-+x_libs="`$PKG_CONFIG --libs $PANGO_PACKAGES`"
-+case x_libs in
-+  *-lX11*) pango_omitted_x_deps=no ;;
-+  *)       pango_omitted_x_deps=yes ;;
-+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.
++      no_undefined_flag='${wl}-z,text'
++      allow_undefined_flag='${wl}-z,nodefs'
++      archive_cmds_need_lc=no
++      hardcode_shlibpath_var=no
++      hardcode_libdir_flag_spec='${wl}-R,$libdir'
++      hardcode_libdir_separator=':'
++      link_all_deplibs=yes
++      export_dynamic_flag_spec='${wl}-Bexport'
++      runpath_var='LD_RUN_PATH'
  
 -# ### END LIBTOOL TAG CONFIG: $tagname
-+if test $pango_omitted_x_deps = yes ; then
-+  { echo "$as_me:$LINENO: checking for X" >&5
-+echo $ECHO_N "checking for X... $ECHO_C" >&6; }
++      if test "$GCC" = yes; then
++	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
++      ;;
  
 -__EOF__
- 
-+# Check whether --with-x was given.
-+if test "${with_x+set}" = set; then
-+  withval=$with_x;
-+fi
- 
-+# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
-+if test "x$with_x" = xno; then
-+  # The user explicitly disabled X.
-+  have_x=disabled
-+else
-+  case $x_includes,$x_libraries in #(
-+    *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5
-+echo "$as_me: error: Cannot use X directory names containing '" >&2;}
-+   { (exit 1); exit 1; }; };; #(
-+    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
++    uts4*)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_shlibpath_var=no
++      ;;
+ 
++    *)
++      ld_shlibs=no
++      ;;
++    esac
+ 
+-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"
-+  # One or both of the vars are not set, and there is no cached value.
-+ac_x_includes=no ac_x_libraries=no
-+rm -f -r conftest.dir
-+if mkdir conftest.dir; then
-+  cd conftest.dir
-+  cat >Imakefile <<'_ACEOF'
-+incroot:
-+	@echo incroot='${INCROOT}'
-+usrlibdir:
-+	@echo usrlibdir='${USRLIBDIR}'
-+libdir:
-+	@echo libdir='${LIBDIR}'
-+_ACEOF
-+  if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
-+    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-+    for ac_var in incroot usrlibdir libdir; do
-+      eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
-+    done
-+    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-+    for ac_extension in a so sl; do
-+      if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
-+	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
-+	ac_im_usrlibdir=$ac_im_libdir; break
-+      fi
-+    done
-+    # Screen out bogus values from the imake configuration.  They are
-+    # bogus both because they are the default anyway, and because
-+    # using them would break gcc on systems where it needs fixed includes.
-+    case $ac_im_incroot in
-+	/usr/include) ac_x_includes= ;;
-+	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
-+    esac
-+    case $ac_im_usrlibdir in
-+	/usr/lib | /lib) ;;
-+	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
-+    esac
++    if test x$host_vendor = xsni; then
++      case $host in
++      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++	export_dynamic_flag_spec='${wl}-Blargedynsym'
++	;;
++      esac
++    fi
    fi
-+  cd ..
-+  rm -f -r conftest.dir
- fi
+-fi
  
-+# Standard set of common directories for X headers.
-+# Check X11 before X11Rn because it is often a symlink to the current release.
-+ac_x_header_dirs='
-+/usr/X11/include
-+/usr/X11R6/include
-+/usr/X11R5/include
-+/usr/X11R4/include
++{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
++$as_echo "$ld_shlibs" >&6; }
++test "$ld_shlibs" = no && can_build_shared=no
  
 -ac_ext=c
 -ac_cpp='$CPP $CPPFLAGS'
 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
++with_gnu_ld=$with_gnu_ld
+ 
 -CC="$lt_save_CC"
--
+ 
 -	else
 -	  tagname=""
 -	fi
 -	;;
--
+ 
 -      GCJ)
 -	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
--
--
+ 
+ 
 -# Source file extension for Java test sources.
 -ac_ext=java
-+/usr/include/X11
-+/usr/include/X11R6
-+/usr/include/X11R5
-+/usr/include/X11R4
  
 -# Object file extension for compiled Java test sources.
 -objext=o
 -objext_GCJ=$objext
-+/usr/local/X11/include
-+/usr/local/X11R6/include
-+/usr/local/X11R5/include
-+/usr/local/X11R4/include
  
 -# Code to be used in simple compile tests
 -lt_simple_compile_test_code="class foo {}"
-+/usr/local/include/X11
-+/usr/local/include/X11R6
-+/usr/local/include/X11R5
-+/usr/local/include/X11R4
  
 -# Code to be used in simple link tests
 -lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
-+/usr/X386/include
-+/usr/x386/include
-+/usr/XFree86/include/X11
  
 -# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+/usr/include
-+/usr/local/include
-+/usr/unsupported/include
-+/usr/athena/include
-+/usr/local/x11r5/include
-+/usr/lpp/Xamples/include
  
 -# If no C compiler was specified, use CC.
 -LTCC=${LTCC-"$CC"}
-+/usr/openwin/include
-+/usr/openwin/share/include'
  
 -# If no C compiler flags were specified, use CFLAGS.
 -LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-+if test "$ac_x_includes" = no; then
-+  # Guess where to find include files, by looking for Xlib.h.
-+  # First, try using that file with no special directory specified.
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <X11/Xlib.h>
-+_ACEOF
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-+  # We can compile using X headers with no special include directory.
-+ac_x_includes=
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
  
 -# Allow CC to be a program name with arguments.
 -compiler=$CC
-+  for ac_dir in $ac_x_header_dirs; do
-+  if test -r "$ac_dir/X11/Xlib.h"; then
-+    ac_x_includes=$ac_dir
-+    break
-+  fi
-+done
-+fi
  
-+rm -f conftest.err conftest.$ac_ext
-+fi # $ac_x_includes = no
  
 -# save warnings/boilerplate of simple test code
 -ac_outfile=conftest.$ac_objext
@@ -31750,73 +27079,86 @@
 -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 -_lt_compiler_boilerplate=`cat conftest.err`
 -$rm conftest*
-+if test "$ac_x_libraries" = no; then
-+  # Check for the libraries.
-+  # See if we find them without any special options.
-+  # Don't add to $LIBS permanently.
-+  ac_save_LIBS=$LIBS
-+  LIBS="-lX11 $LIBS"
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <X11/Xlib.h>
-+int
-+main ()
-+{
-+XrmInitialize ()
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  LIBS=$ac_save_LIBS
-+# We can link X programs with no special library path.
-+ac_x_libraries=
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
  
 -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*
-+	LIBS=$ac_save_LIBS
-+for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
-+do
-+  # Don't even attempt the hair of trying to link an X program!
-+  for ac_extension in a so sl; do
-+    if test -r "$ac_dir/libX11.$ac_extension"; then
-+      ac_x_libraries=$ac_dir
-+      break 2
-+    fi
-+  done
-+done
-+fi
++#
++# Do we need to explicitly link libc?
++#
++case "x$archive_cmds_need_lc" in
++x|xyes)
++  # Assume -lc should be added
++  archive_cmds_need_lc=yes
++
++  if test "$enable_shared" = yes && test "$GCC" = yes; then
++    case $archive_cmds 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.
++      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
++      $RM conftest*
++      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } 2>conftest.err; then
++        soname=conftest
++        lib=conftest
++        libobjs=conftest.$ac_objext
++        deplibs=
++        wl=$lt_prog_compiler_wl
++	pic_flag=$lt_prog_compiler_pic
++        compiler_flags=-v
++        linker_flags=-v
++        verstring=
++        output_objdir=.
++        libname=conftest
++        lt_save_allow_undefined_flag=$allow_undefined_flag
++        allow_undefined_flag=
++        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
++  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++        then
++	  archive_cmds_need_lc=no
++        else
++	  archive_cmds_need_lc=yes
++        fi
++        allow_undefined_flag=$lt_save_allow_undefined_flag
++      else
++        cat conftest.err 1>&5
++      fi
++      $RM conftest*
++      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
++$as_echo "$archive_cmds_need_lc" >&6; }
++      ;;
++    esac
++  fi
++  ;;
++esac
++
++
++
++
++
++
++
++
++
++
++
  
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi # $ac_x_libraries = no
  
 -# Allow CC to be a program name with arguments.
 -lt_save_CC="$CC"
@@ -31829,112 +27171,28 @@
 -    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
 -    \-*) ;;
 -    *) break;;
-+case $ac_x_includes,$ac_x_libraries in #(
-+  no,* | *,no | *\'*)
-+    # Didn't find X, or a directory has "'" in its name.
-+    ac_cv_have_x="have_x=no";; #(
-+  *)
-+    # Record where we found X for the cache.
-+    ac_cv_have_x="have_x=yes\
-+	ac_x_includes='$ac_x_includes'\
-+	ac_x_libraries='$ac_x_libraries'"
-+esac
-+fi
-+;; #(
-+    *) have_x=yes;;
-   esac
+-  esac
 -done
 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
--
-+  eval "$ac_cv_have_x"
-+fi # $with_x != no
+ 
  
 -# GCJ did not exist at the time GCC didn't implicitly link libc in.
 -archive_cmds_need_lc_GCJ=no
-+if test "$have_x" != yes; then
-+  { echo "$as_me:$LINENO: result: $have_x" >&5
-+echo "${ECHO_T}$have_x" >&6; }
-+  no_x=yes
-+else
-+  # If each of the values was on the command line, it overrides each guess.
-+  test "x$x_includes" = xNONE && x_includes=$ac_x_includes
-+  test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
-+  # Update the cache value to reflect the command line values.
-+  ac_cv_have_x="have_x=yes\
-+	ac_x_includes='$x_includes'\
-+	ac_x_libraries='$x_libraries'"
-+  { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
-+echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; }
-+fi
  
 -old_archive_cmds_GCJ=$old_archive_cmds
-+if test "$no_x" = yes; then
-+  # Not all programs may use this symbol, but it does not hurt to define it.
  
-+cat >>confdefs.h <<\_ACEOF
-+#define X_DISPLAY_MISSING 1
-+_ACEOF
  
 -lt_prog_compiler_no_builtin_flag_GCJ=
-+  X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
-+else
-+  if test -n "$x_includes"; then
-+    X_CFLAGS="$X_CFLAGS -I$x_includes"
-+  fi
  
 -if test "$GCC" = yes; then
 -  lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
-+  # It would also be nice to do this for all -L options, not just this one.
-+  if test -n "$x_libraries"; then
-+    X_LIBS="$X_LIBS -L$x_libraries"
-+    # For Solaris; some versions of Sun CC require a space after -R and
-+    # others require no space.  Words are not sufficient . . . .
-+    { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
-+echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; }
-+    ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
-+    ac_xsave_c_werror_flag=$ac_c_werror_flag
-+    ac_c_werror_flag=yes
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
  
-+int
-+main ()
-+{
  
 -{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
 -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+       X_LIBS="$X_LIBS -R$x_libraries"
- else
+-else
 -  lt_cv_prog_compiler_rtti_exceptions=no
 -  ac_outfile=conftest.$ac_objext
 -   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -31963,82 +27221,29 @@
 -     fi
 -   fi
 -   $rm conftest*
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
  
 -fi
 -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-+	LIBS="$ac_xsave_LIBS -R $x_libraries"
-+       cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
  
 -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
 -    lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+	  X_LIBS="$X_LIBS -R $x_libraries"
- else
+-else
 -    :
 -fi
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
  
-+	{ echo "$as_me:$LINENO: result: neither works" >&5
-+echo "${ECHO_T}neither works" >&6; }
- fi
+-fi
  
 -lt_prog_compiler_wl_GCJ=
 -lt_prog_compiler_pic_GCJ=
 -lt_prog_compiler_static_GCJ=
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
  
 -{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+    ac_c_werror_flag=$ac_xsave_c_werror_flag
-+    LIBS=$ac_xsave_LIBS
-+  fi
  
 -  if test "$GCC" = yes; then
 -    lt_prog_compiler_wl_GCJ='-Wl,'
 -    lt_prog_compiler_static_GCJ='-static'
-+  # Check for system-dependent libraries X programs must link with.
-+  # Do this before checking for the system-independent R6 libraries
-+  # (-lICE), since we may need -lsocket or whatever for X linking.
  
 -    case $host_os in
 -      aix*)
@@ -32048,136 +27253,36 @@
 -	lt_prog_compiler_static_GCJ='-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_prog_compiler_pic_GCJ='-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
-+  if test "$ISC" = yes; then
-+    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
-+  else
-+    # Martyn Johnson says this is needed for Ultrix, if the X
-+    # libraries were built with DECnet support.  And Karl Berry says
-+    # the Alpha needs dnet_stub (dnet does not exist).
-+    ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
  
 -      ;;
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char XOpenDisplay ();
-+int
-+main ()
-+{
-+return XOpenDisplay ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  :
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
  
 -    darwin* | rhapsody*)
 -      # PIC is the default on this platform
 -      # Common symbols not allowed in MH_DYLIB files
 -      lt_prog_compiler_pic_GCJ='-fno-common'
 -      ;;
-+	{ echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
-+echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldnet  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
  
 -    interix[3-9]*)
 -      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
 -      # Instead, we relocate shared libraries at runtime.
 -      ;;
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dnet_ntoa ();
-+int
-+main ()
-+{
-+return dnet_ntoa ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_lib_dnet_dnet_ntoa=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
  
 -    msdosdjgpp*)
 -      # Just because we use GCC doesn't mean we suddenly get shared libraries
@@ -32185,23 +27290,12 @@
 -      lt_prog_compiler_can_build_shared_GCJ=no
 -      enable_shared=no
 -      ;;
-+	ac_cv_lib_dnet_dnet_ntoa=no
-+fi
  
 -    sysv4*MP*)
 -      if test -d /usr/nec; then
 -	lt_prog_compiler_pic_GCJ=-Kconform_pic
 -      fi
 -      ;;
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-+echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; }
-+if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
-+  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
-+fi
  
 -    hpux*)
 -      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
@@ -32215,20 +27309,6 @@
 -	;;
 -      esac
 -      ;;
-+    if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-+      { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
-+echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldnet_stub  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
  
 -    *)
 -      lt_prog_compiler_pic_GCJ='-fPIC'
@@ -32256,60 +27336,12 @@
 -         ;;
 -       esac
 -       ;;
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dnet_ntoa ();
-+int
-+main ()
-+{
-+return dnet_ntoa ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_lib_dnet_stub_dnet_ntoa=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
  
 -    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).
-+	ac_cv_lib_dnet_stub_dnet_ntoa=no
-+fi
  
 -      ;;
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-+echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
-+if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
-+  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
-+fi
  
 -    hpux9* | hpux10* | hpux11*)
 -      lt_prog_compiler_wl_GCJ='-Wl,'
@@ -32326,23 +27358,18 @@
 -      # Is there a better lt_prog_compiler_static that works with the bundled CC?
 -      lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive'
 -      ;;
-+    fi
-+fi
  
 -    irix5* | irix6* | nonstopux*)
 -      lt_prog_compiler_wl_GCJ='-Wl,'
 -      # PIC (with -KPIC) is the default.
 -      lt_prog_compiler_static_GCJ='-non_shared'
 -      ;;
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+    LIBS="$ac_xsave_LIBS"
  
 -    newsos6)
 -      lt_prog_compiler_pic_GCJ='-KPIC'
 -      lt_prog_compiler_static_GCJ='-Bstatic'
 -      ;;
--
+ 
 -    linux* | k*bsd*-gnu)
 -      case $cc_basename in
 -      icc* | ecc*)
@@ -32380,17 +27407,17 @@
 -	;;
 -      esac
 -      ;;
--
+ 
 -    osf3* | osf4* | osf5*)
 -      lt_prog_compiler_wl_GCJ='-Wl,'
 -      # All OSF/1 code is PIC.
 -      lt_prog_compiler_static_GCJ='-non_shared'
 -      ;;
--
+ 
 -    rdos*)
 -      lt_prog_compiler_static_GCJ='-non_shared'
 -      ;;
--
+ 
 -    solaris*)
 -      lt_prog_compiler_pic_GCJ='-KPIC'
 -      lt_prog_compiler_static_GCJ='-Bstatic'
@@ -32401,40 +27428,18 @@
 -	lt_prog_compiler_wl_GCJ='-Wl,';;
 -      esac
 -      ;;
--
+ 
 -    sunos4*)
 -      lt_prog_compiler_wl_GCJ='-Qoption ld '
 -      lt_prog_compiler_pic_GCJ='-PIC'
 -      lt_prog_compiler_static_GCJ='-Bstatic'
 -      ;;
--
+ 
 -    sysv4 | sysv4.2uw2* | sysv4.3*)
 -      lt_prog_compiler_wl_GCJ='-Wl,'
 -      lt_prog_compiler_pic_GCJ='-KPIC'
 -      lt_prog_compiler_static_GCJ='-Bstatic'
 -      ;;
-+    # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-+    # to get the SysV transport functions.
-+    # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
-+    # needs -lnsl.
-+    # The nsl library prevents programs from opening the X display
-+    # on Irix 5.2, according to T.E. Dickey.
-+    # The functions gethostbyname, getservbyname, and inet_addr are
-+    # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-+    { echo "$as_me:$LINENO: checking for gethostbyname" >&5
-+echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; }
-+if test "${ac_cv_func_gethostbyname+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define gethostbyname innocuous_gethostbyname
  
 -    sysv4*MP*)
 -      if test -d /usr/nec ;then
@@ -32442,106 +27447,42 @@
 -	lt_prog_compiler_static_GCJ='-Bstatic'
 -      fi
 -      ;;
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char gethostbyname (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
  
 -    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
 -      lt_prog_compiler_wl_GCJ='-Wl,'
 -      lt_prog_compiler_pic_GCJ='-KPIC'
 -      lt_prog_compiler_static_GCJ='-Bstatic'
 -      ;;
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
  
 -    unicos*)
 -      lt_prog_compiler_wl_GCJ='-Wl,'
 -      lt_prog_compiler_can_build_shared_GCJ=no
 -      ;;
-+#undef gethostbyname
  
 -    uts4*)
 -      lt_prog_compiler_pic_GCJ='-pic'
 -      lt_prog_compiler_static_GCJ='-Bstatic'
 -      ;;
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char gethostbyname ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined __stub_gethostbyname || defined __stub___gethostbyname
-+choke me
-+#endif
  
 -    *)
 -      lt_prog_compiler_can_build_shared_GCJ=no
 -      ;;
 -    esac
 -  fi
-+int
-+main ()
-+{
-+return gethostbyname ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_func_gethostbyname=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
  
 -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
 -echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
-+	ac_cv_func_gethostbyname=no
-+fi
  
 -#
 -# Check to make sure the PIC flag actually works.
 -#
 -if test -n "$lt_prog_compiler_pic_GCJ"; then
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; }
  
 -{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
 -if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
-+    if test $ac_cv_func_gethostbyname = no; then
-+      { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
-+echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
 -  lt_cv_prog_compiler_pic_works_GCJ=no
 -  ac_outfile=conftest.$ac_objext
 -   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -32570,76 +27511,22 @@
 -     fi
 -   fi
 -   $rm conftest*
--
+ 
 -fi
 -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
 -echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lnsl  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
  
 -if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
 -    case $lt_prog_compiler_pic_GCJ in
 -     "" | " "*) ;;
 -     *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
 -     esac
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char gethostbyname ();
-+int
-+main ()
-+{
-+return gethostbyname ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_lib_nsl_gethostbyname=yes
- else
+-else
 -    lt_prog_compiler_pic_GCJ=
 -     lt_prog_compiler_can_build_shared_GCJ=no
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_nsl_gethostbyname=no
- fi
+-fi
  
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; }
-+if test $ac_cv_lib_nsl_gethostbyname = yes; then
-+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
- fi
+-fi
 -case $host_os in
 -  # For platforms which do not support PIC, -DPIC is meaningless:
 -  *djgpp*)
@@ -32657,12 +27544,8 @@
 -{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
 -if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
-+      if test $ac_cv_lib_nsl_gethostbyname = no; then
-+	{ echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
-+echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
 -  lt_cv_prog_compiler_static_works_GCJ=no
 -   save_LDFLAGS="$LDFLAGS"
 -   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -32684,55 +27567,8 @@
 -   fi
 -   $rm -r conftest*
 -   LDFLAGS="$save_LDFLAGS"
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lbsd  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char gethostbyname ();
-+int
-+main ()
-+{
-+return gethostbyname ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_lib_bsd_gethostbyname=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
  
-+	ac_cv_lib_bsd_gethostbyname=no
- fi
+-fi
 -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
 -echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }
  
@@ -32740,49 +27576,20 @@
 -    :
 -else
 -    lt_prog_compiler_static_GCJ=
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; }
-+if test $ac_cv_lib_bsd_gethostbyname = yes; then
-+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
- fi
+-fi
  
-+      fi
-+    fi
  
 -{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
 -if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
-+    # lieder@skyler.mavd.honeywell.com says without -lsocket,
-+    # socket/setsockopt and other routines are undefined under SCO ODT
-+    # 2.0.  But -lsocket is broken on IRIX 5.2 (and is not necessary
-+    # on later versions), says Simon Leinen: it contains gethostby*
-+    # variants that don't use the name server (or something).  -lsocket
-+    # must be given before -lnsl if both are needed.  We assume that
-+    # if connect needs -lnsl, so does gethostbyname.
-+    { echo "$as_me:$LINENO: checking for connect" >&5
-+echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
-+if test "${ac_cv_func_connect+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
 -  lt_cv_prog_compiler_c_o_GCJ=no
 -   $rm -r conftest 2>/dev/null
 -   mkdir conftest
 -   cd conftest
 -   mkdir out
 -   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define connect to an innocuous variant, in case <limits.h> declares connect.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define connect innocuous_connect
  
 -   lt_compiler_flag="-o out/conftest2.$ac_objext"
 -   # Insert the option either (1) after the last *FLAGS variable, or
@@ -32817,21 +27624,11 @@
 -   cd ..
 -   rmdir conftest
 -   $rm conftest*
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char connect (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
  
 -fi
 -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
  
-+#undef connect
  
 -hard_links="nottested"
 -if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
@@ -32854,52 +27651,9 @@
 -else
 -  need_locks=no
 -fi
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char connect ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined __stub_connect || defined __stub___connect
-+choke me
-+#endif
  
 -{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-+int
-+main ()
-+{
-+return connect ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_func_connect=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
  
 -  runpath_var=
 -  allow_undefined_flag_GCJ=
@@ -32948,8 +27702,6 @@
 -  esac
 -done
 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+	ac_cv_func_connect=no
-+fi
  
 -  case $host_os in
 -  cygwin* | mingw* | pw32*)
@@ -32968,17 +27720,12 @@
 -    with_gnu_ld=no
 -    ;;
 -  esac
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-+echo "${ECHO_T}$ac_cv_func_connect" >&6; }
  
 -  ld_shlibs_GCJ=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.
@@ -32999,7 +27746,7 @@
 -      *\ 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]*)
@@ -33007,17 +27754,17 @@
 -      if test "$host_cpu" != ia64; then
 -	ld_shlibs_GCJ=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*)
 -      archive_cmds_GCJ='$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)'
 -      hardcode_libdir_flag_spec_GCJ='-L$libdir'
@@ -33031,7 +27778,7 @@
 -      # them.
 -      ld_shlibs_GCJ=no
 -      ;;
--
+ 
 -    beos*)
 -      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 -	allow_undefined_flag_GCJ=unsupported
@@ -33042,7 +27789,7 @@
 -	ld_shlibs_GCJ=no
 -      fi
 -      ;;
--
+ 
 -    cygwin* | mingw* | pw32*)
 -      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
 -      # as there is no search path for DLLs.
@@ -33051,7 +27798,7 @@
 -      always_export_symbols_GCJ=no
 -      enable_shared_with_static_runtimes_GCJ=yes
 -      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
--
+ 
 -      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
 -        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 -	# If the export-symbols file already is a .def file (1st line
@@ -33067,7 +27814,7 @@
 -	ld_shlibs_GCJ=no
 -      fi
 -      ;;
--
+ 
 -    interix[3-9]*)
 -      hardcode_direct_GCJ=no
 -      hardcode_shlibpath_var_GCJ=no
@@ -33082,7 +27829,7 @@
 -      archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 -      archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 -      ;;
--
+ 
 -    gnu* | linux* | k*bsd*-gnu)
 -      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 -	tmp_addflag=
@@ -33111,7 +27858,7 @@
 -	  tmp_sharedflag='-shared' ;;
 -	esac
 -	archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--
+ 
 -	if test $supports_anon_versioning = yes; then
 -	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
 -  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
@@ -33123,7 +27870,7 @@
 -	ld_shlibs_GCJ=no
 -      fi
 -      ;;
--
+ 
 -    netbsd* | netbsdelf*-gnu)
 -      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 -	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -33133,19 +27880,19 @@
 -	archive_expsym_cmds_GCJ='$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
 -	ld_shlibs_GCJ=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
 -	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -33154,20 +27901,20 @@
 -	ld_shlibs_GCJ=no
 -      fi
 -      ;;
--
+ 
 -    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
 -      case `$LD -v 2>&1` in
 -        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
 -	ld_shlibs_GCJ=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
 -	;;
 -	*)
@@ -33181,14 +27928,14 @@
 -	;;
 -      esac
 -      ;;
--
+ 
 -    sunos4*)
 -      archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
 -      wlarc=
 -      hardcode_direct_GCJ=yes
 -      hardcode_shlibpath_var_GCJ=no
 -      ;;
--
+ 
 -    *)
 -      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 -	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -33198,7 +27945,7 @@
 -      fi
 -      ;;
 -    esac
--
+ 
 -    if test "$ld_shlibs_GCJ" = no; then
 -      runpath_var=
 -      hardcode_libdir_flag_spec_GCJ=
@@ -33221,7 +27968,7 @@
 -	hardcode_direct_GCJ=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
@@ -33238,7 +27985,7 @@
 -	  export_symbols_cmds_GCJ='$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.
@@ -33251,22 +27998,22 @@
 -	  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.
--
+ 
 -      archive_cmds_GCJ=''
 -      hardcode_direct_GCJ=yes
 -      hardcode_libdir_separator_GCJ=':'
 -      link_all_deplibs_GCJ=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
@@ -33307,7 +28054,7 @@
 -	  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.
 -      always_export_symbols_GCJ=yes
@@ -33322,41 +28069,34 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+    if test $ac_cv_func_connect = no; then
-+      { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_socket_connect+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char connect ();
- int
- main ()
- {
--
-+return connect ();
-   ;
-   return 0;
- }
-@@ -18977,50 +13907,73 @@
- 	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
--
+ 
+-int
+-main ()
+-{
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
+ 
 -lt_aix_libpath_sed='
 -    /Import File Strings/,/^$/ {
 -	/^0/ {
@@ -33369,25 +28109,16 @@
 -if test -z "$aix_libpath"; then
 -  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 -fi
-+  ac_cv_lib_socket_connect=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--
-+	ac_cv_lib_socket_connect=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-fi
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
 -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
-+if test $ac_cv_lib_socket_connect = yes; then
-+  X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
-+fi
  
 -       hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
 -	archive_expsym_cmds_GCJ="\$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"
@@ -33404,65 +28135,34 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+    fi
  
 -int
-+    # Guillermo Gomez says -lposix is necessary on A/UX.
-+    { echo "$as_me:$LINENO: checking for remove" >&5
-+echo $ECHO_N "checking for remove... $ECHO_C" >&6; }
-+if test "${ac_cv_func_remove+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define remove to an innocuous variant, in case <limits.h> declares remove.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define remove innocuous_remove
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char remove (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef remove
-+
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char remove ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined __stub_remove || defined __stub___remove
-+choke me
-+#endif
-+
-+int
- main ()
- {
--
-+return remove ();
-   ;
-   return 0;
- }
-@@ -19043,7832 +13996,4997 @@
- 	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
--
+-main ()
+-{
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
+ 
 -lt_aix_libpath_sed='
 -    /Import File Strings/,/^$/ {
 -	/^0/ {
@@ -33475,21 +28175,16 @@
 -if test -z "$aix_libpath"; then
 -  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 -fi
-+  ac_cv_func_remove=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--
-+	ac_cv_func_remove=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-fi
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
 -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-+echo "${ECHO_T}$ac_cv_func_remove" >&6; }
  
 -	 hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
 -	  # Warning - without using the other run time loading flags,
@@ -33504,20 +28199,6 @@
 -	fi
 -      fi
 -      ;;
-+    if test $ac_cv_func_remove = no; then
-+      { echo "$as_me:$LINENO: checking for remove in -lposix" >&5
-+echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_posix_remove+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lposix  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
  
 -    amigaos*)
 -      archive_cmds_GCJ='$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)'
@@ -33526,49 +28207,10 @@
 -      # see comment about different semantics on the GNU ld section
 -      ld_shlibs_GCJ=no
 -      ;;
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char remove ();
-+int
-+main ()
-+{
-+return remove ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_lib_posix_remove=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
  
 -    bsdi[45]*)
 -      export_dynamic_flag_spec_GCJ=-rdynamic
 -      ;;
-+	ac_cv_lib_posix_remove=no
-+fi
  
 -    cygwin* | mingw* | pw32*)
 -      # When not using gcc, we currently assume that we are using
@@ -33590,15 +28232,6 @@
 -      fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
 -      enable_shared_with_static_runtimes_GCJ=yes
 -      ;;
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
-+echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; }
-+if test $ac_cv_lib_posix_remove = yes; then
-+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
-+fi
  
 -    darwin* | rhapsody*)
 -      case $host_os in
@@ -33646,7 +28279,7 @@
 -         ld_shlibs_GCJ=no
 -          ;;
 -      esac
-     fi
+-    fi
 -      ;;
  
 -    dgux*)
@@ -33654,29 +28287,10 @@
 -      hardcode_libdir_flag_spec_GCJ='-L$libdir'
 -      hardcode_shlibpath_var_GCJ=no
 -      ;;
-+    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-+    { echo "$as_me:$LINENO: checking for shmat" >&5
-+echo $ECHO_N "checking for shmat... $ECHO_C" >&6; }
-+if test "${ac_cv_func_shmat+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define shmat innocuous_shmat
  
 -    freebsd1*)
 -      ld_shlibs_GCJ=no
 -      ;;
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char shmat (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
  
 -    # 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
@@ -33688,11 +28302,6 @@
 -      hardcode_direct_GCJ=yes
 -      hardcode_shlibpath_var_GCJ=no
 -      ;;
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
  
 -    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
 -    freebsd2*)
@@ -33701,7 +28310,6 @@
 -      hardcode_minus_L_GCJ=yes
 -      hardcode_shlibpath_var_GCJ=no
 -      ;;
-+#undef shmat
  
 -    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
 -    freebsd* | dragonfly*)
@@ -33710,19 +28318,6 @@
 -      hardcode_direct_GCJ=yes
 -      hardcode_shlibpath_var_GCJ=no
 -      ;;
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char shmat ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined __stub_shmat || defined __stub___shmat
-+choke me
-+#endif
  
 -    hpux9*)
 -      if test "$GCC" = yes; then
@@ -33733,44 +28328,12 @@
 -      hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
 -      hardcode_libdir_separator_GCJ=:
 -      hardcode_direct_GCJ=yes
-+int
-+main ()
-+{
-+return shmat ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_func_shmat=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
  
 -      # hardcode_minus_L: Not really in the search PATH,
 -      # but as the default location of the library.
 -      hardcode_minus_L_GCJ=yes
 -      export_dynamic_flag_spec_GCJ='${wl}-E'
 -      ;;
-+	ac_cv_func_shmat=no
-+fi
  
 -    hpux10*)
 -      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -33781,20 +28344,15 @@
 -      if test "$with_gnu_ld" = no; then
 -	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
 -	hardcode_libdir_separator_GCJ=:
--
+ 
 -	hardcode_direct_GCJ=yes
 -	export_dynamic_flag_spec_GCJ='${wl}-E'
--
+ 
 -	# hardcode_minus_L: Not really in the search PATH,
 -	# but as the default location of the library.
 -	hardcode_minus_L_GCJ=yes
 -      fi
 -      ;;
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-+echo "${ECHO_T}$ac_cv_func_shmat" >&6; }
  
 -    hpux11*)
 -      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -33825,20 +28383,6 @@
 -      if test "$with_gnu_ld" = no; then
 -	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
 -	hardcode_libdir_separator_GCJ=:
-+    if test $ac_cv_func_shmat = no; then
-+      { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
-+echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_ipc_shmat+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lipc  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
  
 -	case $host_cpu in
 -	hppa*64*|ia64*)
@@ -33849,43 +28393,6 @@
 -	*)
 -	  hardcode_direct_GCJ=yes
 -	  export_dynamic_flag_spec_GCJ='${wl}-E'
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char shmat ();
-+int
-+main ()
-+{
-+return shmat ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_lib_ipc_shmat=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
  
 -	  # hardcode_minus_L: Not really in the search PATH,
 -	  # but as the default location of the library.
@@ -33894,8 +28401,6 @@
 -	esac
 -      fi
 -      ;;
-+	ac_cv_lib_ipc_shmat=no
-+fi
  
 -    irix5* | irix6* | nonstopux*)
 -      if test "$GCC" = yes; then
@@ -33908,15 +28413,6 @@
 -      hardcode_libdir_separator_GCJ=:
 -      link_all_deplibs_GCJ=yes
 -      ;;
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
-+echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; }
-+if test $ac_cv_lib_ipc_shmat = yes; then
-+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
-+fi
  
 -    netbsd* | netbsdelf*-gnu)
 -      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -33928,8 +28424,6 @@
 -      hardcode_direct_GCJ=yes
 -      hardcode_shlibpath_var_GCJ=no
 -      ;;
-+    fi
-+  fi
  
 -    newsos6)
 -      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
@@ -33938,28 +28432,6 @@
 -      hardcode_libdir_separator_GCJ=:
 -      hardcode_shlibpath_var_GCJ=no
 -      ;;
-+  # Check for libraries that X11R6 Xt/Xaw programs need.
-+  ac_save_LDFLAGS=$LDFLAGS
-+  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
-+  # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-+  # check for ICE first), but we must link in the order -lSM -lICE or
-+  # we get undefined symbols.  So assume we have SM if we have ICE.
-+  # These have to be linked with before -lX11, unlike the other
-+  # libraries we check for below, so use a different variable.
-+  # John Interrante, Karl Berry
-+  { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
-+echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
  
 -    openbsd*)
 -      if test -f /usr/libexec/ld.so; then
@@ -33986,43 +28458,6 @@
 -	ld_shlibs_GCJ=no
 -      fi
 -      ;;
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char IceConnectionNumber ();
-+int
-+main ()
-+{
-+return IceConnectionNumber ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_lib_ICE_IceConnectionNumber=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
  
 -    os2*)
 -      hardcode_libdir_flag_spec_GCJ='-L$libdir'
@@ -34031,8 +28466,6 @@
 -      archive_cmds_GCJ='$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'
 -      old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
 -      ;;
-+	ac_cv_lib_ICE_IceConnectionNumber=no
-+fi
  
 -    osf3*)
 -      if test "$GCC" = yes; then
@@ -34045,15 +28478,6 @@
 -      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
 -      hardcode_libdir_separator_GCJ=:
 -      ;;
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-+echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
-+if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
-+  X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
-+fi
  
 -    osf4* | osf5*)	# as osf3* with the addition of -msym flag
 -      if test "$GCC" = yes; then
@@ -34065,14 +28489,12 @@
 -	archive_cmds_GCJ='$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'
 -	archive_expsym_cmds_GCJ='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'
-+  LDFLAGS=$ac_save_LDFLAGS
  
 -	# Both c and cxx compiler support -rpath directly
 -	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
 -      fi
 -      hardcode_libdir_separator_GCJ=:
 -      ;;
-+fi
  
 -    solaris*)
 -      no_undefined_flag_GCJ=' -z text'
@@ -34119,14 +28541,6 @@
 -      hardcode_minus_L_GCJ=yes
 -      hardcode_shlibpath_var_GCJ=no
 -      ;;
-+  if test x$no_x = xyes ; then
-+    { { echo "$as_me:$LINENO: error: X development libraries not found" >&5
-+echo "$as_me: error: X development libraries not found" >&2;}
-+   { (exit 1); exit 1; }; }
-+  else
-+    X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
-+  fi
-+fi
  
 -    sysv4)
 -      case $host_vendor in
@@ -34149,13 +28563,13 @@
 -      runpath_var='LD_RUN_PATH'
 -      hardcode_shlibpath_var_GCJ=no
 -      ;;
--
+ 
 -    sysv4.3*)
 -      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 -      hardcode_shlibpath_var_GCJ=no
 -      export_dynamic_flag_spec_GCJ='-Bexport'
 -      ;;
--
+ 
 -    sysv4*MP*)
 -      if test -d /usr/nec; then
 -	archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
@@ -34165,27 +28579,12 @@
 -	ld_shlibs_GCJ=yes
 -      fi
 -      ;;
--
+ 
 -    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
 -      no_undefined_flag_GCJ='${wl}-z,text'
 -      archive_cmds_need_lc_GCJ=no
 -      hardcode_shlibpath_var_GCJ=no
 -      runpath_var='LD_RUN_PATH'
-+fusa_save_LDFLAGS=$LDFLAGS
-+LDFLAGS="$LDFLAGS $X_LIBS"
-+{ echo "$as_me:$LINENO: checking for XauFileName in -lXau" >&5
-+echo $ECHO_N "checking for XauFileName in -lXau... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_Xau_XauFileName+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lXau  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
  
 -      if test "$GCC" = yes; then
 -	archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -34195,43 +28594,6 @@
 -	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 -      fi
 -      ;;
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char XauFileName ();
-+int
-+main ()
-+{
-+return XauFileName ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_lib_Xau_XauFileName=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
  
 -    sysv5* | sco3.2v5* | sco5v6*)
 -      # Note: We can NOT use -z defs as we might desire, because we do not
@@ -34249,8 +28611,6 @@
 -      link_all_deplibs_GCJ=yes
 -      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
 -      runpath_var='LD_RUN_PATH'
-+	ac_cv_lib_Xau_XauFileName=no
-+fi
  
 -      if test "$GCC" = yes; then
 -	archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -34260,87 +28620,22 @@
 -	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 -      fi
 -      ;;
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_XauFileName" >&5
-+echo "${ECHO_T}$ac_cv_lib_Xau_XauFileName" >&6; }
-+if test $ac_cv_lib_Xau_XauFileName = yes; then
-+  X_LIBS="$X_LIBS -lXau"
-+else
-+  { { echo "$as_me:$LINENO: error: Xau development libraries not found" >&5
-+echo "$as_me: error: Xau development libraries not found" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
  
 -    uts4*)
 -      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 -      hardcode_libdir_flag_spec_GCJ='-L$libdir'
 -      hardcode_shlibpath_var_GCJ=no
 -      ;;
-+{ echo "$as_me:$LINENO: checking for XmuClientWindow in -lXmu" >&5
-+echo $ECHO_N "checking for XmuClientWindow in -lXmu... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_Xmu_XmuClientWindow+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lXmu  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
  
 -    *)
 -      ld_shlibs_GCJ=no
 -      ;;
 -    esac
 -  fi
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char XmuClientWindow ();
-+int
-+main ()
-+{
-+return XmuClientWindow ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_lib_Xmu_XmuClientWindow=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
  
 -{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
 -echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
 -test "$ld_shlibs_GCJ" = no && can_build_shared=no
-+	ac_cv_lib_Xmu_XmuClientWindow=no
-+fi
  
 -#
 -# Do we need to explicitly link libc?
@@ -34349,19 +28644,6 @@
 -x|xyes)
 -  # Assume -lc should be added
 -  archive_cmds_need_lc_GCJ=yes
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xmu_XmuClientWindow" >&5
-+echo "${ECHO_T}$ac_cv_lib_Xmu_XmuClientWindow" >&6; }
-+if test $ac_cv_lib_Xmu_XmuClientWindow = yes; then
-+  X_LIBS="$X_LIBS -lXmu"
-+else
-+  { { echo "$as_me:$LINENO: error: Xmu development libraries not found" >&5
-+echo "$as_me: error: Xmu development libraries not found" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
  
 -  if test "$enable_shared" = yes && test "$GCC" = yes; then
 -    case $archive_cmds_GCJ in
@@ -34376,7 +28658,6 @@
 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
 -      $rm conftest*
 -      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+LDFLAGS=$fusa_save_LDFLAGS
  
 -      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
@@ -34421,399 +28702,182 @@
  
 -{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
--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"
-+##############################
-+# Users & Groups Config
-+##############################
- 
--need_lib_prefix=unknown
--hardcode_into_libs=no
-+USERS_ADMIN=
- 
--# 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
-+# Check whether --with-users_admin was given.
-+if test "${with_users_admin+set}" = set; then
-+  withval=$with_users_admin; users_admin_cmd="$withval"
++
++  { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++$as_echo_n "checking dynamic linker characteristics... " >&6; }
++
++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
- 
--  # 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 '
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+@@ -19596,7 +10951,6 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -19633,7 +10987,7 @@
+       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
-+if test "x$users_admin_cmd" = "x"; then
-+	# Extract the first word of "users-admin", so it can be a program name with args.
-+set dummy users-admin; 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_users_admin+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $users_admin in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_users_admin="$users_admin" # Let the user override the test with a path.
++	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+ 	:
+       else
+ 	can_build_shared=no
+@@ -19659,9 +11013,18 @@
    ;;
-+  *)
-+  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_users_admin="$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
  
--amigaos*)
+ 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'
-   ;;
-+esac
-+fi
-+users_admin=$ac_cv_path_users_admin
-+if test -n "$users_admin"; then
-+  { echo "$as_me:$LINENO: result: $users_admin" >&5
-+echo "${ECHO_T}$users_admin" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
- 
--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
--  ;;
-+	if test "x$users_admin" = "x"; then
-+		users_admin_cmd="disabled"
-+	else
-+		users_admin_cmd="$users_admin"
-+	fi
-+else
-+	if test "x$users_admin_cmd" = "xno"; then
-+		{ echo "$as_me:$LINENO: result: disabling users and groups admin command" >&5
-+echo "${ECHO_T}disabling users and groups admin command" >&6; }
-+		users_admin=
-+		users_admin_cmd="disabled"
-+	else
-+		{ echo "$as_me:$LINENO: result: using \"$users_admin_cmd\" as the users and groups admin command" >&5
-+echo "${ECHO_T}using \"$users_admin_cmd\" as the users and groups admin command" >&6; }
-+		users_admin="$users_admin_cmd"
-+	fi
-+fi
++  case $host_cpu in
++  powerpc)
++    # Since July 2007 AmigaOS4 officially supports .so libraries.
++    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    ;;
++  m68k)
++    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'
++    ;;
++  esac
+   ;;
+ 
+ beos*)
+@@ -19684,25 +11047,28 @@
+   # libtool to hard-code these into programs
+   ;;
  
 -cygwin* | mingw* | pw32*)
--  version_type=windows
--  shrext_cmds=".dll"
--  need_version=no
--  need_lib_prefix=no
-+if test "x$users_admin" != "x"; then
++cygwin* | mingw* | pw32* | cegcc*)
+   version_type=windows
+   shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
  
--  case $GCC,$host_os in
+   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}`~
++  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+     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~
++      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~
++      chmod a+x \$dldir/$dlname~
++      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
++        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
++      fi'
+     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+       dlpath=$dir/\$dldll~
 -       $rm \$dlpath'
--    shlibpath_overrides_runpath=yes
-+cat >>confdefs.h <<_ACEOF
-+#define USERS_ADMIN "$users_admin"
-+_ACEOF
++       $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"
--      ;;
+     case $host_os in
+@@ -19711,20 +11077,20 @@
+       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}'
++    mingw* | cegcc*)
+       # 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=`$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/;/ /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
--    ;;
-+fi
- 
--  *)
--    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
++        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+       fi
+       ;;
+     pw32*)
+@@ -19748,12 +11114,13 @@
+   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`'
-+##############################
-+# GDM Setup App
-+##############################
- 
--  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
--  ;;
-+GDM_SETUP=
- 
--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
-+
-+# Check whether --with-gdm_setup was given.
-+if test "${with_gdm_setup+set}" = set; then
-+  withval=$with_gdm_setup; gdm_setup_cmd="$withval"
-+fi
-+
-+
-+if test "x$gdm_setup_cmd" = "x"; then
-+	# Extract the first word of "gdmsetup", so it can be a program name with args.
-+set dummy gdmsetup; 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_gdm_setup+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $gdm_setup in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_gdm_setup="$gdm_setup" # 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_gdm_setup="$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
- 
--freebsd1*)
--  dynamic_linker=no
-   ;;
-+esac
-+fi
-+gdm_setup=$ac_cv_path_gdm_setup
-+if test -n "$gdm_setup"; then
-+  { echo "$as_me:$LINENO: result: $gdm_setup" >&5
-+echo "${ECHO_T}$gdm_setup" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
- 
--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
--  ;;
-+	if test "x$gdm_setup" = "x"; then
-+		gdm_setup_cmd="disabled"
-+	else
-+		gdm_setup_cmd="$gdm_setup"
-+	fi
-+else
-+	if test "x$gdm_setup_cmd" = "xno"; then
-+		{ echo "$as_me:$LINENO: result: disabling login screen setup command" >&5
-+echo "${ECHO_T}disabling login screen setup command" >&6; }
-+		gdm_setup=
-+		gdm_setup_cmd="disabled"
-+	else
-+		{ echo "$as_me:$LINENO: result: using \"$gdm_setup_cmd\" as the login screen setup command" >&5
-+echo "${ECHO_T}using \"$gdm_setup_cmd\" as the login screen setup command" >&6; }
-+		gdm_setup="$gdm_setup_cmd"
-+	fi
-+fi
- 
--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
--    ;;
++  library_names_spec='${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`'
+ 
++  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+   ;;
+ 
+@@ -19846,18 +11213,18 @@
+     fi
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
 -   hppa*64*)
 -     shrext_cmds='.sl'
 -     hardcode_into_libs=yes
@@ -34826,399 +28890,221 @@
 -     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'
--  ;;
-+if test "x$gdm_setup" != "x"; then
- 
--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
--  ;;
-+cat >>confdefs.h <<_ACEOF
-+#define GDM_SETUP "$gdm_setup"
-+_ACEOF
- 
--irix5* | irix6* | nonstopux*)
--  case $host_os in
--    nonstopux*) version_type=nonstopux ;;
--    *)
--	if test "$lt_cv_prog_gnu_ld" = yes; then
--		version_type=linux
-+fi
-+
-+
-+##############################
-+# GDM Config File
-+##############################
-+
-+GDMCONFIGFILE=
-+
-+
-+# Check whether --with-gdm_config was given.
-+if test "${with_gdm_config+set}" = set; then
-+  withval=$with_gdm_config; gdmconfigfile="$withval"
-+fi
-+
-+
-+if test "x$gdmconfigfile" = "x" -o "x$gdmconfigfile" = "xno"; then
-+	{ echo "$as_me:$LINENO: checking for GDM configuration file" >&5
-+echo $ECHO_N "checking for GDM configuration file... $ECHO_C" >&6; }
-+
-+	if test -f "/etc/gdm/gdm.conf"; then
-+		gdmconfigfile="/etc/gdm/gdm.conf"
-+	elif test -f "/etc/X11/gdm/gdm.conf"; then
-+		gdmconfigfile="/etc/X11/gdm/gdm.conf"
-+	elif test -f "/etc/gdm/custom.conf"; then
-+		gdmconfigfile="/etc/gdm/custom.conf"
-+	elif test -f "/etc/X11/gdm/custom.conf"; then
-+		gdmconfigfile="/etc/X11/gdm/custom.conf"
-+	elif test -f "/etc/gdm/gdm.conf-custom"; then
-+		gdmconfigfile="/etc/gdm/gdm.conf-custom"
-+	elif test -f "/etc/X11/gdm/gdm.conf-custom"; then
-+		gdmconfigfile="/etc/X11/gdm/gdm.conf-custom"
- 	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
--  ;;
-+		{ { echo "$as_me:$LINENO: error: The GDM config file could not be found, please specify it manually" >&5
-+echo "$as_me: error: The GDM config file could not be found, please specify it manually" >&2;}
-+   { (exit 1); exit 1; }; }
-+	fi
++  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
+@@ -19919,21 +11286,79 @@
+   hardcode_into_libs=yes
+   ;;
  
 -# No shared lib support for Linux oldld, aout, or coff.
 -linux*oldld* | linux*aout* | linux*coff*)
 -  dynamic_linker=no
 -  ;;
-+	{ echo "$as_me:$LINENO: result: $gdmconfigfile" >&5
-+echo "${ECHO_T}$gdmconfigfile" >&6; }
-+else
-+	{ echo "$as_me:$LINENO: result: using \"$gdmconfigfile\" as the gdm.conf location" >&5
-+echo "${ECHO_T}using \"$gdmconfigfile\" as the gdm.conf location" >&6; }
-+fi
- 
--# 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
-+  test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-+  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-+  ac_define_path=`eval echo $"$gdmconfigfile"`
-+  ac_define_path=`eval echo $ac_define_path`
-+  GDMCONFIGFILE="$ac_define_path"
- 
--  # 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'
--  ;;
-+cat >>confdefs.h <<_ACEOF
-+#define GDMCONFIGFILE "$ac_define_path"
-+_ACEOF
- 
--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
--  ;;
-+##############################
-+# Compile Flags
-+##############################
- 
--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'
--  ;;
-+    # Check whether --enable-compile-warnings was given.
-+if test "${enable_compile_warnings+set}" = set; then
-+  enableval=$enable_compile_warnings;
-+else
-+  enable_compile_warnings="maximum"
-+fi
- 
--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
--  ;;
-+    warnCFLAGS=
-+    if test "x$GCC" != xyes; then
-+	enable_compile_warnings=no
-+    fi
- 
--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
--  ;;
-+    warning_flags=
-+    realsave_CFLAGS="$CFLAGS"
- 
--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"
-+    case "$enable_compile_warnings" in
-+    no)
-+	warning_flags=
- 	;;
--    esac
--  fi
--  sys_lib_dlsearch_path_spec='/usr/lib'
--  ;;
-+    minimum)
-+	warning_flags="-Wall"
-+	;;
-+    yes)
-+	warning_flags="-Wall -Wmissing-prototypes"
-+	;;
-+    maximum|error)
-+	warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
-+	CFLAGS="$warning_flags $CFLAGS"
-+	for option in -Wno-sign-compare; do
-+		SAVE_CFLAGS="$CFLAGS"
-+		CFLAGS="$CFLAGS $option"
-+		{ echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
-+echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; }
-+		cat >conftest.$ac_ext <<_ACEOF
++# 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
++  # Some binutils ld are patched to set DT_RUNPATH
++  save_LDFLAGS=$LDFLAGS
++  save_libdir=$libdir
++  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
++       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
++  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
- 
--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
--  ;;
++
 +int
 +main ()
 +{
- 
--*)
--  dynamic_linker=no
--  ;;
++
 +  ;
 +  return 0;
 +}
 +_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
++  shlibpath_overrides_runpath=yes
++fi
++
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++fi
++
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++  LDFLAGS=$save_LDFLAGS
++  libdir=$save_libdir
+ 
+-# 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.
+@@ -19941,7 +11366,7 @@
+ 
+   # 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' ' '`
++    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
+ 
+@@ -19970,7 +11395,7 @@
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++  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'
+@@ -19991,14 +11416,16 @@
+   shlibpath_overrides_runpath=yes
+   ;;
+ 
+-nto-qnx*)
+-  version_type=linux
++*nto* | *qnx*)
++  version_type=qnx
+   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
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='ldqnx.so'
+   ;;
+ 
+ openbsd*)
+@@ -20007,13 +11434,13 @@
+   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  ;;
++    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
++  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
+@@ -20085,7 +11512,6 @@
+     sni)
+       shlibpath_overrides_runpath=no
+       need_lib_prefix=no
+-      export_dynamic_flag_spec='${wl}-Blargedynsym'
+       runpath_var=LD_RUN_PATH
+       ;;
+     siemens)
+@@ -20116,13 +11542,12 @@
+   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
++  shlibpath_overrides_runpath=yes
+   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"
+@@ -20132,6 +11557,17 @@
+   sys_lib_dlsearch_path_spec='/usr/lib'
+   ;;
+ 
++tpf*)
++  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
++
+ uts4*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -20143,1015 +11579,1053 @@
+   dynamic_linker=no
+   ;;
  esac
 -{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
 -echo "${ECHO_T}$dynamic_linker" >&6; }
--test "$dynamic_linker" = no && can_build_shared=no
--
++{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++$as_echo "$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+ 
 -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
@@ -35228,30 +29114,15 @@
 -sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
 -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  has_option=yes
- else
+-else
 -  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
 -fi
 -
 -sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
--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"
-+	has_option=no
+-
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
  fi
  
 -{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
@@ -35260,33 +29131,7 @@
 -if test -n "$hardcode_libdir_flag_spec_GCJ" || \
 -   test -n "$runpath_var_GCJ" || \
 -   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+		CFLAGS="$SAVE_CFLAGS"
-+		{ echo "$as_me:$LINENO: result: $has_option" >&5
-+echo "${ECHO_T}$has_option" >&6; }
-+		if test $has_option = yes; then
-+		  warning_flags="$warning_flags $option"
-+		fi
-+		unset has_option
-+		unset SAVE_CFLAGS
-+	done
-+	unset option
-+	if test "$enable_compile_warnings" = "error" ; then
-+	    warning_flags="$warning_flags -Werror"
-+	fi
-+	;;
-+    *)
-+	{ { echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5
-+echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;}
-+   { (exit 1); exit 1; }; }
-+	;;
-+    esac
-+    CFLAGS="$realsave_CFLAGS"
-+    { echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
-+echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6; }
-+    { echo "$as_me:$LINENO: result: $warning_flags" >&5
-+echo "${ECHO_T}$warning_flags" >&6; }
- 
+-
 -  # We can hardcode non-existant directories.
 -  if test "$hardcode_direct_GCJ" != no &&
 -     # If the only mechanism to avoid hardcoding is shlibpath_var, we
@@ -35300,14 +29145,13 @@
 -    # We can link without hardcoding, and we can hardcode nonexisting dirs.
 -    hardcode_action_GCJ=immediate
 -  fi
-+    # Check whether --enable-iso-c was given.
-+if test "${enable_iso_c+set}" = set; then
-+  enableval=$enable_iso_c;
- else
+-else
 -  # We cannot hardcode anything, or else we can only hardcode existing
 -  # directories.
 -  hardcode_action_GCJ=unsupported
--fi
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+ fi
 -{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
 -echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
 -
@@ -35318,7 +29162,8 @@
 -     test "$enable_shared" = no; then
 -  # Fast installation is not necessary
 -  enable_fast_install=needless
-+  enable_iso_c=no
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
  fi
  
  
@@ -35414,32 +29259,14 @@
 -
 -  cat <<__EOF__ >> "$cfgfile"
 -# ### 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
-+    { echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
-+echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6; }
-+    complCFLAGS=
-+    if test "x$enable_iso_c" != "xno"; then
-+	if test "x$GCC" = "xyes"; then
-+	case " $CFLAGS " in
-+	    *\ \	-ansi\ \	*) ;;
-+	    *) complCFLAGS="$complCFLAGS -ansi" ;;
-+	esac
-+	case " $CFLAGS " in
-+	    *\ \	-pedantic\ \	*) ;;
-+	    *) complCFLAGS="$complCFLAGS -pedantic" ;;
-+	esac
-+	fi
-+    fi
-+    { echo "$as_me:$LINENO: result: $complCFLAGS" >&5
-+echo "${ECHO_T}$complCFLAGS" >&6; }
  
 -# Whether or not to build shared libraries.
 -build_libtool_libs=$enable_shared
-+    WARN_CFLAGS="$warning_flags $complCFLAGS"
  
 -# Whether or not to build static libraries.
 -build_old_libs=$enable_static
@@ -35449,12 +29276,6 @@
  
 -# Whether or not to disallow shared libs when runtime libs are static
 -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ
-+# Check whether --enable-more-warnings was given.
-+if test "${enable_more_warnings+set}" = set; then
-+  enableval=$enable_more_warnings; set_more_warnings="$enableval"
-+else
-+  set_more_warnings=yes
-+fi
  
 -# Whether or not to optimize for fast installation.
 -fast_install=$enable_fast_install
@@ -35463,75 +29284,21 @@
 -host_alias=$host_alias
 -host=$host
 -host_os=$host_os
-+if test "$GCC" = "yes" -a "x$set_more_warnings" = "xyes"; then
-+	for option in -Wcast-align -Wchar-subscripts -Wsign-compare -Wno-strict-aliasing; do
-+		fusa_save_CFLAGS="$CFLAGS"
-+		CFLAGS="$WARN_CFLAGS $option $CFLAGS"
-+		{ echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
-+echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; }
-+		cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
  
 -# The build system.
 -build_alias=$build_alias
 -build=$build
 -build_os=$build_os
-+int
-+main ()
-+{
  
 -# An echo program that does not interpret backslashes.
 -echo=$lt_echo
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  has_option=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
  
 -# The archiver.
 -AR=$lt_AR
 -AR_FLAGS=$lt_AR_FLAGS
-+	has_option=no
-+fi
  
 -# A C compiler.
 -LTCC=$lt_LTCC
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+		CFLAGS="$fusa_save_CFLAGS"
-+		if test $has_option = yes; then
-+		  WARN_CFLAGS="$WARN_CFLAGS $option"
-+		fi
-+		{ echo "$as_me:$LINENO: result: $has_option" >&5
-+echo "${ECHO_T}$has_option" >&6; }
-+		unset has_option
-+		unset fusa_save_CFLAGS
-+	done
-+	unset option
-+fi
  
 -# LTCC compiler flags.
 -LTCFLAGS=$lt_LTCFLAGS
@@ -35544,42 +29311,27 @@
  
 -# An ERE matcher.
 -EGREP=$lt_EGREP
-+##############################
-+# I18n
-+##############################
  
 -# The linker used to build libraries.
 -LD=$lt_LD_GCJ
-+GETTEXT_PACKAGE=fast-user-switch-applet
  
 -# Whether we need hard or soft links.
 -LN_S=$lt_LN_S
  
 -# A BSD-compatible nm program.
 -NM=$lt_NM
-+cat >>confdefs.h <<_ACEOF
-+#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
-+_ACEOF
  
 -# A symbol stripping program
 -STRIP=$lt_STRIP
  
 -# Used to examine libraries when file_magic_cmd begins "file"
 -MAGIC_CMD=$MAGIC_CMD
-+  test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-+  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-+  ac_define_path=`eval echo $"${datadir}/locale"`
-+  ac_define_path=`eval echo $ac_define_path`
-+  GNOMELOCALEDIR="$ac_define_path"
  
 -# Used on cygwin: DLL creation program.
 -DLLTOOL="$DLLTOOL"
  
 -# Used on cygwin: object dumper.
 -OBJDUMP="$OBJDUMP"
-+cat >>confdefs.h <<_ACEOF
-+#define GNOMELOCALEDIR "$ac_define_path"
-+_ACEOF
  
 -# Used on cygwin: assembler.
 -AS="$AS"
@@ -35596,249 +29348,64 @@
  
 -# Object file suffix (normally "o").
 -objext="$ac_objext"
-+for ac_header in locale.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_header_compiler=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
  
 -# Old archive suffix (normally "a").
 -libext="$libext"
-+	ac_header_compiler=no
-+fi
  
 -# Shared library suffix (normally ".so").
 -shrext_cmds='$shrext_cmds'
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
  
 -# Executable file suffix (normally "").
 -exeext="$exeext"
-+# Is the header present?
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$ac_header>
-+_ACEOF
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-+  ac_header_preproc=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
  
 -# Additional compiler flags for building library objects.
 -pic_flag=$lt_lt_prog_compiler_pic_GCJ
 -pic_mode=$pic_mode
-+  ac_header_preproc=no
-+fi
  
 -# What is the maximum length of a command?
 -max_cmd_len=$lt_cv_sys_max_cmd_len
-+rm -f conftest.err conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
  
 -# Does compiler simultaneously support -c and -o options?
 -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
  
 -# 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
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
  
 -# Whether dlopen of statically linked programs is supported.
 -dlopen_self_static=$enable_dlopen_self_static
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
  
 -# Compiler flag to prevent dynamic linking.
 -link_static_flag=$lt_lt_prog_compiler_static_GCJ
-+fi
  
 -# Compiler flag to turn off builtin functions.
 -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
-+done
  
 -# Compiler flag to allow reflexive dlopens.
 -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
-+    if test $ac_cv_header_locale_h = yes; then
-+    { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
-+echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; }
-+if test "${am_cv_val_LC_MESSAGES+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <locale.h>
-+int
-+main ()
-+{
-+return LC_MESSAGES
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  am_cv_val_LC_MESSAGES=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
  
 -# Compiler flag to generate shared objects directly from archives.
 -whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
-+	am_cv_val_LC_MESSAGES=no
-+fi
  
 -# Compiler flag to generate thread-safe objects.
 -thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
-+{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
-+echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; }
-+    if test $am_cv_val_LC_MESSAGES = yes; then
  
 -# Library versioning type.
 -version_type=$version_type
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LC_MESSAGES 1
-+_ACEOF
  
 -# Format of library name prefix.
 -libname_spec=$lt_libname_spec
-+    fi
-+  fi
-+     USE_NLS=yes
  
 -# 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.
@@ -35846,116 +29413,32 @@
  
 -# The coded name of the library, if different from the real name.
 -soname_spec=$lt_soname_spec
-+    gt_cv_have_gettext=no
  
 -# Commands used to build and install an old-style archive.
 -RANLIB=$lt_RANLIB
 -old_archive_cmds=$lt_old_archive_cmds_GCJ
 -old_postinstall_cmds=$lt_old_postinstall_cmds
 -old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+    CATOBJEXT=NONE
-+    XGETTEXT=:
-+    INTLLIBS=
  
 -# Create an old-style archive from a shared archive.
 -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ
-+    if test "${ac_cv_header_libintl_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for libintl.h" >&5
-+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_libintl_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking libintl.h usability" >&5
-+echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <libintl.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_header_compiler=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
  
 -# Create a temporary old-style archive to link instead of a shared archive.
 -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
-+	ac_header_compiler=no
-+fi
  
 -# Commands used to build and install a shared archive.
 -archive_cmds=$lt_archive_cmds_GCJ
 -archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ
 -postinstall_cmds=$lt_postinstall_cmds
 -postuninstall_cmds=$lt_postuninstall_cmds
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
  
 -# Commands used to build a loadable module (assumed same as above if empty)
 -module_cmds=$lt_module_cmds_GCJ
 -module_expsym_cmds=$lt_module_expsym_cmds_GCJ
-+# Is the header present?
-+{ echo "$as_me:$LINENO: checking libintl.h presence" >&5
-+echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <libintl.h>
-+_ACEOF
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-+  ac_header_preproc=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
  
 -# Commands to strip libraries.
 -old_striplib=$lt_old_striplib
 -striplib=$lt_striplib
-+  ac_header_preproc=no
-+fi
  
 -# Dependencies to place before the objects being linked to create a
 -# shared library.
@@ -35980,191 +29463,52 @@
 -# The library search path used internally by the compiler when linking
 -# a shared library.
 -compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
-+rm -f conftest.err conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
  
 -# Method to check whether dependent libraries are shared objects.
 -deplibs_check_method=$lt_deplibs_check_method
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libintl.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: libintl.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libintl.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: libintl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
  
 -# Command to use when deplibs_check_method == file_magic.
 -file_magic_cmd=$lt_file_magic_cmd
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for libintl.h" >&5
-+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_libintl_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_libintl_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
  
 -# Flag that allows shared libraries with undefined symbols to be built.
 -allow_undefined_flag=$lt_allow_undefined_flag_GCJ
-+fi
-+if test $ac_cv_header_libintl_h = yes; then
-+  gt_cv_func_dgettext_libintl="no"
-+      libintl_extra_libs=""
  
 -# Flag that forces no undefined symbols.
 -no_undefined_flag=$lt_no_undefined_flag_GCJ
-+      #
-+      # First check in libc
-+      #
-+      { echo "$as_me:$LINENO: checking for ngettext in libc" >&5
-+echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6; }
-+if test "${gt_cv_func_ngettext_libc+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
  
 -# Commands used to finish a libtool library installation in a directory.
 -finish_cmds=$lt_finish_cmds
-+#include <libintl.h>
  
 -# 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
-+int
-+main ()
-+{
-+return !ngettext ("","", 1)
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  gt_cv_func_ngettext_libc=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
  
 -# Transform the output of nm in a proper C declaration
 -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-+	gt_cv_func_ngettext_libc=no
-+fi
  
 -# 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
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
  
 -# This is the shared library runtime path variable.
 -runpath_var=$runpath_var
-+fi
-+{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
-+echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6; }
  
 -# This is the shared library path variable.
 -shlibpath_var=$shlibpath_var
-+      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-+	      { echo "$as_me:$LINENO: checking for dgettext in libc" >&5
-+echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; }
-+if test "${gt_cv_func_dgettext_libc+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
  
 -# Is shlibpath searched before the hard-coded library search path?
 -shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+#include <libintl.h>
  
 -# How to hardcode a shared library path into an executable.
 -hardcode_action=$hardcode_action_GCJ
-+int
-+main ()
-+{
-+return !dgettext ("","")
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  gt_cv_func_dgettext_libc=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
  
 -# Whether we should hardcode library paths into libraries.
 -hardcode_into_libs=$hardcode_into_libs
-+	gt_cv_func_dgettext_libc=no
-+fi
  
 -# Flag to hardcode \$libdir into a binary during linking.
 -# This must work even if \$libdir does not exist.
 -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
  
 -# If ld is used when linking, flag to hardcode \$libdir into
 -# a binary during linking. This must work even if \$libdir does
@@ -36189,197 +29533,87 @@
 -# 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=$hardcode_automatic_GCJ
-+fi
-+{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
-+echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6; }
-+      fi
  
 -# Variables whose values should be saved in libtool wrapper scripts and
 -# restored at relink time.
 -variables_saved_for_relink="$variables_saved_for_relink"
-+      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
  
 -# Whether libtool must link a program against all its dependency libraries.
 -link_all_deplibs=$link_all_deplibs_GCJ
-+for ac_func in bind_textdomain_codeset
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
  
 -# Compile-time system search path for libraries
 -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
  
 -# Run-time system search path for libraries
 -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
  
 -# Fix the shell variable \$srcfile for the compiler.
 -fix_srcfile_path=$lt_fix_srcfile_path
-+#undef $ac_func
  
 -# Set to yes if exported symbols are required.
 -always_export_symbols=$always_export_symbols_GCJ
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char $ac_func ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined __stub_$ac_func || defined __stub___$ac_func
-+choke me
-+#endif
  
 -# The commands to list exported symbols.
 -export_symbols_cmds=$lt_export_symbols_cmds_GCJ
-+int
-+main ()
-+{
-+return $ac_func ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  eval "$as_ac_var=yes"
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
  
 -# The commands to extract the exported symbol list from a shared archive.
 -extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+	eval "$as_ac_var=no"
-+fi
  
 -# Symbols that should not be listed in the preloaded symbols.
 -exclude_expsyms=$lt_exclude_expsyms_GCJ
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
  
 -# Symbols that must always be exported.
 -include_expsyms=$lt_include_expsyms_GCJ
-+fi
-+done
  
 -# ### END LIBTOOL TAG CONFIG: $tagname
-+      fi
  
 -__EOF__
-+      #
-+      # If we don't have everything we want, check in libintl
-+      #
-+      if test "$gt_cv_func_dgettext_libc" != "yes" \
-+	 || test "$gt_cv_func_ngettext_libc" != "yes" \
-+         || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
- 
-+        { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
-+echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lintl  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char bindtextdomain ();
-+int
-+main ()
-+{
-+return bindtextdomain ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_lib_intl_bindtextdomain=yes
- else
+ 
++  { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
++hardcode_action=
++if test -n "$hardcode_libdir_flag_spec" ||
++   test -n "$runpath_var" ||
++   test "X$hardcode_automatic" = "Xyes" ; then
+ 
+-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
--
--
++  # We can hardcode non-existent directories.
++  if test "$hardcode_direct" != 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_TAGVAR(hardcode_shlibpath_var, )" != no &&
++     test "$hardcode_minus_L" != no; then
++    # Linking always hardcodes the temporary library directory.
++    hardcode_action=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    hardcode_action=immediate
+   fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  hardcode_action=unsupported
+ fi
++{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
++$as_echo "$hardcode_action" >&6; }
+ 
++if test "$hardcode_action" = relink ||
++   test "$inherit_rpath" = yes; 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_ext=c
 -ac_cpp='$CPP $CPPFLAGS'
 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -36394,165 +29628,108 @@
 -	;;
 -
 -      RC)
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
  
-+	ac_cv_lib_intl_bindtextdomain=no
-+fi
  
 -# Source file extension for RC test sources.
 -ac_ext=rc
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
-+echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; }
-+if test $ac_cv_lib_intl_bindtextdomain = yes; then
-+  { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-+echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_intl_ngettext+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lintl  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
  
 -# Object file extension for compiled RC test sources.
 -objext=o
 -objext_RC=$objext
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char ngettext ();
-+int
-+main ()
-+{
-+return ngettext ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_lib_intl_ngettext=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
  
 -# Code to be used in simple compile tests
 -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-+	ac_cv_lib_intl_ngettext=no
-+fi
  
 -# Code to be used in simple link tests
 -lt_simple_link_test_code="$lt_simple_compile_test_code"
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
-+echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }
-+if test $ac_cv_lib_intl_ngettext = yes; then
-+  { echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
-+echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_intl_dgettext+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
++  if test "x$enable_dlopen" != xyes; then
++  enable_dlopen=unknown
++  enable_dlopen_self=unknown
++  enable_dlopen_self_static=unknown
 +else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lintl  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
++  lt_cv_dlopen=no
++  lt_cv_dlopen_libs=
  
 -# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dgettext ();
-+int
-+main ()
-+{
-+return dgettext ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_lib_intl_dgettext=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
++  case $host_os in
++  beos*)
++    lt_cv_dlopen="load_add_on"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ;;
  
 -# If no C compiler was specified, use CC.
 -LTCC=${LTCC-"$CC"}
-+	ac_cv_lib_intl_dgettext=no
-+fi
++  mingw* | pw32* | cegcc*)
++    lt_cv_dlopen="LoadLibrary"
++    lt_cv_dlopen_libs=
++    ;;
  
 -# If no C compiler flags were specified, use CFLAGS.
 -LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
-+echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; }
-+if test $ac_cv_lib_intl_dgettext = yes; then
-+  gt_cv_func_dgettext_libintl=yes
-+fi
++  cygwin*)
++    lt_cv_dlopen="dlopen"
++    lt_cv_dlopen_libs=
++    ;;
  
 -# Allow CC to be a program name with arguments.
 -compiler=$CC
-+fi
++  darwin*)
++  # if libdl is installed we need to link against it
++    { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++$as_echo_n "checking for dlopen in -ldl... " >&6; }
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
  
-+fi
++/* 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.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char dlopen ();
++int
++main ()
++{
++return dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  ac_cv_lib_dl_dlopen=yes
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
  
 -# save warnings/boilerplate of simple test code
 -ac_outfile=conftest.$ac_objext
@@ -36560,68 +29737,28 @@
 -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 -_lt_compiler_boilerplate=`cat conftest.err`
 -$rm conftest*
++	ac_cv_lib_dl_dlopen=no
++fi
  
 -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*
-+	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-+	  { echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
-+echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6; }
-+	  { echo "$as_me:$LINENO: result: " >&5
-+echo "${ECHO_T}" >&6; }
-+  	  { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-+echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_intl_ngettext+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
++rm -rf conftest.dSYM
++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
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 +else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lintl -liconv $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
  
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char ngettext ();
-+int
-+main ()
-+{
-+return ngettext ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_lib_intl_ngettext=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
++    lt_cv_dlopen="dyld"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
  
 -# Allow CC to be a program name with arguments.
 -lt_save_CC="$CC"
@@ -36637,30 +29774,10 @@
 -  esac
 -done
 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+	ac_cv_lib_intl_ngettext=no
 +fi
  
 -lt_cv_prog_compiler_c_o_RC=yes
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
-+echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }
-+if test $ac_cv_lib_intl_ngettext = yes; then
-+  { echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
-+echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lintl -liconv $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
++    ;;
  
 -# The else clause should only fire when bootstrapping the
 -# libtool distribution, otherwise you forgot to ship ltmain.sh
@@ -36743,17 +29860,64 @@
 -      ;;
 -    esac
 -  done
++  *)
++    { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
++$as_echo_n "checking for shl_load... " >&6; }
++if test "${ac_cv_func_shl_load+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define shl_load innocuous_shl_load
+ 
+-  case $lt_echo in
+-  *'\$0 --fallback-echo"')
+-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+-    ;;
+-  esac
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char shl_load (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
+ 
+-cfgfile="$ofile"
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
+ 
+-  cat <<__EOF__ >> "$cfgfile"
+-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
++#undef shl_load
+ 
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 +/* 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.  */
 +#ifdef __cplusplus
 +extern "C"
 +#endif
-+char dcgettext ();
++char shl_load ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined __stub_shl_load || defined __stub___shl_load
++choke me
++#endif
+ 
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
 +int
 +main ()
 +{
-+return dcgettext ();
++return shl_load ();
 +  ;
 +  return 0;
 +}
@@ -36764,129 +29928,177 @@
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_link") 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_lib_intl_dcgettext=yes
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  ac_cv_func_shl_load=yes
 +else
-+  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
  
--  case $lt_echo in
--  *'\$0 --fallback-echo"')
--    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
--    ;;
--  esac
-+	ac_cv_lib_intl_dcgettext=no
-+fi
- 
--cfgfile="$ofile"
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
-+echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6; }
-+if test $ac_cv_lib_intl_dcgettext = yes; then
-+  gt_cv_func_dgettext_libintl=yes
-+			libintl_extra_libs=-liconv
-+else
-+  :
-+fi
- 
--  cat <<__EOF__ >> "$cfgfile"
--# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-+else
-+  :
-+fi
- 
--# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+        fi
- 
--# Shell to use when invoking shell scripts.
--SHELL=$lt_SHELL
-+        #
-+        # If we found libintl, then check in it for bind_textdomain_codeset();
-+        # we'll prefer libc if neither have bind_textdomain_codeset(),
-+        # and both have dgettext and ngettext
-+        #
-+        if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
-+          glib_save_LIBS="$LIBS"
-+          LIBS="$LIBS -lintl $libintl_extra_libs"
-+          unset ac_cv_func_bind_textdomain_codeset
- 
 -# Whether or not to build shared libraries.
 -build_libtool_libs=$enable_shared
-+for ac_func in bind_textdomain_codeset
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
++	ac_cv_func_shl_load=no
++fi
  
 -# Whether or not to build static libraries.
 -build_old_libs=$enable_static
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
++$as_echo "$ac_cv_func_shl_load" >&6; }
++if test "x$ac_cv_func_shl_load" = x""yes; then
++  lt_cv_dlopen="shl_load"
++else
++  { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
++$as_echo_n "checking for shl_load in -ldld... " >&6; }
++if test "${ac_cv_lib_dld_shl_load+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
  
 -# Whether or not to add -lc for building shared libraries.
 -build_libtool_need_lc=$archive_cmds_need_lc_RC
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
++/* 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.  */
++#ifdef __cplusplus
++extern "C"
 +#endif
++char shl_load ();
++int
++main ()
++{
++return shl_load ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  ac_cv_lib_dld_shl_load=yes
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
  
 -# Whether or not to disallow shared libs when runtime libs are static
 -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
-+#undef $ac_func
++	ac_cv_lib_dld_shl_load=no
++fi
  
 -# Whether or not to optimize for fast installation.
 -fast_install=$enable_fast_install
++rm -rf conftest.dSYM
++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
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
++$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
++if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
++  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
++else
++  { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
++$as_echo_n "checking for dlopen... " >&6; }
++if test "${ac_cv_func_dlopen+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define dlopen innocuous_dlopen
+ 
+-# The host system.
+-host_alias=$host_alias
+-host=$host
+-host_os=$host_os
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char dlopen (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
+ 
+-# The build system.
+-build_alias=$build_alias
+-build=$build
+-build_os=$build_os
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
+ 
+-# An echo program that does not interpret backslashes.
+-echo=$lt_echo
++#undef dlopen
+ 
+-# The archiver.
+-AR=$lt_AR
+-AR_FLAGS=$lt_AR_FLAGS
 +/* 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.  */
 +#ifdef __cplusplus
 +extern "C"
 +#endif
-+char $ac_func ();
++char dlopen ();
 +/* The GNU C library defines this for functions which it implements
 +    to always fail with ENOSYS.  Some functions are actually named
 +    something starting with __ and the normal name is an alias.  */
-+#if defined __stub_$ac_func || defined __stub___$ac_func
++#if defined __stub_dlopen || defined __stub___dlopen
 +choke me
 +#endif
  
--# The host system.
--host_alias=$host_alias
--host=$host
--host_os=$host_os
+-# A C compiler.
+-LTCC=$lt_LTCC
 +int
 +main ()
 +{
-+return $ac_func ();
++return dlopen ();
 +  ;
 +  return 0;
 +}
@@ -36897,585 +30109,537 @@
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_link") 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  eval "$as_ac_var=yes"
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  ac_cv_func_dlopen=yes
 +else
-+  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
  
--# The build system.
--build_alias=$build_alias
--build=$build
--build_os=$build_os
-+	eval "$as_ac_var=no"
-+fi
- 
--# An echo program that does not interpret backslashes.
--echo=$lt_echo
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
- 
--# The archiver.
--AR=$lt_AR
--AR_FLAGS=$lt_AR_FLAGS
-+fi
-+done
- 
--# A C compiler.
--LTCC=$lt_LTCC
-+          LIBS="$glib_save_LIBS"
- 
 -# LTCC compiler flags.
 -LTCFLAGS=$lt_LTCFLAGS
-+          if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
-+            gt_cv_func_dgettext_libc=no
-+          else
-+            if test "$gt_cv_func_dgettext_libc" = "yes" \
-+		&& test "$gt_cv_func_ngettext_libc" = "yes"; then
-+              gt_cv_func_dgettext_libintl=no
-+            fi
-+          fi
-+        fi
-+      fi
++	ac_cv_func_dlopen=no
++fi
  
 -# A language-specific compiler.
 -CC=$lt_compiler_RC
-+      if test "$gt_cv_func_dgettext_libc" = "yes" \
-+	|| test "$gt_cv_func_dgettext_libintl" = "yes"; then
-+        gt_cv_have_gettext=yes
-+      fi
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
++$as_echo "$ac_cv_func_dlopen" >&6; }
++if test "x$ac_cv_func_dlopen" = x""yes; then
++  lt_cv_dlopen="dlopen"
++else
++  { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++$as_echo_n "checking for dlopen in -ldl... " >&6; }
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
  
 -# Is the compiler the GNU C compiler?
 -with_gcc=$GCC_RC
-+      if test "$gt_cv_func_dgettext_libintl" = "yes"; then
-+        INTLLIBS="-lintl $libintl_extra_libs"
-+      fi
++/* 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.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char dlopen ();
++int
++main ()
++{
++return dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  ac_cv_lib_dl_dlopen=yes
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
  
 -# An ERE matcher.
 -EGREP=$lt_EGREP
-+      if test "$gt_cv_have_gettext" = "yes"; then
++	ac_cv_lib_dl_dlopen=no
++fi
  
 -# The linker used to build libraries.
 -LD=$lt_LD_RC
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_GETTEXT 1
++rm -rf conftest.dSYM
++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
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
++  { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
++$as_echo_n "checking for dlopen in -lsvld... " >&6; }
++if test "${ac_cv_lib_svld_dlopen+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsvld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
 +_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
  
 -# Whether we need hard or soft links.
 -LN_S=$lt_LN_S
-+	# Extract the first word of "msgfmt", so it can be a program name with args.
-+set dummy msgfmt; 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_MSGFMT+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case "$MSGFMT" in
-+  /*)
-+  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-+  for ac_dir in $PATH; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
-+	ac_cv_path_MSGFMT="$ac_dir/$ac_word"
-+	break
-+      fi
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no"
-+  ;;
++/* 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.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char dlopen ();
++int
++main ()
++{
++return dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
 +esac
-+fi
-+MSGFMT="$ac_cv_path_MSGFMT"
-+if test "$MSGFMT" != "no"; then
-+  { echo "$as_me:$LINENO: result: $MSGFMT" >&5
-+echo "${ECHO_T}$MSGFMT" >&6; }
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  ac_cv_lib_svld_dlopen=yes
 +else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+	if test "$MSGFMT" != "no"; then
-+          glib_save_LIBS="$LIBS"
-+          LIBS="$LIBS $INTLLIBS"
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
  
 -# A BSD-compatible nm program.
 -NM=$lt_NM
-+for ac_func in dcgettext
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
++	ac_cv_lib_svld_dlopen=no
++fi
  
 -# A symbol stripping program
 -STRIP=$lt_STRIP
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
++rm -rf conftest.dSYM
++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
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
++$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
++if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
++else
++  { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
++$as_echo_n "checking for dld_link in -ldld... " >&6; }
++if test "${ac_cv_lib_dld_dld_link+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
  
 -# Used to examine libraries when file_magic_cmd begins "file"
 -MAGIC_CMD=$MAGIC_CMD
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
++/* 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.  */
++#ifdef __cplusplus
++extern "C"
 +#endif
++char dld_link ();
++int
++main ()
++{
++return dld_link ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  ac_cv_lib_dld_dld_link=yes
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
  
 -# Used on cygwin: DLL creation program.
 -DLLTOOL="$DLLTOOL"
-+#undef $ac_func
++	ac_cv_lib_dld_dld_link=no
++fi
  
 -# Used on cygwin: object dumper.
 -OBJDUMP="$OBJDUMP"
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char $ac_func ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined __stub_$ac_func || defined __stub___$ac_func
-+choke me
-+#endif
++rm -rf conftest.dSYM
++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
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
++$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
++if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
++  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
++fi
  
 -# Used on cygwin: assembler.
 -AS="$AS"
-+int
-+main ()
-+{
-+return $ac_func ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  eval "$as_ac_var=yes"
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
  
 -# The name of the directory that contains temporary libtool files.
 -objdir=$objdir
-+	eval "$as_ac_var=no"
 +fi
  
 -# How to create reloadable object files.
 -reload_flag=$lt_reload_flag
 -reload_cmds=$lt_reload_cmds
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
  
 -# How to pass a linker flag through the compiler.
 -wl=$lt_lt_prog_compiler_wl_RC
 +fi
-+done
  
 -# Object file suffix (normally "o").
 -objext="$ac_objext"
-+	  MSGFMT_OPTS=
-+	  { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
-+echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; }
-+	  cat >conftest.foo <<_ACEOF
  
 -# Old archive suffix (normally "a").
 -libext="$libext"
-+msgid ""
-+msgstr ""
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Project-Id-Version: test 1.0\n"
-+"PO-Revision-Date: 2007-02-15 12:01+0100\n"
-+"Last-Translator: test <foo@bar.xx>\n"
-+"Language-Team: C <LL@li.org>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Transfer-Encoding: 8bit\n"
++fi
  
 -# Shared library suffix (normally ".so").
 -shrext_cmds='$shrext_cmds'
-+_ACEOF
-+if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
-+  ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+  MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+else { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+echo "$as_me: failed input was:" >&5
-+sed 's/^/| /' conftest.foo >&5
-+fi
  
 -# Executable file suffix (normally "").
 -exeext="$exeext"
-+	  # Extract the first word of "gmsgfmt", so it can be a program name with args.
-+set dummy gmsgfmt; 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_GMSGFMT+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $GMSGFMT in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_GMSGFMT="$GMSGFMT" # 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_GMSGFMT="$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
++fi
  
 -# Additional compiler flags for building library objects.
 -pic_flag=$lt_lt_prog_compiler_pic_RC
 -pic_mode=$pic_mode
-+  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-+  ;;
-+esac
-+fi
-+GMSGFMT=$ac_cv_path_GMSGFMT
-+if test -n "$GMSGFMT"; then
-+  { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-+echo "${ECHO_T}$GMSGFMT" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
  
 -# What is the maximum length of a command?
 -max_cmd_len=$lt_cv_sys_max_cmd_len
++fi
  
 -# Does compiler simultaneously support -c and -o options?
 -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
-+	  # Extract the first word of "xgettext", so it can be a program name with args.
-+set dummy xgettext; 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_XGETTEXT+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case "$XGETTEXT" in
-+  /*)
-+  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-+  for ac_dir in $PATH; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
-+	ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
-+	break
-+      fi
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
-+  ;;
-+esac
-+fi
-+XGETTEXT="$ac_cv_path_XGETTEXT"
-+if test "$XGETTEXT" != ":"; then
-+  { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-+echo "${ECHO_T}$XGETTEXT" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
++    ;;
++  esac
  
 -# Must we lock files when doing compilation?
 -need_locks=$lt_need_locks
-+	  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
++  if test "x$lt_cv_dlopen" != xno; then
++    enable_dlopen=yes
++  else
++    enable_dlopen=no
++  fi
  
 -# Do we need the lib prefix for modules?
 -need_lib_prefix=$need_lib_prefix
-+int
-+main ()
-+{
-+extern int _nl_msg_cat_cntr;
-+			 return _nl_msg_cat_cntr
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  CATOBJEXT=.gmo
-+             DATADIRNAME=share
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
++  case $lt_cv_dlopen in
++  dlopen)
++    save_CPPFLAGS="$CPPFLAGS"
++    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
  
 -# Do we need a version for libraries?
 -need_version=$need_version
-+	case $host in
-+	    *-*-solaris*)
-+	    	                	    	                { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
-+echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
-+if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
++    save_LDFLAGS="$LDFLAGS"
++    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
  
 -# Whether dlopen is supported.
 -dlopen_support=$enable_dlopen
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char bind_textdomain_codeset (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
++    save_LIBS="$LIBS"
++    LIBS="$lt_cv_dlopen_libs $LIBS"
  
 -# Whether dlopen of programs is supported.
 -dlopen_self=$enable_dlopen_self
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
++    { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
++$as_echo_n "checking whether a program can dlopen itself... " >&6; }
++if test "${lt_cv_dlopen_self+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self=cross
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<_LT_EOF
++#line 12327 "configure"
++#include "confdefs.h"
  
 -# Whether dlopen of statically linked programs is supported.
 -dlopen_self_static=$enable_dlopen_self_static
--
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
+ 
 -# Compiler flag to prevent dynamic linking.
 -link_static_flag=$lt_lt_prog_compiler_static_RC
--
++#include <stdio.h>
+ 
 -# Compiler flag to turn off builtin functions.
 -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
-+#undef bind_textdomain_codeset
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
  
 -# Compiler flag to allow reflexive dlopens.
 -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char bind_textdomain_codeset ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
-+choke me
++/* 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
  
 -# Compiler flag to generate shared objects directly from archives.
 -whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
-+int
-+main ()
++void fnord() { int i=42;}
++int main ()
 +{
-+return bind_textdomain_codeset ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_func_bind_textdomain_codeset=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
  
 -# Compiler flag to generate thread-safe objects.
 -thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
-+	ac_cv_func_bind_textdomain_codeset=no
-+fi
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++  else
++    puts (dlerror ());
  
 -# Library versioning type.
 -version_type=$version_type
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-+echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
-+if test $ac_cv_func_bind_textdomain_codeset = yes; then
-+  CATOBJEXT=.gmo
-+               DATADIRNAME=share
-+else
-+  CATOBJEXT=.mo
-+               DATADIRNAME=lib
-+fi
++  return status;
++}
++_LT_EOF
++  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) >&5 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
++    esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self=no
++  fi
++fi
++rm -fr conftest*
  
 -# Format of library name prefix.
 -libname_spec=$lt_libname_spec
-+	    ;;
-+	    *)
-+	    CATOBJEXT=.mo
-+            DATADIRNAME=lib
-+	    ;;
-+	    esac
-+fi
  
 -# 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
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+          LIBS="$glib_save_LIBS"
-+	  INSTOBJEXT=.mo
-+	else
-+	  gt_cv_have_gettext=no
-+	fi
-+      fi
++fi
++{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
++$as_echo "$lt_cv_dlopen_self" >&6; }
  
 -# The coded name of the library, if different from the real name.
 -soname_spec=$lt_soname_spec
-+fi
++    if test "x$lt_cv_dlopen_self" = xyes; then
++      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
++      { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
++$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
++if test "${lt_cv_dlopen_self_static+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self_static=cross
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<_LT_EOF
++#line 12423 "configure"
++#include "confdefs.h"
  
 -# Commands used to build and install an old-style archive.
 -RANLIB=$lt_RANLIB
 -old_archive_cmds=$lt_old_archive_cmds_RC
 -old_postinstall_cmds=$lt_old_postinstall_cmds
 -old_postuninstall_cmds=$lt_old_postuninstall_cmds
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
  
 -# Create an old-style archive from a shared archive.
 -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
++#include <stdio.h>
  
 -# Create a temporary old-style archive to link instead of a shared archive.
 -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
-+    if test "$gt_cv_have_gettext" = "yes" ; then
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
  
 -# Commands used to build and install a shared archive.
 -archive_cmds=$lt_archive_cmds_RC
 -archive_expsym_cmds=$lt_archive_expsym_cmds_RC
 -postinstall_cmds=$lt_postinstall_cmds
 -postuninstall_cmds=$lt_postuninstall_cmds
-+cat >>confdefs.h <<\_ACEOF
-+#define ENABLE_NLS 1
-+_ACEOF
++/* 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
  
 -# Commands used to build a loadable module (assumed same as above if empty)
 -module_cmds=$lt_module_cmds_RC
 -module_expsym_cmds=$lt_module_expsym_cmds_RC
-+    fi
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
  
 -# Commands to strip libraries.
 -old_striplib=$lt_old_striplib
 -striplib=$lt_striplib
-+        if test "$XGETTEXT" != ":"; then
-+                  if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-+        : ;
-+      else
-+        { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
-+echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }
-+        XGETTEXT=":"
-+      fi
-+    fi
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++  else
++    puts (dlerror ());
  
 -# Dependencies to place before the objects being linked to create a
 -# shared library.
@@ -37500,28 +30664,60 @@
 -# The library search path used internally by the compiler when linking
 -# a shared library.
 -compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-+    # We need to process the po/ directory.
-+    POSUB=po
++  return status;
++}
++_LT_EOF
++  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) >&5 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
++    esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self_static=no
++  fi
++fi
++rm -fr conftest*
  
 -# Method to check whether dependent libraries are shared objects.
 -deplibs_check_method=$lt_deplibs_check_method
-+    ac_config_commands="$ac_config_commands default-1"
  
 -# Command to use when deplibs_check_method == file_magic.
 -file_magic_cmd=$lt_file_magic_cmd
++fi
++{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
++$as_echo "$lt_cv_dlopen_self_static" >&6; }
++    fi
  
 -# Flag that allows shared libraries with undefined symbols to be built.
 -allow_undefined_flag=$lt_allow_undefined_flag_RC
-+                for lang in $ALL_LINGUAS; do
-+      GMOFILES="$GMOFILES $lang.gmo"
-+      POFILES="$POFILES $lang.po"
-+    done
++    CPPFLAGS="$save_CPPFLAGS"
++    LDFLAGS="$save_LDFLAGS"
++    LIBS="$save_LIBS"
++    ;;
++  esac
  
 -# Flag that forces no undefined symbols.
 -no_undefined_flag=$lt_no_undefined_flag_RC
++  case $lt_cv_dlopen_self in
++  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++  *) enable_dlopen_self=unknown ;;
++  esac
  
 -# Commands used to finish a libtool library installation in a directory.
 -finish_cmds=$lt_finish_cmds
++  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
  
 -# Same as above, but a single script fragment to be evaled but not shown.
 -finish_eval=$lt_finish_eval
@@ -37577,124 +30773,73 @@
 -# 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=$hardcode_automatic_RC
-+   if test "$gt_cv_have_gettext" = "yes"; then
-+     if test "x$ALL_LINGUAS" = "x"; then
-+       LINGUAS=
-+     else
-+       { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
-+echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; }
-+       NEW_LINGUAS=
-+       for presentlang in $ALL_LINGUAS; do
-+         useit=no
-+         if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
-+           desiredlanguages="$LINGUAS"
-+         else
-+           desiredlanguages="$ALL_LINGUAS"
-+         fi
-+         for desiredlang in $desiredlanguages; do
-+ 	   # Use the presentlang catalog if desiredlang is
-+           #   a. equal to presentlang, or
-+           #   b. a variant of presentlang (because in this case,
-+           #      presentlang can be used as a fallback for messages
-+           #      which are not translated in the desiredlang catalog).
-+           case "$desiredlang" in
-+             "$presentlang"*) useit=yes;;
-+           esac
-+         done
-+         if test $useit = yes; then
-+           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
-+         fi
-+       done
-+       LINGUAS=$NEW_LINGUAS
-+       { echo "$as_me:$LINENO: result: $LINGUAS" >&5
-+echo "${ECHO_T}$LINGUAS" >&6; }
-+     fi
  
 -# Variables whose values should be saved in libtool wrapper scripts and
 -# restored at relink time.
 -variables_saved_for_relink="$variables_saved_for_relink"
-+          if test -n "$LINGUAS"; then
-+       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-+     fi
-+   fi
  
 -# Whether libtool must link a program against all its dependency libraries.
 -link_all_deplibs=$link_all_deplibs_RC
-+            MKINSTALLDIRS=
-+   if test -n "$ac_aux_dir"; then
-+     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-+   fi
-+   if test -z "$MKINSTALLDIRS"; then
-+     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-+   fi
  
 -# 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
-+         test -d po || mkdir po
-+   if test "x$srcdir" != "x."; then
-+     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-+       posrcprefix="$srcdir/"
-+     else
-+       posrcprefix="../$srcdir/"
-+     fi
-+   else
-+     posrcprefix="../"
-+   fi
-+   rm -f po/POTFILES
-+   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-+	< $srcdir/po/POTFILES.in > po/POTFILES
  
 -# 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=$always_export_symbols_RC
++striplib=
++old_striplib=
++{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
++$as_echo_n "checking whether stripping libraries is possible... " >&6; }
++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"
++  { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
++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"
++      { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
++    else
++      { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++    fi
++    ;;
++  *)
++    { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++    ;;
++  esac
++fi
  
 -# The commands to list exported symbols.
 -export_symbols_cmds=$lt_export_symbols_cmds_RC
-+##############################
-+# Documentation
-+##############################
  
 -# 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_exclude_expsyms_RC
-+gdu_cv_version_required=0.3.2
  
 -# Symbols that must always be exported.
 -include_expsyms=$lt_include_expsyms_RC
-+if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+  gdu_cv_have_gdu=yes
-+else
-+  gdu_cv_have_gdu=no
-+fi
  
 -# ### END LIBTOOL TAG CONFIG: $tagname
-+if test "$gdu_cv_have_gdu" = "yes"; then
-+	:
-+else
-+	{ { echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5
-+echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
  
 -__EOF__
  
  
-+# Check whether --with-help-dir was given.
-+if test "${with_help_dir+set}" = set; then
-+  withval=$with_help_dir;
- else
+-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.
@@ -37702,10 +30847,8 @@
 -  if test -f "$ltmain_in"; then
 -    test -f Makefile && make "$ltmain"
 -  fi
-+  with_help_dir='${datadir}/gnome/help'
- fi
+-fi
  
-+HELP_DIR="$with_help_dir"
  
 -ac_ext=c
 -ac_cpp='$CPP $CPPFLAGS'
@@ -37716,12 +30859,11 @@
 -CC="$lt_save_CC"
  
 -	;;
-+# Check whether --with-omf-dir was given.
-+if test "${with_omf_dir+set}" = set; then
-+  withval=$with_omf_dir;
-+else
-+  with_omf_dir='${datadir}/omf'
-+fi
++  # Report which library types will actually be built
++  { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
++$as_echo_n "checking if libtool supports shared libraries... " >&6; }
++  { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
++$as_echo "$can_build_shared" >&6; }
  
 -      *)
 -	{ { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
@@ -37729,15 +30871,26 @@
 -   { (exit 1); exit 1; }; }
 -	;;
 -      esac
-+OMF_DIR="$with_omf_dir"
++  { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
++$as_echo_n "checking whether to build shared libraries... " >&6; }
++  test "$can_build_shared" = "no" && enable_shared=no
  
 -      # Append the new tag name to the list of available tags.
 -      if test -n "$tagname" ; then
 -      available_tags="$available_tags $tagname"
 -    fi
--    fi
++  # 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
 -  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
@@ -37749,1219 +30902,1025 @@
 -echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
 -   { (exit 1); exit 1; }; }
 -  fi
-+
-+# Check whether --with-help-formats was given.
-+if test "${with_help_formats+set}" = set; then
-+  withval=$with_help_formats;
-+else
-+  with_help_formats=''
- fi
+-fi
++  aix[4-9]*)
++    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++      test "$enable_shared" = yes && enable_static=no
++    fi
++    ;;
++  esac
++  { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
++$as_echo "$enable_shared" >&6; }
  
-+DOC_USER_FORMATS="$with_help_formats"
++  { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
++$as_echo_n "checking whether to build static libraries... " >&6; }
++  # Make sure either enable_shared or enable_static is yes.
++  test "$enable_shared" = yes || enable_static=yes
++  { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
++$as_echo "$enable_static" >&6; }
  
  
 -# This can be used to rebuild libtool when needed
 -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+# Check whether --enable-scrollkeeper was given.
-+if test "${enable_scrollkeeper+set}" = set; then
-+  enableval=$enable_scrollkeeper;
-+else
-+  enable_scrollkeeper=yes
-+fi
  
 -# Always use our own libtool.
 -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+ if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
-+  ENABLE_SK_TRUE=
-+  ENABLE_SK_FALSE='#'
-+else
-+  ENABLE_SK_TRUE='#'
-+  ENABLE_SK_FALSE=
-+fi
-+
-+
-+DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
-+
-+
-+ if test "$gdu_cv_have_gdu" = "yes"; then
-+  HAVE_GNOME_DOC_UTILS_TRUE=
-+  HAVE_GNOME_DOC_UTILS_FALSE='#'
-+else
-+  HAVE_GNOME_DOC_UTILS_TRUE='#'
-+  HAVE_GNOME_DOC_UTILS_FALSE=
-+fi
  
 -# Prevent multiple expansion
- 
- 
- 
- 
-+##############################
-+# ./configure Flags messings
-+##############################
- 
-+cflags_set=${CFLAGS+set}
-+# find the actual value for $prefix that we'll end up with
-+REAL_PREFIX=
-+if test "x$prefix" = "xNONE"; then
-+  REAL_PREFIX=$ac_default_prefix
-+else
-+  REAL_PREFIX=$prefix
 +fi
- 
-+# Have to go $sysconfdir->$prefix/etc->/usr/local/etc
-+# if you actually know how to code shell then fix this :-)
-+SYSCONFDIR_TMP="$sysconfdir"
-+old_prefix=$prefix
-+prefix=$REAL_PREFIX
-+EXPANDED_SYSCONFDIR=`eval echo $SYSCONFDIR_TMP`
-+prefix=$old_prefix
- 
- 
-+ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
- 
- 
-+  test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-+  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-+  ac_define_path=`eval echo $"${prefix}"`
-+  ac_define_path=`eval echo $ac_define_path`
-+  PREFIX="$ac_define_path"
- 
- 
-+cat >>confdefs.h <<_ACEOF
-+#define PREFIX "$ac_define_path"
-+_ACEOF
- 
- 
- 
-+  test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-+  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-+  ac_define_path=`eval echo $"${sysconfdir}"`
-+  ac_define_path=`eval echo $ac_define_path`
-+  SYSCONFDIR="$ac_define_path"
- 
- 
-+cat >>confdefs.h <<_ACEOF
-+#define SYSCONFDIR "$ac_define_path"
-+_ACEOF
- 
- 
- 
-+  test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-+  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-+  ac_define_path=`eval echo $"${libdir}"`
-+  ac_define_path=`eval echo $ac_define_path`
-+  LIBDIR="$ac_define_path"
- 
- 
-+cat >>confdefs.h <<_ACEOF
-+#define LIBDIR "$ac_define_path"
-+_ACEOF
- 
- 
- 
- ##############################
--# Custom Junk
-+# Flags
- ##############################
- 
- 
- 
- 
-+
-+
- ##############################
--# Dependencies
-+# Files
- ##############################
- 
--GTK_REQUIRED_VERSION=2.8.0
--PANEL_REQUIRED_VERSION=2.0.0
--GLADE_REQUIRED_VERSION=2.0.0
--GLIB_REQUIRED_VERSION=2.15.3
-+ac_config_files="$ac_config_files Makefile data/Makefile data/icons/Makefile data/icons/16x16/Makefile data/icons/16x16/status/Makefile data/icons/22x22/Makefile data/icons/22x22/status/Makefile data/icons/24x24/Makefile data/icons/24x24/status/Makefile data/icons/32x32/Makefile data/icons/32x32/status/Makefile data/icons/48x48/Makefile data/icons/48x48/status/Makefile data/icons/scalable/Makefile data/icons/scalable/status/Makefile help/Makefile src/Makefile po/Makefile.in"
- 
-+cat >confcache <<\_ACEOF
-+# This file is a shell script that caches the results of configure
-+# tests run on this system so they can be shared between configure
-+# scripts and configure runs, see configure's option --config-cache.
-+# It is not useful on other systems.  If it contains results you don't
-+# want to keep, you may remove or edit it.
-+#
-+# config.status only pays attention to the cache file if you give it
-+# the --recheck option to rerun configure.
-+#
-+# `ac_cv_env_foo' variables (set or unset) will be overridden when
-+# loading this file, other *unset* `ac_cv_foo' will be assigned the
-+# following values.
- 
-+_ACEOF
- 
--if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
--	if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
--set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
++CC="$lt_save_CC"
+ 
+ 
+ 
+@@ -21165,10 +12639,12 @@
+ 
+ 
+ 
++        ac_config_commands="$ac_config_commands libtool"
+ 
+ 
+ 
+ 
++# Only expand once:
+ 
+ 
+ 
+@@ -21191,6 +12667,7 @@
+ PANEL_REQUIRED_VERSION=2.0.0
+ GLADE_REQUIRED_VERSION=2.0.0
+ GLIB_REQUIRED_VERSION=2.15.3
++DBUS_GLIB_REQUIRED_VERSION=0.76
+ 
+ 
+ 
+@@ -21198,10 +12675,10 @@
+ 	if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
 -{ 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
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--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"
++  $as_echo_n "(cached) " >&6
+ else
+   case $PKG_CONFIG in
+   [\\/]* | ?:[\\/]*)
+@@ -21216,7 +12693,7 @@
+   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
-+# The following way of writing the cache mishandles newlines in values,
-+# but we know of no workaround that is simple, portable, and efficient.
-+# So, we kill variables containing newlines.
-+# Ultrix sh set writes to stderr and can't be redirected directly,
-+# and sets the high bit in the cache file unless we assign to the vars.
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      *) $as_unset $ac_var ;;
-+      esac ;;
-+    esac
-+  done
-+
-+  (set) 2>&1 |
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      # `set' does not quote correctly, so add quotes (double-quote
-+      # substitution turns \\\\ into \\, and sed turns \\ into \).
-+      sed -n \
-+	"s/'/'\\\\''/g;
-+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-+      ;; #(
-+    *)
-+      # `set' quotes correctly as required by POSIX, so do not add quotes.
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-+      ;;
-+    esac |
-+    sort
-+) |
-+  sed '
-+     /^ac_cv_env_/b end
-+     t clear
-+     :clear
-+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-+     t end
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
-+      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-+echo "$as_me: updating cache $cache_file" >&6;}
-+    cat confcache >$cache_file
-+  else
-+    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
    fi
-+fi
-+rm -f confcache
-+
-+test "x$prefix" = xNONE && prefix=$ac_default_prefix
-+# Let make expand exec_prefix.
-+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-+
-+DEFS=-DHAVE_CONFIG_H
-+
-+ac_libobjs=
-+ac_ltlibobjs=
-+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-+  # 1. Remove the extension, and $U if already installed.
-+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-+  ac_i=`echo "$ac_i" | sed "$ac_script"`
-+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-+  #    will be set to the directory where LIBOBJS objects are built.
-+  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-+  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
  done
--done
--IFS=$as_save_IFS
-+LIBOBJS=$ac_libobjs
- 
--  ;;
--esac
-+LTLIBOBJS=$ac_ltlibobjs
-+
-+
-+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
+@@ -21228,11 +12705,11 @@
  fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
+ 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; }
--else
++  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++$as_echo "$PKG_CONFIG" >&6; }
+ else
 -  { echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6; }
-+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"AMDEP\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
- fi
- 
-+  ac_config_commands="$ac_config_commands po/stamp-it"
-+
- 
-+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
- fi
--if test -z "$ac_cv_path_PKG_CONFIG"; then
--  ac_pt_PKG_CONFIG=$PKG_CONFIG
--  # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
+ 
+@@ -21241,10 +12718,10 @@
+   ac_pt_PKG_CONFIG=$PKG_CONFIG
+   # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  case $ac_pt_PKG_CONFIG in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_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_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++  $as_echo_n "(cached) " >&6
+ else
+   case $ac_pt_PKG_CONFIG in
+   [\\/]* | ?:[\\/]*)
+@@ -21259,7 +12736,7 @@
+   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_ac_pt_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
--
--  ;;
--esac
-+if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -21271,11 +12748,11 @@
  fi
--ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
--if test -n "$ac_pt_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ if test -n "$ac_pt_PKG_CONFIG"; then
 -  { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
 -echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
--else
++  { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
++$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+ else
 -  { echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6; }
-+if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"ENABLE_SK\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
  fi
--
--  if test "x$ac_pt_PKG_CONFIG" = x; then
--    PKG_CONFIG=""
--  else
--    case $cross_compiling:$ac_tool_warned in
--yes:)
+ 
+   if test "x$ac_pt_PKG_CONFIG" = x; then
+@@ -21283,12 +12760,8 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 -whose name does not start with the host triplet.  If you think this
 -configuration is useful to you, please write to autoconf@gnu.org." >&5
 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 -whose name does not start with the host triplet.  If you think this
 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
--ac_tool_warned=yes ;;
--esac
--    PKG_CONFIG=$ac_pt_PKG_CONFIG
--  fi
--else
--  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-+if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+     PKG_CONFIG=$ac_pt_PKG_CONFIG
+@@ -21300,43 +12773,52 @@
  fi
- 
--fi
--if test -n "$PKG_CONFIG"; then
--	_pkg_min_version=0.9.0
+ if test -n "$PKG_CONFIG"; then
+ 	_pkg_min_version=0.9.0
 -	{ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
 -echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
--	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++	{ $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
++$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+ 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
 -		{ echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6; }
--	else
++		{ $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
+ 	else
 -		{ echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6; }
--		PKG_CONFIG=""
--	fi
-+: ${CONFIG_STATUS=./config.status}
-+ac_clean_files_save=$ac_clean_files
-+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-+echo "$as_me: creating $CONFIG_STATUS" >&6;}
-+cat >$CONFIG_STATUS <<_ACEOF
-+#! $SHELL
-+# Generated by $as_me.
-+# Run this file to recreate the current configuration.
-+# Compiler output produced by configure, useful for debugging
-+# configure, is in config.log if it exists.
- 
--fi
-+debug=false
-+ac_cs_recheck=false
-+ac_cs_silent=false
-+SHELL=\${CONFIG_SHELL-$SHELL}
-+_ACEOF
- 
--pkg_failed=no
++		{ $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ 		PKG_CONFIG=""
+ 	fi
+ 
+ fi
+ 
+ pkg_failed=no
 -{ echo "$as_me:$LINENO: checking for APPLET" >&5
 -echo $ECHO_N "checking for APPLET... $ECHO_C" >&6; }
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+## --------------------- ##
-+## M4sh Initialization.  ##
-+## --------------------- ##
- 
--if test -n "$PKG_CONFIG"; then
--    if test -n "$APPLET_CFLAGS"; then
--        pkg_cv_APPLET_CFLAGS="$APPLET_CFLAGS"
--    else
--        if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
--	     libpanelapplet-2.0 >= \$PANEL_REQUIRED_VERSION
--	     libglade-2.0 >= \$GLADE_REQUIRED_VERSION
--	     gio-2.0 >= \$GLIB_REQUIRED_VERSION\"") >&5
--  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
--	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
--	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
--	     gio-2.0 >= $GLIB_REQUIRED_VERSION") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
--  pkg_cv_APPLET_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION
--	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
--	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
--	     gio-2.0 >= $GLIB_REQUIRED_VERSION" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
--    fi
--else
--	pkg_failed=untried
--fi
--if test -n "$PKG_CONFIG"; then
--    if test -n "$APPLET_LIBS"; then
--        pkg_cv_APPLET_LIBS="$APPLET_LIBS"
--    else
--        if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
--	     libpanelapplet-2.0 >= \$PANEL_REQUIRED_VERSION
--	     libglade-2.0 >= \$GLADE_REQUIRED_VERSION
--	     gio-2.0 >= \$GLIB_REQUIRED_VERSION\"") >&5
--  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
--	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
--	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
--	     gio-2.0 >= $GLIB_REQUIRED_VERSION") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
--  pkg_cv_APPLET_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION
--	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
--	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
--	     gio-2.0 >= $GLIB_REQUIRED_VERSION" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
--    fi
-+# Be more Bourne compatible
-+DUALCASE=1; export DUALCASE # for MKS sh
-+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
--	pkg_failed=untried
--fi
--
--
--
--if test $pkg_failed = yes; then
-+  case `(set -o) 2>/dev/null` in
-+  *posix*) set -o posix ;;
-+esac
- 
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
--        _pkg_short_errors_supported=yes
--else
--        _pkg_short_errors_supported=no
- fi
--        if test $_pkg_short_errors_supported = yes; then
--	        APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
--	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
--	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
--	     gio-2.0 >= $GLIB_REQUIRED_VERSION"`
--        else
--	        APPLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
--	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
--	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
--	     gio-2.0 >= $GLIB_REQUIRED_VERSION"`
--        fi
--	# Put the nasty error message in config.log where it belongs
--	echo "$APPLET_PKG_ERRORS" >&5
--
++{ $as_echo "$as_me:$LINENO: checking for APPLET" >&5
++$as_echo_n "checking for APPLET... " >&6; }
+ 
+ if test -n "$PKG_CONFIG"; then
+     if test -n "$APPLET_CFLAGS"; then
+         pkg_cv_APPLET_CFLAGS="$APPLET_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
++    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
+ 	     libpanelapplet-2.0 >= \$PANEL_REQUIRED_VERSION
+ 	     libglade-2.0 >= \$GLADE_REQUIRED_VERSION
+-	     gio-2.0 >= \$GLIB_REQUIRED_VERSION\"") >&5
++	     gio-2.0 >= \$GLIB_REQUIRED_VERSION
++		 dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
++	     polkit-gnome
++	     libgnomeui-2.0\"") >&5
+   ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
+ 	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
+ 	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
+-	     gio-2.0 >= $GLIB_REQUIRED_VERSION") 2>&5
++	     gio-2.0 >= $GLIB_REQUIRED_VERSION
++		 dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
++	     polkit-gnome
++	     libgnomeui-2.0") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   pkg_cv_APPLET_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION
+ 	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
+ 	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
+-	     gio-2.0 >= $GLIB_REQUIRED_VERSION" 2>/dev/null`
++	     gio-2.0 >= $GLIB_REQUIRED_VERSION
++		 dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
++	     polkit-gnome
++	     libgnomeui-2.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -21349,21 +12831,30 @@
+         pkg_cv_APPLET_LIBS="$APPLET_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
++    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
+ 	     libpanelapplet-2.0 >= \$PANEL_REQUIRED_VERSION
+ 	     libglade-2.0 >= \$GLADE_REQUIRED_VERSION
+-	     gio-2.0 >= \$GLIB_REQUIRED_VERSION\"") >&5
++	     gio-2.0 >= \$GLIB_REQUIRED_VERSION
++		 dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
++	     polkit-gnome
++	     libgnomeui-2.0\"") >&5
+   ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
+ 	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
+ 	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
+-	     gio-2.0 >= $GLIB_REQUIRED_VERSION") 2>&5
++	     gio-2.0 >= $GLIB_REQUIRED_VERSION
++		 dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
++	     polkit-gnome
++	     libgnomeui-2.0") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   pkg_cv_APPLET_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION
+ 	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
+ 	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
+-	     gio-2.0 >= $GLIB_REQUIRED_VERSION" 2>/dev/null`
++	     gio-2.0 >= $GLIB_REQUIRED_VERSION
++		 dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
++	     polkit-gnome
++	     libgnomeui-2.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -21385,20 +12876,29 @@
+ 	        APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
+ 	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
+ 	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
+-	     gio-2.0 >= $GLIB_REQUIRED_VERSION"`
++	     gio-2.0 >= $GLIB_REQUIRED_VERSION
++		 dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
++	     polkit-gnome
++	     libgnomeui-2.0"`
+         else
+ 	        APPLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
+ 	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
+ 	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
+-	     gio-2.0 >= $GLIB_REQUIRED_VERSION"`
++	     gio-2.0 >= $GLIB_REQUIRED_VERSION
++		 dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
++	     polkit-gnome
++	     libgnomeui-2.0"`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$APPLET_PKG_ERRORS" >&5
+ 
 -	{ { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION
--	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
--	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
++	{ { $as_echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION
+ 	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
+ 	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
 -	     gio-2.0 >= $GLIB_REQUIRED_VERSION) were not met:
--
--$APPLET_PKG_ERRORS
--
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
--
--Alternatively, you may set the environment variables APPLET_CFLAGS
--and APPLET_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--" >&5
++	     gio-2.0 >= $GLIB_REQUIRED_VERSION
++		 dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
++	     polkit-gnome
++	     libgnomeui-2.0) were not met:
+ 
+ $APPLET_PKG_ERRORS
+ 
+@@ -21409,10 +12909,13 @@
+ and APPLET_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ " >&5
 -echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION
--	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
--	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
++$as_echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION
+ 	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
+ 	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
 -	     gio-2.0 >= $GLIB_REQUIRED_VERSION) were not met:
--
--$APPLET_PKG_ERRORS
- 
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
- 
--Alternatively, you may set the environment variables APPLET_CFLAGS
--and APPLET_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--" >&2;}
--   { (exit 1); exit 1; }; }
--elif test $pkg_failed = untried; then
++	     gio-2.0 >= $GLIB_REQUIRED_VERSION
++		 dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
++	     polkit-gnome
++	     libgnomeui-2.0) were not met:
+ 
+ $APPLET_PKG_ERRORS
+ 
+@@ -21425,7 +12928,9 @@
+ " >&2;}
+    { (exit 1); exit 1; }; }
+ elif test $pkg_failed = untried; then
 -	{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
- 
--Alternatively, you may set the environment variables APPLET_CFLAGS
--and APPLET_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
- 
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&5
++	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+@@ -21435,7 +12940,7 @@
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
 -echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
-+# PATH needs CR
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
- 
--Alternatively, you may set the environment variables APPLET_CFLAGS
--and APPLET_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  echo "#! /bin/sh" >conf$$.sh
-+  echo  "exit 0"   >>conf$$.sh
-+  chmod +x conf$$.sh
-+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+    PATH_SEPARATOR=';'
-+  else
-+    PATH_SEPARATOR=:
-+  fi
-+  rm -f conf$$.sh
-+fi
- 
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&2;}
++$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+@@ -21445,12 +12950,12 @@
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }
-+# Support unset when possible.
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+  as_unset=unset
++   { (exit 1); exit 1; }; }; }
  else
--	APPLET_CFLAGS=$pkg_cv_APPLET_CFLAGS
--	APPLET_LIBS=$pkg_cv_APPLET_LIBS
+ 	APPLET_CFLAGS=$pkg_cv_APPLET_CFLAGS
+ 	APPLET_LIBS=$pkg_cv_APPLET_LIBS
 -        { echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6; }
--	:
-+  as_unset=false
++        { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
+ 	:
  fi
  
- 
-+# IFS
-+# We need space, tab and new line, in precisely that order.  Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+as_nl='
-+'
-+IFS=" ""	$as_nl"
- 
--
--
--
--
--for ac_func in setresuid setenv unsetenv clearenv
--do
+@@ -21462,11 +12967,11 @@
+ 
+ for ac_func in setresuid setenv unsetenv clearenv
+ do
 -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ echo "$as_me:$LINENO: checking for $ac_func" >&5
 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
++$as_echo_n "checking for $ac_func... " >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
--/* 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.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--
--int
--main ()
--{
--return $ac_func ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
++  $as_echo_n "(cached) " >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -21519,35 +13024,42 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext &&
 -       $as_test_x conftest$ac_exeext; then
--  eval "$as_ac_var=yes"
--else
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
+   eval "$as_ac_var=yes"
+ else
 -  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--fi
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
++rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
 -ac_res=`eval echo '${'$as_ac_var'}'`
 -	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 -echo "${ECHO_T}$ac_res" >&6; }
 -if test `eval echo '${'$as_ac_var'}'` = yes; then
--  cat >>confdefs.h <<_ACEOF
++ac_res=`eval 'as_val=${'$as_ac_var'}
++		 $as_echo "$as_val"'`
++	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++as_val=`eval 'as_val=${'$as_ac_var'}
++		 $as_echo "$as_val"'`
++   if test "x$as_val" = x""yes; then
+   cat >>confdefs.h <<_ACEOF
 -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--done
--
--
--# Extract the first word of "glib-mkenums", so it can be a program name with args.
--set dummy glib-mkenums; ac_word=$2
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -21556,10 +13068,10 @@
+ 
+ # Extract the first word of "glib-mkenums", so it can be a program name with args.
+ set dummy glib-mkenums; 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_GLIB_MKENUMS+set}" = set; then
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_path_GLIB_MKENUMS+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  case $GLIB_MKENUMS in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_GLIB_MKENUMS="$GLIB_MKENUMS" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+# Find who we are.  Look in the path if we contain no directory separator.
-+case $0 in
-+  *[\\/]* ) as_myself=$0 ;;
-+  *) 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_GLIB_MKENUMS="$as_dir/$ac_word$ac_exec_ext"
++  $as_echo_n "(cached) " >&6
+ else
+   case $GLIB_MKENUMS in
+   [\\/]* | ?:[\\/]*)
+@@ -21574,7 +13086,7 @@
+   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_GLIB_MKENUMS="$as_dir/$ac_word$ac_exec_ext"
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
-+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
  done
- IFS=$as_save_IFS
- 
--  ;;
-+     ;;
- esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+  as_myself=$0
+@@ -21586,20 +13098,20 @@
  fi
--GLIB_MKENUMS=$ac_cv_path_GLIB_MKENUMS
--if test -n "$GLIB_MKENUMS"; then
+ GLIB_MKENUMS=$ac_cv_path_GLIB_MKENUMS
+ if test -n "$GLIB_MKENUMS"; then
 -  { echo "$as_me:$LINENO: result: $GLIB_MKENUMS" >&5
 -echo "${ECHO_T}$GLIB_MKENUMS" >&6; }
--else
++  { $as_echo "$as_me:$LINENO: result: $GLIB_MKENUMS" >&5
++$as_echo "$GLIB_MKENUMS" >&6; }
+ else
 -  { echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6; }
-+if test ! -f "$as_myself"; then
-+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+  { (exit 1); exit 1; }
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
  fi
  
-+# Work around bugs in pre-3.0 UWIN ksh.
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+done
-+PS1='$ '
-+PS2='> '
-+PS4='+ '
  
--# Extract the first word of "glib-genmarshal", so it can be a program name with args.
--set dummy glib-genmarshal; ac_word=$2
+ # Extract the first word of "glib-genmarshal", so it can be a program name with args.
+ set dummy glib-genmarshal; 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_GLIB_GENMARSHAL+set}" = set; then
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_path_GLIB_GENMARSHAL+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  case $GLIB_GENMARSHAL in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_GLIB_GENMARSHAL="$GLIB_GENMARSHAL" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
-+# NLS nuisances.
-+for as_var in \
-+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+  LC_TELEPHONE LC_TIME
- 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_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext"
++  $as_echo_n "(cached) " >&6
+ else
+   case $GLIB_GENMARSHAL in
+   [\\/]* | ?:[\\/]*)
+@@ -21614,7 +13126,7 @@
+   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_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext"
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
-+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+    eval $as_var=C; export $as_var
-+  else
-+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
    fi
  done
--done
--IFS=$as_save_IFS
- 
--  ;;
--esac
--fi
--GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
--if test -n "$GLIB_GENMARSHAL"; then
+@@ -21626,20 +13138,20 @@
+ fi
+ GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
+ if test -n "$GLIB_GENMARSHAL"; then
 -  { echo "$as_me:$LINENO: result: $GLIB_GENMARSHAL" >&5
 -echo "${ECHO_T}$GLIB_GENMARSHAL" >&6; }
-+# Required to use basename.
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+  as_expr=expr
++  { $as_echo "$as_me:$LINENO: result: $GLIB_GENMARSHAL" >&5
++$as_echo "$GLIB_GENMARSHAL" >&6; }
  else
 -  { echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6; }
-+  as_expr=false
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
  fi
  
--
--# Extract the first word of "gconftool-2", so it can be a program name with args.
--set dummy gconftool-2; ac_word=$2
+ 
+ # Extract the first word of "gconftool-2", so it can be a program name with args.
+ set dummy gconftool-2; 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_GCONFTOOL+set}" = set; then
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_path_GCONFTOOL+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  case $GCONFTOOL in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_GCONFTOOL="$GCONFTOOL" # 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_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
++  $as_echo_n "(cached) " >&6
+ else
+   case $GCONFTOOL in
+   [\\/]* | ?:[\\/]*)
+@@ -21654,7 +13166,7 @@
+   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_GCONFTOOL="$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
--GCONFTOOL=$ac_cv_path_GCONFTOOL
--if test -n "$GCONFTOOL"; then
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -21666,11 +13178,11 @@
+ fi
+ GCONFTOOL=$ac_cv_path_GCONFTOOL
+ if test -n "$GCONFTOOL"; then
 -  { echo "$as_me:$LINENO: result: $GCONFTOOL" >&5
 -echo "${ECHO_T}$GCONFTOOL" >&6; }
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-+  as_basename=basename
++  { $as_echo "$as_me:$LINENO: result: $GCONFTOOL" >&5
++$as_echo "$GCONFTOOL" >&6; }
  else
 -  { echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6; }
-+  as_basename=false
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
  fi
  
  
-+# Name of the executable.
-+as_me=`$as_basename -- "$0" ||
-+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-+	 X"$0" : 'X\(//\)$' \| \
-+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X/"$0" |
-+    sed '/^.*\/\([^/][^/]*\)\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
- 
-+# CDPATH.
-+$as_unset CDPATH
- 
--  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
--    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
--  else
--    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
--  fi
--
--
--# Check whether --with-gconf-source was given.
--if test "${with_gconf_source+set}" = set; then
--  withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"
--fi
- 
- 
-+  as_lineno_1=$LINENO
-+  as_lineno_2=$LINENO
-+  test "x$as_lineno_1" != "x$as_lineno_2" &&
-+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+@@ -21690,8 +13202,8 @@
+ 
+ 
  
 -  { echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
 -echo "${ECHO_T}Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
-+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-+  # uniformly replaced by the line number.  The first 'sed' inserts a
-+  # line-number line after each line using $LINENO; the second 'sed'
-+  # does the real work.  The second script uses 'N' to pair each
-+  # line-number line with the line containing $LINENO, and appends
-+  # trailing '-' during substitution so that $LINENO is not a special
-+  # case at line end.
-+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-+  # E. McMahon (1931-1989) for sed's syntax.  :-)
-+  sed -n '
-+    p
-+    /[$]LINENO/=
-+  ' <$as_myself |
-+    sed '
-+      s/[$]LINENO.*/&-/
-+      t lineno
-+      b
-+      :lineno
-+      N
-+      :loop
-+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-+      t loop
-+      s/-\n.*//
-+    ' >$as_me.lineno &&
-+  chmod +x "$as_me.lineno" ||
-+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-+   { (exit 1); exit 1; }; }
- 
--  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
--    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
--  fi
-+  # Don't try to exec as it changes $[0], causing all sort of problems
-+  # (the dirname of $[0] is not the place where we might find the
-+  # original and so on.  Autoconf is especially sensitive to this).
-+  . "./$as_me.lineno"
-+  # Exit status is that of the last command.
-+  exit
-+}
- 
- 
--# Check whether --with-gconf-schema-file-dir was given.
--if test "${with_gconf_schema_file_dir+set}" = set; then
--  withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval"
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+  as_dirname=dirname
-+else
-+  as_dirname=false
- fi
- 
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
-+-n*)
-+  case `echo 'x\c'` in
-+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-+  *)   ECHO_C='\c';;
-+  esac;;
-+*)
-+  ECHO_N='-n';;
-+esac
- 
--
++  { $as_echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
++$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
+ 
+   if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
+     GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
+@@ -21705,15 +13217,15 @@
+ 
+ 
+ 
 -  { echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
 -echo "${ECHO_T}Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
--
--  # Check whether --enable-schemas-install was given.
--if test "${enable_schemas_install+set}" = set; then
--  enableval=$enable_schemas_install; case ${enableval} in
--       yes|no) ;;
++  { $as_echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
++$as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
+ 
+   # Check whether --enable-schemas-install was given.
+ if test "${enable_schemas_install+set}" = set; then
+   enableval=$enable_schemas_install; case ${enableval} in
+        yes|no) ;;
 -       *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5
 -echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;}
--   { (exit 1); exit 1; }; } ;;
--      esac
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+  as_expr=expr
-+else
-+  as_expr=false
- fi
- 
--   if test "$enable_schemas_install" != no; then
--  GCONF_SCHEMAS_INSTALL_TRUE=
--  GCONF_SCHEMAS_INSTALL_FALSE='#'
-+rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+  rm -f conf$$.dir/conf$$.file
- else
--  GCONF_SCHEMAS_INSTALL_TRUE='#'
--  GCONF_SCHEMAS_INSTALL_FALSE=
-+  rm -f conf$$.dir
-+  mkdir conf$$.dir
- fi
--
--
--
--#############################
--# X, Xau, Xmu
--#############################
--#
--# If Pango included the shared library dependencies from X11 in
--# the pkg-config output, then we use that (to avoid duplicates).
--# but if they were omitted to avoid binary compatibility problems
--# then we need to repeat the checks.
--#
--if $PKG_CONFIG --exists pangoxft ; then
--  PANGO_PACKAGES="pangox pangoxft"
-+echo >conf$$.file
-+if ln -s conf$$.file conf$$ 2>/dev/null; then
-+  as_ln_s='ln -s'
-+  # ... but there are two gotchas:
-+  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+  # In both cases, we have to default to `cp -p'.
-+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+    as_ln_s='cp -p'
-+elif ln conf$$.file conf$$ 2>/dev/null; then
-+  as_ln_s=ln
- else
--  PANGO_PACKAGES="pangox"
-+  as_ln_s='cp -p'
- fi
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
- 
--x_libs="`$PKG_CONFIG --libs $PANGO_PACKAGES`"
--case x_libs in
--  *-lX11*) pango_omitted_x_deps=no ;;
--  *)       pango_omitted_x_deps=yes ;;
--esac
--
--if test $pango_omitted_x_deps = yes ; then
++       *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5
++$as_echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;}
+    { (exit 1); exit 1; }; } ;;
+       esac
+ fi
+@@ -21750,8 +13262,8 @@
+ esac
+ 
+ if test $pango_omitted_x_deps = yes ; then
 -  { echo "$as_me:$LINENO: checking for X" >&5
 -echo $ECHO_N "checking for X... $ECHO_C" >&6; }
--
--
--# Check whether --with-x was given.
--if test "${with_x+set}" = set; then
--  withval=$with_x;
-+if mkdir -p . 2>/dev/null; then
-+  as_mkdir_p=:
-+else
-+  test -d ./-p && rmdir ./-p
-+  as_mkdir_p=false
- fi
- 
--# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
--if test "x$with_x" = xno; then
--  # The user explicitly disabled X.
--  have_x=disabled
--else
--  case $x_includes,$x_libraries in #(
++  { $as_echo "$as_me:$LINENO: checking for X" >&5
++$as_echo_n "checking for X... " >&6; }
+ 
+ 
+ # Check whether --with-x was given.
+@@ -21765,11 +13277,11 @@
+   have_x=disabled
+ else
+   case $x_includes,$x_libraries in #(
 -    *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5
 -echo "$as_me: error: Cannot use X directory names containing '" >&2;}
--   { (exit 1); exit 1; }; };; #(
--    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
++    *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5
++$as_echo "$as_me: error: cannot use X directory names containing '" >&2;}
+    { (exit 1); exit 1; }; };; #(
+     *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+if test -x / >/dev/null 2>&1; then
-+  as_test_x='test -x'
++  $as_echo_n "(cached) " >&6
  else
--  # One or both of the vars are not set, and there is no cached value.
--ac_x_includes=no ac_x_libraries=no
--rm -f -r conftest.dir
--if mkdir conftest.dir; then
--  cd conftest.dir
--  cat >Imakefile <<'_ACEOF'
--incroot:
--	@echo incroot='${INCROOT}'
--usrlibdir:
--	@echo usrlibdir='${USRLIBDIR}'
--libdir:
--	@echo libdir='${LIBDIR}'
--_ACEOF
--  if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
--    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
--    for ac_var in incroot usrlibdir libdir; do
--      eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
--    done
--    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
+   # One or both of the vars are not set, and there is no cached value.
+ ac_x_includes=no ac_x_libraries=no
+@@ -21790,7 +13302,7 @@
+       eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
+     done
+     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
 -    for ac_extension in a so sl; do
--      if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
--	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
--	ac_im_usrlibdir=$ac_im_libdir; break
--      fi
--    done
--    # Screen out bogus values from the imake configuration.  They are
--    # bogus both because they are the default anyway, and because
--    # using them would break gcc on systems where it needs fixed includes.
--    case $ac_im_incroot in
--	/usr/include) ac_x_includes= ;;
--	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
--    esac
--    case $ac_im_usrlibdir in
++    for ac_extension in a so sl dylib la dll; do
+       if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
+ 	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
+ 	ac_im_usrlibdir=$ac_im_libdir; break
+@@ -21804,7 +13316,7 @@
+ 	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
+     esac
+     case $ac_im_usrlibdir in
 -	/usr/lib | /lib) ;;
--	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
--    esac
-+  if ls -dL / >/dev/null 2>&1; then
-+    as_ls_L_option=L
-+  else
-+    as_ls_L_option=
++	/usr/lib | /usr/lib64 | /lib | /lib64) ;;
+ 	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
+     esac
    fi
--  cd ..
--  rm -f -r conftest.dir
-+  as_test_x='
-+    eval sh -c '\''
-+      if test -d "$1"; then
-+        test -d "$1/.";
-+      else
-+	case $1 in
-+        -*)set "./$1";;
-+	esac;
-+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-+	???[sx]*):;;*)false;;esac;fi
-+    '\'' sh
-+  '
- fi
-+as_executable_p=$as_test_x
- 
--# Standard set of common directories for X headers.
--# Check X11 before X11Rn because it is often a symlink to the current release.
--ac_x_header_dirs='
--/usr/X11/include
--/usr/X11R6/include
--/usr/X11R5/include
--/usr/X11R4/include
-+# Sed expression to map a string onto a valid CPP name.
-+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
- 
--/usr/include/X11
--/usr/include/X11R6
--/usr/include/X11R5
--/usr/include/X11R4
-+# Sed expression to map a string onto a valid variable name.
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
- 
--/usr/local/X11/include
--/usr/local/X11R6/include
--/usr/local/X11R5/include
--/usr/local/X11R4/include
- 
--/usr/local/include/X11
--/usr/local/include/X11R6
--/usr/local/include/X11R5
--/usr/local/include/X11R4
-+exec 6>&1
- 
--/usr/X386/include
--/usr/x386/include
--/usr/XFree86/include/X11
-+# Save the log message, to keep $[0] and so on meaningful, and to
-+# report actual input values of CONFIG_FILES etc. instead of their
-+# values after options handling.
-+ac_log="
-+This file was extended by $as_me, which was
-+generated by GNU Autoconf 2.61.  Invocation command line was
- 
--/usr/include
--/usr/local/include
--/usr/unsupported/include
--/usr/athena/include
--/usr/local/x11r5/include
--/usr/lpp/Xamples/include
-+  CONFIG_FILES    = $CONFIG_FILES
-+  CONFIG_HEADERS  = $CONFIG_HEADERS
-+  CONFIG_LINKS    = $CONFIG_LINKS
-+  CONFIG_COMMANDS = $CONFIG_COMMANDS
-+  $ $0 $@
- 
--/usr/openwin/include
--/usr/openwin/share/include'
-+on `(hostname || uname -n) 2>/dev/null | sed 1q`
-+"
+@@ -21849,67 +13361,431 @@
+ /usr/openwin/include
+ /usr/openwin/share/include'
  
 -if test "$ac_x_includes" = no; then
 -  # Guess where to find include files, by looking for Xlib.h.
 -  # First, try using that file with no special directory specified.
 -  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++if test "$ac_x_includes" = no; then
++  # Guess where to find include files, by looking for Xlib.h.
++  # First, try using that file with no special directory specified.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <X11/Xlib.h>
++_ACEOF
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
++  # We can compile using X headers with no special include directory.
++ac_x_includes=
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  for ac_dir in $ac_x_header_dirs; do
++  if test -r "$ac_dir/X11/Xlib.h"; then
++    ac_x_includes=$ac_dir
++    break
++  fi
++done
++fi
++
++rm -f conftest.err conftest.$ac_ext
++fi # $ac_x_includes = no
++
++if test "$ac_x_libraries" = no; then
++  # Check for the libraries.
++  # See if we find them without any special options.
++  # Don't add to $LIBS permanently.
++  ac_save_LIBS=$LIBS
++  LIBS="-lX11 $LIBS"
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <X11/Xlib.h>
++int
++main ()
++{
++XrmInitialize ()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  LIBS=$ac_save_LIBS
++# We can link X programs with no special library path.
++ac_x_libraries=
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	LIBS=$ac_save_LIBS
++for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
++do
++  # Don't even attempt the hair of trying to link an X program!
++  for ac_extension in a so sl dylib la dll; do
++    if test -r "$ac_dir/libX11.$ac_extension"; then
++      ac_x_libraries=$ac_dir
++      break 2
++    fi
++  done
++done
++fi
++
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++fi # $ac_x_libraries = no
++
++case $ac_x_includes,$ac_x_libraries in #(
++  no,* | *,no | *\'*)
++    # Didn't find X, or a directory has "'" in its name.
++    ac_cv_have_x="have_x=no";; #(
++  *)
++    # Record where we found X for the cache.
++    ac_cv_have_x="have_x=yes\
++	ac_x_includes='$ac_x_includes'\
++	ac_x_libraries='$ac_x_libraries'"
++esac
++fi
++;; #(
++    *) have_x=yes;;
++  esac
++  eval "$ac_cv_have_x"
++fi # $with_x != no
++
++if test "$have_x" != yes; then
++  { $as_echo "$as_me:$LINENO: result: $have_x" >&5
++$as_echo "$have_x" >&6; }
++  no_x=yes
++else
++  # If each of the values was on the command line, it overrides each guess.
++  test "x$x_includes" = xNONE && x_includes=$ac_x_includes
++  test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
++  # Update the cache value to reflect the command line values.
++  ac_cv_have_x="have_x=yes\
++	ac_x_includes='$x_includes'\
++	ac_x_libraries='$x_libraries'"
++  { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
++$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
++fi
++
++if test "$no_x" = yes; then
++  # Not all programs may use this symbol, but it does not hurt to define it.
++
++cat >>confdefs.h <<\_ACEOF
++#define X_DISPLAY_MISSING 1
++_ACEOF
++
++  X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
++else
++  if test -n "$x_includes"; then
++    X_CFLAGS="$X_CFLAGS -I$x_includes"
++  fi
++
++  # It would also be nice to do this for all -L options, not just this one.
++  if test -n "$x_libraries"; then
++    X_LIBS="$X_LIBS -L$x_libraries"
++    # For Solaris; some versions of Sun CC require a space after -R and
++    # others require no space.  Words are not sufficient . . . .
++    { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
++$as_echo_n "checking whether -R must be followed by a space... " >&6; }
++    ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
++    ac_xsave_c_werror_flag=$ac_c_werror_flag
++    ac_c_werror_flag=yes
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++       X_LIBS="$X_LIBS -R$x_libraries"
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	LIBS="$ac_xsave_LIBS -R $x_libraries"
++       cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
++	  X_LIBS="$X_LIBS -R $x_libraries"
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	{ $as_echo "$as_me:$LINENO: result: neither works" >&5
++$as_echo "neither works" >&6; }
++fi
++
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++    ac_c_werror_flag=$ac_xsave_c_werror_flag
++    LIBS=$ac_xsave_LIBS
++  fi
++
++  # Check for system-dependent libraries X programs must link with.
++  # Do this before checking for the system-independent R6 libraries
++  # (-lICE), since we may need -lsocket or whatever for X linking.
++
++  if test "$ISC" = yes; then
++    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
++  else
++    # Martyn Johnson says this is needed for Ultrix, if the X
++    # libraries were built with DECnet support.  And Karl Berry says
++    # the Alpha needs dnet_stub (dnet does not exist).
++    ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* 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.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char XOpenDisplay ();
++int
++main ()
++{
++return XOpenDisplay ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  :
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	{ $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
++$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
++if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldnet  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
 -#include <X11/Xlib.h>
++
++/* 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.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char dnet_ntoa ();
++int
++main ()
++{
++return dnet_ntoa ();
++  ;
++  return 0;
++}
  _ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } >/dev/null && {
 -	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
+        }; then
 -  # We can compile using X headers with no special include directory.
 -ac_x_includes=
--else
++  ac_cv_lib_dnet_dnet_ntoa=yes
+ else
 -  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 -  for ac_dir in $ac_x_header_dirs; do
 -  if test -r "$ac_dir/X11/Xlib.h"; then
 -    ac_x_includes=$ac_dir
 -    break
 -  fi
 -done
--fi
++	ac_cv_lib_dnet_dnet_ntoa=no
+ fi
  
 -rm -f conftest.err conftest.$ac_ext
 -fi # $ac_x_includes = no
-+cat >>$CONFIG_STATUS <<_ACEOF
-+# Files that config.status was made for.
-+config_files="$ac_config_files"
-+config_headers="$ac_config_headers"
-+config_commands="$ac_config_commands"
++rm -rf conftest.dSYM
++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
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
++if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then
++  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
++fi
  
 -if test "$ac_x_libraries" = no; then
 -  # Check for the libraries.
@@ -38970,44 +31929,68 @@
 -  ac_save_LIBS=$LIBS
 -  LIBS="-lX11 $LIBS"
 -  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++    if test $ac_cv_lib_dnet_dnet_ntoa = no; then
++      { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
++$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
++if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldnet_stub  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
 -#include <X11/Xlib.h>
--int
--main ()
--{
++
++/* 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.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char dnet_ntoa ();
+ int
+ main ()
+ {
 -XrmInitialize ()
--  ;
--  return 0;
--}
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
++return dnet_ntoa ();
+   ;
+   return 0;
+ }
+@@ -21920,109 +13796,168 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext &&
 -       $as_test_x conftest$ac_exeext; then
 -  LIBS=$ac_save_LIBS
 -# We can link X programs with no special library path.
 -ac_x_libraries=
--else
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
 -  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
  
 -	LIBS=$ac_save_LIBS
 -for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
@@ -39020,17 +32003,14 @@
 -    fi
 -  done
 -done
--fi
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+ac_cs_usage="\
-+\`$as_me' instantiates files from templates according to the
-+current configuration.
++	ac_cv_lib_dnet_stub_dnet_ntoa=no
+ fi
  
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
++rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
 -fi # $ac_x_libraries = no
-+Usage: $0 [OPTIONS] [FILE]...
- 
+-
 -case $ac_x_includes,$ac_x_libraries in #(
 -  no,* | *,no | *\'*)
 -    # Didn't find X, or a directory has "'" in its name.
@@ -39041,21 +32021,18 @@
 -	ac_x_includes='$ac_x_includes'\
 -	ac_x_libraries='$ac_x_libraries'"
 -esac
--fi
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
++if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then
++  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+ fi
 -;; #(
 -    *) have_x=yes;;
 -  esac
 -  eval "$ac_cv_have_x"
 -fi # $with_x != no
-+  -h, --help       print this help, then exit
-+  -V, --version    print version number and configuration settings, then exit
-+  -q, --quiet      do not print progress messages
-+  -d, --debug      don't remove temporary files
-+      --recheck    update $as_me by reconfiguring in the same conditions
-+  --file=FILE[:TEMPLATE]
-+		   instantiate the configuration file FILE
-+  --header=FILE[:TEMPLATE]
-+		   instantiate the configuration header FILE
  
 -if test "$have_x" != yes; then
 -  { echo "$as_me:$LINENO: result: $have_x" >&5
@@ -39071,27 +32048,105 @@
 -	ac_x_libraries='$x_libraries'"
 -  { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
 -echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; }
--fi
-+Configuration files:
-+$config_files
++    fi
+ fi
  
 -if test "$no_x" = yes; then
 -  # Not all programs may use this symbol, but it does not hurt to define it.
-+Configuration headers:
-+$config_headers
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++    LIBS="$ac_xsave_LIBS"
  
 -cat >>confdefs.h <<\_ACEOF
 -#define X_DISPLAY_MISSING 1
--_ACEOF
-+Configuration commands:
-+$config_commands
++    # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
++    # to get the SysV transport functions.
++    # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
++    # needs -lnsl.
++    # The nsl library prevents programs from opening the X display
++    # on Irix 5.2, according to T.E. Dickey.
++    # The functions gethostbyname, getservbyname, and inet_addr are
++    # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
++    { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5
++$as_echo_n "checking for gethostbyname... " >&6; }
++if test "${ac_cv_func_gethostbyname+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
+ _ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define gethostbyname innocuous_gethostbyname
  
 -  X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
--else
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char gethostbyname (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef gethostbyname
++
++/* 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.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char gethostbyname ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined __stub_gethostbyname || defined __stub___gethostbyname
++choke me
++#endif
++
++int
++main ()
++{
++return gethostbyname ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  ac_cv_func_gethostbyname=yes
+ else
 -  if test -n "$x_includes"; then
 -    X_CFLAGS="$X_CFLAGS -I$x_includes"
 -  fi
-+Report bugs to <bug-autoconf@gnu.org>."
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
  
 -  # It would also be nice to do this for all -L options, not just this one.
 -  if test -n "$x_libraries"; then
@@ -39104,173 +32159,183 @@
 -    ac_xsave_c_werror_flag=$ac_c_werror_flag
 -    ac_c_werror_flag=yes
 -    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
- _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
-+cat >>$CONFIG_STATUS <<_ACEOF
-+ac_cs_version="\\
-+config.status
-+configured by $0, generated by GNU Autoconf 2.61,
-+  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
- 
--int
--main ()
--{
-+Copyright (C) 2006 Free Software Foundation, Inc.
-+This config.status script is free software; the Free Software Foundation
-+gives unlimited permission to copy, distribute and modify it."
- 
--  ;
--  return 0;
--}
-+ac_pwd='$ac_pwd'
-+srcdir='$srcdir'
-+INSTALL='$INSTALL'
-+MKDIR_P='$MKDIR_P'
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
++	ac_cv_func_gethostbyname=no
++fi
++
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
++$as_echo "$ac_cv_func_gethostbyname" >&6; }
++
++    if test $ac_cv_func_gethostbyname = no; then
++      { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
++$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
++if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lnsl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
++/* 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.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char gethostbyname ();
+ int
+ main ()
+ {
+-
++return gethostbyname ();
+   ;
+   return 0;
+ }
+@@ -22033,37 +13968,66 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext &&
 -       $as_test_x conftest$ac_exeext; then
 -  { echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6; }
 -       X_LIBS="$X_LIBS -R$x_libraries"
--else
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  ac_cv_lib_nsl_gethostbyname=yes
+ else
 -  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
  
 -	LIBS="$ac_xsave_LIBS -R $x_libraries"
 -       cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+# If no file are specified by the user, then we need to provide default
-+# value.  By we need to know if files were specified by the user.
-+ac_need_defaults=:
-+while test $# != 0
-+do
-+  case $1 in
-+  --*=*)
-+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-+    ac_shift=:
-+    ;;
-+  *)
-+    ac_option=$1
-+    ac_optarg=$2
-+    ac_shift=shift
-+    ;;
-+  esac
- 
--int
--main ()
--{
-+  case $ac_option in
-+  # Handling of the options.
-+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+    ac_cs_recheck=: ;;
-+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-+    echo "$ac_cs_version"; exit ;;
-+  --debug | --debu | --deb | --de | --d | -d )
-+    debug=: ;;
-+  --file | --fil | --fi | --f )
-+    $ac_shift
-+    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-+    ac_need_defaults=false;;
-+  --header | --heade | --head | --hea )
-+    $ac_shift
-+    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-+    ac_need_defaults=false;;
-+  --he | --h)
-+    # Conflict between --help and --header
-+    { echo "$as_me: error: ambiguous option: $1
-+Try \`$0 --help' for more information." >&2
-+   { (exit 1); exit 1; }; };;
-+  --help | --hel | -h )
-+    echo "$ac_cs_usage"; exit ;;
-+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-+    ac_cs_silent=: ;;
- 
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
++	ac_cv_lib_nsl_gethostbyname=no
++fi
++
++rm -rf conftest.dSYM
++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
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
++$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
++if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
++  X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
++fi
++
++      if test $ac_cv_lib_nsl_gethostbyname = no; then
++	{ $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
++$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
++if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lbsd  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
++/* 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.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char gethostbyname ();
+ int
+ main ()
+ {
+-
++return gethostbyname ();
+   ;
+   return 0;
+ }
+@@ -22074,56 +14038,77 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext &&
 -       $as_test_x conftest$ac_exeext; then
 -  { echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6; }
 -	  X_LIBS="$X_LIBS -R $x_libraries"
--else
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  ac_cv_lib_bsd_gethostbyname=yes
+ else
 -  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+  # This is an error.
-+  -*) { echo "$as_me: error: unrecognized option: $1
-+Try \`$0 --help' for more information." >&2
-+   { (exit 1); exit 1; }; } ;;
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
  
 -	{ echo "$as_me:$LINENO: result: neither works" >&5
 -echo "${ECHO_T}neither works" >&6; }
--fi
-+  *) ac_config_targets="$ac_config_targets $1"
-+     ac_need_defaults=false ;;
++	ac_cv_lib_bsd_gethostbyname=no
+ fi
  
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--fi
-+  esac
-+  shift
-+done
++rm -rf conftest.dSYM
+ 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
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
++$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
++if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then
++  X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+ fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -    ac_c_werror_flag=$ac_xsave_c_werror_flag
 -    LIBS=$ac_xsave_LIBS
 -  fi
-+ac_configure_extra_args=
- 
+-
 -  # Check for system-dependent libraries X programs must link with.
 -  # Do this before checking for the system-independent R6 libraries
 -  # (-lICE), since we may need -lsocket or whatever for X linking.
-+if $ac_cs_silent; then
-+  exec 6>/dev/null
-+  ac_configure_extra_args="$ac_configure_extra_args --silent"
-+fi
++      fi
++    fi
  
 -  if test "$ISC" = yes; then
 -    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
@@ -39280,372 +32345,181 @@
 -    # the Alpha needs dnet_stub (dnet does not exist).
 -    ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
 -    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
++    # lieder@skyler.mavd.honeywell.com says without -lsocket,
++    # socket/setsockopt and other routines are undefined under SCO ODT
++    # 2.0.  But -lsocket is broken on IRIX 5.2 (and is not necessary
++    # on later versions), says Simon Leinen: it contains gethostby*
++    # variants that don't use the name server (or something).  -lsocket
++    # must be given before -lnsl if both are needed.  We assume that
++    # if connect needs -lnsl, so does gethostbyname.
++    { $as_echo "$as_me:$LINENO: checking for connect" >&5
++$as_echo_n "checking for connect... " >&6; }
++if test "${ac_cv_func_connect+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
  _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
-+cat >>$CONFIG_STATUS <<_ACEOF
-+if \$ac_cs_recheck; then
-+  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-+  CONFIG_SHELL=$SHELL
-+  export CONFIG_SHELL
-+  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+fi
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++/* Define connect to an innocuous variant, in case <limits.h> declares connect.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define connect innocuous_connect
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char connect (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef connect
  
--/* 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.  */
--#ifdef __cplusplus
--extern "C"
--#endif
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+@@ -22131,11 +14116,18 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
 -char XOpenDisplay ();
--int
--main ()
--{
++char connect ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined __stub_connect || defined __stub___connect
++choke me
++#endif
++
+ int
+ main ()
+ {
 -return XOpenDisplay ();
--  ;
--  return 0;
--}
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
++return connect ();
+   ;
+   return 0;
+ }
+@@ -22146,30 +14138,44 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext &&
 -       $as_test_x conftest$ac_exeext; then
 -  :
--else
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  ac_cv_func_connect=yes
+ else
 -  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+exec 5>>config.log
-+{
-+  echo
-+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-+## Running $as_me. ##
-+_ASBOX
-+  echo "$ac_log"
-+} >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
  
 -	{ echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
 -echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; }
 -if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
++	ac_cv_func_connect=no
++fi
++
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
++$as_echo "$ac_cv_func_connect" >&6; }
++
++    if test $ac_cv_func_connect = no; then
++      { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
++$as_echo_n "checking for connect in -lsocket... " >&6; }
++if test "${ac_cv_lib_socket_connect+set}" = set; then
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
 -LIBS="-ldnet  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
++LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
  _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
-+cat >>$CONFIG_STATUS <<_ACEOF
-+#
-+# INIT-COMMANDS
-+#
-+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
- 
--/* 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.  */
--#ifdef __cplusplus
--extern "C"
--#endif
+@@ -22183,11 +14189,11 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
 -char dnet_ntoa ();
--int
--main ()
--{
++char connect ();
+ int
+ main ()
+ {
 -return dnet_ntoa ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
-+
-+# 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
-+
-+sed_quote_subst='$sed_quote_subst'
-+double_quote_subst='$double_quote_subst'
-+delay_variable_subst='$delay_variable_subst'
-+macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
-+macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
-+enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
-+enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
-+pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
-+enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
-+host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
-+host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
-+host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
-+build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
-+build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
-+build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
-+SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
-+Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
-+GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
-+EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
-+FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
-+LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
-+NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
-+LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
-+max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
-+ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
-+exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
-+reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
-+reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
-+file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
-+AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
-+AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-+STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
-+RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
-+old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
-+CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-+compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
-+GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-+objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
-+SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
-+ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
-+MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
-+need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
-+DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
-+NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
-+LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
-+OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
-+OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
-+libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
-+shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
-+enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
-+export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
-+old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
-+allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-+no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
-+inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
-+link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
-+fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
-+always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
-+export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-+include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-+prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
-+need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-+need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
-+version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
-+runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-+shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-+shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
-+libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
-+sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
-+enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
-+enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
-+enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
-+old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
-+striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
-+
-+LTCC='$LTCC'
-+LTCFLAGS='$LTCFLAGS'
-+compiler='$compiler_DEFAULT'
-+
-+# Quote evaled strings.
-+for var in SED \
-+GREP \
-+EGREP \
-+FGREP \
-+LD \
-+NM \
-+LN_S \
-+lt_SP2NL \
-+lt_NL2SP \
-+reload_flag \
-+deplibs_check_method \
-+file_magic_cmd \
-+AR \
-+AR_FLAGS \
-+STRIP \
-+RANLIB \
-+CC \
-+CFLAGS \
-+compiler \
-+lt_cv_sys_global_symbol_pipe \
-+lt_cv_sys_global_symbol_to_cdecl \
-+lt_cv_sys_global_symbol_to_c_name_address \
-+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-+SHELL \
-+ECHO \
-+lt_prog_compiler_no_builtin_flag \
-+lt_prog_compiler_wl \
-+lt_prog_compiler_pic \
-+lt_prog_compiler_static \
-+lt_cv_prog_compiler_c_o \
-+need_locks \
-+DSYMUTIL \
-+NMEDIT \
-+LIPO \
-+OTOOL \
-+OTOOL64 \
-+shrext_cmds \
-+export_dynamic_flag_spec \
-+whole_archive_flag_spec \
-+compiler_needs_object \
-+with_gnu_ld \
-+allow_undefined_flag \
-+no_undefined_flag \
-+hardcode_libdir_flag_spec \
-+hardcode_libdir_flag_spec_ld \
-+hardcode_libdir_separator \
-+fix_srcfile_path \
-+exclude_expsyms \
-+include_expsyms \
-+file_list_spec \
-+variables_saved_for_relink \
-+libname_spec \
-+library_names_spec \
-+soname_spec \
-+finish_eval \
-+old_striplib \
-+striplib; do
-+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-+    *[\\\\\\\`\\"\\\$]*)
-+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-+      ;;
-+    *)
-+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-+      ;;
-+    esac
-+done
-+
-+# Double-quote double-evaled strings.
-+for var in reload_cmds \
-+old_postinstall_cmds \
-+old_postuninstall_cmds \
-+old_archive_cmds \
-+extract_expsyms_cmds \
-+old_archive_from_new_cmds \
-+old_archive_from_expsyms_cmds \
-+archive_cmds \
-+archive_expsym_cmds \
-+module_cmds \
-+module_expsym_cmds \
-+export_symbols_cmds \
-+prelink_cmds \
-+postinstall_cmds \
-+postuninstall_cmds \
-+finish_cmds \
-+sys_lib_search_path_spec \
-+sys_lib_dlsearch_path_spec; do
-+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-+    *[\\\\\\\`\\"\\\$]*)
-+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-+      ;;
-+    *)
-+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-+      ;;
-+    esac
-+done
-+
-+# Fix-up fallback echo if it was mangled by the above quoting rules.
-+case \$lt_ECHO in
-+*'\\\$0 --fallback-echo"')  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
-+  ;;
++return connect ();
+   ;
+   return 0;
+ }
+@@ -22198,44 +14204,137 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
  esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext &&
 -       $as_test_x conftest$ac_exeext; then
 -  ac_cv_lib_dnet_dnet_ntoa=yes
--else
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  ac_cv_lib_socket_connect=yes
+ else
 -  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
  
 -	ac_cv_lib_dnet_dnet_ntoa=no
--fi
-+ac_aux_dir='$ac_aux_dir'
-+xsi_shell='$xsi_shell'
-+lt_shell_append='$lt_shell_append'
++	ac_cv_lib_socket_connect=no
+ fi
  
--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
++rm -rf conftest.dSYM
+ 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
 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
 -echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; }
 -if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
 -  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
-+# See if we are running on zsh, and set the options which allow our
-+# commands through without removal of \ escapes INIT.
-+if test -n "\${ZSH_VERSION+set}" ; then
-+   setopt NO_GLOB_SUBST
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
++$as_echo "$ac_cv_lib_socket_connect" >&6; }
++if test "x$ac_cv_lib_socket_connect" = x""yes; then
++  X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
  fi
  
 -    if test $ac_cv_lib_dnet_dnet_ntoa = no; then
@@ -39653,85 +32527,177 @@
 -echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; }
 -if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
++    fi
++
++    # Guillermo Gomez says -lposix is necessary on A/UX.
++    { $as_echo "$as_me:$LINENO: checking for remove" >&5
++$as_echo_n "checking for remove... " >&6; }
++if test "${ac_cv_func_remove+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define remove to an innocuous variant, in case <limits.h> declares remove.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define remove innocuous_remove
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char remove (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef remove
++
++/* 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.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char remove ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined __stub_remove || defined __stub___remove
++choke me
++#endif
++
++int
++main ()
++{
++return remove ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  ac_cv_func_remove=yes
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_func_remove=no
++fi
++
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
++$as_echo "$ac_cv_func_remove" >&6; }
++
++    if test $ac_cv_func_remove = no; then
++      { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
++$as_echo_n "checking for remove in -lposix... " >&6; }
++if test "${ac_cv_lib_posix_remove+set}" = set; then
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
 -LIBS="-ldnet_stub  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
-+
-+    PACKAGE='$PACKAGE'
-+    VERSION='$VERSION'
-+    TIMESTAMP='$TIMESTAMP'
-+    RM='$RM'
-+    ofile='$ofile'
-+
-+
-+
-+
-+
++LIBS="-lposix  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
  _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
- 
--/* 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.  */
--#ifdef __cplusplus
--extern "C"
--#endif
+@@ -22249,11 +14348,11 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
 -char dnet_ntoa ();
--int
--main ()
--{
++char remove ();
+ int
+ main ()
+ {
 -return dnet_ntoa ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
++return remove ();
+   ;
+   return 0;
+ }
+@@ -22264,55 +14363,47 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext &&
 -       $as_test_x conftest$ac_exeext; then
 -  ac_cv_lib_dnet_stub_dnet_ntoa=yes
--else
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  ac_cv_lib_posix_remove=yes
+ else
 -  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 -	ac_cv_lib_dnet_stub_dnet_ntoa=no
--fi
--
--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
++	ac_cv_lib_posix_remove=no
+ fi
+ 
++rm -rf conftest.dSYM
+ 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
 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
 -echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
 -if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
 -  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
--fi
--
--    fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
++$as_echo "$ac_cv_lib_posix_remove" >&6; }
++if test "x$ac_cv_lib_posix_remove" = x""yes; then
++  X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+ fi
+ 
+     fi
 -fi
 -
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -    LIBS="$ac_xsave_LIBS"
--
+ 
 -    # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
 -    # to get the SysV transport functions.
 -    # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
@@ -39744,292 +32710,279 @@
 -echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; }
 -if test "${ac_cv_func_gethostbyname+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
++    { $as_echo "$as_me:$LINENO: checking for shmat" >&5
++$as_echo_n "checking for shmat... " >&6; }
++if test "${ac_cv_func_shmat+set}" = set; then
++  $as_echo_n "(cached) " >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -22320,12 +14411,12 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
 -/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
+    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define gethostbyname innocuous_gethostbyname
-+cat >>$CONFIG_STATUS <<\_ACEOF
++#define shmat innocuous_shmat
  
--/* System header to define __stub macros and hopefully few prototypes,
+ /* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char gethostbyname (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
-+# Handling of arguments.
-+for ac_config_target in $ac_config_targets
-+do
-+  case $ac_config_target in
-+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-+    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-+    "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
-+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-+    "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
-+    "data/icons/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/Makefile" ;;
-+    "data/icons/16x16/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/16x16/Makefile" ;;
-+    "data/icons/16x16/status/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/16x16/status/Makefile" ;;
-+    "data/icons/22x22/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/22x22/Makefile" ;;
-+    "data/icons/22x22/status/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/22x22/status/Makefile" ;;
-+    "data/icons/24x24/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/24x24/Makefile" ;;
-+    "data/icons/24x24/status/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/24x24/status/Makefile" ;;
-+    "data/icons/32x32/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/32x32/Makefile" ;;
-+    "data/icons/32x32/status/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/32x32/status/Makefile" ;;
-+    "data/icons/48x48/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/48x48/Makefile" ;;
-+    "data/icons/48x48/status/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/48x48/status/Makefile" ;;
-+    "data/icons/scalable/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/scalable/Makefile" ;;
-+    "data/icons/scalable/status/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/scalable/status/Makefile" ;;
-+    "help/Makefile") CONFIG_FILES="$CONFIG_FILES help/Makefile" ;;
-+    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-+    "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
-+    "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
++    which can conflict with char shmat (); below.
+     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+     <limits.h> exists even on freestanding compilers.  */
  
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-+  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-+   { (exit 1); exit 1; }; };;
-+  esac
-+done
+@@ -22335,7 +14426,7 @@
+ # include <assert.h>
+ #endif
  
 -#undef gethostbyname
++#undef shmat
  
--/* 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.  */
--#ifdef __cplusplus
--extern "C"
--#endif
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+@@ -22343,18 +14434,18 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
 -char gethostbyname ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
++char shmat ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
 -#if defined __stub_gethostbyname || defined __stub___gethostbyname
--choke me
--#endif
-+# If the user did not use the arguments to specify the items to instantiate,
-+# then the envvar interface is used.  Set only those that are not.
-+# We use the long form for the default assignment because of an extremely
-+# bizarre bug on SunOS 4.1.3.
-+if $ac_need_defaults; then
-+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-+fi
++#if defined __stub_shmat || defined __stub___shmat
+ choke me
+ #endif
  
--int
--main ()
-+# Have a temporary directory for convenience.  Make it in the build tree
-+# simply because there is no reason against having it here, and in addition,
-+# creating and moving files from /tmp can sometimes cause problems.
-+# Hook for its removal unless debugging.
-+# Note that there is a small window in which the directory will not be cleaned:
-+# after its creation but before its name has been assigned to `$tmp'.
-+$debug ||
+ int
+ main ()
  {
 -return gethostbyname ();
--  ;
--  return 0;
-+  tmp=
-+  trap 'exit_status=$?
-+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-+' 0
-+  trap '{ (exit 1); exit 1; }' 1 2 13 15
++return shmat ();
+   ;
+   return 0;
  }
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
+@@ -22365,40 +14456,44 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext &&
 -       $as_test_x conftest$ac_exeext; then
 -  ac_cv_func_gethostbyname=yes
--else
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  ac_cv_func_shmat=yes
+ else
 -  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+# Create a (secure) tmp directory for tmp files.
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
  
 -	ac_cv_func_gethostbyname=no
--fi
-+{
-+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-+  test -n "$tmp" && test -d "$tmp"
-+}  ||
-+{
-+  tmp=./conf$$-$RANDOM
-+  (umask 077 && mkdir "$tmp")
-+} ||
-+{
-+   echo "$me: cannot create a temporary directory in ." >&2
-+   { (exit 1); exit 1; }
-+}
++	ac_cv_func_shmat=no
+ fi
  
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--fi
++rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
 -{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
 -echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; }
-+#
-+# Set up the sed scripts for CONFIG_FILES section.
-+#
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
++$as_echo "$ac_cv_func_shmat" >&6; }
  
 -    if test $ac_cv_func_gethostbyname = no; then
 -      { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
 -echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; }
 -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
++    if test $ac_cv_func_shmat = no; then
++      { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
++$as_echo_n "checking for shmat in -lipc... " >&6; }
++if test "${ac_cv_lib_ipc_shmat+set}" = set; then
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lnsl  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
-+# No need to generate the scripts if there are no CONFIG_FILES.
-+# This happens for instance when ./config.status config.h
-+if test -n "$CONFIG_FILES"; then
- 
--/* 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.  */
--#ifdef __cplusplus
--extern "C"
--#endif
++LIBS="-lipc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -22412,11 +14507,11 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
 -char gethostbyname ();
--int
--main ()
--{
++char shmat ();
+ int
+ main ()
+ {
 -return gethostbyname ();
--  ;
--  return 0;
--}
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
++return shmat ();
+   ;
+   return 0;
+ }
+@@ -22427,44 +14522,59 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext &&
 -       $as_test_x conftest$ac_exeext; then
 -  ac_cv_lib_nsl_gethostbyname=yes
--else
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  ac_cv_lib_ipc_shmat=yes
+ else
 -  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
  
 -	ac_cv_lib_nsl_gethostbyname=no
--fi
++	ac_cv_lib_ipc_shmat=no
+ fi
  
--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
++rm -rf conftest.dSYM
+ 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
 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
 -echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; }
 -if test $ac_cv_lib_nsl_gethostbyname = yes; then
 -  X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
--fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
++$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
++if test "x$ac_cv_lib_ipc_shmat" = x""yes; then
++  X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+ fi
  
 -      if test $ac_cv_lib_nsl_gethostbyname = no; then
 -	{ echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
 -echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; }
 -if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
++    fi
++  fi
++
++  # Check for libraries that X11R6 Xt/Xaw programs need.
++  ac_save_LDFLAGS=$LDFLAGS
++  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
++  # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
++  # check for ICE first), but we must link in the order -lSM -lICE or
++  # we get undefined symbols.  So assume we have SM if we have ICE.
++  # These have to be linked with before -lX11, unlike the other
++  # libraries we check for below, so use a different variable.
++  # John Interrante, Karl Berry
++  { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
++$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
++if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lbsd  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--/* 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.  */
--#ifdef __cplusplus
--extern "C"
--#endif
++LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -22478,11 +14588,11 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
 -char gethostbyname ();
--int
--main ()
--{
++char IceConnectionNumber ();
+ int
+ main ()
+ {
 -return gethostbyname ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
++return IceConnectionNumber ();
+   ;
+   return 0;
+ }
+@@ -22493,73 +14603,69 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext &&
 -       $as_test_x conftest$ac_exeext; then
 -  ac_cv_lib_bsd_gethostbyname=yes
--else
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
 -  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 -	ac_cv_lib_bsd_gethostbyname=no
--fi
--
--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
++	ac_cv_lib_ICE_IceConnectionNumber=no
+ fi
+ 
++rm -rf conftest.dSYM
+ 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
 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
 -echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; }
 -if test $ac_cv_lib_bsd_gethostbyname = yes; then
 -  X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
--fi
--
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
++if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then
++  X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+ fi
+ 
 -      fi
 -    fi
--
++  LDFLAGS=$ac_save_LDFLAGS
+ 
 -    # lieder@skyler.mavd.honeywell.com says without -lsocket,
 -    # socket/setsockopt and other routines are undefined under SCO ODT
 -    # 2.0.  But -lsocket is broken on IRIX 5.2 (and is not necessary
@@ -40041,13 +32994,34 @@
 -echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
 -if test "${ac_cv_func_connect+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++fi
++
++
++  if test x$no_x = xyes ; then
++    { { $as_echo "$as_me:$LINENO: error: X development libraries not found" >&5
++$as_echo "$as_me: error: X development libraries not found" >&2;}
++   { (exit 1); exit 1; }; }
++  else
++    X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
++  fi
++fi
++
++fusa_save_LDFLAGS=$LDFLAGS
++LDFLAGS="$LDFLAGS $X_LIBS"
++{ $as_echo "$as_me:$LINENO: checking for XauFileName in -lXau" >&5
++$as_echo_n "checking for XauFileName in -lXau... " >&6; }
++if test "${ac_cv_lib_Xau_XauFileName+set}" = set; then
++  $as_echo_n "(cached) " >&6
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lXau  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
 -/* Define connect to an innocuous variant, in case <limits.h> declares connect.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define connect innocuous_connect
@@ -40064,13 +33038,13 @@
 -#endif
 -
 -#undef connect
--
--/* 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.  */
--#ifdef __cplusplus
--extern "C"
--#endif
+ 
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+@@ -22567,18 +14673,11 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
 -char connect ();
 -/* The GNU C library defines this for functions which it implements
 -    to always fail with ENOSYS.  Some functions are actually named
@@ -40079,82 +33053,100 @@
 -choke me
 -#endif
 -
--int
--main ()
--{
++char XauFileName ();
+ int
+ main ()
+ {
 -return connect ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
++return XauFileName ();
+   ;
+   return 0;
+ }
+@@ -22589,40 +14688,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext &&
 -       $as_test_x conftest$ac_exeext; then
 -  ac_cv_func_connect=yes
--else
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  ac_cv_lib_Xau_XauFileName=yes
+ else
 -  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 -	ac_cv_func_connect=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--fi
++	ac_cv_lib_Xau_XauFileName=no
+ fi
+ 
++rm -rf conftest.dSYM
+ 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
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_XauFileName" >&5
++$as_echo "$ac_cv_lib_Xau_XauFileName" >&6; }
++if test "x$ac_cv_lib_Xau_XauFileName" = x""yes; then
++  X_LIBS="$X_LIBS -lXau"
++else
++  { { $as_echo "$as_me:$LINENO: error: Xau development libraries not found" >&5
++$as_echo "$as_me: error: Xau development libraries not found" >&2;}
++   { (exit 1); exit 1; }; }
+ fi
 -{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
 -echo "${ECHO_T}$ac_cv_func_connect" >&6; }
--
+ 
 -    if test $ac_cv_func_connect = no; then
 -      { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
 -echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
 -if test "${ac_cv_lib_socket_connect+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
++{ $as_echo "$as_me:$LINENO: checking for XmuClientWindow in -lXmu" >&5
++$as_echo_n "checking for XmuClientWindow in -lXmu... " >&6; }
++if test "${ac_cv_lib_Xmu_XmuClientWindow+set}" = set; then
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--/* 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.  */
--#ifdef __cplusplus
--extern "C"
--#endif
++LIBS="-lXmu  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -22636,11 +14746,11 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
 -char connect ();
--int
--main ()
--{
++char XmuClientWindow ();
+ int
+ main ()
+ {
 -return connect ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
++return XmuClientWindow ();
+   ;
+   return 0;
+ }
+@@ -22651,525 +14761,664 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 -  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
@@ -40168,13 +33160,185 @@
 -       } && test -s conftest$ac_exeext &&
 -       $as_test_x conftest$ac_exeext; then
 -  ac_cv_lib_socket_connect=yes
--else
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  ac_cv_lib_Xmu_XmuClientWindow=yes
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_lib_Xmu_XmuClientWindow=no
++fi
++
++rm -rf conftest.dSYM
++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
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xmu_XmuClientWindow" >&5
++$as_echo "$ac_cv_lib_Xmu_XmuClientWindow" >&6; }
++if test "x$ac_cv_lib_Xmu_XmuClientWindow" = x""yes; then
++  X_LIBS="$X_LIBS -lXmu"
++else
++  { { $as_echo "$as_me:$LINENO: error: Xmu development libraries not found" >&5
++$as_echo "$as_me: error: Xmu development libraries not found" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++LDFLAGS=$fusa_save_LDFLAGS
++
++
++##############################
++# Users & Groups Config
++##############################
++
++USERS_ADMIN=
++
++
++# Check whether --with-users_admin was given.
++if test "${with_users_admin+set}" = set; then
++  withval=$with_users_admin; users_admin_cmd="$withval"
++fi
++
++
++if test "x$users_admin_cmd" = "x"; then
++	# Extract the first word of "users-admin", so it can be a program name with args.
++set dummy users-admin; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_users_admin+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  case $users_admin in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_users_admin="$users_admin" # 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_users_admin="$as_dir/$ac_word$ac_exec_ext"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
++
++  ;;
++esac
++fi
++users_admin=$ac_cv_path_users_admin
++if test -n "$users_admin"; then
++  { $as_echo "$as_me:$LINENO: result: $users_admin" >&5
++$as_echo "$users_admin" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++	if test "x$users_admin" = "x"; then
++		users_admin_cmd="disabled"
++	else
++		users_admin_cmd="$users_admin"
++	fi
++else
++	if test "x$users_admin_cmd" = "xno"; then
++		{ $as_echo "$as_me:$LINENO: result: disabling users and groups admin command" >&5
++$as_echo "disabling users and groups admin command" >&6; }
++		users_admin=
++		users_admin_cmd="disabled"
++	else
++		{ $as_echo "$as_me:$LINENO: result: using \"$users_admin_cmd\" as the users and groups admin command" >&5
++$as_echo "using \"$users_admin_cmd\" as the users and groups admin command" >&6; }
++		users_admin="$users_admin_cmd"
++	fi
++fi
++
++if test "x$users_admin" != "x"; then
++
++cat >>confdefs.h <<_ACEOF
++#define USERS_ADMIN "$users_admin"
++_ACEOF
++
++fi
++
++
++##############################
++# GDM Setup App
++##############################
++
++GDM_SETUP=
++
++
++# Check whether --with-gdm_setup was given.
++if test "${with_gdm_setup+set}" = set; then
++  withval=$with_gdm_setup; gdm_setup_cmd="$withval"
++fi
++
++
++if test "x$gdm_setup_cmd" = "x"; then
++	# Extract the first word of "gdmsetup", so it can be a program name with args.
++set dummy gdmsetup; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_gdm_setup+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  case $gdm_setup in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_gdm_setup="$gdm_setup" # 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_gdm_setup="$as_dir/$ac_word$ac_exec_ext"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
++
++  ;;
++esac
++fi
++gdm_setup=$ac_cv_path_gdm_setup
++if test -n "$gdm_setup"; then
++  { $as_echo "$as_me:$LINENO: result: $gdm_setup" >&5
++$as_echo "$gdm_setup" >&6; }
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_lib_socket_connect=no
--fi
--
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
@@ -40183,10 +33347,28 @@
 -echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
 -if test $ac_cv_lib_socket_connect = yes; then
 -  X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
--fi
--
++
++	if test "x$gdm_setup" = "x"; then
++		gdm_setup_cmd="disabled"
++	else
++		gdm_setup_cmd="$gdm_setup"
++	fi
++else
++	if test "x$gdm_setup_cmd" = "xno"; then
++		{ $as_echo "$as_me:$LINENO: result: disabling login screen setup command" >&5
++$as_echo "disabling login screen setup command" >&6; }
++		gdm_setup=
++		gdm_setup_cmd="disabled"
++	else
++		{ $as_echo "$as_me:$LINENO: result: using \"$gdm_setup_cmd\" as the login screen setup command" >&5
++$as_echo "using \"$gdm_setup_cmd\" as the login screen setup command" >&6; }
++		gdm_setup="$gdm_setup_cmd"
++	fi
+ fi
+ 
 -    fi
--
++if test "x$gdm_setup" != "x"; then
+ 
 -    # Guillermo Gomez says -lposix is necessary on A/UX.
 -    { echo "$as_me:$LINENO: checking for remove" >&5
 -echo $ECHO_N "checking for remove... $ECHO_C" >&6; }
@@ -40195,27 +33377,33 @@
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
++cat >>confdefs.h <<_ACEOF
++#define GDM_SETUP "$gdm_setup"
+ _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -/* Define remove to an innocuous variant, in case <limits.h> declares remove.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define remove innocuous_remove
--
+ 
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char remove (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
--
++fi
+ 
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
--
+ 
 -#undef remove
--
++##############################
++# GDM Config File
++##############################
+ 
 -/* 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.  */
@@ -40229,7 +33417,8 @@
 -#if defined __stub_remove || defined __stub___remove
 -choke me
 -#endif
--
++GDMCONFIGFILE=
+ 
 -int
 -main ()
 -{
@@ -40260,22 +33449,49 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	ac_cv_func_remove=no
--fi
--
++# Check whether --with-gdm_config was given.
++if test "${with_gdm_config+set}" = set; then
++  withval=$with_gdm_config; gdmconfigfile="$withval"
+ fi
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -fi
 -{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
 -echo "${ECHO_T}$ac_cv_func_remove" >&6; }
--
+ 
 -    if test $ac_cv_func_remove = no; then
 -      { echo "$as_me:$LINENO: checking for remove in -lposix" >&5
 -echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; }
 -if test "${ac_cv_lib_posix_remove+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++if test "x$gdmconfigfile" = "x" -o "x$gdmconfigfile" = "xno"; then
++	{ $as_echo "$as_me:$LINENO: checking for GDM configuration file" >&5
++$as_echo_n "checking for GDM configuration file... " >&6; }
++
++	if test -f "/etc/gdm/gdm.conf"; then
++		gdmconfigfile="/etc/gdm/gdm.conf"
++	elif test -f "/etc/X11/gdm/gdm.conf"; then
++		gdmconfigfile="/etc/X11/gdm/gdm.conf"
++	elif test -f "/etc/gdm/custom.conf"; then
++		gdmconfigfile="/etc/gdm/custom.conf"
++	elif test -f "/etc/X11/gdm/custom.conf"; then
++		gdmconfigfile="/etc/X11/gdm/custom.conf"
++	elif test -f "/etc/gdm/gdm.conf-custom"; then
++		gdmconfigfile="/etc/gdm/gdm.conf-custom"
++	elif test -f "/etc/X11/gdm/gdm.conf-custom"; then
++		gdmconfigfile="/etc/X11/gdm/gdm.conf-custom"
++	else
++		{ { $as_echo "$as_me:$LINENO: error: The GDM config file could not be found, please specify it manually" >&5
++$as_echo "$as_me: error: The GDM config file could not be found, please specify it manually" >&2;}
++   { (exit 1); exit 1; }; }
++	fi
++
++	{ $as_echo "$as_me:$LINENO: result: $gdmconfigfile" >&5
++$as_echo "$gdmconfigfile" >&6; }
+ else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lposix  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
@@ -40284,7 +33500,10 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
++	{ $as_echo "$as_me:$LINENO: result: using \"$gdmconfigfile\" as the gdm.conf location" >&5
++$as_echo "using \"$gdmconfigfile\" as the gdm.conf location" >&6; }
++fi
+ 
 -/* 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.  */
@@ -40299,7 +33518,17 @@
 -  ;
 -  return 0;
 -}
--_ACEOF
++
++  test "x$prefix" = xNONE && prefix="$ac_default_prefix"
++  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
++  ac_define_path=`eval echo $"$gdmconfigfile"`
++  ac_define_path=`eval echo $ac_define_path`
++  GDMCONFIGFILE="$ac_define_path"
++
++
++cat >>confdefs.h <<_ACEOF
++#define GDMCONFIGFILE "$ac_define_path"
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -40322,10 +33551,10 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	ac_cv_lib_posix_remove=no
 -fi
--
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
@@ -40335,15 +33564,24 @@
 -if test $ac_cv_lib_posix_remove = yes; then
 -  X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
 -fi
--
+ 
 -    fi
--
+ 
 -    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
 -    { echo "$as_me:$LINENO: checking for shmat" >&5
 -echo $ECHO_N "checking for shmat... $ECHO_C" >&6; }
 -if test "${ac_cv_func_shmat+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++##############################
++# Compile Flags
++##############################
++
++
++
++    # Check whether --enable-compile-warnings was given.
++if test "${enable_compile_warnings+set}" = set; then
++  enableval=$enable_compile_warnings;
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -40353,20 +33591,28 @@
 -/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define shmat innocuous_shmat
--
++  enable_compile_warnings="maximum"
++fi
+ 
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char shmat (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
--
+ 
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
--
++    warnCFLAGS=
++    if test "x$GCC" != xyes; then
++	enable_compile_warnings=no
++    fi
+ 
 -#undef shmat
--
++    warning_flags=
++    realsave_CFLAGS="$CFLAGS"
+ 
 -/* 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.  */
@@ -40380,62 +33626,166 @@
 -#if defined __stub_shmat || defined __stub___shmat
 -choke me
 -#endif
--
--int
--main ()
--{
++    case "$enable_compile_warnings" in
++    no)
++	warning_flags=
++	;;
++    minimum)
++	warning_flags="-Wall"
++	;;
++    yes)
++	warning_flags="-Wall -Wmissing-prototypes"
++	;;
++    maximum|error)
++	warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
++	CFLAGS="$warning_flags $CFLAGS"
++	for option in -Wno-sign-compare; do
++		SAVE_CFLAGS="$CFLAGS"
++		CFLAGS="$CFLAGS $option"
++		{ $as_echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
++$as_echo_n "checking whether gcc understands $option... " >&6; }
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ int
+ main ()
+ {
 -return shmat ();
--  ;
--  return 0;
--}
--_ACEOF
++
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 -  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext &&
 -       $as_test_x conftest$ac_exeext; then
 -  ac_cv_func_shmat=yes
--else
++       } && test -s conftest.$ac_objext; then
++  has_option=yes
+ else
 -  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 -	ac_cv_func_shmat=no
--fi
--
++	has_option=no
+ fi
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
--fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++		CFLAGS="$SAVE_CFLAGS"
++		{ $as_echo "$as_me:$LINENO: result: $has_option" >&5
++$as_echo "$has_option" >&6; }
++		if test $has_option = yes; then
++		  warning_flags="$warning_flags $option"
++		fi
++		unset has_option
++		unset SAVE_CFLAGS
++	done
++	unset option
++	if test "$enable_compile_warnings" = "error" ; then
++	    warning_flags="$warning_flags -Werror"
++	fi
++	;;
++    *)
++	{ { $as_echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5
++$as_echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;}
++   { (exit 1); exit 1; }; }
++	;;
++    esac
++    CFLAGS="$realsave_CFLAGS"
++    { $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
++$as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
++    { $as_echo "$as_me:$LINENO: result: $warning_flags" >&5
++$as_echo "$warning_flags" >&6; }
++
++    # Check whether --enable-iso-c was given.
++if test "${enable_iso_c+set}" = set; then
++  enableval=$enable_iso_c;
++else
++  enable_iso_c=no
+ fi
 -{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
 -echo "${ECHO_T}$ac_cv_func_shmat" >&6; }
--
+ 
 -    if test $ac_cv_func_shmat = no; then
 -      { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
 -echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; }
 -if test "${ac_cv_lib_ipc_shmat+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++
++    { $as_echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
++$as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; }
++    complCFLAGS=
++    if test "x$enable_iso_c" != "xno"; then
++	if test "x$GCC" = "xyes"; then
++	case " $CFLAGS " in
++	    *\ \	-ansi\ \	*) ;;
++	    *) complCFLAGS="$complCFLAGS -ansi" ;;
++	esac
++	case " $CFLAGS " in
++	    *\ \	-pedantic\ \	*) ;;
++	    *) complCFLAGS="$complCFLAGS -pedantic" ;;
++	esac
++	fi
++    fi
++    { $as_echo "$as_me:$LINENO: result: $complCFLAGS" >&5
++$as_echo "$complCFLAGS" >&6; }
++
++    WARN_CFLAGS="$warning_flags $complCFLAGS"
++
++
++
++# Check whether --enable-more-warnings was given.
++if test "${enable_more_warnings+set}" = set; then
++  enableval=$enable_more_warnings; set_more_warnings="$enableval"
+ else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lipc  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
++  set_more_warnings=yes
++fi
++
++
++if test "$GCC" = "yes" -a "x$set_more_warnings" = "xyes"; then
++	for option in -Wcast-align -Wchar-subscripts -Wsign-compare -Wno-strict-aliasing; do
++		fusa_save_CFLAGS="$CFLAGS"
++		CFLAGS="$WARN_CFLAGS $option $CFLAGS"
++		{ $as_echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
++$as_echo_n "checking whether gcc understands $option... " >&6; }
++		cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
 -/* 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.  */
@@ -40443,40 +33793,51 @@
 -extern "C"
 -#endif
 -char shmat ();
--int
--main ()
--{
+ int
+ main ()
+ {
 -return shmat ();
--  ;
--  return 0;
--}
--_ACEOF
++
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 -  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext &&
 -       $as_test_x conftest$ac_exeext; then
 -  ac_cv_lib_ipc_shmat=yes
--else
++       } && test -s conftest.$ac_objext; then
++  has_option=yes
+ else
 -  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 -	ac_cv_lib_ipc_shmat=no
--fi
--
++	has_option=no
+ fi
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
@@ -40485,11 +33846,22 @@
 -echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; }
 -if test $ac_cv_lib_ipc_shmat = yes; then
 -  X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
--fi
--
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++		CFLAGS="$fusa_save_CFLAGS"
++		if test $has_option = yes; then
++		  WARN_CFLAGS="$WARN_CFLAGS $option"
++		fi
++		{ $as_echo "$as_me:$LINENO: result: $has_option" >&5
++$as_echo "$has_option" >&6; }
++		unset has_option
++		unset fusa_save_CFLAGS
++	done
++	unset option
+ fi
+ 
 -    fi
 -  fi
--
+ 
 -  # Check for libraries that X11R6 Xt/Xaw programs need.
 -  ac_save_LDFLAGS=$LDFLAGS
 -  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
@@ -40503,15 +33875,60 @@
 -echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; }
 -if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++
++
++##############################
++# I18n
++##############################
++
++GETTEXT_PACKAGE=fast-user-switch-applet
++
++
++cat >>confdefs.h <<_ACEOF
++#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
++_ACEOF
++
++
++  test "x$prefix" = xNONE && prefix="$ac_default_prefix"
++  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
++  ac_define_path=`eval echo $"${datadir}/locale"`
++  ac_define_path=`eval echo $ac_define_path`
++  GNOMELOCALEDIR="$ac_define_path"
++
++
++cat >>confdefs.h <<_ACEOF
++#define GNOMELOCALEDIR "$ac_define_path"
++_ACEOF
++
++
++
++
++
++for ac_header in locale.h
++do
++as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
++$as_echo_n "checking for $ac_header... " >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  $as_echo_n "(cached) " >&6
++fi
++ac_res=`eval 'as_val=${'$as_ac_Header'}
++		 $as_echo "$as_val"'`
++	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
+ else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lICE $X_EXTRA_LIBS $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++  # Is the header compilable?
++{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
++$as_echo_n "checking $ac_header usability... " >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
 -
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -40527,30 +33944,41 @@
 -  ;
 -  return 0;
 -}
--_ACEOF
++$ac_includes_default
++#include <$ac_header>
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 -  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext &&
 -       $as_test_x conftest$ac_exeext; then
 -  ac_cv_lib_ICE_IceConnectionNumber=yes
--else
++       } && test -s conftest.$ac_objext; then
++  ac_header_compiler=yes
+ else
 -  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 -	ac_cv_lib_ICE_IceConnectionNumber=no
 -fi
 -
@@ -40566,9 +33994,13 @@
 -
 -  LDFLAGS=$ac_save_LDFLAGS
 -
--fi
--
--
++	ac_header_compiler=no
+ fi
+ 
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++$as_echo "$ac_header_compiler" >&6; }
+ 
 -  if test x$no_x = xyes ; then
 -    { { echo "$as_me:$LINENO: error: X development libraries not found" >&5
 -echo "$as_me: error: X development libraries not found" >&2;}
@@ -40587,12 +34019,15 @@
 -else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lXau  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++# Is the header present?
++{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
++$as_echo_n "checking $ac_header presence... " >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
 -
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -40608,37 +34043,90 @@
 -  ;
 -  return 0;
 -}
--_ACEOF
++#include <$ac_header>
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
++if { (ac_try="$ac_cpp conftest.$ac_ext"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 -  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext &&
 -       $as_test_x conftest$ac_exeext; then
 -  ac_cv_lib_Xau_XauFileName=yes
--else
++       }; then
++  ac_header_preproc=yes
+ else
 -  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 -	ac_cv_lib_Xau_XauFileName=no
--fi
--
++  ac_header_preproc=no
++fi
++
++rm -f conftest.err conftest.$ac_ext
++{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++$as_echo "$ac_header_preproc" >&6; }
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++
++    ;;
++esac
++{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
++$as_echo_n "checking for $ac_header... " >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  $as_echo_n "(cached) " >&6
++else
++  eval "$as_ac_Header=\$ac_header_preproc"
+ fi
++ac_res=`eval 'as_val=${'$as_ac_Header'}
++		 $as_echo "$as_val"'`
++	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
+ 
 -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
+ fi
 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_XauFileName" >&5
 -echo "${ECHO_T}$ac_cv_lib_Xau_XauFileName" >&6; }
 -if test $ac_cv_lib_Xau_XauFileName = yes; then
@@ -40647,21 +34135,36 @@
 -  { { echo "$as_me:$LINENO: error: Xau development libraries not found" >&5
 -echo "$as_me: error: Xau development libraries not found" >&2;}
 -   { (exit 1); exit 1; }; }
--fi
--
++as_val=`eval 'as_val=${'$as_ac_Header'}
++		 $as_echo "$as_val"'`
++   if test "x$as_val" = x""yes; then
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
+ fi
+ 
 -{ echo "$as_me:$LINENO: checking for XmuClientWindow in -lXmu" >&5
 -echo $ECHO_N "checking for XmuClientWindow in -lXmu... $ECHO_C" >&6; }
 -if test "${ac_cv_lib_Xmu_XmuClientWindow+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++done
++
++    if test $ac_cv_header_locale_h = yes; then
++    { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
++$as_echo_n "checking for LC_MESSAGES... " >&6; }
++if test "${am_cv_val_LC_MESSAGES+set}" = set; then
++  $as_echo_n "(cached) " >&6
+ else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lXmu  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++  cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
 -
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -40670,42 +34173,52 @@
 -extern "C"
 -#endif
 -char XmuClientWindow ();
--int
--main ()
--{
++#include <locale.h>
+ int
+ main ()
+ {
 -return XmuClientWindow ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
++return LC_MESSAGES
+   ;
+   return 0;
+ }
+@@ -23180,316 +15429,72 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext &&
 -       $as_test_x conftest$ac_exeext; then
 -  ac_cv_lib_Xmu_XmuClientWindow=yes
--else
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  am_cv_val_LC_MESSAGES=yes
+ else
 -  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 -	ac_cv_lib_Xmu_XmuClientWindow=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
++	am_cv_val_LC_MESSAGES=no
+ fi
+ 
++rm -rf conftest.dSYM
+ 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
 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xmu_XmuClientWindow" >&5
@@ -40791,14 +34304,19 @@
 -echo "${ECHO_T}using \"$users_admin_cmd\" as the users and groups admin command" >&6; }
 -		users_admin="$users_admin_cmd"
 -	fi
--fi
--
+ fi
++{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
++$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
++    if test $am_cv_val_LC_MESSAGES = yes; then
+ 
 -if test "x$users_admin" != "x"; then
 -
 -cat >>confdefs.h <<_ACEOF
 -#define USERS_ADMIN "$users_admin"
--_ACEOF
--
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_LC_MESSAGES 1
+ _ACEOF
+ 
 -fi
 -
 -
@@ -40838,7 +34356,8 @@
 -    ac_cv_path_gdm_setup="$as_dir/$ac_word$ac_exec_ext"
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 -    break 2
--  fi
++    fi
+   fi
 -done
 -done
 -IFS=$as_save_IFS
@@ -40952,16 +34471,21 @@
 -else
 -  enable_compile_warnings="maximum"
 -fi
--
--
++     USE_NLS=yes
+ 
+ 
 -    warnCFLAGS=
 -    if test "x$GCC" != xyes; then
 -	enable_compile_warnings=no
 -    fi
--
++    gt_cv_have_gettext=no
+ 
 -    warning_flags=
 -    realsave_CFLAGS="$CFLAGS"
--
++    CATOBJEXT=NONE
++    XGETTEXT=:
++    INTLLIBS=
+ 
 -    case "$enable_compile_warnings" in
 -    no)
 -	warning_flags=
@@ -40981,11 +34505,24 @@
 -		{ echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
 -echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; }
 -		cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++    if test "${ac_cv_header_libintl_h+set}" = set; then
++  { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
++$as_echo_n "checking for libintl.h... " >&6; }
++if test "${ac_cv_header_libintl_h+set}" = set; then
++  $as_echo_n "(cached) " >&6
++fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
++$as_echo "$ac_cv_header_libintl_h" >&6; }
++else
++  # Is the header compilable?
++{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5
++$as_echo_n "checking libintl.h usability... " >&6; }
++cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
 -
 -int
 -main ()
@@ -40994,33 +34531,41 @@
 -  ;
 -  return 0;
 -}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
++$ac_includes_default
++#include <libintl.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+@@ -23497,335 +15502,369 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
 -  has_option=yes
--else
++  ac_header_compiler=yes
+ else
 -  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 -	has_option=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -		CFLAGS="$SAVE_CFLAGS"
 -		{ echo "$as_me:$LINENO: result: $has_option" >&5
 -echo "${ECHO_T}$has_option" >&6; }
@@ -41046,11 +34591,42 @@
 -echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6; }
 -    { echo "$as_me:$LINENO: result: $warning_flags" >&5
 -echo "${ECHO_T}$warning_flags" >&6; }
--
++{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++$as_echo "$ac_header_compiler" >&6; }
+ 
 -    # Check whether --enable-iso-c was given.
 -if test "${enable_iso_c+set}" = set; then
 -  enableval=$enable_iso_c;
--else
++# Is the header present?
++{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5
++$as_echo_n "checking libintl.h presence... " >&6; }
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <libintl.h>
++_ACEOF
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
++  ac_header_preproc=yes
+ else
 -  enable_iso_c=no
 -fi
 -
@@ -41072,19 +34648,61 @@
 -    fi
 -    { echo "$as_me:$LINENO: result: $complCFLAGS" >&5
 -echo "${ECHO_T}$complCFLAGS" >&6; }
--
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
 -    WARN_CFLAGS="$warning_flags $complCFLAGS"
--
--
--
++  ac_header_preproc=no
++fi
+ 
++rm -f conftest.err conftest.$ac_ext
++{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++$as_echo "$ac_header_preproc" >&6; }
+ 
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
++$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
++$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
++$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: libintl.h:     check for missing prerequisite headers?" >&5
++$as_echo "$as_me: WARNING: libintl.h:     check for missing prerequisite headers?" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
++$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: libintl.h:     section \"Present But Cannot Be Compiled\"" >&5
++$as_echo "$as_me: WARNING: libintl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
++$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
++$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
+ 
 -# Check whether --enable-more-warnings was given.
 -if test "${enable_more_warnings+set}" = set; then
 -  enableval=$enable_more_warnings; set_more_warnings="$enableval"
--else
++    ;;
++esac
++{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
++$as_echo_n "checking for libintl.h... " >&6; }
++if test "${ac_cv_header_libintl_h+set}" = set; then
++  $as_echo_n "(cached) " >&6
+ else
 -  set_more_warnings=yes
--fi
--
--
++  ac_cv_header_libintl_h=$ac_header_preproc
+ fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
++$as_echo "$ac_cv_header_libintl_h" >&6; }
+ 
++fi
++if test "x$ac_cv_header_libintl_h" = x""yes; then
++  gt_cv_func_dgettext_libintl="no"
++      libintl_extra_libs=""
+ 
 -if test "$GCC" = "yes" -a "x$set_more_warnings" = "xyes"; then
 -	for option in -Wcast-align -Wchar-subscripts -Wsign-compare -Wno-strict-aliasing; do
 -		fusa_save_CFLAGS="$CFLAGS"
@@ -41092,42 +34710,66 @@
 -		{ echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
 -echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; }
 -		cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
++      #
++      # First check in libc
++      #
++      { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5
++$as_echo_n "checking for ngettext in libc... " >&6; }
++if test "${gt_cv_func_ngettext_libc+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
++#include <libintl.h>
++
+ int
+ main ()
+ {
+-
++return !ngettext ("","", 1)
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 -  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  has_option=yes
--else
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  gt_cv_func_ngettext_libc=yes
+ else
 -  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 -	has_option=no
 -fi
 -
@@ -41142,9 +34784,13 @@
 -		unset fusa_save_CFLAGS
 -	done
 -	unset option
--fi
--
--
++	gt_cv_func_ngettext_libc=no
+ fi
+ 
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
+ 
 -
 -
 -##############################
@@ -41182,52 +34828,140 @@
 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--fi
+ fi
 -ac_res=`eval echo '${'$as_ac_Header'}'`
 -	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 -echo "${ECHO_T}$ac_res" >&6; }
--else
++{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
++$as_echo "$gt_cv_func_ngettext_libc" >&6; }
++
++      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
++	      { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5
++$as_echo_n "checking for dgettext in libc... " >&6; }
++if test "${gt_cv_func_dgettext_libc+set}" = set; then
++  $as_echo_n "(cached) " >&6
+ else
 -  # Is the header compilable?
 -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 -cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++  cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
 -$ac_includes_default
 -#include <$ac_header>
--_ACEOF
++
++#include <libintl.h>
++
++int
++main ()
++{
++return !dgettext ("","")
++  ;
++  return 0;
++}
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 -  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_header_compiler=yes
--else
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  gt_cv_func_dgettext_libc=yes
+ else
 -  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 -	ac_header_compiler=no
 -fi
--
++	gt_cv_func_dgettext_libc=no
++fi
++
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++
++fi
++{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
++$as_echo "$gt_cv_func_dgettext_libc" >&6; }
++      fi
++
++      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
++
++for ac_func in bind_textdomain_codeset
++do
++as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
++$as_echo_n "checking for $ac_func... " >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++  $as_echo_n "(cached) " >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -echo "${ECHO_T}$ac_header_compiler" >&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.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined __stub_$ac_func || defined __stub___$ac_func
++choke me
++#endif
+ 
 -# Is the header present?
 -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
@@ -41238,28 +34972,48 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <$ac_header>
--_ACEOF
++int
++main ()
++{
++return $ac_func ();
++  ;
++  return 0;
++}
+ _ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } >/dev/null && {
 -	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
+        }; then
 -  ac_header_preproc=yes
--else
++  eval "$as_ac_var=yes"
+ else
 -  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 -  ac_header_preproc=no
 -fi
 -
@@ -41298,71 +35052,117 @@
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
 -  eval "$as_ac_Header=\$ac_header_preproc"
--fi
++	eval "$as_ac_var=no"
+ fi
 -ac_res=`eval echo '${'$as_ac_Header'}'`
 -	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 -echo "${ECHO_T}$ac_res" >&6; }
--
--fi
+ 
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
+ fi
 -if test `eval echo '${'$as_ac_Header'}'` = yes; then
--  cat >>confdefs.h <<_ACEOF
++ac_res=`eval 'as_val=${'$as_ac_var'}
++		 $as_echo "$as_val"'`
++	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++as_val=`eval 'as_val=${'$as_ac_var'}
++		 $as_echo "$as_val"'`
++   if test "x$as_val" = x""yes; then
+   cat >>confdefs.h <<_ACEOF
 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--
--done
--
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+-
+ done
+ 
 -    if test $ac_cv_header_locale_h = yes; then
 -    { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
 -echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; }
 -if test "${am_cv_val_LC_MESSAGES+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++      fi
++
++      #
++      # If we don't have everything we want, check in libintl
++      #
++      if test "$gt_cv_func_dgettext_libc" != "yes" \
++	 || test "$gt_cv_func_ngettext_libc" != "yes" \
++         || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
++
++        { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
++$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
++if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
++  $as_echo_n "(cached) " >&6
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lintl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
 -#include <locale.h>
--int
--main ()
--{
++
++/* 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.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char bindtextdomain ();
+ int
+ main ()
+ {
 -return LC_MESSAGES
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
++return bindtextdomain ();
+   ;
+   return 0;
+ }
+@@ -23836,198 +15875,207 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext &&
 -       $as_test_x conftest$ac_exeext; then
 -  am_cv_val_LC_MESSAGES=yes
--else
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  ac_cv_lib_intl_bindtextdomain=yes
+ else
 -  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 -	am_cv_val_LC_MESSAGES=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--fi
++	ac_cv_lib_intl_bindtextdomain=no
+ fi
+ 
++rm -rf conftest.dSYM
+ 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
 -{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
 -echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; }
 -    if test $am_cv_val_LC_MESSAGES = yes; then
@@ -41390,44 +35190,81 @@
 -fi
 -{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
 -echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
--else
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
++$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
++if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then
++  { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
++$as_echo_n "checking for ngettext in -lintl... " >&6; }
++if test "${ac_cv_lib_intl_ngettext+set}" = set; then
++  $as_echo_n "(cached) " >&6
+ else
 -  # Is the header compilable?
 -{ echo "$as_me:$LINENO: checking libintl.h usability" >&5
 -echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lintl  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
 -$ac_includes_default
 -#include <libintl.h>
--_ACEOF
++
++/* 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.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char ngettext ();
++int
++main ()
++{
++return ngettext ();
++  ;
++  return 0;
++}
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 -  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_header_compiler=yes
--else
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  ac_cv_lib_intl_ngettext=yes
+ else
 -  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 -	ac_header_compiler=no
--fi
--
++	ac_cv_lib_intl_ngettext=no
+ fi
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -41435,38 +35272,82 @@
 -# Is the header present?
 -{ echo "$as_me:$LINENO: checking libintl.h presence" >&5
 -echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++rm -rf conftest.dSYM
++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
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
++$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
++  { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
++$as_echo_n "checking for dgettext in -lintl... " >&6; }
++if test "${ac_cv_lib_intl_dgettext+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lintl  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
 -#include <libintl.h>
--_ACEOF
++
++/* 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.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char dgettext ();
++int
++main ()
++{
++return dgettext ();
++  ;
++  return 0;
++}
+ _ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } >/dev/null && {
 -	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
+        }; then
 -  ac_header_preproc=yes
--else
++  ac_cv_lib_intl_dgettext=yes
+ else
 -  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 -  ac_header_preproc=no
--fi
--
++	ac_cv_lib_intl_dgettext=no
+ fi
+ 
 -rm -f conftest.err conftest.$ac_ext
 -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -echo "${ECHO_T}$ac_header_preproc" >&6; }
@@ -41493,7 +35374,17 @@
 -echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
 -    { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
 -echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
--
++rm -rf conftest.dSYM
++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
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
++$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
++if test "x$ac_cv_lib_intl_dgettext" = x""yes; then
++  gt_cv_func_dgettext_libintl=yes
++fi
+ 
 -    ;;
 -esac
 -{ echo "$as_me:$LINENO: checking for libintl.h" >&5
@@ -41502,15 +35393,15 @@
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
 -  ac_cv_header_libintl_h=$ac_header_preproc
--fi
+ fi
 -{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
 -echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
--
--fi
+ 
+ fi
 -if test $ac_cv_header_libintl_h = yes; then
 -  gt_cv_func_dgettext_libintl="no"
 -      libintl_extra_libs=""
--
+ 
 -      #
 -      # First check in libc
 -      #
@@ -41518,54 +35409,84 @@
 -echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6; }
 -if test "${gt_cv_func_ngettext_libc+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++
++	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
++	  { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
++$as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
++	  { $as_echo "$as_me:$LINENO: result: " >&5
++$as_echo "" >&6; }
++  	  { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
++$as_echo_n "checking for ngettext in -lintl... " >&6; }
++if test "${ac_cv_lib_intl_ngettext+set}" = set; then
++  $as_echo_n "(cached) " >&6
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lintl -liconv $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
 -#include <libintl.h>
 -
--int
--main ()
--{
++/* 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.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char ngettext ();
+ int
+ main ()
+ {
 -return !ngettext ("","", 1)
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
++return ngettext ();
+   ;
+   return 0;
+ }
+@@ -24038,52 +16086,62 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext &&
 -       $as_test_x conftest$ac_exeext; then
 -  gt_cv_func_ngettext_libc=yes
--else
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  ac_cv_lib_intl_ngettext=yes
+ else
 -  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 -	gt_cv_func_ngettext_libc=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--
--fi
++	ac_cv_lib_intl_ngettext=no
+ fi
+ 
++rm -rf conftest.dSYM
+ 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
 -{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
 -echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6; }
 -
@@ -41574,221 +35495,351 @@
 -echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; }
 -if test "${gt_cv_func_dgettext_libc+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
++$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
++  { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
++$as_echo_n "checking for dcgettext in -lintl... " >&6; }
++if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
++  $as_echo_n "(cached) " >&6
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lintl -liconv $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
 -#include <libintl.h>
 -
--int
--main ()
--{
++/* 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.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char dcgettext ();
+ int
+ main ()
+ {
 -return !dgettext ("","")
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
++return dcgettext ();
+   ;
+   return 0;
+ }
+@@ -24094,43 +16152,66 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext &&
 -       $as_test_x conftest$ac_exeext; then
 -  gt_cv_func_dgettext_libc=yes
--else
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  ac_cv_lib_intl_dcgettext=yes
+ else
 -  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 -	gt_cv_func_dgettext_libc=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--
--fi
++	ac_cv_lib_intl_dcgettext=no
+ fi
+ 
++rm -rf conftest.dSYM
+ 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
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
++$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
++if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then
++  gt_cv_func_dgettext_libintl=yes
++			libintl_extra_libs=-liconv
++else
++  :
++fi
+ 
++else
++  :
+ fi
 -{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
 -echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6; }
 -      fi
--
+ 
 -      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
--
--for ac_func in bind_textdomain_codeset
--do
++        fi
++
++        #
++        # If we found libintl, then check in it for bind_textdomain_codeset();
++        # we'll prefer libc if neither have bind_textdomain_codeset(),
++        # and both have dgettext and ngettext
++        #
++        if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
++          glib_save_LIBS="$LIBS"
++          LIBS="$LIBS -lintl $libintl_extra_libs"
++          unset ac_cv_func_bind_textdomain_codeset
+ 
+ for ac_func in bind_textdomain_codeset
+ do
 -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ echo "$as_me:$LINENO: checking for $ac_func" >&5
 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
++$as_echo_n "checking for $ac_func... " >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
--/* 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.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--
--int
--main ()
--{
--return $ac_func ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
++  $as_echo_n "(cached) " >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -24183,62 +16264,144 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext &&
 -       $as_test_x conftest$ac_exeext; then
--  eval "$as_ac_var=yes"
--else
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
+   eval "$as_ac_var=yes"
+ else
 -  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--fi
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
++rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
 -ac_res=`eval echo '${'$as_ac_var'}'`
 -	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 -echo "${ECHO_T}$ac_res" >&6; }
 -if test `eval echo '${'$as_ac_var'}'` = yes; then
--  cat >>confdefs.h <<_ACEOF
++ac_res=`eval 'as_val=${'$as_ac_var'}
++		 $as_echo "$as_val"'`
++	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++as_val=`eval 'as_val=${'$as_ac_var'}
++		 $as_echo "$as_val"'`
++   if test "x$as_val" = x""yes; then
+   cat >>confdefs.h <<_ACEOF
 -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--done
--
--      fi
--
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+ done
+ 
++          LIBS="$glib_save_LIBS"
++
++          if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
++            gt_cv_func_dgettext_libc=no
++          else
++            if test "$gt_cv_func_dgettext_libc" = "yes" \
++		&& test "$gt_cv_func_ngettext_libc" = "yes"; then
++              gt_cv_func_dgettext_libintl=no
++            fi
++          fi
++        fi
+       fi
+ 
 -      #
 -      # If we don't have everything we want, check in libintl
 -      #
 -      if test "$gt_cv_func_dgettext_libc" != "yes" \
 -	 || test "$gt_cv_func_ngettext_libc" != "yes" \
 -         || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
--
++      if test "$gt_cv_func_dgettext_libc" = "yes" \
++	|| test "$gt_cv_func_dgettext_libintl" = "yes"; then
++        gt_cv_have_gettext=yes
++      fi
+ 
 -        { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
 -echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; }
 -if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++      if test "$gt_cv_func_dgettext_libintl" = "yes"; then
++        INTLLIBS="-lintl $libintl_extra_libs"
++      fi
++
++      if test "$gt_cv_have_gettext" = "yes"; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_GETTEXT 1
++_ACEOF
++
++	# Extract the first word of "msgfmt", so it can be a program name with args.
++set dummy msgfmt; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_MSGFMT+set}" = set; then
++  $as_echo_n "(cached) " >&6
+ else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lintl  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--/* 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.  */
--#ifdef __cplusplus
--extern "C"
--#endif
++  case "$MSGFMT" in
++  /*)
++  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
++  ;;
++  *)
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
++  for ac_dir in $PATH; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
++	ac_cv_path_MSGFMT="$ac_dir/$ac_word"
++	break
++      fi
++    fi
++  done
++  IFS="$ac_save_ifs"
++  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no"
++  ;;
++esac
++fi
++MSGFMT="$ac_cv_path_MSGFMT"
++if test "$MSGFMT" != "no"; then
++  { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
++$as_echo "$MSGFMT" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
++	if test "$MSGFMT" != "no"; then
++          glib_save_LIBS="$LIBS"
++          LIBS="$LIBS $INTLLIBS"
++
++for ac_func in dcgettext
++do
++as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
++$as_echo_n "checking for $ac_func... " >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++  $as_echo_n "(cached) " >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
+ 
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+@@ -24246,11 +16409,18 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
 -char bindtextdomain ();
--int
--main ()
--{
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined __stub_$ac_func || defined __stub___$ac_func
++choke me
++#endif
++
+ int
+ main ()
+ {
 -return bindtextdomain ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
++return $ac_func ();
+   ;
+   return 0;
+ }
+@@ -24261,58 +16431,165 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext &&
 -       $as_test_x conftest$ac_exeext; then
 -  ac_cv_lib_intl_bindtextdomain=yes
--else
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  eval "$as_ac_var=yes"
+ else
 -  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 -	ac_cv_lib_intl_bindtextdomain=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
++	eval "$as_ac_var=no"
+ fi
+ 
++rm -rf conftest.dSYM
+ 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
+ fi
 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
 -echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; }
 -if test $ac_cv_lib_intl_bindtextdomain = yes; then
@@ -41796,16 +35847,136 @@
 -echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }
 -if test "${ac_cv_lib_intl_ngettext+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++ac_res=`eval 'as_val=${'$as_ac_var'}
++		 $as_echo "$as_val"'`
++	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++as_val=`eval 'as_val=${'$as_ac_var'}
++		 $as_echo "$as_val"'`
++   if test "x$as_val" = x""yes; then
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++done
++
++	  MSGFMT_OPTS=
++	  { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
++$as_echo_n "checking if msgfmt accepts -c... " >&6; }
++	  cat >conftest.foo <<_ACEOF
++
++msgid ""
++msgstr ""
++"Content-Type: text/plain; charset=UTF-8\n"
++"Project-Id-Version: test 1.0\n"
++"PO-Revision-Date: 2007-02-15 12:01+0100\n"
++"Last-Translator: test <foo@bar.xx>\n"
++"Language-Team: C <LL@li.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++_ACEOF
++if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
++  ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
++else { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++echo "$as_me: failed input was:" >&5
++sed 's/^/| /' conftest.foo >&5
++fi
++
++	  # Extract the first word of "gmsgfmt", so it can be a program name with args.
++set dummy gmsgfmt; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_GMSGFMT+set}" = set; then
++  $as_echo_n "(cached) " >&6
+ else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lintl  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
++  case $GMSGFMT in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_GMSGFMT="$GMSGFMT" # 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_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
++    $as_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_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
++  ;;
++esac
++fi
++GMSGFMT=$ac_cv_path_GMSGFMT
++if test -n "$GMSGFMT"; then
++  { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
++$as_echo "$GMSGFMT" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++	  # Extract the first word of "xgettext", so it can be a program name with args.
++set dummy xgettext; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_XGETTEXT+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  case "$XGETTEXT" in
++  /*)
++  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
++  ;;
++  *)
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
++  for ac_dir in $PATH; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
++	ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
++	break
++      fi
++    fi
++  done
++  IFS="$ac_save_ifs"
++  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
++  ;;
++esac
++fi
++XGETTEXT="$ac_cv_path_XGETTEXT"
++if test "$XGETTEXT" != ":"; then
++  { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
++$as_echo "$XGETTEXT" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++	  cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
 -/* 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.  */
@@ -41813,34 +35984,42 @@
 -extern "C"
 -#endif
 -char ngettext ();
--int
--main ()
--{
+ int
+ main ()
+ {
 -return ngettext ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
++extern int _nl_msg_cat_cntr;
++			 return _nl_msg_cat_cntr
+   ;
+   return 0;
+ }
+@@ -24323,46 +16600,56 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext &&
 -       $as_test_x conftest$ac_exeext; then
 -  ac_cv_lib_intl_ngettext=yes
--else
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  CATOBJEXT=.gmo
++             DATADIRNAME=share
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
@@ -41858,57 +36037,330 @@
 -echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; }
 -if test "${ac_cv_lib_intl_dgettext+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	case $host in
++	    *-*-solaris*)
++	    	                	    	                { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
++$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
++if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
++  $as_echo_n "(cached) " >&6
+ else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lintl  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--/* 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.  */
--#ifdef __cplusplus
--extern "C"
--#endif
++  cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char bind_textdomain_codeset (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef bind_textdomain_codeset
+ 
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+@@ -24370,11 +16657,18 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
 -char dgettext ();
--int
--main ()
--{
++char bind_textdomain_codeset ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
++choke me
++#endif
++
+ int
+ main ()
+ {
 -return dgettext ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
++return bind_textdomain_codeset ();
+   ;
+   return 0;
+ }
+@@ -24385,2490 +16679,2712 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext &&
 -       $as_test_x conftest$ac_exeext; then
 -  ac_cv_lib_intl_dgettext=yes
--else
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  ac_cv_func_bind_textdomain_codeset=yes
+ else
 -  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 -	ac_cv_lib_intl_dgettext=no
 -fi
--
++	ac_cv_func_bind_textdomain_codeset=no
++fi
++
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
++$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
++  CATOBJEXT=.gmo
++               DATADIRNAME=share
++else
++  CATOBJEXT=.mo
++               DATADIRNAME=lib
++fi
++
++	    ;;
++	    *)
++	    CATOBJEXT=.mo
++            DATADIRNAME=lib
++	    ;;
++	    esac
++fi
++
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++          LIBS="$glib_save_LIBS"
++	  INSTOBJEXT=.mo
++	else
++	  gt_cv_have_gettext=no
++	fi
++      fi
++
++fi
++
++
++
++    if test "$gt_cv_have_gettext" = "yes" ; then
++
++cat >>confdefs.h <<\_ACEOF
++#define ENABLE_NLS 1
++_ACEOF
++
++    fi
++
++        if test "$XGETTEXT" != ":"; then
++                  if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
++        : ;
++      else
++        { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
++$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
++        XGETTEXT=":"
++      fi
++    fi
++
++    # We need to process the po/ directory.
++    POSUB=po
++
++    ac_config_commands="$ac_config_commands default-1"
++
++
++                for lang in $ALL_LINGUAS; do
++      GMOFILES="$GMOFILES $lang.gmo"
++      POFILES="$POFILES $lang.po"
++    done
++
++
++
++
++
++
++
++
++
++
++
++
++
++   if test "$gt_cv_have_gettext" = "yes"; then
++     if test "x$ALL_LINGUAS" = "x"; then
++       LINGUAS=
++     else
++       { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
++$as_echo_n "checking for catalogs to be installed... " >&6; }
++       NEW_LINGUAS=
++       for presentlang in $ALL_LINGUAS; do
++         useit=no
++         if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
++           desiredlanguages="$LINGUAS"
++         else
++           desiredlanguages="$ALL_LINGUAS"
++         fi
++         for desiredlang in $desiredlanguages; do
++ 	   # Use the presentlang catalog if desiredlang is
++           #   a. equal to presentlang, or
++           #   b. a variant of presentlang (because in this case,
++           #      presentlang can be used as a fallback for messages
++           #      which are not translated in the desiredlang catalog).
++           case "$desiredlang" in
++             "$presentlang"*) useit=yes;;
++           esac
++         done
++         if test $useit = yes; then
++           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
++         fi
++       done
++       LINGUAS=$NEW_LINGUAS
++       { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5
++$as_echo "$LINGUAS" >&6; }
++     fi
++
++          if test -n "$LINGUAS"; then
++       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
++     fi
++   fi
++
++            MKINSTALLDIRS=
++   if test -n "$ac_aux_dir"; then
++     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
++   fi
++   if test -z "$MKINSTALLDIRS"; then
++     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
++   fi
++
++
++         test -d po || mkdir po
++   if test "x$srcdir" != "x."; then
++     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
++       posrcprefix="$srcdir/"
++     else
++       posrcprefix="../$srcdir/"
++     fi
++   else
++     posrcprefix="../"
++   fi
++   rm -f po/POTFILES
++   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
++	< $srcdir/po/POTFILES.in > po/POTFILES
++
++
++
++##############################
++# Documentation
++##############################
++
++
++gdu_cv_version_required=0.3.2
++
++if test -n "$PKG_CONFIG" && \
++    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
++  ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  gdu_cv_have_gdu=yes
++else
++  gdu_cv_have_gdu=no
++fi
++
++if test "$gdu_cv_have_gdu" = "yes"; then
++	:
++else
++	{ { $as_echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5
++$as_echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++
++
++# Check whether --with-help-dir was given.
++if test "${with_help_dir+set}" = set; then
++  withval=$with_help_dir;
++else
++  with_help_dir='${datadir}/gnome/help'
++fi
++
++HELP_DIR="$with_help_dir"
++
++
++
++# Check whether --with-omf-dir was given.
++if test "${with_omf_dir+set}" = set; then
++  withval=$with_omf_dir;
++else
++  with_omf_dir='${datadir}/omf'
++fi
++
++OMF_DIR="$with_omf_dir"
++
++
++
++# Check whether --with-help-formats was given.
++if test "${with_help_formats+set}" = set; then
++  withval=$with_help_formats;
++else
++  with_help_formats=''
++fi
++
++DOC_USER_FORMATS="$with_help_formats"
++
++
++# Check whether --enable-scrollkeeper was given.
++if test "${enable_scrollkeeper+set}" = set; then
++  enableval=$enable_scrollkeeper;
++else
++  enable_scrollkeeper=yes
++fi
++
++ if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
++  ENABLE_SK_TRUE=
++  ENABLE_SK_FALSE='#'
++else
++  ENABLE_SK_TRUE='#'
++  ENABLE_SK_FALSE=
++fi
++
++
++DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
++
++
++ if test "$gdu_cv_have_gdu" = "yes"; then
++  HAVE_GNOME_DOC_UTILS_TRUE=
++  HAVE_GNOME_DOC_UTILS_FALSE='#'
++else
++  HAVE_GNOME_DOC_UTILS_TRUE='#'
++  HAVE_GNOME_DOC_UTILS_FALSE=
++fi
++
++
++
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
@@ -41918,12 +36370,29 @@
 -if test $ac_cv_lib_intl_dgettext = yes; then
 -  gt_cv_func_dgettext_libintl=yes
 -fi
--
--fi
--
--fi
--
--
+ 
+-fi
++##############################
++# ./configure Flags messings
++##############################
+ 
++cflags_set=${CFLAGS+set}
++# find the actual value for $prefix that we'll end up with
++REAL_PREFIX=
++if test "x$prefix" = "xNONE"; then
++  REAL_PREFIX=$ac_default_prefix
++else
++  REAL_PREFIX=$prefix
+ fi
+ 
++# Have to go $sysconfdir->$prefix/etc->/usr/local/etc
++# if you actually know how to code shell then fix this :-)
++SYSCONFDIR_TMP="$sysconfdir"
++old_prefix=$prefix
++prefix=$REAL_PREFIX
++EXPANDED_SYSCONFDIR=`eval echo $SYSCONFDIR_TMP`
++prefix=$old_prefix
+ 
 -	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
 -	  { echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
 -echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6; }
@@ -41942,7 +36411,7 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
+ 
 -/* 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.  */
@@ -41957,7 +36426,19 @@
 -  ;
 -  return 0;
 -}
--_ACEOF
++ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
++
++
++  test "x$prefix" = xNONE && prefix="$ac_default_prefix"
++  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
++  ac_define_path=`eval echo $"${prefix}"`
++  ac_define_path=`eval echo $ac_define_path`
++  PREFIX="$ac_define_path"
++
++
++cat >>confdefs.h <<_ACEOF
++#define PREFIX "$ac_define_path"
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -41980,10 +36461,10 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	ac_cv_lib_intl_ngettext=no
 -fi
--
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
@@ -42000,11 +36481,21 @@
 -LIBS="-lintl -liconv $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
++
++  test "x$prefix" = xNONE && prefix="$ac_default_prefix"
++  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
++  ac_define_path=`eval echo $"${sysconfdir}"`
++  ac_define_path=`eval echo $ac_define_path`
++  SYSCONFDIR="$ac_define_path"
++
++
++cat >>confdefs.h <<_ACEOF
++#define SYSCONFDIR "$ac_define_path"
+ _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
+ 
 -/* 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.  */
@@ -42019,7 +36510,18 @@
 -  ;
 -  return 0;
 -}
--_ACEOF
++
++
++  test "x$prefix" = xNONE && prefix="$ac_default_prefix"
++  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
++  ac_define_path=`eval echo $"${libdir}"`
++  ac_define_path=`eval echo $ac_define_path`
++  LIBDIR="$ac_define_path"
++
++
++cat >>confdefs.h <<_ACEOF
++#define LIBDIR "$ac_define_path"
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -42042,10 +36544,10 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	ac_cv_lib_intl_dcgettext=no
 -fi
--
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
@@ -42058,13 +36560,16 @@
 -else
 -  :
 -fi
--
+ 
 -else
 -  :
 -fi
--
++##############################
++# Flags
++##############################
+ 
 -        fi
--
+ 
 -        #
 -        # If we found libintl, then check in it for bind_textdomain_codeset();
 -        # we'll prefer libc if neither have bind_textdomain_codeset(),
@@ -42074,7 +36579,7 @@
 -          glib_save_LIBS="$LIBS"
 -          LIBS="$LIBS -lintl $libintl_extra_libs"
 -          unset ac_cv_func_bind_textdomain_codeset
--
+ 
 -for ac_func in bind_textdomain_codeset
 -do
 -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -42085,27 +36590,125 @@
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
++
++
++
++##############################
++# Files
++##############################
++
++ac_config_files="$ac_config_files Makefile data/Makefile data/icons/Makefile data/icons/16x16/Makefile data/icons/16x16/status/Makefile data/icons/16x16/actions/Makefile data/icons/22x22/Makefile data/icons/22x22/status/Makefile data/icons/22x22/actions/Makefile data/icons/24x24/Makefile data/icons/24x24/status/Makefile data/icons/24x24/actions/Makefile data/icons/32x32/Makefile data/icons/32x32/status/Makefile data/icons/32x32/actions/Makefile data/icons/48x48/Makefile data/icons/48x48/status/Makefile data/icons/scalable/Makefile data/icons/scalable/status/Makefile data/icons/scalable/actions/Makefile help/Makefile src/Makefile po/Makefile.in"
++
++cat >confcache <<\_ACEOF
++# This file is a shell script that caches the results of configure
++# tests run on this system so they can be shared between configure
++# scripts and configure runs, see configure's option --config-cache.
++# It is not useful on other systems.  If it contains results you don't
++# want to keep, you may remove or edit it.
++#
++# config.status only pays attention to the cache file if you give it
++# the --recheck option to rerun configure.
++#
++# `ac_cv_env_foo' variables (set or unset) will be overridden when
++# loading this file, other *unset* `ac_cv_foo' will be assigned the
++# following values.
++
+ _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
--
+ 
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
--
++# The following way of writing the cache mishandles newlines in values,
++# but we know of no workaround that is simple, portable, and efficient.
++# So, we kill variables containing newlines.
++# Ultrix sh set writes to stderr and can't be redirected directly,
++# and sets the high bit in the cache file unless we assign to the vars.
++(
++  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
++    eval ac_val=\$$ac_var
++    case $ac_val in #(
++    *${as_nl}*)
++      case $ac_var in #(
++      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
++      esac
++      case $ac_var in #(
++      _ | IFS | as_nl) ;; #(
++      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
++      *) $as_unset $ac_var ;;
++      esac ;;
++    esac
++  done
++
++  (set) 2>&1 |
++    case $as_nl`(ac_space=' '; set) 2>&1` in #(
++    *${as_nl}ac_space=\ *)
++      # `set' does not quote correctly, so add quotes (double-quote
++      # substitution turns \\\\ into \\, and sed turns \\ into \).
++      sed -n \
++	"s/'/'\\\\''/g;
++	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
++      ;; #(
++    *)
++      # `set' quotes correctly as required by POSIX, so do not add quotes.
++      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
++      ;;
++    esac |
++    sort
++) |
++  sed '
++     /^ac_cv_env_/b end
++     t clear
++     :clear
++     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
++     t end
++     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     :end' >>confcache
++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
++  if test -w "$cache_file"; then
++    test "x$cache_file" != "x/dev/null" &&
++      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
++$as_echo "$as_me: updating cache $cache_file" >&6;}
++    cat confcache >$cache_file
++  else
++    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
++  fi
++fi
++rm -f confcache
++
++test "x$prefix" = xNONE && prefix=$ac_default_prefix
++# Let make expand exec_prefix.
++test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+ 
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
--
++DEFS=-DHAVE_CONFIG_H
+ 
 -#undef $ac_func
--
++ac_libobjs=
++ac_ltlibobjs=
++for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
++  # 1. Remove the extension, and $U if already installed.
++  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
++  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
++  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
++  #    will be set to the directory where LIBOBJS objects are built.
++  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
++  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
++done
++LIBOBJS=$ac_libobjs
+ 
 -/* 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.  */
@@ -42119,7 +36722,8 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
--
++LTLIBOBJS=$ac_ltlibobjs
+ 
 -int
 -main ()
 -{
@@ -42150,13 +36754,25 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	eval "$as_ac_var=no"
--fi
++if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
++  { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
+ fi
 -
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
--fi
++if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
++  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
+ fi
 -ac_res=`eval echo '${'$as_ac_var'}'`
 -	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 -echo "${ECHO_T}$ac_res" >&6; }
@@ -42165,9 +36781,15 @@
 -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 -_ACEOF
 -
--fi
++if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
++  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
+ fi
 -done
--
+ 
 -          LIBS="$glib_save_LIBS"
 -
 -          if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
@@ -42180,22 +36802,67 @@
 -          fi
 -        fi
 -      fi
--
++  ac_config_commands="$ac_config_commands po/stamp-it"
+ 
 -      if test "$gt_cv_func_dgettext_libc" = "yes" \
 -	|| test "$gt_cv_func_dgettext_libintl" = "yes"; then
 -        gt_cv_have_gettext=yes
 -      fi
--
+ 
 -      if test "$gt_cv_func_dgettext_libintl" = "yes"; then
 -        INTLLIBS="-lintl $libintl_extra_libs"
 -      fi
--
++if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
++  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
++  { { $as_echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++$as_echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then
++  { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++$as_echo "$as_me: error: conditional \"ENABLE_SK\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then
++  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++$as_echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
+ 
 -      if test "$gt_cv_have_gettext" = "yes"; then
--
++: ${CONFIG_STATUS=./config.status}
++ac_write_fail=0
++ac_clean_files_save=$ac_clean_files
++ac_clean_files="$ac_clean_files $CONFIG_STATUS"
++{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
++$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
++cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++#! $SHELL
++# Generated by $as_me.
++# Run this file to recreate the current configuration.
++# Compiler output produced by configure, useful for debugging
++# configure, is in config.log if it exists.
+ 
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_GETTEXT 1
--_ACEOF
--
++debug=false
++ac_cs_recheck=false
++ac_cs_silent=false
++SHELL=\${CONFIG_SHELL-$SHELL}
+ _ACEOF
+ 
 -	# Extract the first word of "msgfmt", so it can be a program name with args.
 -set dummy msgfmt; ac_word=$2
 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -42234,7 +36901,11 @@
 -	if test "$MSGFMT" != "no"; then
 -          glib_save_LIBS="$LIBS"
 -          LIBS="$LIBS $INTLLIBS"
--
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++## --------------------- ##
++## M4sh Initialization.  ##
++## --------------------- ##
+ 
 -for ac_func in dcgettext
 -do
 -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -42242,7 +36913,16 @@
 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++# Be more Bourne compatible
++DUALCASE=1; export DUALCASE # for MKS sh
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
++  setopt NO_GLOB_SUBST
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -42252,20 +36932,24 @@
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
--
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
+ 
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
--
++fi
+ 
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
--
+ 
 -#undef $ac_func
--
+ 
 -/* 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.  */
@@ -42279,7 +36963,7 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
--
+ 
 -int
 -main ()
 -{
@@ -42310,13 +36994,57 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++# PATH needs CR
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
+ 
 -	eval "$as_ac_var=no"
--fi
--
++as_nl='
++'
++export as_nl
++# Printing a long string crashes Solaris 7 /usr/bin/printf.
++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
++if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
++  as_echo='printf %s\n'
++  as_echo_n='printf %s'
++else
++  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
++    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
++    as_echo_n='/usr/ucb/echo -n'
++  else
++    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
++    as_echo_n_body='eval
++      arg=$1;
++      case $arg in
++      *"$as_nl"*)
++	expr "X$arg" : "X\\(.*\\)$as_nl";
++	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
++      esac;
++      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
++    '
++    export as_echo_n_body
++    as_echo_n='sh -c $as_echo_n_body as_echo'
++  fi
++  export as_echo_body
++  as_echo='sh -c $as_echo_body as_echo'
+ fi
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
--fi
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++  PATH_SEPARATOR=:
++  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
++    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
++      PATH_SEPARATOR=';'
++  }
+ fi
 -ac_res=`eval echo '${'$as_ac_var'}'`
 -	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 -echo "${ECHO_T}$ac_res" >&6; }
@@ -42324,15 +37052,20 @@
 -  cat >>confdefs.h <<_ACEOF
 -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 -_ACEOF
--
--fi
+ 
++# Support unset when possible.
++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
++  as_unset=unset
++else
++  as_unset=false
+ fi
 -done
 -
 -	  MSGFMT_OPTS=
 -	  { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
 -echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; }
 -	  cat >conftest.foo <<_ACEOF
--
+ 
 -msgid ""
 -msgstr ""
 -"Content-Type: text/plain; charset=UTF-8\n"
@@ -42342,7 +37075,7 @@
 -"Language-Team: C <LL@li.org>\n"
 -"MIME-Version: 1.0\n"
 -"Content-Transfer-Encoding: 8bit\n"
--
+ 
 -_ACEOF
 -if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
 -  ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
@@ -42356,7 +37089,13 @@
 -echo "$as_me: failed input was:" >&5
 -sed 's/^/| /' conftest.foo >&5
 -fi
--
++# IFS
++# We need space, tab and new line, in precisely that order.  Quoting is
++# there to prevent editors from complaining about space-tab.
++# (If _AS_PATH_WALK were called with IFS unset, it would disable word
++# splitting by setting IFS to empty value.)
++IFS=" ""	$as_nl"
+ 
 -	  # Extract the first word of "gmsgfmt", so it can be a program name with args.
 -set dummy gmsgfmt; ac_word=$2
 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -42370,10 +37109,14 @@
 -  ;;
 -  *)
 -  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
++# Find who we are.  Look in the path if we contain no directory separator.
++case $0 in
++  *[\\/]* ) as_myself=$0 ;;
++  *) 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_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
@@ -42381,13 +37124,19 @@
 -    break 2
 -  fi
 -done
--done
--IFS=$as_save_IFS
--
++  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
+ IFS=$as_save_IFS
+ 
 -  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
 -  ;;
--esac
--fi
++     ;;
+ esac
++# We did not find ourselves, most probably we were run as `sh COMMAND'
++# in which case we are not to be found in the path.
++if test "x$as_myself" = x; then
++  as_myself=$0
+ fi
 -GMSGFMT=$ac_cv_path_GMSGFMT
 -if test -n "$GMSGFMT"; then
 -  { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
@@ -42395,16 +37144,36 @@
 -else
 -  { echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6; }
--fi
--
--
++if test ! -f "$as_myself"; then
++  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++  { (exit 1); exit 1; }
+ fi
+ 
++# Work around bugs in pre-3.0 UWIN ksh.
++for as_var in ENV MAIL MAILPATH
++do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++done
++PS1='$ '
++PS2='> '
++PS4='+ '
++
++# NLS nuisances.
++LC_ALL=C
++export LC_ALL
++LANGUAGE=C
++export LANGUAGE
+ 
 -	  # Extract the first word of "xgettext", so it can be a program name with args.
 -set dummy xgettext; 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_XGETTEXT+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++# Required to use basename.
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++   test "X`expr 00001 : '.*\(...\)'`" = X001; then
++  as_expr=expr
+ else
 -  case "$XGETTEXT" in
 -  /*)
 -  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
@@ -42424,23 +37193,28 @@
 -  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
 -  ;;
 -esac
--fi
++  as_expr=false
+ fi
 -XGETTEXT="$ac_cv_path_XGETTEXT"
 -if test "$XGETTEXT" != ":"; then
 -  { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
 -echo "${ECHO_T}$XGETTEXT" >&6; }
--else
++
++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
++  as_basename=basename
+ else
 -  { echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6; }
--fi
--
++  as_basename=false
+ fi
+ 
 -	  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
+ 
 -int
 -main ()
 -{
@@ -42448,14 +37222,96 @@
 -			 return _nl_msg_cat_cntr
 -  ;
 -  return 0;
--}
++# Name of the executable.
++as_me=`$as_basename -- "$0" ||
++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
++	 X"$0" : 'X\(//\)$' \| \
++	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X/"$0" |
++    sed '/^.*\/\([^/][^/]*\)\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\/\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\/\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
++
++# CDPATH.
++$as_unset CDPATH
++
++
++
++  as_lineno_1=$LINENO
++  as_lineno_2=$LINENO
++  test "x$as_lineno_1" != "x$as_lineno_2" &&
++  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
++
++  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
++  # uniformly replaced by the line number.  The first 'sed' inserts a
++  # line-number line after each line using $LINENO; the second 'sed'
++  # does the real work.  The second script uses 'N' to pair each
++  # line-number line with the line containing $LINENO, and appends
++  # trailing '-' during substitution so that $LINENO is not a special
++  # case at line end.
++  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
++  # scripts with optimization help from Paolo Bonzini.  Blame Lee
++  # E. McMahon (1931-1989) for sed's syntax.  :-)
++  sed -n '
++    p
++    /[$]LINENO/=
++  ' <$as_myself |
++    sed '
++      s/[$]LINENO.*/&-/
++      t lineno
++      b
++      :lineno
++      N
++      :loop
++      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
++      t loop
++      s/-\n.*//
++    ' >$as_me.lineno &&
++  chmod +x "$as_me.lineno" ||
++    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
++   { (exit 1); exit 1; }; }
++
++  # Don't try to exec as it changes $[0], causing all sort of problems
++  # (the dirname of $[0] is not the place where we might find the
++  # original and so on.  Autoconf is especially sensitive to this).
++  . "./$as_me.lineno"
++  # Exit status is that of the last command.
++  exit
+ }
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
--esac
++
++
++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
++  as_dirname=dirname
++else
++  as_dirname=false
++fi
++
++ECHO_C= ECHO_N= ECHO_T=
++case `echo -n x` in
++-n*)
++  case `echo 'x\c'` in
++  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
++  *)   ECHO_C='\c';;
++  esac;;
++*)
++  ECHO_N='-n';;
+ esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 -  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
@@ -42470,17 +37326,58 @@
 -       $as_test_x conftest$ac_exeext; then
 -  CATOBJEXT=.gmo
 -             DATADIRNAME=share
--else
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++   test "X`expr 00001 : '.*\(...\)'`" = X001; then
++  as_expr=expr
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++  as_expr=false
++fi
+ 
 -	case $host in
 -	    *-*-solaris*)
 -	    	                	    	                { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
 -echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
 -if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++rm -f conf$$ conf$$.exe conf$$.file
++if test -d conf$$.dir; then
++  rm -f conf$$.dir/conf$$.file
++else
++  rm -f conf$$.dir
++  mkdir conf$$.dir 2>/dev/null
++fi
++if (echo >conf$$.file) 2>/dev/null; then
++  if ln -s conf$$.file conf$$ 2>/dev/null; then
++    as_ln_s='ln -s'
++    # ... but there are two gotchas:
++    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
++    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
++    # In both cases, we have to default to `cp -p'.
++    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
++      as_ln_s='cp -p'
++  elif ln conf$$.file conf$$ 2>/dev/null; then
++    as_ln_s=ln
++  else
++    as_ln_s='cp -p'
++  fi
++else
++  as_ln_s='cp -p'
++fi
++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
++rmdir conf$$.dir 2>/dev/null
++
++if mkdir -p . 2>/dev/null; then
++  as_mkdir_p=:
++else
++  test -d ./-p && rmdir ./-p
++  as_mkdir_p=false
++fi
++
++if test -x / >/dev/null 2>&1; then
++  as_test_x='test -x'
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -42490,20 +37387,43 @@
 -/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
--
++  if ls -dL / >/dev/null 2>&1; then
++    as_ls_L_option=L
++  else
++    as_ls_L_option=
++  fi
++  as_test_x='
++    eval sh -c '\''
++      if test -d "$1"; then
++	test -d "$1/.";
++      else
++	case $1 in
++	-*)set "./$1";;
++	esac;
++	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
++	???[sx]*):;;*)false;;esac;fi
++    '\'' sh
++  '
++fi
++as_executable_p=$as_test_x
+ 
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char bind_textdomain_codeset (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
--
++# Sed expression to map a string onto a valid CPP name.
++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+ 
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
--
++# Sed expression to map a string onto a valid variable name.
++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+ 
 -#undef bind_textdomain_codeset
--
+ 
 -/* 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.  */
@@ -42517,7 +37437,24 @@
 -#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
 -choke me
 -#endif
--
++exec 6>&1
++
++# Save the log message, to keep $[0] and so on meaningful, and to
++# report actual input values of CONFIG_FILES etc. instead of their
++# values after options handling.
++ac_log="
++This file was extended by $as_me, which was
++generated by GNU Autoconf 2.63.  Invocation command line was
++
++  CONFIG_FILES    = $CONFIG_FILES
++  CONFIG_HEADERS  = $CONFIG_HEADERS
++  CONFIG_LINKS    = $CONFIG_LINKS
++  CONFIG_COMMANDS = $CONFIG_COMMANDS
++  $ $0 $@
++
++on `(hostname || uname -n) 2>/dev/null | sed 1q`
++"
+ 
 -int
 -main ()
 -{
@@ -42525,13 +37462,16 @@
 -  ;
 -  return 0;
 -}
--_ACEOF
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
--esac
++
++case $ac_config_files in *"
++"*) set x $ac_config_files; shift; ac_config_files=$*;;
+ esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 -  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
@@ -42548,10 +37488,13 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	ac_cv_func_bind_textdomain_codeset=no
 -fi
--
++case $ac_config_headers in *"
++"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
++esac
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -fi
@@ -42564,7 +37507,7 @@
 -  CATOBJEXT=.mo
 -               DATADIRNAME=lib
 -fi
--
+ 
 -	    ;;
 -	    *)
 -	    CATOBJEXT=.mo
@@ -42572,7 +37515,12 @@
 -	    ;;
 -	    esac
 -fi
--
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++# Files that config.status was made for.
++config_files="$ac_config_files"
++config_headers="$ac_config_headers"
++config_commands="$ac_config_commands"
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -          LIBS="$glib_save_LIBS"
@@ -42581,19 +37529,53 @@
 -	  gt_cv_have_gettext=no
 -	fi
 -      fi
--
++_ACEOF
+ 
 -fi
--
--
--
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++ac_cs_usage="\
++\`$as_me' instantiates files from templates according to the
++current configuration.
+ 
++Usage: $0 [OPTION]... [FILE]...
++
++  -h, --help       print this help, then exit
++  -V, --version    print version number and configuration settings, then exit
++  -q, --quiet, --silent
++                   do not print progress messages
++  -d, --debug      don't remove temporary files
++      --recheck    update $as_me by reconfiguring in the same conditions
++      --file=FILE[:TEMPLATE]
++                   instantiate the configuration file FILE
++      --header=FILE[:TEMPLATE]
++                   instantiate the configuration header FILE
+ 
++Configuration files:
++$config_files
+ 
 -    if test "$gt_cv_have_gettext" = "yes" ; then
--
++Configuration headers:
++$config_headers
++
++Configuration commands:
++$config_commands
++
++Report bugs to <bug-autoconf@gnu.org>."
+ 
 -cat >>confdefs.h <<\_ACEOF
 -#define ENABLE_NLS 1
--_ACEOF
--
+ _ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++ac_cs_version="\\
++config.status
++configured by $0, generated by GNU Autoconf 2.63,
++  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+ 
 -    fi
--
++Copyright (C) 2008 Free Software Foundation, Inc.
++This config.status script is free software; the Free Software Foundation
++gives unlimited permission to copy, distribute and modify it."
+ 
 -        if test "$XGETTEXT" != ":"; then
 -                  if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
 -        : ;
@@ -42603,30 +37585,365 @@
 -        XGETTEXT=":"
 -      fi
 -    fi
--
++ac_pwd='$ac_pwd'
++srcdir='$srcdir'
++INSTALL='$INSTALL'
++MKDIR_P='$MKDIR_P'
++AWK='$AWK'
++test -n "\$AWK" || AWK=awk
++_ACEOF
+ 
 -    # We need to process the po/ directory.
 -    POSUB=po
--
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++# The default lists apply if the user does not specify any file.
++ac_need_defaults=:
++while test $# != 0
++do
++  case $1 in
++  --*=*)
++    ac_option=`expr "X$1" : 'X\([^=]*\)='`
++    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
++    ac_shift=:
++    ;;
++  *)
++    ac_option=$1
++    ac_optarg=$2
++    ac_shift=shift
++    ;;
++  esac
+ 
 -    ac_config_commands="$ac_config_commands default-1"
--
--
++  case $ac_option in
++  # Handling of the options.
++  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++    ac_cs_recheck=: ;;
++  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
++    $as_echo "$ac_cs_version"; exit ;;
++  --debug | --debu | --deb | --de | --d | -d )
++    debug=: ;;
++  --file | --fil | --fi | --f )
++    $ac_shift
++    case $ac_optarg in
++    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
++    esac
++    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
++    ac_need_defaults=false;;
++  --header | --heade | --head | --hea )
++    $ac_shift
++    case $ac_optarg in
++    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
++    esac
++    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
++    ac_need_defaults=false;;
++  --he | --h)
++    # Conflict between --help and --header
++    { $as_echo "$as_me: error: ambiguous option: $1
++Try \`$0 --help' for more information." >&2
++   { (exit 1); exit 1; }; };;
++  --help | --hel | -h )
++    $as_echo "$ac_cs_usage"; exit ;;
++  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
++  | -silent | --silent | --silen | --sile | --sil | --si | --s)
++    ac_cs_silent=: ;;
++
++  # This is an error.
++  -*) { $as_echo "$as_me: error: unrecognized option: $1
++Try \`$0 --help' for more information." >&2
++   { (exit 1); exit 1; }; } ;;
+ 
++  *) ac_config_targets="$ac_config_targets $1"
++     ac_need_defaults=false ;;
+ 
 -                for lang in $ALL_LINGUAS; do
 -      GMOFILES="$GMOFILES $lang.gmo"
 -      POFILES="$POFILES $lang.po"
 -    done
--
--
--
--
--
--
--
--
--
--
--
--
--
++  esac
++  shift
++done
+ 
++ac_configure_extra_args=
+ 
++if $ac_cs_silent; then
++  exec 6>/dev/null
++  ac_configure_extra_args="$ac_configure_extra_args --silent"
++fi
+ 
++_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++if \$ac_cs_recheck; then
++  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++  shift
++  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
++  CONFIG_SHELL='$SHELL'
++  export CONFIG_SHELL
++  exec "\$@"
++fi
+ 
++_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++exec 5>>config.log
++{
++  echo
++  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
++## Running $as_me. ##
++_ASBOX
++  $as_echo "$ac_log"
++} >&5
+ 
++_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++#
++# INIT-COMMANDS
++#
++AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+ 
+ 
++# 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
+ 
++sed_quote_subst='$sed_quote_subst'
++double_quote_subst='$double_quote_subst'
++delay_variable_subst='$delay_variable_subst'
++macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
++macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
++enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
++enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
++pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
++enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
++host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
++host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
++host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
++build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
++build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
++build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
++SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
++Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
++GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
++EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
++FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
++LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
++NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
++LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
++max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
++ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
++exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
++lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
++lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
++lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
++reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
++reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
++deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
++file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
++AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
++AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
++STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
++RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
++old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
++CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
++compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
++GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
++lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
++lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
++lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
++objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
++SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
++ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
++MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
++lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
++lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
++lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
++lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
++lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
++need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
++DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
++NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
++LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
++OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
++OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
++libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
++shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
++enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
++export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
++whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
++compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
++old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
++allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
++no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
++inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
++link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
++fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
++always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
++export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
++include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
++prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
++variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
++need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
++need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
++version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
++runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
++shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
++shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
++libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
++library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
++soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
++postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
++sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
++sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
++enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
++enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
++enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
++old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
++striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
++
++LTCC='$LTCC'
++LTCFLAGS='$LTCFLAGS'
++compiler='$compiler_DEFAULT'
++
++# Quote evaled strings.
++for var in SED \
++GREP \
++EGREP \
++FGREP \
++LD \
++NM \
++LN_S \
++lt_SP2NL \
++lt_NL2SP \
++reload_flag \
++OBJDUMP \
++deplibs_check_method \
++file_magic_cmd \
++AR \
++AR_FLAGS \
++STRIP \
++RANLIB \
++CC \
++CFLAGS \
++compiler \
++lt_cv_sys_global_symbol_pipe \
++lt_cv_sys_global_symbol_to_cdecl \
++lt_cv_sys_global_symbol_to_c_name_address \
++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
++SHELL \
++ECHO \
++lt_prog_compiler_no_builtin_flag \
++lt_prog_compiler_wl \
++lt_prog_compiler_pic \
++lt_prog_compiler_static \
++lt_cv_prog_compiler_c_o \
++need_locks \
++DSYMUTIL \
++NMEDIT \
++LIPO \
++OTOOL \
++OTOOL64 \
++shrext_cmds \
++export_dynamic_flag_spec \
++whole_archive_flag_spec \
++compiler_needs_object \
++with_gnu_ld \
++allow_undefined_flag \
++no_undefined_flag \
++hardcode_libdir_flag_spec \
++hardcode_libdir_flag_spec_ld \
++hardcode_libdir_separator \
++fix_srcfile_path \
++exclude_expsyms \
++include_expsyms \
++file_list_spec \
++variables_saved_for_relink \
++libname_spec \
++library_names_spec \
++soname_spec \
++finish_eval \
++old_striplib \
++striplib; do
++    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
++    *[\\\\\\\`\\"\\\$]*)
++      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
++      ;;
++    *)
++      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
++      ;;
++    esac
++done
+ 
++# Double-quote double-evaled strings.
++for var in reload_cmds \
++old_postinstall_cmds \
++old_postuninstall_cmds \
++old_archive_cmds \
++extract_expsyms_cmds \
++old_archive_from_new_cmds \
++old_archive_from_expsyms_cmds \
++archive_cmds \
++archive_expsym_cmds \
++module_cmds \
++module_expsym_cmds \
++export_symbols_cmds \
++prelink_cmds \
++postinstall_cmds \
++postuninstall_cmds \
++finish_cmds \
++sys_lib_search_path_spec \
++sys_lib_dlsearch_path_spec; do
++    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
++    *[\\\\\\\`\\"\\\$]*)
++      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
++      ;;
++    *)
++      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
++      ;;
++    esac
++done
+ 
++# Fix-up fallback echo if it was mangled by the above quoting rules.
++case \$lt_ECHO in
++*'\\\$0 --fallback-echo"')  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
++  ;;
++esac
+ 
++ac_aux_dir='$ac_aux_dir'
++xsi_shell='$xsi_shell'
++lt_shell_append='$lt_shell_append'
+ 
++# See if we are running on zsh, and set the options which allow our
++# commands through without removal of \ escapes INIT.
++if test -n "\${ZSH_VERSION+set}" ; then
++   setopt NO_GLOB_SUBST
++fi
+ 
 -   if test "$gt_cv_have_gettext" = "yes"; then
 -     if test "x$ALL_LINGUAS" = "x"; then
 -       LINGUAS=
@@ -42659,12 +37976,17 @@
 -       { echo "$as_me:$LINENO: result: $LINGUAS" >&5
 -echo "${ECHO_T}$LINGUAS" >&6; }
 -     fi
--
+ 
 -          if test -n "$LINGUAS"; then
 -       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
 -     fi
 -   fi
--
++    PACKAGE='$PACKAGE'
++    VERSION='$VERSION'
++    TIMESTAMP='$TIMESTAMP'
++    RM='$RM'
++    ofile='$ofile'
+ 
 -            MKINSTALLDIRS=
 -   if test -n "$ac_aux_dir"; then
 -     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
@@ -42672,8 +37994,8 @@
 -   if test -z "$MKINSTALLDIRS"; then
 -     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
 -   fi
--
--
+ 
+ 
 -         test -d po || mkdir po
 -   if test "x$srcdir" != "x."; then
 -     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
@@ -42687,16 +38009,55 @@
 -   rm -f po/POTFILES
 -   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
 -	< $srcdir/po/POTFILES.in > po/POTFILES
--
--
--
+ 
+ 
++_ACEOF
+ 
 -##############################
 -# Documentation
 -##############################
--
--
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ 
++# Handling of arguments.
++for ac_config_target in $ac_config_targets
++do
++  case $ac_config_target in
++    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
++    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
++    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
++    "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
++    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
++    "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
++    "data/icons/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/Makefile" ;;
++    "data/icons/16x16/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/16x16/Makefile" ;;
++    "data/icons/16x16/status/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/16x16/status/Makefile" ;;
++    "data/icons/16x16/actions/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/16x16/actions/Makefile" ;;
++    "data/icons/22x22/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/22x22/Makefile" ;;
++    "data/icons/22x22/status/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/22x22/status/Makefile" ;;
++    "data/icons/22x22/actions/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/22x22/actions/Makefile" ;;
++    "data/icons/24x24/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/24x24/Makefile" ;;
++    "data/icons/24x24/status/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/24x24/status/Makefile" ;;
++    "data/icons/24x24/actions/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/24x24/actions/Makefile" ;;
++    "data/icons/32x32/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/32x32/Makefile" ;;
++    "data/icons/32x32/status/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/32x32/status/Makefile" ;;
++    "data/icons/32x32/actions/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/32x32/actions/Makefile" ;;
++    "data/icons/48x48/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/48x48/Makefile" ;;
++    "data/icons/48x48/status/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/48x48/status/Makefile" ;;
++    "data/icons/scalable/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/scalable/Makefile" ;;
++    "data/icons/scalable/status/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/scalable/status/Makefile" ;;
++    "data/icons/scalable/actions/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/scalable/actions/Makefile" ;;
++    "help/Makefile") CONFIG_FILES="$CONFIG_FILES help/Makefile" ;;
++    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
++    "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
++    "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
+ 
 -gdu_cv_version_required=0.3.2
--
++  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
++$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
++   { (exit 1); exit 1; }; };;
++  esac
++done
+ 
 -if test -n "$PKG_CONFIG" && \
 -    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
 -  ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
@@ -42707,17 +38068,52 @@
 -else
 -  gdu_cv_have_gdu=no
 -fi
--
+ 
 -if test "$gdu_cv_have_gdu" = "yes"; then
 -	:
 -else
 -	{ { echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5
 -echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}
 -   { (exit 1); exit 1; }; }
--fi
--
--
--
++# If the user did not use the arguments to specify the items to instantiate,
++# then the envvar interface is used.  Set only those that are not.
++# We use the long form for the default assignment because of an extremely
++# bizarre bug on SunOS 4.1.3.
++if $ac_need_defaults; then
++  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
++  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
++  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+ fi
+ 
++# Have a temporary directory for convenience.  Make it in the build tree
++# simply because there is no reason against having it here, and in addition,
++# creating and moving files from /tmp can sometimes cause problems.
++# Hook for its removal unless debugging.
++# Note that there is a small window in which the directory will not be cleaned:
++# after its creation but before its name has been assigned to `$tmp'.
++$debug ||
++{
++  tmp=
++  trap 'exit_status=$?
++  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
++' 0
++  trap '{ (exit 1); exit 1; }' 1 2 13 15
++}
++# Create a (secure) tmp directory for tmp files.
+ 
++{
++  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
++  test -n "$tmp" && test -d "$tmp"
++}  ||
++{
++  tmp=./conf$$-$RANDOM
++  (umask 077 && mkdir "$tmp")
++} ||
++{
++   $as_echo "$as_me: cannot create a temporary directory in ." >&2
++   { (exit 1); exit 1; }
++}
+ 
 -# Check whether --with-help-dir was given.
 -if test "${with_help_dir+set}" = set; then
 -  withval=$with_help_dir;
@@ -42727,343 +38123,163 @@
 -
 -HELP_DIR="$with_help_dir"
 -
--
--
++# Set up the scripts for CONFIG_FILES section.
++# No need to generate them if there are no CONFIG_FILES.
++# This happens for instance with `./config.status config.h'.
++if test -n "$CONFIG_FILES"; then
+ 
+ 
 -# Check whether --with-omf-dir was given.
 -if test "${with_omf_dir+set}" = set; then
 -  withval=$with_omf_dir;
--else
++ac_cr='
'
++ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
++if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
++  ac_cs_awk_cr='\\r'
+ else
 -  with_omf_dir='${datadir}/omf'
--fi
--
++  ac_cs_awk_cr=$ac_cr
+ fi
+ 
 -OMF_DIR="$with_omf_dir"
--
--
--
++echo 'BEGIN {' >"$tmp/subs1.awk" &&
++_ACEOF
+ 
+ 
++{
++  echo "cat >conf$$subs.awk <<_ACEOF" &&
++  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
++  echo "_ACEOF"
++} >conf$$subs.sh ||
++  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++   { (exit 1); exit 1; }; }
++ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++  . ./conf$$subs.sh ||
++    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++   { (exit 1); exit 1; }; }
+ 
 -# Check whether --with-help-formats was given.
 -if test "${with_help_formats+set}" = set; then
 -  withval=$with_help_formats;
 -else
 -  with_help_formats=''
 -fi
--
++  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
++  if test $ac_delim_n = $ac_delim_num; then
++    break
++  elif $ac_last_try; then
++    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++   { (exit 1); exit 1; }; }
++  else
++    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
++  fi
++done
++rm -f conf$$subs.sh
+ 
 -DOC_USER_FORMATS="$with_help_formats"
--
--
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
++_ACEOF
++sed -n '
++h
++s/^/S["/; s/!.*/"]=/
++p
++g
++s/^[^!]*!//
++:repl
++t repl
++s/'"$ac_delim"'$//
++t delim
++:nl
++h
++s/\(.\{148\}\).*/\1/
++t more1
++s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
++p
++n
++b repl
++:more1
++s/["\\]/\\&/g; s/^/"/; s/$/"\\/
++p
++g
++s/.\{148\}//
++t nl
++:delim
++h
++s/\(.\{148\}\).*/\1/
++t more2
++s/["\\]/\\&/g; s/^/"/; s/$/"/
++p
++b
++:more2
++s/["\\]/\\&/g; s/^/"/; s/$/"\\/
++p
++g
++s/.\{148\}//
++t delim
++' <conf$$subs.awk | sed '
++/^[^""]/{
++  N
++  s/\n//
++}
++' >>$CONFIG_STATUS || ac_write_fail=1
++rm -f conf$$subs.awk
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++_ACAWK
++cat >>"\$tmp/subs1.awk" <<_ACAWK &&
++  for (key in S) S_is_set[key] = 1
++  FS = ""
++
++}
++{
++  line = $ 0
++  nfields = split(line, field, "@")
++  substed = 0
++  len = length(field[1])
++  for (i = 2; i < nfields; i++) {
++    key = field[i]
++    keylen = length(key)
++    if (S_is_set[key]) {
++      value = S[key]
++      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
++      len += length(value) + length(field[++i])
++      substed = 1
++    } else
++      len += 1 + keylen
++  }
+ 
++  print line
++}
+ 
 -# Check whether --enable-scrollkeeper was given.
 -if test "${enable_scrollkeeper+set}" = set; then
 -  enableval=$enable_scrollkeeper;
--else
++_ACAWK
++_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
++  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+ else
 -  enable_scrollkeeper=yes
 -fi
--
++  cat
++fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
++  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
++$as_echo "$as_me: error: could not setup config files machinery" >&2;}
++   { (exit 1); exit 1; }; }
++_ACEOF
+ 
 - if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
 -  ENABLE_SK_TRUE=
 -  ENABLE_SK_FALSE='#'
 -else
 -  ENABLE_SK_TRUE='#'
 -  ENABLE_SK_FALSE=
--fi
--
--
--DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+  cat >conf$$subs.sed <<_ACEOF
-+SHELL!$SHELL$ac_delim
-+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-+exec_prefix!$exec_prefix$ac_delim
-+prefix!$prefix$ac_delim
-+program_transform_name!$program_transform_name$ac_delim
-+bindir!$bindir$ac_delim
-+sbindir!$sbindir$ac_delim
-+libexecdir!$libexecdir$ac_delim
-+datarootdir!$datarootdir$ac_delim
-+datadir!$datadir$ac_delim
-+sysconfdir!$sysconfdir$ac_delim
-+sharedstatedir!$sharedstatedir$ac_delim
-+localstatedir!$localstatedir$ac_delim
-+includedir!$includedir$ac_delim
-+oldincludedir!$oldincludedir$ac_delim
-+docdir!$docdir$ac_delim
-+infodir!$infodir$ac_delim
-+htmldir!$htmldir$ac_delim
-+dvidir!$dvidir$ac_delim
-+pdfdir!$pdfdir$ac_delim
-+psdir!$psdir$ac_delim
-+libdir!$libdir$ac_delim
-+localedir!$localedir$ac_delim
-+mandir!$mandir$ac_delim
-+DEFS!$DEFS$ac_delim
-+ECHO_C!$ECHO_C$ac_delim
-+ECHO_N!$ECHO_N$ac_delim
-+ECHO_T!$ECHO_T$ac_delim
-+LIBS!$LIBS$ac_delim
-+build_alias!$build_alias$ac_delim
-+host_alias!$host_alias$ac_delim
-+target_alias!$target_alias$ac_delim
-+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-+INSTALL_DATA!$INSTALL_DATA$ac_delim
-+am__isrc!$am__isrc$ac_delim
-+CYGPATH_W!$CYGPATH_W$ac_delim
-+PACKAGE!$PACKAGE$ac_delim
-+VERSION!$VERSION$ac_delim
-+ACLOCAL!$ACLOCAL$ac_delim
-+AUTOCONF!$AUTOCONF$ac_delim
-+AUTOMAKE!$AUTOMAKE$ac_delim
-+AUTOHEADER!$AUTOHEADER$ac_delim
-+MAKEINFO!$MAKEINFO$ac_delim
-+install_sh!$install_sh$ac_delim
-+STRIP!$STRIP$ac_delim
-+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-+mkdir_p!$mkdir_p$ac_delim
-+AWK!$AWK$ac_delim
-+SET_MAKE!$SET_MAKE$ac_delim
-+am__leading_dot!$am__leading_dot$ac_delim
-+AMTAR!$AMTAR$ac_delim
-+am__tar!$am__tar$ac_delim
-+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
-+USE_NLS!$USE_NLS$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
-+INTLTOOL_PROP_RULE!$INTLTOOL_PROP_RULE$ac_delim
-+INTLTOOL_OAF_RULE!$INTLTOOL_OAF_RULE$ac_delim
-+INTLTOOL_PONG_RULE!$INTLTOOL_PONG_RULE$ac_delim
-+INTLTOOL_SERVER_RULE!$INTLTOOL_SERVER_RULE$ac_delim
-+INTLTOOL_SHEET_RULE!$INTLTOOL_SHEET_RULE$ac_delim
-+INTLTOOL_SOUNDLIST_RULE!$INTLTOOL_SOUNDLIST_RULE$ac_delim
-+INTLTOOL_UI_RULE!$INTLTOOL_UI_RULE$ac_delim
-+INTLTOOL_XAM_RULE!$INTLTOOL_XAM_RULE$ac_delim
-+INTLTOOL_KBD_RULE!$INTLTOOL_KBD_RULE$ac_delim
-+INTLTOOL_XML_RULE!$INTLTOOL_XML_RULE$ac_delim
-+INTLTOOL_XML_NOMERGE_RULE!$INTLTOOL_XML_NOMERGE_RULE$ac_delim
-+INTLTOOL_CAVES_RULE!$INTLTOOL_CAVES_RULE$ac_delim
-+INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim
-+INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
-+INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
-+INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim
-+XGETTEXT!$XGETTEXT$ac_delim
-+MSGMERGE!$MSGMERGE$ac_delim
-+MSGFMT!$MSGFMT$ac_delim
-+GMSGFMT!$GMSGFMT$ac_delim
-+INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
-+ALL_LINGUAS!$ALL_LINGUAS$ac_delim
-+CC!$CC$ac_delim
-+CFLAGS!$CFLAGS$ac_delim
-+LDFLAGS!$LDFLAGS$ac_delim
-+CPPFLAGS!$CPPFLAGS$ac_delim
-+ac_ct_CC!$ac_ct_CC$ac_delim
-+EXEEXT!$EXEEXT$ac_delim
-+_ACEOF
- 
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+    break
-+  elif $ac_last_try; then
-+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+   { (exit 1); exit 1; }; }
-+  else
-+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+  fi
-+done
- 
-- if test "$gdu_cv_have_gdu" = "yes"; then
--  HAVE_GNOME_DOC_UTILS_TRUE=
--  HAVE_GNOME_DOC_UTILS_FALSE='#'
--else
--  HAVE_GNOME_DOC_UTILS_TRUE='#'
--  HAVE_GNOME_DOC_UTILS_FALSE=
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+  ac_eof=`expr $ac_eof + 1`
- fi
- 
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+CEOF$ac_eof
-+_ACEOF
- 
- 
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+  cat >conf$$subs.sed <<_ACEOF
-+OBJEXT!$OBJEXT$ac_delim
-+DEPDIR!$DEPDIR$ac_delim
-+am__include!$am__include$ac_delim
-+am__quote!$am__quote$ac_delim
-+AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-+AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-+CCDEPMODE!$CCDEPMODE$ac_delim
-+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-+DATADIRNAME!$DATADIRNAME$ac_delim
-+CPP!$CPP$ac_delim
-+GREP!$GREP$ac_delim
-+EGREP!$EGREP$ac_delim
-+LIBTOOL!$LIBTOOL$ac_delim
-+build!$build$ac_delim
-+build_cpu!$build_cpu$ac_delim
-+build_vendor!$build_vendor$ac_delim
-+build_os!$build_os$ac_delim
-+host!$host$ac_delim
-+host_cpu!$host_cpu$ac_delim
-+host_vendor!$host_vendor$ac_delim
-+host_os!$host_os$ac_delim
-+SED!$SED$ac_delim
-+FGREP!$FGREP$ac_delim
-+LD!$LD$ac_delim
-+DUMPBIN!$DUMPBIN$ac_delim
-+ac_ct_DUMPBIN!$ac_ct_DUMPBIN$ac_delim
-+NM!$NM$ac_delim
-+LN_S!$LN_S$ac_delim
-+AR!$AR$ac_delim
-+RANLIB!$RANLIB$ac_delim
-+lt_ECHO!$lt_ECHO$ac_delim
-+DSYMUTIL!$DSYMUTIL$ac_delim
-+NMEDIT!$NMEDIT$ac_delim
-+LIPO!$LIPO$ac_delim
-+OTOOL!$OTOOL$ac_delim
-+OTOOL64!$OTOOL64$ac_delim
-+PKG_CONFIG!$PKG_CONFIG$ac_delim
-+APPLET_CFLAGS!$APPLET_CFLAGS$ac_delim
-+APPLET_LIBS!$APPLET_LIBS$ac_delim
-+GLIB_MKENUMS!$GLIB_MKENUMS$ac_delim
-+GLIB_GENMARSHAL!$GLIB_GENMARSHAL$ac_delim
-+GCONFTOOL!$GCONFTOOL$ac_delim
-+GCONF_SCHEMA_CONFIG_SOURCE!$GCONF_SCHEMA_CONFIG_SOURCE$ac_delim
-+GCONF_SCHEMA_FILE_DIR!$GCONF_SCHEMA_FILE_DIR$ac_delim
-+GCONF_SCHEMAS_INSTALL_TRUE!$GCONF_SCHEMAS_INSTALL_TRUE$ac_delim
-+GCONF_SCHEMAS_INSTALL_FALSE!$GCONF_SCHEMAS_INSTALL_FALSE$ac_delim
-+XMKMF!$XMKMF$ac_delim
-+X_CFLAGS!$X_CFLAGS$ac_delim
-+X_PRE_LIBS!$X_PRE_LIBS$ac_delim
-+X_LIBS!$X_LIBS$ac_delim
-+X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
-+users_admin!$users_admin$ac_delim
-+gdm_setup!$gdm_setup$ac_delim
-+GDMCONFIGFILE!$GDMCONFIGFILE$ac_delim
-+WARN_CFLAGS!$WARN_CFLAGS$ac_delim
-+GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
-+GNOMELOCALEDIR!$GNOMELOCALEDIR$ac_delim
-+MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
-+CATALOGS!$CATALOGS$ac_delim
-+CATOBJEXT!$CATOBJEXT$ac_delim
-+GMOFILES!$GMOFILES$ac_delim
-+INSTOBJEXT!$INSTOBJEXT$ac_delim
-+INTLLIBS!$INTLLIBS$ac_delim
-+PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim
-+PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
-+POFILES!$POFILES$ac_delim
-+POSUB!$POSUB$ac_delim
-+MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
-+HELP_DIR!$HELP_DIR$ac_delim
-+OMF_DIR!$OMF_DIR$ac_delim
-+DOC_USER_FORMATS!$DOC_USER_FORMATS$ac_delim
-+ENABLE_SK_TRUE!$ENABLE_SK_TRUE$ac_delim
-+ENABLE_SK_FALSE!$ENABLE_SK_FALSE$ac_delim
-+DISTCHECK_CONFIGURE_FLAGS!$DISTCHECK_CONFIGURE_FLAGS$ac_delim
-+HAVE_GNOME_DOC_UTILS_TRUE!$HAVE_GNOME_DOC_UTILS_TRUE$ac_delim
-+HAVE_GNOME_DOC_UTILS_FALSE!$HAVE_GNOME_DOC_UTILS_FALSE$ac_delim
-+EXPANDED_SYSCONFDIR!$EXPANDED_SYSCONFDIR$ac_delim
-+PREFIX!$PREFIX$ac_delim
-+SYSCONFDIR!$SYSCONFDIR$ac_delim
-+LIBDIR!$LIBDIR$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` = 84; then
-+    break
-+  elif $ac_last_try; then
-+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+   { (exit 1); exit 1; }; }
-+  else
-+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+  fi
-+done
- 
--##############################
--# ./configure Flags messings
--##############################
--
--cflags_set=${CFLAGS+set}
--# find the actual value for $prefix that we'll end up with
--REAL_PREFIX=
--if test "x$prefix" = "xNONE"; then
--  REAL_PREFIX=$ac_default_prefix
--else
--  REAL_PREFIX=$prefix
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+  ac_eof=`expr $ac_eof + 1`
- fi
- 
--# Have to go $sysconfdir->$prefix/etc->/usr/local/etc
--# if you actually know how to code shell then fix this :-)
--SYSCONFDIR_TMP="$sysconfdir"
--old_prefix=$prefix
--prefix=$REAL_PREFIX
--EXPANDED_SYSCONFDIR=`eval echo $SYSCONFDIR_TMP`
--prefix=$old_prefix
--
--
--ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+:end
-+s/|#_!!_#|//g
-+CEOF$ac_eof
-+_ACEOF
- 
- 
--  test "x$prefix" = xNONE && prefix="$ac_default_prefix"
--  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
--  ac_define_path=`eval echo $"${prefix}"`
--  ac_define_path=`eval echo $ac_define_path`
--  PREFIX="$ac_define_path"
 +# VPATH may cause trouble with some makes, so we remove $(srcdir),
 +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 +# trailing colons and then remove the whole line if VPATH becomes empty
@@ -43077,24 +38293,143 @@
 +s/:*$//
 +s/^[^=]*=[	 ]*$//
 +}'
-+fi
+ fi
  
-+cat >>$CONFIG_STATUS <<\_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 +fi # test -n "$CONFIG_FILES"
  
--cat >>confdefs.h <<_ACEOF
--#define PREFIX "$ac_define_path"
--_ACEOF
- 
-+for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
+-DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
++# Set up the scripts for CONFIG_HEADERS section.
++# No need to generate them if there are no CONFIG_HEADERS.
++# This happens for instance with `./config.status Makefile'.
++if test -n "$CONFIG_HEADERS"; then
++cat >"$tmp/defines.awk" <<\_ACAWK ||
++BEGIN {
++_ACEOF
+ 
++# Transform confdefs.h into an awk script `defines.awk', embedded as
++# here-document in config.status, that substitutes the proper values into
++# config.h.in to produce config.h.
+ 
+- if test "$gdu_cv_have_gdu" = "yes"; then
+-  HAVE_GNOME_DOC_UTILS_TRUE=
+-  HAVE_GNOME_DOC_UTILS_FALSE='#'
+-else
+-  HAVE_GNOME_DOC_UTILS_TRUE='#'
+-  HAVE_GNOME_DOC_UTILS_FALSE=
+-fi
++# Create a delimiter string that does not exist in confdefs.h, to ease
++# handling of long lines.
++ac_delim='%!_!# '
++for ac_last_try in false false :; do
++  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
++  if test -z "$ac_t"; then
++    break
++  elif $ac_last_try; then
++    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
++$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
++   { (exit 1); exit 1; }; }
++  else
++    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
++  fi
++done
+ 
++# For the awk script, D is an array of macro values keyed by name,
++# likewise P contains macro parameters if any.  Preserve backslash
++# newline sequences.
+ 
++ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
++sed -n '
++s/.\{148\}/&'"$ac_delim"'/g
++t rset
++:rset
++s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
++t def
++d
++:def
++s/\\$//
++t bsnl
++s/["\\]/\\&/g
++s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
++D["\1"]=" \3"/p
++s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
++d
++:bsnl
++s/["\\]/\\&/g
++s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
++D["\1"]=" \3\\\\\\n"\\/p
++t cont
++s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
++t cont
++d
++:cont
++n
++s/.\{148\}/&'"$ac_delim"'/g
++t clear
++:clear
++s/\\$//
++t bsnlc
++s/["\\]/\\&/g; s/^/"/; s/$/"/p
++d
++:bsnlc
++s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
++b cont
++' <confdefs.h | sed '
++s/'"$ac_delim"'/"\\\
++"/g' >>$CONFIG_STATUS || ac_write_fail=1
++
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++  for (key in D) D_is_set[key] = 1
++  FS = ""
++}
++/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
++  line = \$ 0
++  split(line, arg, " ")
++  if (arg[1] == "#") {
++    defundef = arg[2]
++    mac1 = arg[3]
++  } else {
++    defundef = substr(arg[1], 2)
++    mac1 = arg[2]
++  }
++  split(mac1, mac2, "(") #)
++  macro = mac2[1]
++  prefix = substr(line, 1, index(line, defundef) - 1)
++  if (D_is_set[macro]) {
++    # Preserve the white space surrounding the "#".
++    print prefix "define", macro P[macro] D[macro]
++    next
++  } else {
++    # Replace #undef with comments.  This is necessary, for example,
++    # in the case of _POSIX_SOURCE, which is predefined and required
++    # on some systems where configure will not decide to define it.
++    if (defundef == "undef") {
++      print "/*", prefix defundef, macro, "*/"
++      next
++    }
++  }
++}
++{ print }
++_ACAWK
++_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
++$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
++   { (exit 1); exit 1; }; }
++fi # test -n "$CONFIG_HEADERS"
+ 
+ 
++eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
++shift
++for ac_tag
 +do
 +  case $ac_tag in
 +  :[FHLC]) ac_mode=$ac_tag; continue;;
 +  esac
 +  case $ac_mode$ac_tag in
 +  :[FHL]*:*);;
-+  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
++  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
++$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
 +   { (exit 1); exit 1; }; };;
 +  :[FH]-) ac_tag=-:-;;
 +  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -43107,6 +38442,9 @@
 +  ac_file=$1
 +  shift
  
+-##############################
+-# ./configure Flags messings
+-##############################
 +  case $ac_mode in
 +  :L) ac_source=$1;;
 +  :[FH])
@@ -43123,44 +38461,63 @@
 +	   [\\/$]*) false;;
 +	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 +	   esac ||
-+	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
++	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
++$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
 +   { (exit 1); exit 1; }; };;
 +      esac
-+      ac_file_inputs="$ac_file_inputs $ac_f"
++      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
++      ac_file_inputs="$ac_file_inputs '$ac_f'"
 +    done
  
--  test "x$prefix" = xNONE && prefix="$ac_default_prefix"
--  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
--  ac_define_path=`eval echo $"${sysconfdir}"`
--  ac_define_path=`eval echo $ac_define_path`
--  SYSCONFDIR="$ac_define_path"
+-cflags_set=${CFLAGS+set}
+-# find the actual value for $prefix that we'll end up with
+-REAL_PREFIX=
+-if test "x$prefix" = "xNONE"; then
+-  REAL_PREFIX=$ac_default_prefix
+-else
+-  REAL_PREFIX=$prefix
+-fi
 +    # Let's still pretend it is `configure' which instantiates (i.e., don't
 +    # use $as_me), people would be surprised to read:
 +    #    /* config.h.  Generated by config.status.  */
-+    configure_input="Generated from "`IFS=:
-+	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
++    configure_input='Generated from '`
++	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
++	`' by configure.'
 +    if test x"$ac_file" != x-; then
 +      configure_input="$ac_file.  $configure_input"
-+      { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
++      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
++$as_echo "$as_me: creating $ac_file" >&6;}
 +    fi
++    # Neutralize special characters interpreted by sed in replacement strings.
++    case $configure_input in #(
++    *\&* | *\|* | *\\* )
++       ac_sed_conf_input=`$as_echo "$configure_input" |
++       sed 's/[\\\\&|]/\\\\&/g'`;; #(
++    *) ac_sed_conf_input=$configure_input;;
++    esac
  
+-# Have to go $sysconfdir->$prefix/etc->/usr/local/etc
+-# if you actually know how to code shell then fix this :-)
+-SYSCONFDIR_TMP="$sysconfdir"
+-old_prefix=$prefix
+-prefix=$REAL_PREFIX
+-EXPANDED_SYSCONFDIR=`eval echo $SYSCONFDIR_TMP`
+-prefix=$old_prefix
 +    case $ac_tag in
-+    *:-:* | *:-) cat >"$tmp/stdin";;
++    *:-:* | *:-) cat >"$tmp/stdin" \
++      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
++$as_echo "$as_me: error: could not create $ac_file" >&2;}
++   { (exit 1); exit 1; }; } ;;
 +    esac
 +    ;;
 +  esac
  
--cat >>confdefs.h <<_ACEOF
--#define SYSCONFDIR "$ac_define_path"
--_ACEOF
 +  ac_dir=`$as_dirname -- "$ac_file" ||
 +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 +	 X"$ac_file" : 'X\(//\)[^/]' \| \
 +	 X"$ac_file" : 'X\(//\)$' \| \
 +	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X"$ac_file" |
++$as_echo X"$ac_file" |
 +    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 +	    s//\1/
 +	    q
@@ -43186,7 +38543,7 @@
 +    as_dirs=
 +    while :; do
 +      case $as_dir in #(
-+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
++      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
 +      *) as_qdir=$as_dir;;
 +      esac
 +      as_dirs="'$as_qdir' $as_dirs"
@@ -43195,7 +38552,7 @@
 +	 X"$as_dir" : 'X\(//\)[^/]' \| \
 +	 X"$as_dir" : 'X\(//\)$' \| \
 +	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X"$as_dir" |
++$as_echo X"$as_dir" |
 +    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 +	    s//\1/
 +	    q
@@ -43216,17 +38573,18 @@
 +      test -d "$as_dir" && break
 +    done
 +    test -z "$as_dirs" || eval "mkdir $as_dirs"
-+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
++  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
++$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
 +   { (exit 1); exit 1; }; }; }
 +  ac_builddir=.
  
+-ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
 +case "$ac_dir" in
 +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 +*)
-+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
++  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
 +  # A ".." for each directory in $ac_dir_suffix.
-+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
++  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
 +  case $ac_top_builddir_sub in
 +  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
 +  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -43255,9 +38613,9 @@
  
 -  test "x$prefix" = xNONE && prefix="$ac_default_prefix"
 -  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
--  ac_define_path=`eval echo $"${libdir}"`
+-  ac_define_path=`eval echo $"${prefix}"`
 -  ac_define_path=`eval echo $ac_define_path`
--  LIBDIR="$ac_define_path"
+-  PREFIX="$ac_define_path"
  
 +  case $ac_mode in
 +  :F)
@@ -43266,7 +38624,7 @@
 +  #
  
 -cat >>confdefs.h <<_ACEOF
--#define LIBDIR "$ac_define_path"
+-#define PREFIX "$ac_define_path"
 +  case $INSTALL in
 +  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
 +  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
@@ -43278,12 +38636,13 @@
 +  esac
  _ACEOF
  
-+cat >>$CONFIG_STATUS <<\_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 +# If the template does not know about datarootdir, expand it.
 +# FIXME: This hack should be removed a few years after 2.60.
 +ac_datarootdir_hack=; ac_datarootdir_seen=
  
-+case `sed -n '/datarootdir/ {
++ac_sed_dataroot='
++/datarootdir/ {
 +  p
 +  q
 +}
@@ -43292,13 +38651,14 @@
 +/@infodir@/p
 +/@localedir@/p
 +/@mandir@/p
-+' $ac_file_inputs` in
++'
++case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 +*datarootdir*) ac_datarootdir_seen=yes;;
 +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-+  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
++  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
++$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 +_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 +  ac_datarootdir_hack='
 +  s&@datadir@&$datadir&g
 +  s&@docdir@&$docdir&g
@@ -43309,23 +38669,28 @@
 +esac
 +_ACEOF
  
--##############################
--# Flags
--##############################
--
--
+-  test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+-  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+-  ac_define_path=`eval echo $"${sysconfdir}"`
+-  ac_define_path=`eval echo $ac_define_path`
+-  SYSCONFDIR="$ac_define_path"
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define SYSCONFDIR "$ac_define_path"
 +# Neutralize VPATH when `$srcdir' = `.'.
 +# Shell code in configure.ac might set extrasub.
 +# FIXME: do we really want to maintain this feature?
-+cat >>$CONFIG_STATUS <<_ACEOF
-+  sed "$ac_vpsub
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++ac_sed_extra="$ac_vpsub
 +$extrasub
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
+ _ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 +:t
 +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+s&@configure_input@&$configure_input&;t t
++s|@configure_input@|$ac_sed_conf_input|;t t
 +s&@top_builddir@&$ac_top_builddir_sub&;t t
++s&@top_build_prefix@&$ac_top_build_prefix&;t t
 +s&@srcdir@&$ac_srcdir&;t t
 +s&@abs_srcdir@&$ac_abs_srcdir&;t t
 +s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -43336,72 +38701,314 @@
 +s&@INSTALL@&$ac_INSTALL&;t t
 +s&@MKDIR_P@&$ac_MKDIR_P&;t t
 +$ac_datarootdir_hack
-+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
- 
++"
++eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
++  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
++$as_echo "$as_me: error: could not create $ac_file" >&2;}
++   { (exit 1); exit 1; }; }
++
 +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
 +  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
 +  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-+  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
++  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 +which seems to be undefined.  Please make sure it is defined." >&5
-+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
++$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 +which seems to be undefined.  Please make sure it is defined." >&2;}
  
 +  rm -f "$tmp/stdin"
 +  case $ac_file in
-+  -) cat "$tmp/out"; rm -f "$tmp/out";;
-+  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-+  esac
++  -) cat "$tmp/out" && rm -f "$tmp/out";;
++  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
++  esac \
++  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
++$as_echo "$as_me: error: could not create $ac_file" >&2;}
++   { (exit 1); exit 1; }; }
 + ;;
 +  :H)
 +  #
 +  # CONFIG_HEADER
 +  #
-+_ACEOF
- 
-+# Transform confdefs.h into a sed script `conftest.defines', that
-+# substitutes the proper values into config.h.in to produce config.h.
-+rm -f conftest.defines conftest.tail
-+# First, append a space to every undef/define line, to ease matching.
-+echo 's/$/ /' >conftest.defines
-+# Then, protect against being on the right side of a sed subst, or in
-+# an unquoted here document, in config.status.  If some macros were
-+# called several times there might be several #defines for the same
-+# symbol, which is useless.  But do not sort them, since the last
-+# AC_DEFINE must be honored.
-+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-+# NAME is the cpp macro being defined, VALUE is the value it is being given.
-+# PARAMS is the parameter list in the macro definition--in most cases, it's
-+# just an empty string.
-+ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
-+ac_dB='\\)[	 (].*,\\1define\\2'
-+ac_dC=' '
-+ac_dD=' ,'
++  if test x"$ac_file" != x-; then
++    {
++      $as_echo "/* $configure_input  */" \
++      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
++    } >"$tmp/config.h" \
++      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
++$as_echo "$as_me: error: could not create $ac_file" >&2;}
++   { (exit 1); exit 1; }; }
++    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
++      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
++$as_echo "$as_me: $ac_file is unchanged" >&6;}
++    else
++      rm -f "$ac_file"
++      mv "$tmp/config.h" "$ac_file" \
++	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
++$as_echo "$as_me: error: could not create $ac_file" >&2;}
++   { (exit 1); exit 1; }; }
++    fi
++  else
++    $as_echo "/* $configure_input  */" \
++      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
++      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
++$as_echo "$as_me: error: could not create -" >&2;}
++   { (exit 1); exit 1; }; }
++  fi
++# Compute "$ac_file"'s index in $config_headers.
++_am_arg="$ac_file"
++_am_stamp_count=1
++for _am_header in $config_headers :; do
++  case $_am_header in
++    $_am_arg | $_am_arg:* )
++      break ;;
++    * )
++      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
++  esac
++done
++echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
++$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$_am_arg" : 'X\(//\)[^/]' \| \
++	 X"$_am_arg" : 'X\(//\)$' \| \
++	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X"$_am_arg" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`/stamp-h$_am_stamp_count
++ ;;
+ 
++  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
++$as_echo "$as_me: executing $ac_file commands" >&6;}
++ ;;
++  esac
+ 
+-  test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+-  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+-  ac_define_path=`eval echo $"${libdir}"`
+-  ac_define_path=`eval echo $ac_define_path`
+-  LIBDIR="$ac_define_path"
+ 
++  case $ac_file$ac_mode in
++    "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
++# are listed without --file.  Let's play safe and only enable the eval
++# if we detect the quoting.
++case $CONFIG_FILES in
++*\'*) eval set x "$CONFIG_FILES" ;;
++*)   set x $CONFIG_FILES ;;
++esac
++shift
++for mf
++do
++  # Strip MF so we end up with the name of the file.
++  mf=`echo "$mf" | sed -e 's/:.*$//'`
++  # Check whether this is an Automake generated Makefile or not.
++  # We used to match only the files named `Makefile.in', but
++  # some people rename them; so instead we look at the file content.
++  # Grep'ing the first line is not enough: some people post-process
++  # each Makefile.in and add a new line on top of each file to say so.
++  # Grep'ing the whole file is not good either: AIX grep has a line
++  # limit of 2048, but all sed's we know have understand at least 4000.
++  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
++    dirpart=`$as_dirname -- "$mf" ||
++$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$mf" : 'X\(//\)[^/]' \| \
++	 X"$mf" : 'X\(//\)$' \| \
++	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X"$mf" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
++  else
++    continue
++  fi
++  # Extract the definition of DEPDIR, am__include, and am__quote
++  # from the Makefile without running `make'.
++  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
++  test -z "$DEPDIR" && continue
++  am__include=`sed -n 's/^am__include = //p' < "$mf"`
++  test -z "am__include" && continue
++  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
++  # When using ansi2knr, U may be empty or an underscore; expand it
++  U=`sed -n 's/^U = //p' < "$mf"`
++  # Find all dependency output files, they are included files with
++  # $(DEPDIR) in their names.  We invoke sed twice because it is the
++  # simplest approach to changing $(DEPDIR) to its actual value in the
++  # expansion.
++  for file in `sed -n "
++    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
++       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
++    # Make sure the directory exists.
++    test -f "$dirpart/$file" && continue
++    fdir=`$as_dirname -- "$file" ||
++$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$file" : 'X\(//\)[^/]' \| \
++	 X"$file" : 'X\(//\)$' \| \
++	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X"$file" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
++    { as_dir=$dirpart/$fdir
++  case $as_dir in #(
++  -*) as_dir=./$as_dir;;
++  esac
++  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
++    as_dirs=
++    while :; do
++      case $as_dir in #(
++      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
++      *) as_qdir=$as_dir;;
++      esac
++      as_dirs="'$as_qdir' $as_dirs"
++      as_dir=`$as_dirname -- "$as_dir" ||
++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$as_dir" : 'X\(//\)[^/]' \| \
++	 X"$as_dir" : 'X\(//\)$' \| \
++	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X"$as_dir" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
++      test -d "$as_dir" && break
++    done
++    test -z "$as_dirs" || eval "mkdir $as_dirs"
++  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
++$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
++   { (exit 1); exit 1; }; }; }
++    # echo "creating $dirpart/$file"
++    echo '# dummy' > "$dirpart/$file"
++  done
++done
++ ;;
++    "libtool":C)
+ 
+-cat >>confdefs.h <<_ACEOF
+-#define LIBDIR "$ac_define_path"
+-_ACEOF
++    # 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
+ 
++    cfgfile="${ofile}T"
++    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
++    $RM "$cfgfile"
+ 
++    cat <<_LT_EOF >> "$cfgfile"
++#! $SHELL
+ 
+-##############################
+-# Flags
+-##############################
++# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
++# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++# NOTE: Changes made to this file will be lost: look at ltmain.sh.
++#
++#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
++#                 2006, 2007, 2008 Free Software Foundation, Inc.
++#   Written by Gordon Matzigkeit, 1996
++#
++#   This file is part of GNU Libtool.
++#
++# GNU Libtool 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 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.
+ 
+ 
++# The names of the tagged configurations supported by this script.
++available_tags=""
+ 
++# ### BEGIN LIBTOOL CONFIG
+ 
++# Which release of libtool.m4 was used?
++macro_version=$macro_version
++macro_revision=$macro_revision
+ 
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
  
 -##############################
 -# Files
 -##############################
-+uniq confdefs.h |
-+  sed -n '
-+	t rset
-+	:rset
-+	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
-+	t ok
-+	d
-+	:ok
-+	s/[\\&,]/\\&/g
-+	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-+	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-+  ' >>conftest.defines
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
  
 -ac_config_files="$ac_config_files Makefile data/Makefile help/Makefile src/Makefile po/Makefile.in"
-+# Remove the space that was appended to ease matching.
-+# Then replace #undef with comments.  This is necessary, for
-+# example, in the case of _POSIX_SOURCE, which is predefined and required
-+# on some systems where configure will not decide to define it.
-+# (The regexp can be short, since the line contains either #define or #undef.)
-+echo 's/ $//
-+s,^[	 #]*u.*,/* & */,' >>conftest.defines
++# What type of objects to build.
++pic_mode=$pic_mode
  
 -cat >confcache <<\_ACEOF
 -# This file is a shell script that caches the results of configure
@@ -43416,17 +39023,14 @@
 -# `ac_cv_env_foo' variables (set or unset) will be overridden when
 -# loading this file, other *unset* `ac_cv_foo' will be assigned the
 -# following values.
-+# Break up conftest.defines:
-+ac_max_sed_lines=50
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
  
 -_ACEOF
-+# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-+# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-+# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-+# et cetera.
-+ac_in='$ac_file_inputs'
-+ac_out='"$tmp/out1"'
-+ac_nxt='"$tmp/out2"'
++# The host system.
++host_alias=$host_alias
++host=$host
++host_os=$host_os
  
 -# The following way of writing the cache mishandles newlines in values,
 -# but we know of no workaround that is simple, portable, and efficient.
@@ -43448,27 +39052,10 @@
 -      esac ;;
 -    esac
 -  done
-+while :
-+do
-+  # Write a here document:
-+    cat >>$CONFIG_STATUS <<_ACEOF
-+    # First, check the format of the line:
-+    cat >"\$tmp/defines.sed" <<\\CEOF
-+/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-+/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-+b
-+:def
-+_ACEOF
-+  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-+  echo 'CEOF
-+    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-+  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-+  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-+  grep . conftest.tail >/dev/null || break
-+  rm -f conftest.defines
-+  mv conftest.tail conftest.defines
-+done
-+rm -f conftest.defines conftest.tail
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
  
 -  (set) 2>&1 |
 -    case $as_nl`(ac_space=' '; set) 2>&1` in #(
@@ -43500,72 +39087,24 @@
 -      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
 -echo "$as_me: updating cache $cache_file" >&6;}
 -    cat confcache >$cache_file
-+echo "ac_result=$ac_in" >>$CONFIG_STATUS
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+  if test x"$ac_file" != x-; then
-+    echo "/* $configure_input  */" >"$tmp/config.h"
-+    cat "$ac_result" >>"$tmp/config.h"
-+    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-+      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-+echo "$as_me: $ac_file is unchanged" >&6;}
-+    else
-+      rm -f $ac_file
-+      mv "$tmp/config.h" $ac_file
-+    fi
-   else
+-  else
 -    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
 -echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-+    echo "/* $configure_input  */"
-+    cat "$ac_result"
-   fi
+-  fi
 -fi
 -rm -f confcache
-+  rm -f "$tmp/out12"
-+# Compute $ac_file's index in $config_headers.
-+_am_arg=$ac_file
-+_am_stamp_count=1
-+for _am_header in $config_headers :; do
-+  case $_am_header in
-+    $_am_arg | $_am_arg:* )
-+      break ;;
-+    * )
-+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-+  esac
-+done
-+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
-+	 X"$_am_arg" : 'X\(//\)$' \| \
-+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X"$_am_arg" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`/stamp-h$_am_stamp_count
-+ ;;
++# A sed program that does not truncate output.
++SED=$lt_SED
  
 -test "x$prefix" = xNONE && prefix=$ac_default_prefix
 -# Let make expand exec_prefix.
 -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-+  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-+echo "$as_me: executing $ac_file commands" >&6;}
-+ ;;
-+  esac
++# Sed that helps us avoid accidentally triggering echo(1) options like -n.
++Xsed="\$SED -e 1s/^X//"
  
 -DEFS=-DHAVE_CONFIG_H
++# A grep program that handles long lines.
++GREP=$lt_GREP
  
 -ac_libobjs=
 -ac_ltlibobjs=
@@ -43577,135 +39116,18 @@
 -  #    will be set to the directory where LIBOBJS objects are built.
 -  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
 -  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
-+  case $ac_file$ac_mode in
-+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-+  # Strip MF so we end up with the name of the file.
-+  mf=`echo "$mf" | sed -e 's/:.*$//'`
-+  # Check whether this is an Automake generated Makefile or not.
-+  # We used to match only the files named `Makefile.in', but
-+  # some people rename them; so instead we look at the file content.
-+  # Grep'ing the first line is not enough: some people post-process
-+  # each Makefile.in and add a new line on top of each file to say so.
-+  # Grep'ing the whole file is not good either: AIX grep has a line
-+  # limit of 2048, but all sed's we know have understand at least 4000.
-+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-+    dirpart=`$as_dirname -- "$mf" ||
-+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$mf" : 'X\(//\)[^/]' \| \
-+	 X"$mf" : 'X\(//\)$' \| \
-+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X"$mf" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+  else
-+    continue
-+  fi
-+  # Extract the definition of DEPDIR, am__include, and am__quote
-+  # from the Makefile without running `make'.
-+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+  test -z "$DEPDIR" && continue
-+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+  test -z "am__include" && continue
-+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+  # When using ansi2knr, U may be empty or an underscore; expand it
-+  U=`sed -n 's/^U = //p' < "$mf"`
-+  # Find all dependency output files, they are included files with
-+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-+  # simplest approach to changing $(DEPDIR) to its actual value in the
-+  # expansion.
-+  for file in `sed -n "
-+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+    # Make sure the directory exists.
-+    test -f "$dirpart/$file" && continue
-+    fdir=`$as_dirname -- "$file" ||
-+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$file" : 'X\(//\)[^/]' \| \
-+	 X"$file" : 'X\(//\)$' \| \
-+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X"$file" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+    { as_dir=$dirpart/$fdir
-+  case $as_dir in #(
-+  -*) as_dir=./$as_dir;;
-+  esac
-+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-+    as_dirs=
-+    while :; do
-+      case $as_dir in #(
-+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-+      *) as_qdir=$as_dir;;
-+      esac
-+      as_dirs="'$as_qdir' $as_dirs"
-+      as_dir=`$as_dirname -- "$as_dir" ||
-+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$as_dir" : 'X\(//\)[^/]' \| \
-+	 X"$as_dir" : 'X\(//\)$' \| \
-+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X"$as_dir" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+      test -d "$as_dir" && break
-+    done
-+    test -z "$as_dirs" || eval "mkdir $as_dirs"
-+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
-+   { (exit 1); exit 1; }; }; }
-+    # echo "creating $dirpart/$file"
-+    echo '# dummy' > "$dirpart/$file"
-+  done
- done
+-done
 -LIBOBJS=$ac_libobjs
--
++# An ERE matcher.
++EGREP=$lt_EGREP
+ 
 -LTLIBOBJS=$ac_ltlibobjs
--
--
++# A literal string matcher.
++FGREP=$lt_FGREP
+ 
++# A BSD- or MS-compatible name lister.
++NM=$lt_NM
+ 
 -if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
 -  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
 -Usually this means the macro was only invoked conditionally." >&5
@@ -43727,16 +39149,15 @@
 -Usually this means the macro was only invoked conditionally." >&2;}
 -   { (exit 1); exit 1; }; }
 -fi
--
++# Whether we need soft or hard links.
++LN_S=$lt_LN_S
+ 
 -  ac_config_commands="$ac_config_commands po/stamp-it"
-+ ;;
-+    "libtool":C)
++# What is the maximum length of a command?
++max_cmd_len=$max_cmd_len
  
-+    # 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
++# Object file suffix (normally "o").
++objext=$ac_objext
  
 -if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
 -  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
@@ -43773,9 +39194,8 @@
 -Usually this means the macro was only invoked conditionally." >&2;}
 -   { (exit 1); exit 1; }; }
 -fi
-+    cfgfile="${ofile}T"
-+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-+    $RM "$cfgfile"
++# Executable file suffix (normally "").
++exeext=$exeext
  
 -: ${CONFIG_STATUS=./config.status}
 -ac_clean_files_save=$ac_clean_files
@@ -43783,54 +39203,28 @@
 -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
 -echo "$as_me: creating $CONFIG_STATUS" >&6;}
 -cat >$CONFIG_STATUS <<_ACEOF
-+    cat <<_LT_EOF >> "$cfgfile"
- #! $SHELL
+-#! $SHELL
 -# Generated by $as_me.
 -# Run this file to recreate the current configuration.
 -# Compiler output produced by configure, useful for debugging
 -# configure, is in config.log if it exists.
++# whether the shell understands "unset".
++lt_unset=$lt_unset
  
 -debug=false
 -ac_cs_recheck=false
 -ac_cs_silent=false
 -SHELL=\${CONFIG_SHELL-$SHELL}
 -_ACEOF
-+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-+#
-+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-+#                 2006, 2007, 2008 Free Software Foundation, Inc.
-+#   Written by Gordon Matzigkeit, 1996
-+#
-+#   This file is part of GNU Libtool.
-+#
-+# GNU Libtool 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 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.
++# turn spaces into newlines.
++SP2NL=$lt_lt_SP2NL
  
 -cat >>$CONFIG_STATUS <<\_ACEOF
 -## --------------------- ##
 -## M4sh Initialization.  ##
 -## --------------------- ##
++# turn newlines into spaces.
++NL2SP=$lt_lt_NL2SP
  
 -# Be more Bourne compatible
 -DUALCASE=1; export DUALCASE # for MKS sh
@@ -43845,24 +39239,23 @@
 -  case `(set -o) 2>/dev/null` in
 -  *posix*) set -o posix ;;
 -esac
-+# The names of the tagged configurations supported by this script.
-+available_tags=""
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
  
 -fi
-+# ### BEGIN LIBTOOL CONFIG
-+
-+# Which release of libtool.m4 was used?
-+macro_version=$macro_version
-+macro_revision=$macro_revision
- 
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
- 
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
- 
-+# What type of objects to build.
-+pic_mode=$pic_mode
++# An object symbol dumper.
++OBJDUMP=$lt_OBJDUMP
+ 
++# 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
+ 
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
  
 -# PATH needs CR
 -# Avoid depending upon Character Ranges.
@@ -43871,8 +39264,8 @@
 -as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 -as_cr_digits='0123456789'
 -as_cr_alnum=$as_cr_Letters$as_cr_digits
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
++# A symbol stripping program.
++STRIP=$lt_STRIP
  
 -# The user is always right.
 -if test "${PATH_SEPARATOR+set}" != set; then
@@ -43886,10 +39279,10 @@
 -  fi
 -  rm -f conf$$.sh
 -fi
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+host_os=$host_os
++# Commands used to install an old-style archive.
++RANLIB=$lt_RANLIB
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
  
 -# Support unset when possible.
 -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
@@ -43897,13 +39290,11 @@
 -else
 -  as_unset=false
 -fi
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
++# A C compiler.
++LTCC=$lt_CC
  
-+# A sed program that does not truncate output.
-+SED=$lt_SED
++# LTCC compiler flags.
++LTCFLAGS=$lt_CFLAGS
  
 -# IFS
 -# We need space, tab and new line, in precisely that order.  Quoting is
@@ -43913,8 +39304,8 @@
 -as_nl='
 -'
 -IFS=" ""	$as_nl"
-+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-+Xsed="\$SED -e 1s/^X//"
++# 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
  
 -# Find who we are.  Look in the path if we contain no directory separator.
 -case $0 in
@@ -43927,8 +39318,8 @@
 -  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
 -done
 -IFS=$as_save_IFS
-+# A grep program that handles long lines.
-+GREP=$lt_GREP
++# Transform the output of nm in a proper C declaration.
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
  
 -     ;;
 -esac
@@ -43941,8 +39332,8 @@
 -  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
 -  { (exit 1); exit 1; }
 -fi
-+# An ERE matcher.
-+EGREP=$lt_EGREP
++# 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
  
 -# Work around bugs in pre-3.0 UWIN ksh.
 -for as_var in ENV MAIL MAILPATH
@@ -43951,8 +39342,8 @@
 -PS1='$ '
 -PS2='> '
 -PS4='+ '
-+# A literal string matcher.
-+FGREP=$lt_FGREP
++# Transform the output of nm in a C name address pair when lib prefix is needed.
++global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
  
 -# NLS nuisances.
 -for as_var in \
@@ -43966,8 +39357,8 @@
 -    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
 -  fi
 -done
-+# A BSD- or MS-compatible name lister.
-+NM=$lt_NM
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
  
 -# Required to use basename.
 -if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -43976,19 +39367,19 @@
 -else
 -  as_expr=false
 -fi
-+# Whether we need soft or hard links.
-+LN_S=$lt_LN_S
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
  
 -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
 -  as_basename=basename
 -else
 -  as_basename=false
 -fi
-+# What is the maximum length of a command?
-+max_cmd_len=$max_cmd_len
++# An echo program that does not interpret backslashes.
++ECHO=$lt_ECHO
  
-+# Object file suffix (normally "o").
-+objext=$ac_objext
++# Used to examine libraries when file_magic_cmd begins with "file".
++MAGIC_CMD=$MAGIC_CMD
  
 -# Name of the executable.
 -as_me=`$as_basename -- "$0" ||
@@ -44009,27 +39400,26 @@
 -	    q
 -	  }
 -	  s/.*/./; q'`
-+# Executable file suffix (normally "").
-+exeext=$exeext
++# Must we lock files when doing compilation?
++need_locks=$lt_need_locks
  
 -# CDPATH.
 -$as_unset CDPATH
-+# whether the shell understands "unset".
-+lt_unset=$lt_unset
- 
-+# turn spaces into newlines.
-+SP2NL=$lt_lt_SP2NL
- 
-+# turn newlines into spaces.
-+NL2SP=$lt_lt_NL2SP
++# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
++DSYMUTIL=$lt_DSYMUTIL
+ 
++# Tool to change global to local symbols on Mac OS X.
++NMEDIT=$lt_NMEDIT
+ 
++# Tool to manipulate fat objects and archives on Mac OS X.
++LIPO=$lt_LIPO
  
 -  as_lineno_1=$LINENO
 -  as_lineno_2=$LINENO
 -  test "x$as_lineno_1" != "x$as_lineno_2" &&
 -  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
++# ldd/readelf like tool for Mach-O binaries on Mac OS X.
++OTOOL=$lt_OTOOL
  
 -  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
 -  # uniformly replaced by the line number.  The first 'sed' inserts a
@@ -44059,8 +39449,8 @@
 -  chmod +x "$as_me.lineno" ||
 -    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
 -   { (exit 1); exit 1; }; }
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
++# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
++OTOOL64=$lt_OTOOL64
  
 -  # Don't try to exec as it changes $[0], causing all sort of problems
 -  # (the dirname of $[0] is not the place where we might find the
@@ -44069,20 +39459,19 @@
 -  # Exit status is that of the last command.
 -  exit
 -}
-+# Command to use when deplibs_check_method == "file_magic".
-+file_magic_cmd=$lt_file_magic_cmd
++# Old archive suffix (normally "a").
++libext=$libext
  
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
++# Shared library suffix (normally ".so").
++shrext_cmds=$lt_shrext_cmds
  
 -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
 -  as_dirname=dirname
 -else
 -  as_dirname=false
 -fi
-+# A symbol stripping program.
-+STRIP=$lt_STRIP
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
  
 -ECHO_C= ECHO_N= ECHO_T=
 -case `echo -n x` in
@@ -44094,10 +39483,9 @@
 -*)
 -  ECHO_N='-n';;
 -esac
-+# Commands used to install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at link time.
++variables_saved_for_relink=$lt_variables_saved_for_relink
  
 -if expr a : '\(a\)' >/dev/null 2>&1 &&
 -   test "X`expr 00001 : '.*\(...\)'`" = X001; then
@@ -44105,8 +39493,8 @@
 -else
 -  as_expr=false
 -fi
-+# A C compiler.
-+LTCC=$lt_CC
++# Do we need the "lib" prefix for modules?
++need_lib_prefix=$need_lib_prefix
  
 -rm -f conf$$ conf$$.exe conf$$.file
 -if test -d conf$$.dir; then
@@ -44131,8 +39519,11 @@
 -fi
 -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 -rmdir conf$$.dir 2>/dev/null
-+# LTCC compiler flags.
-+LTCFLAGS=$lt_CFLAGS
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Library versioning type.
++version_type=$version_type
  
 -if mkdir -p . 2>/dev/null; then
 -  as_mkdir_p=:
@@ -44140,8 +39531,8 @@
 -  test -d ./-p && rmdir ./-p
 -  as_mkdir_p=false
 -fi
-+# 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
++# Shared library runtime path variable.
++runpath_var=$runpath_var
  
 -if test -x / >/dev/null 2>&1; then
 -  as_test_x='test -x'
@@ -44165,25 +39556,26 @@
 -  '
 -fi
 -as_executable_p=$as_test_x
-+# Transform the output of nm in a proper C declaration.
-+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++# Shared library path variable.
++shlibpath_var=$shlibpath_var
  
 -# Sed expression to map a string onto a valid CPP name.
 -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-+# 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
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
  
 -# Sed expression to map a string onto a valid variable name.
 -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-+# Transform the output of nm in a C name address pair when lib prefix is needed.
-+global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
  
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
++# 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
  
 -exec 6>&1
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
  
 -# Save the log message, to keep $[0] and so on meaningful, and to
 -# report actual input values of CONFIG_FILES etc. instead of their
@@ -44191,48 +39583,49 @@
 -ac_log="
 -This file was extended by $as_me, which was
 -generated by GNU Autoconf 2.61.  Invocation command line was
-+# An echo program that does not interpret backslashes.
-+ECHO=$lt_ECHO
++# Command to use after installation of a shared archive.
++postinstall_cmds=$lt_postinstall_cmds
  
 -  CONFIG_FILES    = $CONFIG_FILES
 -  CONFIG_HEADERS  = $CONFIG_HEADERS
 -  CONFIG_LINKS    = $CONFIG_LINKS
 -  CONFIG_COMMANDS = $CONFIG_COMMANDS
 -  $ $0 $@
-+# Used to examine libraries when file_magic_cmd begins with "file".
-+MAGIC_CMD=$MAGIC_CMD
++# Command to use after uninstallation of a shared archive.
++postuninstall_cmds=$lt_postuninstall_cmds
  
 -on `(hostname || uname -n) 2>/dev/null | sed 1q`
 -"
-+# Must we lock files when doing compilation?
-+need_locks=$lt_need_locks
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
  
 -_ACEOF
-+# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
-+DSYMUTIL=$lt_DSYMUTIL
++# As "finish_cmds", except a single script fragment to be evaled but
++# not shown.
++finish_eval=$lt_finish_eval
  
 -cat >>$CONFIG_STATUS <<_ACEOF
 -# Files that config.status was made for.
 -config_files="$ac_config_files"
 -config_headers="$ac_config_headers"
 -config_commands="$ac_config_commands"
-+# Tool to change global to local symbols on Mac OS X.
-+NMEDIT=$lt_NMEDIT
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
  
 -_ACEOF
-+# Tool to manipulate fat objects and archives on Mac OS X.
-+LIPO=$lt_LIPO
++# Compile-time system search path for libraries.
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
  
 -cat >>$CONFIG_STATUS <<\_ACEOF
 -ac_cs_usage="\
 -\`$as_me' instantiates files from templates according to the
 -current configuration.
-+# ldd/readelf like tool for Mach-O binaries on Mac OS X.
-+OTOOL=$lt_OTOOL
++# Run-time system search path for libraries.
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
  
 -Usage: $0 [OPTIONS] [FILE]...
-+# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
-+OTOOL64=$lt_OTOOL64
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
  
 -  -h, --help       print this help, then exit
 -  -V, --version    print version number and configuration settings, then exit
@@ -44243,28 +39636,26 @@
 -		   instantiate the configuration file FILE
 -  --header=FILE[:TEMPLATE]
 -		   instantiate the configuration header FILE
-+# Old archive suffix (normally "a").
-+libext=$libext
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
  
 -Configuration files:
 -$config_files
-+# Shared library suffix (normally ".so").
-+shrext_cmds=$lt_shrext_cmds
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
  
 -Configuration headers:
 -$config_headers
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
  
 -Configuration commands:
 -$config_commands
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at link time.
-+variables_saved_for_relink=$lt_variables_saved_for_relink
  
 -Report bugs to <bug-autoconf@gnu.org>."
-+# Do we need the "lib" prefix for modules?
-+need_lib_prefix=$need_lib_prefix
++# The linker used to build libraries.
++LD=$lt_LD
  
 -_ACEOF
 -cat >>$CONFIG_STATUS <<_ACEOF
@@ -44272,22 +39663,22 @@
 -config.status
 -configured by $0, generated by GNU Autoconf 2.61,
 -  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-+# Do we need a version for libraries?
-+need_version=$need_version
++# Commands used to build an old-style archive.
++old_archive_cmds=$lt_old_archive_cmds
  
 -Copyright (C) 2006 Free Software Foundation, Inc.
 -This config.status script is free software; the Free Software Foundation
 -gives unlimited permission to copy, distribute and modify it."
-+# Library versioning type.
-+version_type=$version_type
++# A language specific compiler.
++CC=$lt_compiler
  
 -ac_pwd='$ac_pwd'
 -srcdir='$srcdir'
 -INSTALL='$INSTALL'
 -MKDIR_P='$MKDIR_P'
 -_ACEOF
-+# Shared library runtime path variable.
-+runpath_var=$runpath_var
++# Is the compiler the GNU compiler?
++with_gcc=$GCC
  
 -cat >>$CONFIG_STATUS <<\_ACEOF
 -# If no file are specified by the user, then we need to provide default
@@ -44307,8 +39698,8 @@
 -    ac_shift=shift
 -    ;;
 -  esac
-+# Shared library path variable.
-+shlibpath_var=$shlibpath_var
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
  
 -  case $ac_option in
 -  # Handling of the options.
@@ -44336,38 +39727,37 @@
 -  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
 -  | -silent | --silent | --silen | --sile | --sil | --si | --s)
 -    ac_cs_silent=: ;;
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl
  
 -  # This is an error.
 -  -*) { echo "$as_me: error: unrecognized option: $1
 -Try \`$0 --help' for more information." >&2
 -   { (exit 1); exit 1; }; } ;;
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic
  
 -  *) ac_config_targets="$ac_config_targets $1"
 -     ac_need_defaults=false ;;
-+# 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
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static
  
 -  esac
 -  shift
 -done
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o
  
 -ac_configure_extra_args=
-+# Command to use after installation of a shared archive.
-+postinstall_cmds=$lt_postinstall_cmds
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc
  
 -if $ac_cs_silent; then
 -  exec 6>/dev/null
 -  ac_configure_extra_args="$ac_configure_extra_args --silent"
 -fi
-+# Command to use after uninstallation of a shared archive.
-+postuninstall_cmds=$lt_postuninstall_cmds
++# Whether or not to disallow shared libs when runtime libs are static.
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
  
 -_ACEOF
 -cat >>$CONFIG_STATUS <<_ACEOF
@@ -44377,8 +39767,8 @@
 -  export CONFIG_SHELL
 -  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
 -fi
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
  
 -_ACEOF
 -cat >>$CONFIG_STATUS <<\_ACEOF
@@ -44390,9 +39780,8 @@
 -_ASBOX
 -  echo "$ac_log"
 -} >&5
-+# As "finish_cmds", except a single script fragment to be evaled but
-+# not shown.
-+finish_eval=$lt_finish_eval
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec
  
 -_ACEOF
 -cat >>$CONFIG_STATUS <<_ACEOF
@@ -44403,19 +39792,20 @@
 -INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
 -prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
 -INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
++# Whether the compiler copes with passing no objects directly.
++compiler_needs_object=$lt_compiler_needs_object
  
-+# Compile-time system search path for libraries.
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
  
 -_ACEOF
-+# Run-time system search path for libraries.
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
  
 -cat >>$CONFIG_STATUS <<\_ACEOF
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
++# Commands used to build a shared archive.
++archive_cmds=$lt_archive_cmds
++archive_expsym_cmds=$lt_archive_expsym_cmds
  
 -# Handling of arguments.
 -for ac_config_target in $ac_config_targets
@@ -44431,20 +39821,21 @@
 -    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
 -    "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
 -    "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
++# Commands used to build a loadable module if different from building
++# a shared archive.
++module_cmds=$lt_module_cmds
++module_expsym_cmds=$lt_module_expsym_cmds
  
 -  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
 -   { (exit 1); exit 1; }; };;
 -  esac
 -done
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
++# Whether we are building with GNU ld or not.
++with_gnu_ld=$lt_with_gnu_ld
  
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag
  
 -# If the user did not use the arguments to specify the items to instantiate,
 -# then the envvar interface is used.  Set only those that are not.
@@ -44455,6 +39846,8 @@
 -  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
 -  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
 -fi
++# Flag that enforces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag
  
 -# Have a temporary directory for convenience.  Make it in the build tree
 -# simply because there is no reason against having it here, and in addition,
@@ -44471,8 +39864,9 @@
 -  trap '{ (exit 1); exit 1; }' 1 2 13 15
 -}
 -# Create a (secure) tmp directory for tmp files.
-+# The linker used to build libraries.
-+LD=$lt_LD
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist
++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
  
 -{
 -  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
@@ -44486,30 +39880,37 @@
 -   echo "$me: cannot create a temporary directory in ." >&2
 -   { (exit 1); exit 1; }
 -}
-+# Commands used to build an old-style archive.
-+old_archive_cmds=$lt_old_archive_cmds
++# 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_hardcode_libdir_flag_spec_ld
  
 -#
 -# Set up the sed scripts for CONFIG_FILES section.
 -#
-+# A language specific compiler.
-+CC=$lt_compiler
++# Whether we need a single "-rpath" flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator
  
 -# No need to generate the scripts if there are no CONFIG_FILES.
 -# This happens for instance when ./config.status config.h
 -if test -n "$CONFIG_FILES"; then
-+# Is the compiler the GNU compiler?
-+with_gcc=$GCC
++# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
++# DIR into the resulting binary.
++hardcode_direct=$hardcode_direct
  
 -_ACEOF
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
- 
-+# How to pass a linker flag through the compiler.
-+wl=$lt_lt_prog_compiler_wl
- 
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_lt_prog_compiler_pic
++# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
++# DIR into the resulting binary and the resulting library dependency is
++# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
++# library is relocated.
++hardcode_direct_absolute=$hardcode_direct_absolute
+ 
++# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
++# into the resulting binary.
++hardcode_minus_L=$hardcode_minus_L
+ 
++# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
++# into the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var
  
 -ac_delim='%!_!# '
 -for ac_last_try in false false false false false :; do
@@ -44612,26 +40013,10 @@
 -OBJEXT!$OBJEXT$ac_delim
 -DEPDIR!$DEPDIR$ac_delim
 -_ACEOF
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static
-+
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-+
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$archive_cmds_need_lc
-+
-+# Whether or not to disallow shared libs when runtime libs are static.
-+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-+
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-+
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec
-+
-+# Whether the compiler copes with passing no objects directly.
-+compiler_needs_object=$lt_compiler_needs_object
++# 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=$hardcode_automatic
  
 -  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
 -    break
@@ -44643,16 +40028,17 @@
 -    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
 -  fi
 -done
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
++# Set to yes if linker adds runtime paths of dependent libraries
++# to runtime path list.
++inherit_rpath=$inherit_rpath
  
 -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
 -if test -n "$ac_eof"; then
 -  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
 -  ac_eof=`expr $ac_eof + 1`
 -fi
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs
  
 -cat >>$CONFIG_STATUS <<_ACEOF
 -cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
@@ -44671,14 +40057,11 @@
 -cat >>$CONFIG_STATUS <<_ACEOF
 -CEOF$ac_eof
 -_ACEOF
-+# Commands used to build a shared archive.
-+archive_cmds=$lt_archive_cmds
-+archive_expsym_cmds=$lt_archive_expsym_cmds
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path=$lt_fix_srcfile_path
  
-+# Commands used to build a loadable module if different from building
-+# a shared archive.
-+module_cmds=$lt_module_cmds
-+module_expsym_cmds=$lt_module_expsym_cmds
++# Set to "yes" if exported symbols are required.
++always_export_symbols=$always_export_symbols
  
 -ac_delim='%!_!# '
 -for ac_last_try in false false false false false :; do
@@ -44770,8 +40153,8 @@
 -LIBOBJS!$LIBOBJS$ac_delim
 -LTLIBOBJS!$LTLIBOBJS$ac_delim
 -_ACEOF
-+# Whether we are building with GNU ld or not.
-+with_gnu_ld=$lt_with_gnu_ld
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds
  
 -  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 86; then
 -    break
@@ -44783,17 +40166,15 @@
 -    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
 -  fi
 -done
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms
  
 -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
 -if test -n "$ac_eof"; then
 -  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
 -  ac_eof=`expr $ac_eof + 1`
 -fi
-+# Flag that enforces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag
- 
+-
 -cat >>$CONFIG_STATUS <<_ACEOF
 -cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
 -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
@@ -44813,13 +40194,11 @@
 -s/|#_!!_#|//g
 -CEOF$ac_eof
 -_ACEOF
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist
-+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms
  
-+# 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_hardcode_libdir_flag_spec_ld
++# Commands necessary for linking programs (against libraries) with templates.
++prelink_cmds=$lt_prelink_cmds
  
 -# VPATH may cause trouble with some makes, so we remove $(srcdir),
 -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
@@ -44834,27 +40213,60 @@
 -s/:*$//
 -s/^[^=]*=[	 ]*$//
 -}'
--fi
-+# Whether we need a single "-rpath" flag with a separated argument.
-+hardcode_libdir_separator=$lt_hardcode_libdir_separator
++# Specify filename containing input files.
++file_list_spec=$lt_file_list_spec
++
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action
++
++# ### END LIBTOOL CONFIG
++
++_LT_EOF
++
++  case $host_os in
++  aix3*)
++    cat <<\_LT_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
++_LT_EOF
++    ;;
++  esac
  
 -cat >>$CONFIG_STATUS <<\_ACEOF
 -fi # test -n "$CONFIG_FILES"
-+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-+# DIR into the resulting binary.
-+hardcode_direct=$hardcode_direct
  
-+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-+# DIR into the resulting binary and the resulting library dependency is
-+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
-+# library is relocated.
-+hardcode_direct_absolute=$hardcode_direct_absolute
++ltmain="$ac_aux_dir/ltmain.sh"
  
 -for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
 -do
 -  case $ac_tag in
 -  :[FHLC]) ac_mode=$ac_tag; continue;;
--  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 '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
++    || (rm -f "$cfgfile"; exit 1)
++
++  case $xsi_shell in
++  yes)
++    cat << \_LT_EOF >> "$cfgfile"
++
++# func_dirname file append nondir_replacement
++# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
++# otherwise set result to NONDIR_REPLACEMENT.
++func_dirname ()
++{
++  case ${1} in
++    */*) func_dirname_result="${1%/*}${2}" ;;
++    *  ) func_dirname_result="${3}" ;;
+   esac
 -  case $ac_mode$ac_tag in
 -  :[FHL]*:*);;
 -  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
@@ -44862,7 +40274,32 @@
 -   { (exit 1); exit 1; }; };;
 -  :[FH]-) ac_tag=-:-;;
 -  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
--  esac
++}
++
++# func_basename file
++func_basename ()
++{
++  func_basename_result="${1##*/}"
++}
++
++# 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 ()
++{
++  case ${1} in
++    */*) func_dirname_result="${1%/*}${2}" ;;
++    *  ) func_dirname_result="${3}" ;;
+   esac
 -  ac_save_IFS=$IFS
 -  IFS=:
 -  set x $ac_tag
@@ -44870,9 +40307,8 @@
 -  shift
 -  ac_file=$1
 -  shift
-+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-+# into the resulting binary.
-+hardcode_minus_L=$hardcode_minus_L
++  func_basename_result="${1##*/}"
++}
  
 -  case $ac_mode in
 -  :L) ac_source=$1;;
@@ -44896,9 +40332,19 @@
 -      esac
 -      ac_file_inputs="$ac_file_inputs $ac_f"
 -    done
-+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-+# into the resulting binary.
-+hardcode_shlibpath_var=$hardcode_shlibpath_var
++# func_stripname prefix suffix name
++# strip PREFIX and SUFFIX off of NAME.
++# PREFIX and SUFFIX must not contain globbing or regex special
++# characters, hashes, percent signs, but SUFFIX may contain a leading
++# dot (in which case that matches only a dot).
++func_stripname ()
++{
++  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
++  # positional parameters, so assign one to ordinary parameter first.
++  func_stripname_result=${3}
++  func_stripname_result=${func_stripname_result#"${1}"}
++  func_stripname_result=${func_stripname_result%"${2}"}
++}
  
 -    # Let's still pretend it is `configure' which instantiates (i.e., don't
 -    # use $as_me), people would be surprised to read:
@@ -44910,62 +40356,25 @@
 -      { echo "$as_me:$LINENO: creating $ac_file" >&5
 -echo "$as_me: creating $ac_file" >&6;}
 -    fi
-+# 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=$hardcode_automatic
-+
-+# Set to yes if linker adds runtime paths of dependent libraries
-+# to runtime path list.
-+inherit_rpath=$inherit_rpath
-+
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$link_all_deplibs
-+
-+# 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=$always_export_symbols
-+
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_export_symbols_cmds
-+
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms
-+
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms
-+
-+# Commands necessary for linking programs (against libraries) with templates.
-+prelink_cmds=$lt_prelink_cmds
-+
-+# Specify filename containing input files.
-+file_list_spec=$lt_file_list_spec
-+
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action
-+
-+# ### END LIBTOOL CONFIG
++# func_opt_split
++func_opt_split ()
++{
++  func_opt_split_opt=${1%%=*}
++  func_opt_split_arg=${1#*=}
++}
  
 -    case $ac_tag in
 -    *:-:* | *:-) cat >"$tmp/stdin";;
 -    esac
-+_LT_EOF
-+
-+  case $host_os in
-+  aix3*)
-+    cat <<\_LT_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
-+_LT_EOF
-     ;;
+-    ;;
++# func_lo2o object
++func_lo2o ()
++{
++  case ${1} in
++    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
++    *)    func_lo2o_result=${1} ;;
    esac
++}
  
 -  ac_dir=`$as_dirname -- "$ac_file" ||
 -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -45032,6 +40441,11 @@
 -echo "$as_me: error: cannot create directory $as_dir" >&2;}
 -   { (exit 1); exit 1; }; }; }
 -  ac_builddir=.
++# func_xform libobj-or-source
++func_xform ()
++{
++  func_xform_result=${1%.*}.lo
++}
  
 -case "$ac_dir" in
 -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
@@ -45048,7 +40462,11 @@
 -ac_abs_builddir=$ac_pwd$ac_dir_suffix
 -# for backward compatibility:
 -ac_top_builddir=$ac_top_build_prefix
-+ltmain="$ac_aux_dir/ltmain.sh"
++# func_arith arithmetic-term...
++func_arith ()
++{
++  func_arith_result=$(( $* ))
++}
  
 -case $srcdir in
 -  .)  # We are building in place.
@@ -45065,86 +40483,76 @@
 -    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
 -esac
 -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
++# func_len string
++# STRING may not start with a hyphen.
++func_len ()
++{
++  func_len_result=${#1}
++}
  
-+  # 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 '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-+    || (rm -f "$cfgfile"; exit 1)
++_LT_EOF
++    ;;
++  *) # Bourne compatible functions.
++    cat << \_LT_EOF >> "$cfgfile"
  
 -  case $ac_mode in
 -  :F)
 -  #
 -  # CONFIG_FILE
 -  #
-+  case $xsi_shell in
-+  yes)
-+    cat << \_LT_EOF >> "$cfgfile"
++# func_dirname file append nondir_replacement
++# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
++# otherwise set result to NONDIR_REPLACEMENT.
++func_dirname ()
++{
++  # 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
++}
  
 -  case $INSTALL in
 -  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
 -  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-+# func_dirname file append nondir_replacement
-+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-+# otherwise set result to NONDIR_REPLACEMENT.
-+func_dirname ()
-+{
-+  case ${1} in
-+    */*) func_dirname_result="${1%/*}${2}" ;;
-+    *  ) func_dirname_result="${3}" ;;
-   esac
+-  esac
 -  ac_MKDIR_P=$MKDIR_P
 -  case $MKDIR_P in
 -  [\\/$]* | ?:[\\/]* ) ;;
 -  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-+}
-+
 +# func_basename file
 +func_basename ()
 +{
-+  func_basename_result="${1##*/}"
++  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
 +}
 +
-+# 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 ()
++
++# func_stripname prefix suffix name
++# strip PREFIX and SUFFIX off of NAME.
++# PREFIX and SUFFIX must not contain globbing or regex special
++# characters, hashes, percent signs, but SUFFIX may contain a leading
++# dot (in which case that matches only a dot).
++# func_strip_suffix prefix name
++func_stripname ()
 +{
-+  case ${1} in
-+    */*) func_dirname_result="${1%/*}${2}" ;;
-+    *  ) func_dirname_result="${3}" ;;
++  case ${2} in
++    .*) func_stripname_result=`$ECHO "X${3}" \
++           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
++    *)  func_stripname_result=`$ECHO "X${3}" \
++           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
    esac
 -_ACEOF
-+  func_basename_result="${1##*/}"
 +}
  
 -cat >>$CONFIG_STATUS <<\_ACEOF
 -# If the template does not know about datarootdir, expand it.
 -# FIXME: This hack should be removed a few years after 2.60.
 -ac_datarootdir_hack=; ac_datarootdir_seen=
-+# func_stripname prefix suffix name
-+# strip PREFIX and SUFFIX off of NAME.
-+# PREFIX and SUFFIX must not contain globbing or regex special
-+# characters, hashes, percent signs, but SUFFIX may contain a leading
-+# dot (in which case that matches only a dot).
-+func_stripname ()
-+{
-+  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-+  # positional parameters, so assign one to ordinary parameter first.
-+  func_stripname_result=${3}
-+  func_stripname_result=${func_stripname_result#"${1}"}
-+  func_stripname_result=${func_stripname_result%"${2}"}
-+}
++# sed scripts:
++my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
++my_sed_long_arg='1s/^-[^=]*=//'
  
 -case `sed -n '/datarootdir/ {
 -  p
@@ -45152,8 +40560,8 @@
 +# func_opt_split
 +func_opt_split ()
 +{
-+  func_opt_split_opt=${1%%=*}
-+  func_opt_split_arg=${1#*=}
++  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
++  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
  }
 -/@datadir@/p
 -/@docdir@/p
@@ -45203,10 +40611,7 @@
 +# func_lo2o object
 +func_lo2o ()
 +{
-+  case ${1} in
-+    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-+    *)    func_lo2o_result=${1} ;;
-+  esac
++  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
 +}
  
 -test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
@@ -45219,72 +40624,24 @@
 +# func_xform libobj-or-source
 +func_xform ()
 +{
-+  func_xform_result=${1%.*}.lo
++  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
 +}
  
 -  rm -f "$tmp/stdin"
 -  case $ac_file in
 -  -) cat "$tmp/out"; rm -f "$tmp/out";;
 -  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-+# func_arith arithmetic-term...
-+func_arith ()
-+{
-+  func_arith_result=$(( $* ))
-+}
-+
-+# func_len string
-+# STRING may not start with a hyphen.
-+func_len ()
-+{
-+  func_len_result=${#1}
-+}
-+
-+_LT_EOF
-+    ;;
-+  *) # Bourne compatible functions.
-+    cat << \_LT_EOF >> "$cfgfile"
-+
-+# func_dirname file append nondir_replacement
-+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-+# otherwise set result to NONDIR_REPLACEMENT.
-+func_dirname ()
-+{
-+  # 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 file
-+func_basename ()
-+{
-+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-+}
-+
-+
-+# func_stripname prefix suffix name
-+# strip PREFIX and SUFFIX off of NAME.
-+# PREFIX and SUFFIX must not contain globbing or regex special
-+# characters, hashes, percent signs, but SUFFIX may contain a leading
-+# dot (in which case that matches only a dot).
-+# func_strip_suffix prefix name
-+func_stripname ()
-+{
-+  case ${2} in
-+    .*) func_stripname_result=`$ECHO "X${3}" \
-+           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
-+    *)  func_stripname_result=`$ECHO "X${3}" \
-+           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
-   esac
+-  esac
 - ;;
 -  :H)
 -  #
 -  # CONFIG_HEADER
 -  #
 -_ACEOF
++# func_arith arithmetic-term...
++func_arith ()
++{
++  func_arith_result=`expr "$@"`
 +}
  
 -# Transform confdefs.h into a sed script `conftest.defines', that
@@ -45306,21 +40663,11 @@
 -ac_dB='\\)[	 (].*,\\1define\\2'
 -ac_dC=' '
 -ac_dD=' ,'
-+# sed scripts:
-+my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
-+my_sed_long_arg='1s/^-[^=]*=//'
-+
-+# func_opt_split
-+func_opt_split ()
-+{
-+  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
-+  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-+}
-+
-+# func_lo2o object
-+func_lo2o ()
-+{
-+  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
++# func_len string
++# STRING may not start with a hyphen.
++func_len ()
++{
++  func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
 +}
  
 -uniq confdefs.h |
@@ -45335,12 +40682,7 @@
 -	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
 -	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
 -  ' >>conftest.defines
-+# func_xform libobj-or-source
-+func_xform ()
-+{
-+  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
-+}
- 
+-
 -# Remove the space that was appended to ease matching.
 -# Then replace #undef with comments.  This is necessary, for
 -# example, in the case of _POSIX_SOURCE, which is predefined and required
@@ -45348,21 +40690,10 @@
 -# (The regexp can be short, since the line contains either #define or #undef.)
 -echo 's/ $//
 -s,^[	 #]*u.*,/* & */,' >>conftest.defines
-+# func_arith arithmetic-term...
-+func_arith ()
-+{
-+  func_arith_result=`expr "$@"`
-+}
- 
+-
 -# Break up conftest.defines:
 -ac_max_sed_lines=50
-+# func_len string
-+# STRING may not start with a hyphen.
-+func_len ()
-+{
-+  func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
-+}
- 
+-
 -# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
 -# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
 -# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
@@ -45370,9 +40701,7 @@
 -ac_in='$ac_file_inputs'
 -ac_out='"$tmp/out1"'
 -ac_nxt='"$tmp/out2"'
-+_LT_EOF
-+esac
- 
+-
 -while :
 -do
 -  # Write a here document:
@@ -45394,20 +40723,8 @@
 -  mv conftest.tail conftest.defines
 -done
 -rm -f conftest.defines conftest.tail
-+case $lt_shell_append in
-+  yes)
-+    cat << \_LT_EOF >> "$cfgfile"
-+
-+# func_append var value
-+# Append VALUE to the end of shell variable VAR.
-+func_append ()
-+{
-+  eval "$1+=\$2"
-+}
 +_LT_EOF
-+    ;;
-+  *)
-+    cat << \_LT_EOF >> "$cfgfile"
++esac
  
 -echo "ac_result=$ac_in" >>$CONFIG_STATUS
 -cat >>$CONFIG_STATUS <<\_ACEOF
@@ -45461,16 +40778,31 @@
 -	  }
 -	  s/.*/./; q'`/stamp-h$_am_stamp_count
 - ;;
++case $lt_shell_append in
++  yes)
++    cat << \_LT_EOF >> "$cfgfile"
++
 +# func_append var value
 +# Append VALUE to the end of shell variable VAR.
 +func_append ()
 +{
-+  eval "$1=\$$1\$2"
++  eval "$1+=\$2"
 +}
++_LT_EOF
++    ;;
++  *)
++    cat << \_LT_EOF >> "$cfgfile"
  
 -  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
 -echo "$as_me: executing $ac_file commands" >&6;}
 - ;;
++# func_append var value
++# Append VALUE to the end of shell variable VAR.
++func_append ()
++{
++  eval "$1=\$$1\$2"
++}
++
 +_LT_EOF
 +    ;;
    esac
@@ -45628,14 +40960,14 @@
        esac ;;
      "po/stamp-it":C)
 +    if  ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" ; then
-+       { { echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5
-+echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}
++       { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5
++$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}
 +   { (exit 1); exit 1; }; }
 +    fi
      rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
      >"po/stamp-it.tmp"
      sed '/^#/d
-@@ -26877,17 +18995,11 @@
+@@ -26877,17 +19393,11 @@
  	'"s|^|	$ac_top_srcdir/|" \
        "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES"
  
@@ -45654,11 +40986,501 @@
      rm -f "po/Makefile.tmp"
      mv "po/stamp-it.tmp" "po/stamp-it"
     ;;
+@@ -26901,6 +19411,11 @@
+ chmod +x $CONFIG_STATUS
+ ac_clean_files=$ac_clean_files_save
+ 
++test $ac_write_fail = 0 ||
++  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
++$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
++   { (exit 1); exit 1; }; }
++
+ 
+ # configure is writing to config.log, and then calls config.status.
+ # config.status does its own redirection, appending to config.log.
+@@ -26922,6 +19437,10 @@
+   # would make configure fail if this is the last instruction.
+   $ac_cs_success || { (exit 1); exit 1; }
+ fi
++if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
++  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
++$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
++fi
+ 
+ 
+ 
+@@ -26929,7 +19448,7 @@
+ # Results
+ ##############################
+ 
+-{ echo "$as_me:$LINENO:
++{ $as_echo "$as_me:$LINENO:
+ 
+ Fast User Switch Applet Configuration:
+ 
+@@ -26939,7 +19458,7 @@
+ 	GDM Setup:	 $gdm_setup_cmd
+ 	Users Admin:	 $users_admin_cmd
+ " >&5
+-echo "$as_me:
++$as_echo "$as_me:
+ 
+ Fast User Switch Applet Configuration:
+ 
+diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/data/icons/16x16/actions/Makefile.in fast-user-switch-applet-2.24.0.new/data/icons/16x16/actions/Makefile.in
+--- fast-user-switch-applet-2.24.0/data/icons/16x16/actions/Makefile.in	1969-12-31 18:00:00.000000000 -0600
++++ fast-user-switch-applet-2.24.0.new/data/icons/16x16/actions/Makefile.in	2009-03-04 17:19:45.000000000 -0600
+@@ -0,0 +1,445 @@
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# @configure_input@
++
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++@SET_MAKE@
++
++VPATH = @srcdir@
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++build_triplet = @build@
++host_triplet = @host@
++subdir = data/icons/16x16/actions
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
++	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
++	$(top_srcdir)/configure.ac
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(iconsdir)"
++iconsDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(icons_DATA)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++ACLOCAL = @ACLOCAL@
++ALL_LINGUAS = @ALL_LINGUAS@
++AMTAR = @AMTAR@
++APPLET_CFLAGS = @APPLET_CFLAGS@
++APPLET_LIBS = @APPLET_LIBS@
++AR = @AR@
++AUTOCONF = @AUTOCONF@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
++CATALOGS = @CATALOGS@
++CATOBJEXT = @CATOBJEXT@
++CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DATADIRNAME = @DATADIRNAME@
++DEFS = @DEFS@
++DEPDIR = @DEPDIR@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
++DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
++DUMPBIN = @DUMPBIN@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
++EXEEXT = @EXEEXT@
++EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
++FGREP = @FGREP@
++GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
++GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++GDMCONFIGFILE = @GDMCONFIGFILE@
++GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
++GLIB_MKENUMS = @GLIB_MKENUMS@
++GMOFILES = @GMOFILES@
++GMSGFMT = @GMSGFMT@
++GNOMELOCALEDIR = @GNOMELOCALEDIR@
++GREP = @GREP@
++HELP_DIR = @HELP_DIR@
++INSTALL = @INSTALL@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++INSTOBJEXT = @INSTOBJEXT@
++INTLLIBS = @INTLLIBS@
++INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
++INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
++INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
++INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
++INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
++INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
++INTLTOOL_MERGE = @INTLTOOL_MERGE@
++INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
++INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
++INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
++INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
++INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
++INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
++INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
++INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
++INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
++INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
++INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
++INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
++INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
++INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
++LD = @LD@
++LDFLAGS = @LDFLAGS@
++LIBDIR = @LIBDIR@
++LIBOBJS = @LIBOBJS@
++LIBS = @LIBS@
++LIBTOOL = @LIBTOOL@
++LIPO = @LIPO@
++LN_S = @LN_S@
++LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
++MSGFMT = @MSGFMT@
++MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NM = @NM@
++NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
++OBJEXT = @OBJEXT@
++OMF_DIR = @OMF_DIR@
++OTOOL = @OTOOL@
++OTOOL64 = @OTOOL64@
++PACKAGE = @PACKAGE@
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_VERSION = @PACKAGE_VERSION@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++PKG_CONFIG = @PKG_CONFIG@
++POFILES = @POFILES@
++POSUB = @POSUB@
++PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
++PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
++PREFIX = @PREFIX@
++RANLIB = @RANLIB@
++SED = @SED@
++SET_MAKE = @SET_MAKE@
++SHELL = @SHELL@
++STRIP = @STRIP@
++SYSCONFDIR = @SYSCONFDIR@
++USE_NLS = @USE_NLS@
++VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
++XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
++X_CFLAGS = @X_CFLAGS@
++X_EXTRA_LIBS = @X_EXTRA_LIBS@
++X_LIBS = @X_LIBS@
++X_PRE_LIBS = @X_PRE_LIBS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
++ac_ct_CC = @ac_ct_CC@
++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
++am__include = @am__include@
++am__leading_dot = @am__leading_dot@
++am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
++bindir = @bindir@
++build = @build@
++build_alias = @build_alias@
++build_cpu = @build_cpu@
++build_os = @build_os@
++build_vendor = @build_vendor@
++builddir = @builddir@
++datadir = @datadir@
++datarootdir = @datarootdir@
++docdir = @docdir@
++dvidir = @dvidir@
++exec_prefix = @exec_prefix@
++gdm_setup = @gdm_setup@
++host = @host@
++host_alias = @host_alias@
++host_cpu = @host_cpu@
++host_os = @host_os@
++host_vendor = @host_vendor@
++htmldir = @htmldir@
++includedir = @includedir@
++infodir = @infodir@
++install_sh = @install_sh@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localedir = @localedir@
++localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++psdir = @psdir@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
++sysconfdir = @sysconfdir@
++target_alias = @target_alias@
++top_build_prefix = @top_build_prefix@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
++users_admin = @users_admin@
++iconsdir = $(pkgdatadir)/icons/hicolor/16x16/actions
++icons_DATA = \
++	system-shutdown.png		\
++	system-restart.png		\
++	system-log-out.png
++
++CLEANFILES = $(icons_DATA)
++all: all-am
++
++.SUFFIXES:
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++	        && { if test -f $@; then exit 0; else break; fi; }; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  data/icons/16x16/actions/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --gnu  data/icons/16x16/actions/Makefile
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++mostlyclean-libtool:
++	-rm -f *.lo
++
++clean-libtool:
++	-rm -rf .libs _libs
++install-iconsDATA: $(icons_DATA)
++	@$(NORMAL_INSTALL)
++	test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
++	@list='$(icons_DATA)'; for p in $$list; do \
++	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++	  f=$(am__strip_dir) \
++	  echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
++	  $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
++	done
++
++uninstall-iconsDATA:
++	@$(NORMAL_UNINSTALL)
++	@list='$(icons_DATA)'; for p in $$list; do \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
++	done
++tags: TAGS
++TAGS:
++
++ctags: CTAGS
++CTAGS:
++
++
++distdir: $(DISTFILES)
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
++	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
++	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++	    fi; \
++	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
++	  else \
++	    test -f $(distdir)/$$file \
++	    || cp -p $$d/$$file $(distdir)/$$file \
++	    || exit 1; \
++	  fi; \
++	done
++check-am: all-am
++check: check-am
++all-am: Makefile $(DATA)
++installdirs:
++	for dir in "$(DESTDIR)$(iconsdir)"; do \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++	done
++install: install-am
++install-exec: install-exec-am
++install-data: install-data-am
++uninstall: uninstall-am
++
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++
++installcheck: installcheck-am
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++	  `test -z '$(STRIP)' || \
++	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++mostlyclean-generic:
++
++clean-generic:
++	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
++
++distclean-generic:
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++
++maintainer-clean-generic:
++	@echo "This command is intended for maintainers to use"
++	@echo "it deletes files that may require special tools to rebuild."
++clean: clean-am
++
++clean-am: clean-generic clean-libtool mostlyclean-am
++
++distclean: distclean-am
++	-rm -f Makefile
++distclean-am: clean-am distclean-generic
++
++dvi: dvi-am
++
++dvi-am:
++
++html: html-am
++
++info: info-am
++
++info-am:
++
++install-data-am: install-iconsDATA
++
++install-dvi: install-dvi-am
++
++install-exec-am:
++
++install-html: install-html-am
++
++install-info: install-info-am
++
++install-man:
++
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
++installcheck-am:
++
++maintainer-clean: maintainer-clean-am
++	-rm -f Makefile
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-generic mostlyclean-libtool
++
++pdf: pdf-am
++
++pdf-am:
++
++ps: ps-am
++
++ps-am:
++
++uninstall-am: uninstall-iconsDATA
++
++.MAKE: install-am install-strip
++
++.PHONY: all all-am check check-am clean clean-generic clean-libtool \
++	distclean distclean-generic distclean-libtool distdir dvi \
++	dvi-am html html-am info info-am install install-am \
++	install-data install-data-am install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
++	install-iconsDATA install-info install-info-am install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
++	install-strip installcheck installcheck-am installdirs \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	uninstall uninstall-am uninstall-iconsDATA
++
++
++system-shutdown.png: system-shutdown.png.uuencode
++	uudecode -o system-shutdown.png $(srcdir)/system-shutdown.png.uuencode
++
++system-restart.png: system-restart.png.uuencode
++	uudecode -o system-restart.png $(srcdir)/system-restart.png.uuencode
++
++system-log-out.png: system-log-out.png.uuencode
++	uudecode -o system-log-out.png $(srcdir)/system-log-out.png.uuencode
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
 diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/data/icons/16x16/Makefile.in fast-user-switch-applet-2.24.0.new/data/icons/16x16/Makefile.in
---- fast-user-switch-applet-2.24.0/data/icons/16x16/Makefile.in	1970-01-01 01:00:00.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/data/icons/16x16/Makefile.in	2009-02-09 19:52:08.000000000 +0000
-@@ -0,0 +1,550 @@
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+--- fast-user-switch-applet-2.24.0/data/icons/16x16/Makefile.in	1969-12-31 18:00:00.000000000 -0600
++++ fast-user-switch-applet-2.24.0.new/data/icons/16x16/Makefile.in	2009-03-04 17:19:45.000000000 -0600
+@@ -0,0 +1,556 @@
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -45694,7 +41516,11 @@
 +subdir = data/icons/16x16
 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
++am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
++	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
++	$(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -45807,6 +41633,7 @@
 +MSGMERGE = @MSGMERGE@
 +NM = @NM@
 +NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
 +OBJEXT = @OBJEXT@
 +OMF_DIR = @OMF_DIR@
 +OTOOL = @OTOOL@
@@ -45889,10 +41716,11 @@
 +srcdir = @srcdir@
 +sysconfdir = @sysconfdir@
 +target_alias = @target_alias@
++top_build_prefix = @top_build_prefix@
 +top_builddir = @top_builddir@
 +top_srcdir = @top_srcdir@
 +users_admin = @users_admin@
-+SUBDIRS = status
++SUBDIRS = status actions
 +all: all-recursive
 +
 +.SUFFIXES:
@@ -45900,8 +41728,8 @@
 +	@for dep in $?; do \
 +	  case '$(am__configure_deps)' in \
 +	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
++	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++	        && { if test -f $@; then exit 0; else break; fi; }; \
 +	      exit 1;; \
 +	  esac; \
 +	done; \
@@ -46007,7 +41835,7 @@
 +	unique=`for i in $$list; do \
 +	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +	  done | \
-+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	mkid -fID $$unique
 +tags: TAGS
@@ -46209,10 +42037,10 @@
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
 diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/data/icons/16x16/status/Makefile.in fast-user-switch-applet-2.24.0.new/data/icons/16x16/status/Makefile.in
---- fast-user-switch-applet-2.24.0/data/icons/16x16/status/Makefile.in	1970-01-01 01:00:00.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/data/icons/16x16/status/Makefile.in	2009-02-09 19:52:08.000000000 +0000
-@@ -0,0 +1,443 @@
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+--- fast-user-switch-applet-2.24.0/data/icons/16x16/status/Makefile.in	1969-12-31 18:00:00.000000000 -0600
++++ fast-user-switch-applet-2.24.0.new/data/icons/16x16/status/Makefile.in	2009-03-04 17:19:45.000000000 -0600
+@@ -0,0 +1,449 @@
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -46249,7 +42077,11 @@
 +subdir = data/icons/16x16/status
 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
++am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
++	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
++	$(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -46359,6 +42191,7 @@
 +MSGMERGE = @MSGMERGE@
 +NM = @NM@
 +NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
 +OBJEXT = @OBJEXT@
 +OMF_DIR = @OMF_DIR@
 +OTOOL = @OTOOL@
@@ -46441,6 +42274,7 @@
 +srcdir = @srcdir@
 +sysconfdir = @sysconfdir@
 +target_alias = @target_alias@
++top_build_prefix = @top_build_prefix@
 +top_builddir = @top_builddir@
 +top_srcdir = @top_srcdir@
 +users_admin = @users_admin@
@@ -46459,8 +42293,8 @@
 +	@for dep in $?; do \
 +	  case '$(am__configure_deps)' in \
 +	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
++	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++	        && { if test -f $@; then exit 0; else break; fi; }; \
 +	      exit 1;; \
 +	  esac; \
 +	done; \
@@ -46655,11 +42489,460 @@
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
+diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/data/icons/22x22/actions/Makefile.in fast-user-switch-applet-2.24.0.new/data/icons/22x22/actions/Makefile.in
+--- fast-user-switch-applet-2.24.0/data/icons/22x22/actions/Makefile.in	1969-12-31 18:00:00.000000000 -0600
++++ fast-user-switch-applet-2.24.0.new/data/icons/22x22/actions/Makefile.in	2009-03-04 17:19:45.000000000 -0600
+@@ -0,0 +1,445 @@
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# @configure_input@
++
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++@SET_MAKE@
++
++VPATH = @srcdir@
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++build_triplet = @build@
++host_triplet = @host@
++subdir = data/icons/22x22/actions
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
++	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
++	$(top_srcdir)/configure.ac
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(iconsdir)"
++iconsDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(icons_DATA)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++ACLOCAL = @ACLOCAL@
++ALL_LINGUAS = @ALL_LINGUAS@
++AMTAR = @AMTAR@
++APPLET_CFLAGS = @APPLET_CFLAGS@
++APPLET_LIBS = @APPLET_LIBS@
++AR = @AR@
++AUTOCONF = @AUTOCONF@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
++CATALOGS = @CATALOGS@
++CATOBJEXT = @CATOBJEXT@
++CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DATADIRNAME = @DATADIRNAME@
++DEFS = @DEFS@
++DEPDIR = @DEPDIR@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
++DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
++DUMPBIN = @DUMPBIN@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
++EXEEXT = @EXEEXT@
++EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
++FGREP = @FGREP@
++GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
++GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++GDMCONFIGFILE = @GDMCONFIGFILE@
++GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
++GLIB_MKENUMS = @GLIB_MKENUMS@
++GMOFILES = @GMOFILES@
++GMSGFMT = @GMSGFMT@
++GNOMELOCALEDIR = @GNOMELOCALEDIR@
++GREP = @GREP@
++HELP_DIR = @HELP_DIR@
++INSTALL = @INSTALL@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++INSTOBJEXT = @INSTOBJEXT@
++INTLLIBS = @INTLLIBS@
++INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
++INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
++INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
++INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
++INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
++INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
++INTLTOOL_MERGE = @INTLTOOL_MERGE@
++INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
++INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
++INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
++INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
++INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
++INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
++INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
++INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
++INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
++INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
++INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
++INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
++INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
++INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
++LD = @LD@
++LDFLAGS = @LDFLAGS@
++LIBDIR = @LIBDIR@
++LIBOBJS = @LIBOBJS@
++LIBS = @LIBS@
++LIBTOOL = @LIBTOOL@
++LIPO = @LIPO@
++LN_S = @LN_S@
++LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
++MSGFMT = @MSGFMT@
++MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NM = @NM@
++NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
++OBJEXT = @OBJEXT@
++OMF_DIR = @OMF_DIR@
++OTOOL = @OTOOL@
++OTOOL64 = @OTOOL64@
++PACKAGE = @PACKAGE@
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_VERSION = @PACKAGE_VERSION@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++PKG_CONFIG = @PKG_CONFIG@
++POFILES = @POFILES@
++POSUB = @POSUB@
++PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
++PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
++PREFIX = @PREFIX@
++RANLIB = @RANLIB@
++SED = @SED@
++SET_MAKE = @SET_MAKE@
++SHELL = @SHELL@
++STRIP = @STRIP@
++SYSCONFDIR = @SYSCONFDIR@
++USE_NLS = @USE_NLS@
++VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
++XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
++X_CFLAGS = @X_CFLAGS@
++X_EXTRA_LIBS = @X_EXTRA_LIBS@
++X_LIBS = @X_LIBS@
++X_PRE_LIBS = @X_PRE_LIBS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
++ac_ct_CC = @ac_ct_CC@
++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
++am__include = @am__include@
++am__leading_dot = @am__leading_dot@
++am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
++bindir = @bindir@
++build = @build@
++build_alias = @build_alias@
++build_cpu = @build_cpu@
++build_os = @build_os@
++build_vendor = @build_vendor@
++builddir = @builddir@
++datadir = @datadir@
++datarootdir = @datarootdir@
++docdir = @docdir@
++dvidir = @dvidir@
++exec_prefix = @exec_prefix@
++gdm_setup = @gdm_setup@
++host = @host@
++host_alias = @host_alias@
++host_cpu = @host_cpu@
++host_os = @host_os@
++host_vendor = @host_vendor@
++htmldir = @htmldir@
++includedir = @includedir@
++infodir = @infodir@
++install_sh = @install_sh@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localedir = @localedir@
++localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++psdir = @psdir@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
++sysconfdir = @sysconfdir@
++target_alias = @target_alias@
++top_build_prefix = @top_build_prefix@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
++users_admin = @users_admin@
++iconsdir = $(pkgdatadir)/icons/hicolor/22x22/actions
++icons_DATA = \
++	system-shutdown.png		\
++	system-restart.png		\
++	system-log-out.png
++
++CLEANFILES = $(icons_DATA)
++all: all-am
++
++.SUFFIXES:
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++	        && { if test -f $@; then exit 0; else break; fi; }; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  data/icons/22x22/actions/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --gnu  data/icons/22x22/actions/Makefile
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++mostlyclean-libtool:
++	-rm -f *.lo
++
++clean-libtool:
++	-rm -rf .libs _libs
++install-iconsDATA: $(icons_DATA)
++	@$(NORMAL_INSTALL)
++	test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
++	@list='$(icons_DATA)'; for p in $$list; do \
++	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++	  f=$(am__strip_dir) \
++	  echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
++	  $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
++	done
++
++uninstall-iconsDATA:
++	@$(NORMAL_UNINSTALL)
++	@list='$(icons_DATA)'; for p in $$list; do \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
++	done
++tags: TAGS
++TAGS:
++
++ctags: CTAGS
++CTAGS:
++
++
++distdir: $(DISTFILES)
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
++	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
++	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++	    fi; \
++	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
++	  else \
++	    test -f $(distdir)/$$file \
++	    || cp -p $$d/$$file $(distdir)/$$file \
++	    || exit 1; \
++	  fi; \
++	done
++check-am: all-am
++check: check-am
++all-am: Makefile $(DATA)
++installdirs:
++	for dir in "$(DESTDIR)$(iconsdir)"; do \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++	done
++install: install-am
++install-exec: install-exec-am
++install-data: install-data-am
++uninstall: uninstall-am
++
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++
++installcheck: installcheck-am
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++	  `test -z '$(STRIP)' || \
++	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++mostlyclean-generic:
++
++clean-generic:
++	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
++
++distclean-generic:
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++
++maintainer-clean-generic:
++	@echo "This command is intended for maintainers to use"
++	@echo "it deletes files that may require special tools to rebuild."
++clean: clean-am
++
++clean-am: clean-generic clean-libtool mostlyclean-am
++
++distclean: distclean-am
++	-rm -f Makefile
++distclean-am: clean-am distclean-generic
++
++dvi: dvi-am
++
++dvi-am:
++
++html: html-am
++
++info: info-am
++
++info-am:
++
++install-data-am: install-iconsDATA
++
++install-dvi: install-dvi-am
++
++install-exec-am:
++
++install-html: install-html-am
++
++install-info: install-info-am
++
++install-man:
++
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
++installcheck-am:
++
++maintainer-clean: maintainer-clean-am
++	-rm -f Makefile
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-generic mostlyclean-libtool
++
++pdf: pdf-am
++
++pdf-am:
++
++ps: ps-am
++
++ps-am:
++
++uninstall-am: uninstall-iconsDATA
++
++.MAKE: install-am install-strip
++
++.PHONY: all all-am check check-am clean clean-generic clean-libtool \
++	distclean distclean-generic distclean-libtool distdir dvi \
++	dvi-am html html-am info info-am install install-am \
++	install-data install-data-am install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
++	install-iconsDATA install-info install-info-am install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
++	install-strip installcheck installcheck-am installdirs \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	uninstall uninstall-am uninstall-iconsDATA
++
++
++system-shutdown.png: system-shutdown.png.uuencode
++	uudecode -o system-shutdown.png $(srcdir)/system-shutdown.png.uuencode
++
++system-restart.png: system-restart.png.uuencode
++	uudecode -o system-restart.png $(srcdir)/system-restart.png.uuencode
++
++system-log-out.png: system-log-out.png.uuencode
++	uudecode -o system-log-out.png $(srcdir)/system-log-out.png.uuencode
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
 diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/data/icons/22x22/Makefile.in fast-user-switch-applet-2.24.0.new/data/icons/22x22/Makefile.in
---- fast-user-switch-applet-2.24.0/data/icons/22x22/Makefile.in	1970-01-01 01:00:00.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/data/icons/22x22/Makefile.in	2009-02-09 19:52:08.000000000 +0000
-@@ -0,0 +1,550 @@
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+--- fast-user-switch-applet-2.24.0/data/icons/22x22/Makefile.in	1969-12-31 18:00:00.000000000 -0600
++++ fast-user-switch-applet-2.24.0.new/data/icons/22x22/Makefile.in	2009-03-04 17:19:45.000000000 -0600
+@@ -0,0 +1,556 @@
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -46695,7 +42978,11 @@
 +subdir = data/icons/22x22
 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
++am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
++	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
++	$(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -46808,6 +43095,7 @@
 +MSGMERGE = @MSGMERGE@
 +NM = @NM@
 +NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
 +OBJEXT = @OBJEXT@
 +OMF_DIR = @OMF_DIR@
 +OTOOL = @OTOOL@
@@ -46890,10 +43178,11 @@
 +srcdir = @srcdir@
 +sysconfdir = @sysconfdir@
 +target_alias = @target_alias@
++top_build_prefix = @top_build_prefix@
 +top_builddir = @top_builddir@
 +top_srcdir = @top_srcdir@
 +users_admin = @users_admin@
-+SUBDIRS = status
++SUBDIRS = status actions
 +all: all-recursive
 +
 +.SUFFIXES:
@@ -46901,8 +43190,8 @@
 +	@for dep in $?; do \
 +	  case '$(am__configure_deps)' in \
 +	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
++	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++	        && { if test -f $@; then exit 0; else break; fi; }; \
 +	      exit 1;; \
 +	  esac; \
 +	done; \
@@ -47008,7 +43297,7 @@
 +	unique=`for i in $$list; do \
 +	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +	  done | \
-+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	mkid -fID $$unique
 +tags: TAGS
@@ -47210,10 +43499,10 @@
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
 diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/data/icons/22x22/status/Makefile.in fast-user-switch-applet-2.24.0.new/data/icons/22x22/status/Makefile.in
---- fast-user-switch-applet-2.24.0/data/icons/22x22/status/Makefile.in	1970-01-01 01:00:00.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/data/icons/22x22/status/Makefile.in	2009-02-09 19:52:08.000000000 +0000
-@@ -0,0 +1,443 @@
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+--- fast-user-switch-applet-2.24.0/data/icons/22x22/status/Makefile.in	1969-12-31 18:00:00.000000000 -0600
++++ fast-user-switch-applet-2.24.0.new/data/icons/22x22/status/Makefile.in	2009-03-04 17:19:45.000000000 -0600
+@@ -0,0 +1,449 @@
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -47250,7 +43539,11 @@
 +subdir = data/icons/22x22/status
 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
++am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
++	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
++	$(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -47360,6 +43653,7 @@
 +MSGMERGE = @MSGMERGE@
 +NM = @NM@
 +NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
 +OBJEXT = @OBJEXT@
 +OMF_DIR = @OMF_DIR@
 +OTOOL = @OTOOL@
@@ -47442,6 +43736,7 @@
 +srcdir = @srcdir@
 +sysconfdir = @sysconfdir@
 +target_alias = @target_alias@
++top_build_prefix = @top_build_prefix@
 +top_builddir = @top_builddir@
 +top_srcdir = @top_srcdir@
 +users_admin = @users_admin@
@@ -47460,8 +43755,8 @@
 +	@for dep in $?; do \
 +	  case '$(am__configure_deps)' in \
 +	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
++	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++	        && { if test -f $@; then exit 0; else break; fi; }; \
 +	      exit 1;; \
 +	  esac; \
 +	done; \
@@ -47656,11 +43951,460 @@
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
+diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/data/icons/24x24/actions/Makefile.in fast-user-switch-applet-2.24.0.new/data/icons/24x24/actions/Makefile.in
+--- fast-user-switch-applet-2.24.0/data/icons/24x24/actions/Makefile.in	1969-12-31 18:00:00.000000000 -0600
++++ fast-user-switch-applet-2.24.0.new/data/icons/24x24/actions/Makefile.in	2009-03-04 17:19:45.000000000 -0600
+@@ -0,0 +1,445 @@
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# @configure_input@
++
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++@SET_MAKE@
++
++VPATH = @srcdir@
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++build_triplet = @build@
++host_triplet = @host@
++subdir = data/icons/24x24/actions
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
++	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
++	$(top_srcdir)/configure.ac
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(iconsdir)"
++iconsDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(icons_DATA)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++ACLOCAL = @ACLOCAL@
++ALL_LINGUAS = @ALL_LINGUAS@
++AMTAR = @AMTAR@
++APPLET_CFLAGS = @APPLET_CFLAGS@
++APPLET_LIBS = @APPLET_LIBS@
++AR = @AR@
++AUTOCONF = @AUTOCONF@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
++CATALOGS = @CATALOGS@
++CATOBJEXT = @CATOBJEXT@
++CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DATADIRNAME = @DATADIRNAME@
++DEFS = @DEFS@
++DEPDIR = @DEPDIR@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
++DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
++DUMPBIN = @DUMPBIN@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
++EXEEXT = @EXEEXT@
++EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
++FGREP = @FGREP@
++GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
++GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++GDMCONFIGFILE = @GDMCONFIGFILE@
++GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
++GLIB_MKENUMS = @GLIB_MKENUMS@
++GMOFILES = @GMOFILES@
++GMSGFMT = @GMSGFMT@
++GNOMELOCALEDIR = @GNOMELOCALEDIR@
++GREP = @GREP@
++HELP_DIR = @HELP_DIR@
++INSTALL = @INSTALL@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++INSTOBJEXT = @INSTOBJEXT@
++INTLLIBS = @INTLLIBS@
++INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
++INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
++INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
++INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
++INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
++INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
++INTLTOOL_MERGE = @INTLTOOL_MERGE@
++INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
++INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
++INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
++INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
++INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
++INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
++INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
++INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
++INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
++INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
++INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
++INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
++INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
++INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
++LD = @LD@
++LDFLAGS = @LDFLAGS@
++LIBDIR = @LIBDIR@
++LIBOBJS = @LIBOBJS@
++LIBS = @LIBS@
++LIBTOOL = @LIBTOOL@
++LIPO = @LIPO@
++LN_S = @LN_S@
++LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
++MSGFMT = @MSGFMT@
++MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NM = @NM@
++NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
++OBJEXT = @OBJEXT@
++OMF_DIR = @OMF_DIR@
++OTOOL = @OTOOL@
++OTOOL64 = @OTOOL64@
++PACKAGE = @PACKAGE@
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_VERSION = @PACKAGE_VERSION@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++PKG_CONFIG = @PKG_CONFIG@
++POFILES = @POFILES@
++POSUB = @POSUB@
++PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
++PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
++PREFIX = @PREFIX@
++RANLIB = @RANLIB@
++SED = @SED@
++SET_MAKE = @SET_MAKE@
++SHELL = @SHELL@
++STRIP = @STRIP@
++SYSCONFDIR = @SYSCONFDIR@
++USE_NLS = @USE_NLS@
++VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
++XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
++X_CFLAGS = @X_CFLAGS@
++X_EXTRA_LIBS = @X_EXTRA_LIBS@
++X_LIBS = @X_LIBS@
++X_PRE_LIBS = @X_PRE_LIBS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
++ac_ct_CC = @ac_ct_CC@
++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
++am__include = @am__include@
++am__leading_dot = @am__leading_dot@
++am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
++bindir = @bindir@
++build = @build@
++build_alias = @build_alias@
++build_cpu = @build_cpu@
++build_os = @build_os@
++build_vendor = @build_vendor@
++builddir = @builddir@
++datadir = @datadir@
++datarootdir = @datarootdir@
++docdir = @docdir@
++dvidir = @dvidir@
++exec_prefix = @exec_prefix@
++gdm_setup = @gdm_setup@
++host = @host@
++host_alias = @host_alias@
++host_cpu = @host_cpu@
++host_os = @host_os@
++host_vendor = @host_vendor@
++htmldir = @htmldir@
++includedir = @includedir@
++infodir = @infodir@
++install_sh = @install_sh@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localedir = @localedir@
++localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++psdir = @psdir@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
++sysconfdir = @sysconfdir@
++target_alias = @target_alias@
++top_build_prefix = @top_build_prefix@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
++users_admin = @users_admin@
++iconsdir = $(pkgdatadir)/icons/hicolor/24x24/actions
++icons_DATA = \
++	system-shutdown.png		\
++	system-restart.png		\
++	system-log-out.png
++
++CLEANFILES = $(icons_DATA)
++all: all-am
++
++.SUFFIXES:
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++	        && { if test -f $@; then exit 0; else break; fi; }; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  data/icons/24x24/actions/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --gnu  data/icons/24x24/actions/Makefile
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++mostlyclean-libtool:
++	-rm -f *.lo
++
++clean-libtool:
++	-rm -rf .libs _libs
++install-iconsDATA: $(icons_DATA)
++	@$(NORMAL_INSTALL)
++	test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
++	@list='$(icons_DATA)'; for p in $$list; do \
++	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++	  f=$(am__strip_dir) \
++	  echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
++	  $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
++	done
++
++uninstall-iconsDATA:
++	@$(NORMAL_UNINSTALL)
++	@list='$(icons_DATA)'; for p in $$list; do \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
++	done
++tags: TAGS
++TAGS:
++
++ctags: CTAGS
++CTAGS:
++
++
++distdir: $(DISTFILES)
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
++	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
++	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++	    fi; \
++	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
++	  else \
++	    test -f $(distdir)/$$file \
++	    || cp -p $$d/$$file $(distdir)/$$file \
++	    || exit 1; \
++	  fi; \
++	done
++check-am: all-am
++check: check-am
++all-am: Makefile $(DATA)
++installdirs:
++	for dir in "$(DESTDIR)$(iconsdir)"; do \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++	done
++install: install-am
++install-exec: install-exec-am
++install-data: install-data-am
++uninstall: uninstall-am
++
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++
++installcheck: installcheck-am
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++	  `test -z '$(STRIP)' || \
++	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++mostlyclean-generic:
++
++clean-generic:
++	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
++
++distclean-generic:
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++
++maintainer-clean-generic:
++	@echo "This command is intended for maintainers to use"
++	@echo "it deletes files that may require special tools to rebuild."
++clean: clean-am
++
++clean-am: clean-generic clean-libtool mostlyclean-am
++
++distclean: distclean-am
++	-rm -f Makefile
++distclean-am: clean-am distclean-generic
++
++dvi: dvi-am
++
++dvi-am:
++
++html: html-am
++
++info: info-am
++
++info-am:
++
++install-data-am: install-iconsDATA
++
++install-dvi: install-dvi-am
++
++install-exec-am:
++
++install-html: install-html-am
++
++install-info: install-info-am
++
++install-man:
++
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
++installcheck-am:
++
++maintainer-clean: maintainer-clean-am
++	-rm -f Makefile
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-generic mostlyclean-libtool
++
++pdf: pdf-am
++
++pdf-am:
++
++ps: ps-am
++
++ps-am:
++
++uninstall-am: uninstall-iconsDATA
++
++.MAKE: install-am install-strip
++
++.PHONY: all all-am check check-am clean clean-generic clean-libtool \
++	distclean distclean-generic distclean-libtool distdir dvi \
++	dvi-am html html-am info info-am install install-am \
++	install-data install-data-am install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
++	install-iconsDATA install-info install-info-am install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
++	install-strip installcheck installcheck-am installdirs \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	uninstall uninstall-am uninstall-iconsDATA
++
++
++system-shutdown.png: system-shutdown.png.uuencode
++	uudecode -o system-shutdown.png $(srcdir)/system-shutdown.png.uuencode
++
++system-restart.png: system-restart.png.uuencode
++	uudecode -o system-restart.png $(srcdir)/system-restart.png.uuencode
++
++system-log-out.png: system-log-out.png.uuencode
++	uudecode -o system-log-out.png $(srcdir)/system-log-out.png.uuencode
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
 diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/data/icons/24x24/Makefile.in fast-user-switch-applet-2.24.0.new/data/icons/24x24/Makefile.in
---- fast-user-switch-applet-2.24.0/data/icons/24x24/Makefile.in	1970-01-01 01:00:00.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/data/icons/24x24/Makefile.in	2009-02-09 19:52:09.000000000 +0000
-@@ -0,0 +1,550 @@
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+--- fast-user-switch-applet-2.24.0/data/icons/24x24/Makefile.in	1969-12-31 18:00:00.000000000 -0600
++++ fast-user-switch-applet-2.24.0.new/data/icons/24x24/Makefile.in	2009-03-04 17:19:45.000000000 -0600
+@@ -0,0 +1,556 @@
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -47696,7 +44440,11 @@
 +subdir = data/icons/24x24
 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
++am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
++	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
++	$(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -47809,6 +44557,7 @@
 +MSGMERGE = @MSGMERGE@
 +NM = @NM@
 +NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
 +OBJEXT = @OBJEXT@
 +OMF_DIR = @OMF_DIR@
 +OTOOL = @OTOOL@
@@ -47891,10 +44640,11 @@
 +srcdir = @srcdir@
 +sysconfdir = @sysconfdir@
 +target_alias = @target_alias@
++top_build_prefix = @top_build_prefix@
 +top_builddir = @top_builddir@
 +top_srcdir = @top_srcdir@
 +users_admin = @users_admin@
-+SUBDIRS = status
++SUBDIRS = status actions
 +all: all-recursive
 +
 +.SUFFIXES:
@@ -47902,8 +44652,8 @@
 +	@for dep in $?; do \
 +	  case '$(am__configure_deps)' in \
 +	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
++	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++	        && { if test -f $@; then exit 0; else break; fi; }; \
 +	      exit 1;; \
 +	  esac; \
 +	done; \
@@ -48009,7 +44759,7 @@
 +	unique=`for i in $$list; do \
 +	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +	  done | \
-+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	mkid -fID $$unique
 +tags: TAGS
@@ -48211,10 +44961,10 @@
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
 diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/data/icons/24x24/status/Makefile.in fast-user-switch-applet-2.24.0.new/data/icons/24x24/status/Makefile.in
---- fast-user-switch-applet-2.24.0/data/icons/24x24/status/Makefile.in	1970-01-01 01:00:00.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/data/icons/24x24/status/Makefile.in	2009-02-09 19:52:09.000000000 +0000
-@@ -0,0 +1,443 @@
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+--- fast-user-switch-applet-2.24.0/data/icons/24x24/status/Makefile.in	1969-12-31 18:00:00.000000000 -0600
++++ fast-user-switch-applet-2.24.0.new/data/icons/24x24/status/Makefile.in	2009-03-04 17:19:45.000000000 -0600
+@@ -0,0 +1,449 @@
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -48251,7 +45001,11 @@
 +subdir = data/icons/24x24/status
 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
++am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
++	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
++	$(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -48361,6 +45115,7 @@
 +MSGMERGE = @MSGMERGE@
 +NM = @NM@
 +NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
 +OBJEXT = @OBJEXT@
 +OMF_DIR = @OMF_DIR@
 +OTOOL = @OTOOL@
@@ -48443,6 +45198,7 @@
 +srcdir = @srcdir@
 +sysconfdir = @sysconfdir@
 +target_alias = @target_alias@
++top_build_prefix = @top_build_prefix@
 +top_builddir = @top_builddir@
 +top_srcdir = @top_srcdir@
 +users_admin = @users_admin@
@@ -48461,8 +45217,8 @@
 +	@for dep in $?; do \
 +	  case '$(am__configure_deps)' in \
 +	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
++	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++	        && { if test -f $@; then exit 0; else break; fi; }; \
 +	      exit 1;; \
 +	  esac; \
 +	done; \
@@ -48657,11 +45413,456 @@
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
+diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/data/icons/32x32/actions/Makefile.in fast-user-switch-applet-2.24.0.new/data/icons/32x32/actions/Makefile.in
+--- fast-user-switch-applet-2.24.0/data/icons/32x32/actions/Makefile.in	1969-12-31 18:00:00.000000000 -0600
++++ fast-user-switch-applet-2.24.0.new/data/icons/32x32/actions/Makefile.in	2009-03-04 17:19:45.000000000 -0600
+@@ -0,0 +1,441 @@
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# @configure_input@
++
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++@SET_MAKE@
++
++VPATH = @srcdir@
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++build_triplet = @build@
++host_triplet = @host@
++subdir = data/icons/32x32/actions
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
++	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
++	$(top_srcdir)/configure.ac
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(iconsdir)"
++iconsDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(icons_DATA)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++ACLOCAL = @ACLOCAL@
++ALL_LINGUAS = @ALL_LINGUAS@
++AMTAR = @AMTAR@
++APPLET_CFLAGS = @APPLET_CFLAGS@
++APPLET_LIBS = @APPLET_LIBS@
++AR = @AR@
++AUTOCONF = @AUTOCONF@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
++CATALOGS = @CATALOGS@
++CATOBJEXT = @CATOBJEXT@
++CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DATADIRNAME = @DATADIRNAME@
++DEFS = @DEFS@
++DEPDIR = @DEPDIR@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
++DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
++DUMPBIN = @DUMPBIN@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
++EXEEXT = @EXEEXT@
++EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
++FGREP = @FGREP@
++GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
++GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++GDMCONFIGFILE = @GDMCONFIGFILE@
++GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
++GLIB_MKENUMS = @GLIB_MKENUMS@
++GMOFILES = @GMOFILES@
++GMSGFMT = @GMSGFMT@
++GNOMELOCALEDIR = @GNOMELOCALEDIR@
++GREP = @GREP@
++HELP_DIR = @HELP_DIR@
++INSTALL = @INSTALL@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++INSTOBJEXT = @INSTOBJEXT@
++INTLLIBS = @INTLLIBS@
++INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
++INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
++INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
++INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
++INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
++INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
++INTLTOOL_MERGE = @INTLTOOL_MERGE@
++INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
++INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
++INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
++INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
++INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
++INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
++INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
++INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
++INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
++INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
++INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
++INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
++INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
++INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
++LD = @LD@
++LDFLAGS = @LDFLAGS@
++LIBDIR = @LIBDIR@
++LIBOBJS = @LIBOBJS@
++LIBS = @LIBS@
++LIBTOOL = @LIBTOOL@
++LIPO = @LIPO@
++LN_S = @LN_S@
++LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
++MSGFMT = @MSGFMT@
++MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NM = @NM@
++NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
++OBJEXT = @OBJEXT@
++OMF_DIR = @OMF_DIR@
++OTOOL = @OTOOL@
++OTOOL64 = @OTOOL64@
++PACKAGE = @PACKAGE@
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_VERSION = @PACKAGE_VERSION@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++PKG_CONFIG = @PKG_CONFIG@
++POFILES = @POFILES@
++POSUB = @POSUB@
++PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
++PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
++PREFIX = @PREFIX@
++RANLIB = @RANLIB@
++SED = @SED@
++SET_MAKE = @SET_MAKE@
++SHELL = @SHELL@
++STRIP = @STRIP@
++SYSCONFDIR = @SYSCONFDIR@
++USE_NLS = @USE_NLS@
++VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
++XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
++X_CFLAGS = @X_CFLAGS@
++X_EXTRA_LIBS = @X_EXTRA_LIBS@
++X_LIBS = @X_LIBS@
++X_PRE_LIBS = @X_PRE_LIBS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
++ac_ct_CC = @ac_ct_CC@
++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
++am__include = @am__include@
++am__leading_dot = @am__leading_dot@
++am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
++bindir = @bindir@
++build = @build@
++build_alias = @build_alias@
++build_cpu = @build_cpu@
++build_os = @build_os@
++build_vendor = @build_vendor@
++builddir = @builddir@
++datadir = @datadir@
++datarootdir = @datarootdir@
++docdir = @docdir@
++dvidir = @dvidir@
++exec_prefix = @exec_prefix@
++gdm_setup = @gdm_setup@
++host = @host@
++host_alias = @host_alias@
++host_cpu = @host_cpu@
++host_os = @host_os@
++host_vendor = @host_vendor@
++htmldir = @htmldir@
++includedir = @includedir@
++infodir = @infodir@
++install_sh = @install_sh@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localedir = @localedir@
++localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++psdir = @psdir@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
++sysconfdir = @sysconfdir@
++target_alias = @target_alias@
++top_build_prefix = @top_build_prefix@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
++users_admin = @users_admin@
++iconsdir = $(pkgdatadir)/icons/hicolor/32x32/actions
++icons_DATA = \
++	system-restart.png		\
++	system-log-out.png
++
++CLEANFILES = $(icons_DATA)
++all: all-am
++
++.SUFFIXES:
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++	        && { if test -f $@; then exit 0; else break; fi; }; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  data/icons/32x32/actions/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --gnu  data/icons/32x32/actions/Makefile
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++mostlyclean-libtool:
++	-rm -f *.lo
++
++clean-libtool:
++	-rm -rf .libs _libs
++install-iconsDATA: $(icons_DATA)
++	@$(NORMAL_INSTALL)
++	test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
++	@list='$(icons_DATA)'; for p in $$list; do \
++	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++	  f=$(am__strip_dir) \
++	  echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
++	  $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
++	done
++
++uninstall-iconsDATA:
++	@$(NORMAL_UNINSTALL)
++	@list='$(icons_DATA)'; for p in $$list; do \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
++	done
++tags: TAGS
++TAGS:
++
++ctags: CTAGS
++CTAGS:
++
++
++distdir: $(DISTFILES)
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
++	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
++	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++	    fi; \
++	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
++	  else \
++	    test -f $(distdir)/$$file \
++	    || cp -p $$d/$$file $(distdir)/$$file \
++	    || exit 1; \
++	  fi; \
++	done
++check-am: all-am
++check: check-am
++all-am: Makefile $(DATA)
++installdirs:
++	for dir in "$(DESTDIR)$(iconsdir)"; do \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++	done
++install: install-am
++install-exec: install-exec-am
++install-data: install-data-am
++uninstall: uninstall-am
++
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++
++installcheck: installcheck-am
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++	  `test -z '$(STRIP)' || \
++	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++mostlyclean-generic:
++
++clean-generic:
++	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
++
++distclean-generic:
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++
++maintainer-clean-generic:
++	@echo "This command is intended for maintainers to use"
++	@echo "it deletes files that may require special tools to rebuild."
++clean: clean-am
++
++clean-am: clean-generic clean-libtool mostlyclean-am
++
++distclean: distclean-am
++	-rm -f Makefile
++distclean-am: clean-am distclean-generic
++
++dvi: dvi-am
++
++dvi-am:
++
++html: html-am
++
++info: info-am
++
++info-am:
++
++install-data-am: install-iconsDATA
++
++install-dvi: install-dvi-am
++
++install-exec-am:
++
++install-html: install-html-am
++
++install-info: install-info-am
++
++install-man:
++
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
++installcheck-am:
++
++maintainer-clean: maintainer-clean-am
++	-rm -f Makefile
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-generic mostlyclean-libtool
++
++pdf: pdf-am
++
++pdf-am:
++
++ps: ps-am
++
++ps-am:
++
++uninstall-am: uninstall-iconsDATA
++
++.MAKE: install-am install-strip
++
++.PHONY: all all-am check check-am clean clean-generic clean-libtool \
++	distclean distclean-generic distclean-libtool distdir dvi \
++	dvi-am html html-am info info-am install install-am \
++	install-data install-data-am install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
++	install-iconsDATA install-info install-info-am install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
++	install-strip installcheck installcheck-am installdirs \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	uninstall uninstall-am uninstall-iconsDATA
++
++
++system-restart.png: system-restart.png.uuencode
++	uudecode -o system-restart.png $(srcdir)/system-restart.png.uuencode
++
++system-log-out.png: system-log-out.png.uuencode
++	uudecode -o system-log-out.png $(srcdir)/system-log-out.png.uuencode
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
 diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/data/icons/32x32/Makefile.in fast-user-switch-applet-2.24.0.new/data/icons/32x32/Makefile.in
---- fast-user-switch-applet-2.24.0/data/icons/32x32/Makefile.in	1970-01-01 01:00:00.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/data/icons/32x32/Makefile.in	2009-02-09 19:52:09.000000000 +0000
-@@ -0,0 +1,550 @@
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+--- fast-user-switch-applet-2.24.0/data/icons/32x32/Makefile.in	1969-12-31 18:00:00.000000000 -0600
++++ fast-user-switch-applet-2.24.0.new/data/icons/32x32/Makefile.in	2009-03-04 17:19:45.000000000 -0600
+@@ -0,0 +1,556 @@
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -48697,7 +45898,11 @@
 +subdir = data/icons/32x32
 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
++am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
++	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
++	$(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -48810,6 +46015,7 @@
 +MSGMERGE = @MSGMERGE@
 +NM = @NM@
 +NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
 +OBJEXT = @OBJEXT@
 +OMF_DIR = @OMF_DIR@
 +OTOOL = @OTOOL@
@@ -48892,10 +46098,11 @@
 +srcdir = @srcdir@
 +sysconfdir = @sysconfdir@
 +target_alias = @target_alias@
++top_build_prefix = @top_build_prefix@
 +top_builddir = @top_builddir@
 +top_srcdir = @top_srcdir@
 +users_admin = @users_admin@
-+SUBDIRS = status
++SUBDIRS = status actions
 +all: all-recursive
 +
 +.SUFFIXES:
@@ -48903,8 +46110,8 @@
 +	@for dep in $?; do \
 +	  case '$(am__configure_deps)' in \
 +	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
++	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++	        && { if test -f $@; then exit 0; else break; fi; }; \
 +	      exit 1;; \
 +	  esac; \
 +	done; \
@@ -49010,7 +46217,7 @@
 +	unique=`for i in $$list; do \
 +	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +	  done | \
-+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	mkid -fID $$unique
 +tags: TAGS
@@ -49212,10 +46419,10 @@
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
 diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/data/icons/32x32/status/Makefile.in fast-user-switch-applet-2.24.0.new/data/icons/32x32/status/Makefile.in
---- fast-user-switch-applet-2.24.0/data/icons/32x32/status/Makefile.in	1970-01-01 01:00:00.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/data/icons/32x32/status/Makefile.in	2009-02-09 19:52:09.000000000 +0000
-@@ -0,0 +1,443 @@
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+--- fast-user-switch-applet-2.24.0/data/icons/32x32/status/Makefile.in	1969-12-31 18:00:00.000000000 -0600
++++ fast-user-switch-applet-2.24.0.new/data/icons/32x32/status/Makefile.in	2009-03-04 17:19:45.000000000 -0600
+@@ -0,0 +1,449 @@
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -49252,7 +46459,11 @@
 +subdir = data/icons/32x32/status
 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
++am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
++	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
++	$(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -49362,6 +46573,7 @@
 +MSGMERGE = @MSGMERGE@
 +NM = @NM@
 +NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
 +OBJEXT = @OBJEXT@
 +OMF_DIR = @OMF_DIR@
 +OTOOL = @OTOOL@
@@ -49444,6 +46656,7 @@
 +srcdir = @srcdir@
 +sysconfdir = @sysconfdir@
 +target_alias = @target_alias@
++top_build_prefix = @top_build_prefix@
 +top_builddir = @top_builddir@
 +top_srcdir = @top_srcdir@
 +users_admin = @users_admin@
@@ -49462,8 +46675,8 @@
 +	@for dep in $?; do \
 +	  case '$(am__configure_deps)' in \
 +	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
++	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++	        && { if test -f $@; then exit 0; else break; fi; }; \
 +	      exit 1;; \
 +	  esac; \
 +	done; \
@@ -49659,10 +46872,10 @@
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
 diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/data/icons/48x48/Makefile.in fast-user-switch-applet-2.24.0.new/data/icons/48x48/Makefile.in
---- fast-user-switch-applet-2.24.0/data/icons/48x48/Makefile.in	1970-01-01 01:00:00.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/data/icons/48x48/Makefile.in	2009-02-09 19:52:09.000000000 +0000
-@@ -0,0 +1,550 @@
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+--- fast-user-switch-applet-2.24.0/data/icons/48x48/Makefile.in	1969-12-31 18:00:00.000000000 -0600
++++ fast-user-switch-applet-2.24.0.new/data/icons/48x48/Makefile.in	2009-03-04 17:19:46.000000000 -0600
+@@ -0,0 +1,556 @@
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -49698,7 +46911,11 @@
 +subdir = data/icons/48x48
 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
++am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
++	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
++	$(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -49811,6 +47028,7 @@
 +MSGMERGE = @MSGMERGE@
 +NM = @NM@
 +NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
 +OBJEXT = @OBJEXT@
 +OMF_DIR = @OMF_DIR@
 +OTOOL = @OTOOL@
@@ -49893,6 +47111,7 @@
 +srcdir = @srcdir@
 +sysconfdir = @sysconfdir@
 +target_alias = @target_alias@
++top_build_prefix = @top_build_prefix@
 +top_builddir = @top_builddir@
 +top_srcdir = @top_srcdir@
 +users_admin = @users_admin@
@@ -49904,8 +47123,8 @@
 +	@for dep in $?; do \
 +	  case '$(am__configure_deps)' in \
 +	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
++	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++	        && { if test -f $@; then exit 0; else break; fi; }; \
 +	      exit 1;; \
 +	  esac; \
 +	done; \
@@ -50011,7 +47230,7 @@
 +	unique=`for i in $$list; do \
 +	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +	  done | \
-+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	mkid -fID $$unique
 +tags: TAGS
@@ -50213,10 +47432,10 @@
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
 diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/data/icons/48x48/status/Makefile.in fast-user-switch-applet-2.24.0.new/data/icons/48x48/status/Makefile.in
---- fast-user-switch-applet-2.24.0/data/icons/48x48/status/Makefile.in	1970-01-01 01:00:00.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/data/icons/48x48/status/Makefile.in	2009-02-09 19:52:09.000000000 +0000
-@@ -0,0 +1,443 @@
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+--- fast-user-switch-applet-2.24.0/data/icons/48x48/status/Makefile.in	1969-12-31 18:00:00.000000000 -0600
++++ fast-user-switch-applet-2.24.0.new/data/icons/48x48/status/Makefile.in	2009-03-04 17:19:46.000000000 -0600
+@@ -0,0 +1,449 @@
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -50253,7 +47472,11 @@
 +subdir = data/icons/48x48/status
 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
++am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
++	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
++	$(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -50363,6 +47586,7 @@
 +MSGMERGE = @MSGMERGE@
 +NM = @NM@
 +NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
 +OBJEXT = @OBJEXT@
 +OMF_DIR = @OMF_DIR@
 +OTOOL = @OTOOL@
@@ -50445,6 +47669,7 @@
 +srcdir = @srcdir@
 +sysconfdir = @sysconfdir@
 +target_alias = @target_alias@
++top_build_prefix = @top_build_prefix@
 +top_builddir = @top_builddir@
 +top_srcdir = @top_srcdir@
 +users_admin = @users_admin@
@@ -50463,8 +47688,8 @@
 +	@for dep in $?; do \
 +	  case '$(am__configure_deps)' in \
 +	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
++	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++	        && { if test -f $@; then exit 0; else break; fi; }; \
 +	      exit 1;; \
 +	  esac; \
 +	done; \
@@ -50660,10 +47885,10 @@
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
 diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/data/icons/Makefile.in fast-user-switch-applet-2.24.0.new/data/icons/Makefile.in
---- fast-user-switch-applet-2.24.0/data/icons/Makefile.in	1970-01-01 01:00:00.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/data/icons/Makefile.in	2009-02-09 19:52:09.000000000 +0000
-@@ -0,0 +1,566 @@
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+--- fast-user-switch-applet-2.24.0/data/icons/Makefile.in	1969-12-31 18:00:00.000000000 -0600
++++ fast-user-switch-applet-2.24.0.new/data/icons/Makefile.in	2009-03-04 17:19:46.000000000 -0600
+@@ -0,0 +1,572 @@
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -50699,7 +47924,11 @@
 +subdir = data/icons
 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
++am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
++	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
++	$(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -50812,6 +48041,7 @@
 +MSGMERGE = @MSGMERGE@
 +NM = @NM@
 +NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
 +OBJEXT = @OBJEXT@
 +OMF_DIR = @OMF_DIR@
 +OTOOL = @OTOOL@
@@ -50894,6 +48124,7 @@
 +srcdir = @srcdir@
 +sysconfdir = @sysconfdir@
 +target_alias = @target_alias@
++top_build_prefix = @top_build_prefix@
 +top_builddir = @top_builddir@
 +top_srcdir = @top_srcdir@
 +users_admin = @users_admin@
@@ -50906,8 +48137,8 @@
 +	@for dep in $?; do \
 +	  case '$(am__configure_deps)' in \
 +	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
++	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++	        && { if test -f $@; then exit 0; else break; fi; }; \
 +	      exit 1;; \
 +	  esac; \
 +	done; \
@@ -51013,7 +48244,7 @@
 +	unique=`for i in $$list; do \
 +	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +	  done | \
-+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	mkid -fID $$unique
 +tags: TAGS
@@ -51229,11 +48460,449 @@
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
+diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/data/icons/scalable/actions/Makefile.in fast-user-switch-applet-2.24.0.new/data/icons/scalable/actions/Makefile.in
+--- fast-user-switch-applet-2.24.0/data/icons/scalable/actions/Makefile.in	1969-12-31 18:00:00.000000000 -0600
++++ fast-user-switch-applet-2.24.0.new/data/icons/scalable/actions/Makefile.in	2009-03-04 17:19:46.000000000 -0600
+@@ -0,0 +1,434 @@
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# @configure_input@
++
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++@SET_MAKE@
++
++VPATH = @srcdir@
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++build_triplet = @build@
++host_triplet = @host@
++subdir = data/icons/scalable/actions
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
++	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
++	$(top_srcdir)/configure.ac
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(iconsdir)"
++iconsDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(icons_DATA)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++ACLOCAL = @ACLOCAL@
++ALL_LINGUAS = @ALL_LINGUAS@
++AMTAR = @AMTAR@
++APPLET_CFLAGS = @APPLET_CFLAGS@
++APPLET_LIBS = @APPLET_LIBS@
++AR = @AR@
++AUTOCONF = @AUTOCONF@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
++CATALOGS = @CATALOGS@
++CATOBJEXT = @CATOBJEXT@
++CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DATADIRNAME = @DATADIRNAME@
++DEFS = @DEFS@
++DEPDIR = @DEPDIR@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
++DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
++DUMPBIN = @DUMPBIN@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
++EXEEXT = @EXEEXT@
++EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
++FGREP = @FGREP@
++GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
++GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++GDMCONFIGFILE = @GDMCONFIGFILE@
++GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
++GLIB_MKENUMS = @GLIB_MKENUMS@
++GMOFILES = @GMOFILES@
++GMSGFMT = @GMSGFMT@
++GNOMELOCALEDIR = @GNOMELOCALEDIR@
++GREP = @GREP@
++HELP_DIR = @HELP_DIR@
++INSTALL = @INSTALL@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++INSTOBJEXT = @INSTOBJEXT@
++INTLLIBS = @INTLLIBS@
++INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
++INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
++INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
++INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
++INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
++INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
++INTLTOOL_MERGE = @INTLTOOL_MERGE@
++INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
++INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
++INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
++INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
++INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
++INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
++INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
++INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
++INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
++INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
++INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
++INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
++INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
++INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
++LD = @LD@
++LDFLAGS = @LDFLAGS@
++LIBDIR = @LIBDIR@
++LIBOBJS = @LIBOBJS@
++LIBS = @LIBS@
++LIBTOOL = @LIBTOOL@
++LIPO = @LIPO@
++LN_S = @LN_S@
++LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
++MSGFMT = @MSGFMT@
++MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NM = @NM@
++NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
++OBJEXT = @OBJEXT@
++OMF_DIR = @OMF_DIR@
++OTOOL = @OTOOL@
++OTOOL64 = @OTOOL64@
++PACKAGE = @PACKAGE@
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_VERSION = @PACKAGE_VERSION@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++PKG_CONFIG = @PKG_CONFIG@
++POFILES = @POFILES@
++POSUB = @POSUB@
++PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
++PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
++PREFIX = @PREFIX@
++RANLIB = @RANLIB@
++SED = @SED@
++SET_MAKE = @SET_MAKE@
++SHELL = @SHELL@
++STRIP = @STRIP@
++SYSCONFDIR = @SYSCONFDIR@
++USE_NLS = @USE_NLS@
++VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
++XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
++X_CFLAGS = @X_CFLAGS@
++X_EXTRA_LIBS = @X_EXTRA_LIBS@
++X_LIBS = @X_LIBS@
++X_PRE_LIBS = @X_PRE_LIBS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
++ac_ct_CC = @ac_ct_CC@
++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
++am__include = @am__include@
++am__leading_dot = @am__leading_dot@
++am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
++bindir = @bindir@
++build = @build@
++build_alias = @build_alias@
++build_cpu = @build_cpu@
++build_os = @build_os@
++build_vendor = @build_vendor@
++builddir = @builddir@
++datadir = @datadir@
++datarootdir = @datarootdir@
++docdir = @docdir@
++dvidir = @dvidir@
++exec_prefix = @exec_prefix@
++gdm_setup = @gdm_setup@
++host = @host@
++host_alias = @host_alias@
++host_cpu = @host_cpu@
++host_os = @host_os@
++host_vendor = @host_vendor@
++htmldir = @htmldir@
++includedir = @includedir@
++infodir = @infodir@
++install_sh = @install_sh@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localedir = @localedir@
++localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++psdir = @psdir@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
++sysconfdir = @sysconfdir@
++target_alias = @target_alias@
++top_build_prefix = @top_build_prefix@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
++users_admin = @users_admin@
++iconsdir = $(pkgdatadir)/icons/hicolor/scalable/actions
++icons_DATA = \
++	system-restart.svg \
++	system-log-out.svg \
++	system-shutdown.svg
++
++all: all-am
++
++.SUFFIXES:
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++	        && { if test -f $@; then exit 0; else break; fi; }; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  data/icons/scalable/actions/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --gnu  data/icons/scalable/actions/Makefile
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++mostlyclean-libtool:
++	-rm -f *.lo
++
++clean-libtool:
++	-rm -rf .libs _libs
++install-iconsDATA: $(icons_DATA)
++	@$(NORMAL_INSTALL)
++	test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
++	@list='$(icons_DATA)'; for p in $$list; do \
++	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++	  f=$(am__strip_dir) \
++	  echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
++	  $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
++	done
++
++uninstall-iconsDATA:
++	@$(NORMAL_UNINSTALL)
++	@list='$(icons_DATA)'; for p in $$list; do \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
++	done
++tags: TAGS
++TAGS:
++
++ctags: CTAGS
++CTAGS:
++
++
++distdir: $(DISTFILES)
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
++	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
++	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++	    fi; \
++	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
++	  else \
++	    test -f $(distdir)/$$file \
++	    || cp -p $$d/$$file $(distdir)/$$file \
++	    || exit 1; \
++	  fi; \
++	done
++check-am: all-am
++check: check-am
++all-am: Makefile $(DATA)
++installdirs:
++	for dir in "$(DESTDIR)$(iconsdir)"; do \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++	done
++install: install-am
++install-exec: install-exec-am
++install-data: install-data-am
++uninstall: uninstall-am
++
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++
++installcheck: installcheck-am
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++	  `test -z '$(STRIP)' || \
++	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++mostlyclean-generic:
++
++clean-generic:
++
++distclean-generic:
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++
++maintainer-clean-generic:
++	@echo "This command is intended for maintainers to use"
++	@echo "it deletes files that may require special tools to rebuild."
++clean: clean-am
++
++clean-am: clean-generic clean-libtool mostlyclean-am
++
++distclean: distclean-am
++	-rm -f Makefile
++distclean-am: clean-am distclean-generic
++
++dvi: dvi-am
++
++dvi-am:
++
++html: html-am
++
++info: info-am
++
++info-am:
++
++install-data-am: install-iconsDATA
++
++install-dvi: install-dvi-am
++
++install-exec-am:
++
++install-html: install-html-am
++
++install-info: install-info-am
++
++install-man:
++
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
++installcheck-am:
++
++maintainer-clean: maintainer-clean-am
++	-rm -f Makefile
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-generic mostlyclean-libtool
++
++pdf: pdf-am
++
++pdf-am:
++
++ps: ps-am
++
++ps-am:
++
++uninstall-am: uninstall-iconsDATA
++
++.MAKE: install-am install-strip
++
++.PHONY: all all-am check check-am clean clean-generic clean-libtool \
++	distclean distclean-generic distclean-libtool distdir dvi \
++	dvi-am html html-am info info-am install install-am \
++	install-data install-data-am install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
++	install-iconsDATA install-info install-info-am install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
++	install-strip installcheck installcheck-am installdirs \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	uninstall uninstall-am uninstall-iconsDATA
++
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
 diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/data/icons/scalable/Makefile.in fast-user-switch-applet-2.24.0.new/data/icons/scalable/Makefile.in
---- fast-user-switch-applet-2.24.0/data/icons/scalable/Makefile.in	1970-01-01 01:00:00.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/data/icons/scalable/Makefile.in	2009-02-09 19:52:09.000000000 +0000
-@@ -0,0 +1,550 @@
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+--- fast-user-switch-applet-2.24.0/data/icons/scalable/Makefile.in	1969-12-31 18:00:00.000000000 -0600
++++ fast-user-switch-applet-2.24.0.new/data/icons/scalable/Makefile.in	2009-03-04 17:19:46.000000000 -0600
+@@ -0,0 +1,556 @@
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -51269,7 +48938,11 @@
 +subdir = data/icons/scalable
 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
++am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
++	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
++	$(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -51382,6 +49055,7 @@
 +MSGMERGE = @MSGMERGE@
 +NM = @NM@
 +NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
 +OBJEXT = @OBJEXT@
 +OMF_DIR = @OMF_DIR@
 +OTOOL = @OTOOL@
@@ -51464,10 +49138,11 @@
 +srcdir = @srcdir@
 +sysconfdir = @sysconfdir@
 +target_alias = @target_alias@
++top_build_prefix = @top_build_prefix@
 +top_builddir = @top_builddir@
 +top_srcdir = @top_srcdir@
 +users_admin = @users_admin@
-+SUBDIRS = status
++SUBDIRS = status actions
 +all: all-recursive
 +
 +.SUFFIXES:
@@ -51475,8 +49150,8 @@
 +	@for dep in $?; do \
 +	  case '$(am__configure_deps)' in \
 +	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
++	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++	        && { if test -f $@; then exit 0; else break; fi; }; \
 +	      exit 1;; \
 +	  esac; \
 +	done; \
@@ -51582,7 +49257,7 @@
 +	unique=`for i in $$list; do \
 +	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +	  done | \
-+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	mkid -fID $$unique
 +tags: TAGS
@@ -51784,10 +49459,10 @@
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
 diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/data/icons/scalable/status/Makefile.in fast-user-switch-applet-2.24.0.new/data/icons/scalable/status/Makefile.in
---- fast-user-switch-applet-2.24.0/data/icons/scalable/status/Makefile.in	1970-01-01 01:00:00.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/data/icons/scalable/status/Makefile.in	2009-02-09 19:52:09.000000000 +0000
-@@ -0,0 +1,429 @@
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+--- fast-user-switch-applet-2.24.0/data/icons/scalable/status/Makefile.in	1969-12-31 18:00:00.000000000 -0600
++++ fast-user-switch-applet-2.24.0.new/data/icons/scalable/status/Makefile.in	2009-03-04 17:19:46.000000000 -0600
+@@ -0,0 +1,435 @@
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -51824,7 +49499,11 @@
 +subdir = data/icons/scalable/status
 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
++am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
++	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
++	$(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -51934,6 +49613,7 @@
 +MSGMERGE = @MSGMERGE@
 +NM = @NM@
 +NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
 +OBJEXT = @OBJEXT@
 +OMF_DIR = @OMF_DIR@
 +OTOOL = @OTOOL@
@@ -52016,6 +49696,7 @@
 +srcdir = @srcdir@
 +sysconfdir = @sysconfdir@
 +target_alias = @target_alias@
++top_build_prefix = @top_build_prefix@
 +top_builddir = @top_builddir@
 +top_srcdir = @top_srcdir@
 +users_admin = @users_admin@
@@ -52033,8 +49714,8 @@
 +	@for dep in $?; do \
 +	  case '$(am__configure_deps)' in \
 +	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
++	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++	        && { if test -f $@; then exit 0; else break; fi; }; \
 +	      exit 1;; \
 +	  esac; \
 +	done; \
@@ -52217,19 +49898,27 @@
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
 diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/data/Makefile.in fast-user-switch-applet-2.24.0.new/data/Makefile.in
---- fast-user-switch-applet-2.24.0/data/Makefile.in	2008-09-22 15:25:38.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/data/Makefile.in	2009-02-09 19:52:08.000000000 +0000
-@@ -37,8 +37,7 @@
- subdir = data
+--- fast-user-switch-applet-2.24.0/data/Makefile.in	2008-09-22 09:25:38.000000000 -0500
++++ fast-user-switch-applet-2.24.0.new/data/Makefile.in	2009-03-04 17:19:45.000000000 -0600
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -38,7 +38,10 @@
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
 -	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
-+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
++	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
++	$(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -46,6 +45,13 @@
+@@ -46,6 +49,13 @@
  CONFIG_CLEAN_FILES =
  SOURCES =
  DIST_SOURCES =
@@ -52243,7 +49932,7 @@
  am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
  am__vpath_adj = case $$p in \
      $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-@@ -59,6 +65,11 @@
+@@ -59,6 +69,11 @@
  serverDATA_INSTALL = $(INSTALL_DATA)
  uiDATA_INSTALL = $(INSTALL_DATA)
  DATA = $(glade_DATA) $(schema_DATA) $(server_DATA) $(ui_DATA)
@@ -52255,7 +49944,7 @@
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  ACLOCAL = @ACLOCAL@
  ALL_LINGUAS = @ALL_LINGUAS@
-@@ -77,10 +88,6 @@
+@@ -77,10 +92,6 @@
  CFLAGS = @CFLAGS@
  CPP = @CPP@
  CPPFLAGS = @CPPFLAGS@
@@ -52266,7 +49955,7 @@
  CYGPATH_W = @CYGPATH_W@
  DATADIRNAME = @DATADIRNAME@
  DEFS = @DEFS@
-@@ -88,15 +95,14 @@
+@@ -88,15 +99,14 @@
  DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
  DOC_USER_FORMATS = @DOC_USER_FORMATS@
  DSYMUTIL = @DSYMUTIL@
@@ -52284,7 +49973,7 @@
  GCONFTOOL = @GCONFTOOL@
  GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
  GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-@@ -139,11 +145,13 @@
+@@ -139,11 +149,13 @@
  INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
  INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
  INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
@@ -52298,12 +49987,13 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MAINT = @MAINT@
-@@ -153,9 +161,12 @@
+@@ -153,9 +165,13 @@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
  MSGMERGE = @MSGMERGE@
 +NM = @NM@
  NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
  OBJEXT = @OBJEXT@
  OMF_DIR = @OMF_DIR@
 +OTOOL = @OTOOL@
@@ -52311,7 +50001,7 @@
  PACKAGE = @PACKAGE@
  PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
-@@ -189,8 +200,7 @@
+@@ -189,8 +205,7 @@
  abs_top_builddir = @abs_top_builddir@
  abs_top_srcdir = @abs_top_srcdir@
  ac_ct_CC = @ac_ct_CC@
@@ -52321,7 +50011,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -222,6 +232,7 @@
+@@ -222,6 +237,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -52329,7 +50019,12 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
-@@ -238,6 +249,7 @@
+@@ -234,10 +250,12 @@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  users_admin = @users_admin@
  AUTOMAKE_OPTIONS = 1.9
@@ -52337,7 +50032,7 @@
  
  ##############################
  # Bonobo .server
-@@ -304,7 +316,7 @@
+@@ -304,15 +322,15 @@
  MAINTAINERCLEANFILES = \
  	Makefile.in
  
@@ -52346,7 +50041,17 @@
  
  .SUFFIXES:
  $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-@@ -410,12 +422,136 @@
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+ 	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
++	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++	        && { if test -f $@; then exit 0; else break; fi; }; \
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+@@ -410,12 +428,136 @@
  	  echo " rm -f '$(DESTDIR)$(uidir)/$$f'"; \
  	  rm -f "$(DESTDIR)$(uidir)/$$f"; \
  	done
@@ -52426,7 +50131,7 @@
 +	unique=`for i in $$list; do \
 +	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +	  done | \
-+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	mkid -fID $$unique
  tags: TAGS
@@ -52485,7 +50190,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-@@ -443,22 +579,40 @@
+@@ -443,22 +585,40 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -52533,7 +50238,7 @@
  install-strip:
  	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
  	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-@@ -476,77 +630,81 @@
+@@ -476,77 +636,81 @@
  	@echo "This command is intended for maintainers to use"
  	@echo "it deletes files that may require special tools to rebuild."
  	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
@@ -52643,20 +50348,64 @@
  
  
  $(server_in_files): $(server_in_files:.server.in=.server.in.in)
+diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/gnome-doc-utils.make fast-user-switch-applet-2.24.0.new/gnome-doc-utils.make
+--- fast-user-switch-applet-2.24.0/gnome-doc-utils.make	2008-09-22 09:25:26.000000000 -0500
++++ fast-user-switch-applet-2.24.0.new/gnome-doc-utils.make	2009-03-04 17:19:35.000000000 -0600
+@@ -504,14 +504,13 @@
+ install-doc-figs:
+ 	@list='$(patsubst C/%,%,$(_DOC_C_FIGURES))'; for fig in $$list; do \
+ 	  for lc in C $(_DOC_REAL_LINGUAS); do \
++	    figsymlink=false; \
+ 	    if test -f "$$lc/$$fig"; then \
+ 	      figfile="$$lc/$$fig"; \
+ 	    elif test -f "$(srcdir)/$$lc/$$fig"; then \
+ 	      figfile="$(srcdir)/$$lc/$$fig"; \
+-	    elif test -f "C/$$fig"; then \
+-	      figfile="C/$$fig"; \
+ 	    else \
+-	      figfile="$(srcdir)/C/$$fig"; \
++	      figsymlink=true; \
+ 	    fi; \
+ 	    figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
+ 	    figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \
+@@ -520,8 +519,13 @@
+ 	      $(mkinstalldirs) "$$figdir"; \
+ 	    fi; \
+ 	    figbase=`echo $$fig | sed -e 's/^.*\///'`; \
+-	    echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \
+-	    $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \
++	    if $$figsymlink; then \
++	      echo "cd $$figdir && $(LN_S) -f ../../C/$$fig $$figbase"; \
++	      ( cd "$$figdir" && $(LN_S) -f "../../C/$$fig" "$$figbase" ); \
++	    else \
++	      echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \
++	      $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \
++	    fi; \
+ 	  done; \
+ 	done
+ 
 diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/help/Makefile.in fast-user-switch-applet-2.24.0.new/help/Makefile.in
---- fast-user-switch-applet-2.24.0/help/Makefile.in	2008-09-22 15:25:39.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/help/Makefile.in	2009-02-09 19:52:09.000000000 +0000
-@@ -59,8 +59,7 @@
- 	$(top_srcdir)/gnome-doc-utils.make ChangeLog
+--- fast-user-switch-applet-2.24.0/help/Makefile.in	2008-09-22 09:25:39.000000000 -0500
++++ fast-user-switch-applet-2.24.0.new/help/Makefile.in	2009-03-04 17:19:46.000000000 -0600
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -60,7 +60,10 @@
  subdir = help
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
 -	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
-+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
++	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
++	$(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -86,10 +85,6 @@
+@@ -86,10 +89,6 @@
  CFLAGS = @CFLAGS@
  CPP = @CPP@
  CPPFLAGS = @CPPFLAGS@
@@ -52667,7 +50416,7 @@
  CYGPATH_W = @CYGPATH_W@
  DATADIRNAME = @DATADIRNAME@
  DEFS = @DEFS@
-@@ -97,15 +92,14 @@
+@@ -97,15 +96,14 @@
  DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
  DOC_USER_FORMATS = @DOC_USER_FORMATS@
  DSYMUTIL = @DSYMUTIL@
@@ -52685,7 +50434,7 @@
  GCONFTOOL = @GCONFTOOL@
  GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
  GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-@@ -148,11 +142,13 @@
+@@ -148,11 +146,13 @@
  INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
  INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
  INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
@@ -52699,12 +50448,13 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MAINT = @MAINT@
-@@ -162,9 +158,12 @@
+@@ -162,9 +162,13 @@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
  MSGMERGE = @MSGMERGE@
 +NM = @NM@
  NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
  OBJEXT = @OBJEXT@
  OMF_DIR = @OMF_DIR@
 +OTOOL = @OTOOL@
@@ -52712,7 +50462,7 @@
  PACKAGE = @PACKAGE@
  PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
-@@ -198,8 +197,7 @@
+@@ -198,8 +202,7 @@
  abs_top_builddir = @abs_top_builddir@
  abs_top_srcdir = @abs_top_srcdir@
  ac_ct_CC = @ac_ct_CC@
@@ -52722,7 +50472,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -231,6 +229,7 @@
+@@ -231,6 +234,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -52730,9 +50480,61 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
+@@ -243,6 +247,7 @@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ users_admin = @users_admin@
+@@ -366,8 +371,8 @@
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+ 	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
++	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++	        && { if test -f $@; then exit 0; else break; fi; }; \
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+@@ -831,14 +836,13 @@
+ install-doc-figs:
+ 	@list='$(patsubst C/%,%,$(_DOC_C_FIGURES))'; for fig in $$list; do \
+ 	  for lc in C $(_DOC_REAL_LINGUAS); do \
++	    figsymlink=false; \
+ 	    if test -f "$$lc/$$fig"; then \
+ 	      figfile="$$lc/$$fig"; \
+ 	    elif test -f "$(srcdir)/$$lc/$$fig"; then \
+ 	      figfile="$(srcdir)/$$lc/$$fig"; \
+-	    elif test -f "C/$$fig"; then \
+-	      figfile="C/$$fig"; \
+ 	    else \
+-	      figfile="$(srcdir)/C/$$fig"; \
++	      figsymlink=true; \
+ 	    fi; \
+ 	    figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
+ 	    figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \
+@@ -847,8 +851,13 @@
+ 	      $(mkinstalldirs) "$$figdir"; \
+ 	    fi; \
+ 	    figbase=`echo $$fig | sed -e 's/^.*\///'`; \
+-	    echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \
+-	    $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \
++	    if $$figsymlink; then \
++	      echo "cd $$figdir && $(LN_S) -f ../../C/$$fig $$figbase"; \
++	      ( cd "$$figdir" && $(LN_S) -f "../../C/$$fig" "$$figbase" ); \
++	    else \
++	      echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \
++	      $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \
++	    fi; \
+ 	  done; \
+ 	done
+ 
 diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/ltmain.sh fast-user-switch-applet-2.24.0.new/ltmain.sh
---- fast-user-switch-applet-2.24.0/ltmain.sh	2008-02-08 00:54:46.000000000 +0000
-+++ fast-user-switch-applet-2.24.0.new/ltmain.sh	2009-02-09 19:52:01.000000000 +0000
+--- fast-user-switch-applet-2.24.0/ltmain.sh	2008-02-07 18:54:46.000000000 -0600
++++ fast-user-switch-applet-2.24.0.new/ltmain.sh	2009-03-04 17:19:35.000000000 -0600
 @@ -1,52 +1,83 @@
 -# ltmain.sh - Provide generalized library-building support services.
 -# NOTE: Changing this file will not affect anything until you rerun configure.
@@ -52744,7 +50546,7 @@
 -# This program is free software; you can redistribute it and/or modify
 +# Generated from ltmain.m4sh.
 +
-+# ltmain.sh (GNU libtool) 2.2.4
++# ltmain.sh (GNU libtool) 2.2.6
 +# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 +
 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
@@ -52833,7 +50635,7 @@
 +#       compiler:		$LTCC
 +#       compiler flags:		$LTCFLAGS
 +#       linker:		$LD (gnu? $with_gnu_ld)
-+#       $progname:		(GNU libtool) 2.2.4 Debian-2.2.4-0ubuntu4
++#       $progname:		(GNU libtool) 2.2.6 Debian-2.2.6a-1ubuntu1
 +#       automake:		$automake_version
 +#       autoconf:		$autoconf_version
 +#
@@ -52843,9 +50645,9 @@
  PACKAGE=libtool
 -VERSION="1.5.26 Debian 1.5.26-1ubuntu1"
 -TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
-+VERSION="2.2.4 Debian-2.2.4-0ubuntu4"
++VERSION="2.2.6 Debian-2.2.6a-1ubuntu1"
 +TIMESTAMP=""
-+package_revision=1.2976
++package_revision=1.3012
  
 -# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
 +# Be Bourne compatible
@@ -53203,7 +51005,7 @@
        # Return a directory name, but don't create it in dry-run mode
        my_tmpdir="${my_template}-$$"
      else
-@@ -176,525 +364,785 @@
+@@ -176,526 +364,787 @@
        my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
  
        if test ! -d "$my_tmpdir"; then
@@ -54026,7 +51828,7 @@
 +
 +
 +  case $host in
-+    *cygwin* | *mingw* | *pw32*)
++    *cygwin* | *mingw* | *pw32* | *cegcc*)
 +      # don't eliminate duplications in $postdeps and $predeps
 +      opt_duplicate_compiler_generated_deps=:
        ;;
@@ -54149,8 +51951,9 @@
 +# determined imposters.
 +func_lalib_p ()
 +{
-+    $SED -e 4q "$1" 2>/dev/null \
-+      | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
++    test -f "$1" &&
++      $SED -e 4q "$1" 2>/dev/null \
++        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
 +}
  
 -      target )
@@ -54168,7 +51971,7 @@
 +func_lalib_unsafe_p ()
 +{
 +    lalib_p=no
-+    if test -r "$1" && exec 5<&0 <"$1"; then
++    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
 +	for lalib_p_l in 1 2 3 4
 +	do
 +	    read lalib_p_line
@@ -54204,6 +52007,7 @@
 -	-static | -prefer-pic | -prefer-non-pic)
 -	  later="$later $arg"
 -	  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
@@ -54418,10 +52222,11 @@
 +	-shared | -static | -prefer-pic | -prefer-non-pic)
 +	  later="$later $arg"
 +	  continue
- 	  ;;
++	  ;;
  
  	-no-suppress)
-@@ -708,31 +1156,25 @@
+ 	  suppress_opt=no
+@@ -708,31 +1157,25 @@
  	  ;;            #  replaced later.  I would guess that would be a bug.
  
  	-Wc,*)
@@ -54461,7 +52266,7 @@
  	  # Accept the current argument as the source file.
  	  # The previous "srcfile" becomes the current argument.
  	  #
-@@ -744,66 +1186,42 @@
+@@ -744,66 +1187,42 @@
        esac    #  case $arg_mode
  
        # Aesthetically quote the previous argument.
@@ -54545,7 +52350,7 @@
        ;;
      esac
  
-@@ -811,7 +1229,15 @@
+@@ -811,7 +1230,15 @@
  
      for arg in $later; do
        case $arg in
@@ -54561,7 +52366,7 @@
  	build_old_libs=yes
  	continue
  	;;
-@@ -828,28 +1254,17 @@
+@@ -828,28 +1255,17 @@
        esac
      done
  
@@ -54599,7 +52404,7 @@
  
      # Delete any leftover library objects.
      if test "$build_old_libs" = yes; then
-@@ -858,9 +1273,6 @@
+@@ -858,12 +1274,9 @@
        removelist="$lobj $libobj ${libobj}T"
      fi
  
@@ -54608,8 +52413,12 @@
 -
      # On Cygwin there's no "real" PIC flag so we must build both object types
      case $host_os in
-     cygwin* | mingw* | pw32* | os2*)
-@@ -875,10 +1287,8 @@
+-    cygwin* | mingw* | pw32* | os2*)
++    cygwin* | mingw* | pw32* | os2* | cegcc*)
+       pic_mode=default
+       ;;
+     esac
+@@ -875,10 +1288,8 @@
      # Calculate the filename of the output object if compiler does
      # not support -o with -c
      if test "$compiler_c_o" = no; then
@@ -54621,7 +52430,7 @@
      else
        output_obj=
        need_locks=no
-@@ -888,13 +1298,13 @@
+@@ -888,13 +1299,13 @@
      # 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
@@ -54638,7 +52447,7 @@
  *** ERROR, $lockfile exists and contains:
  `cat $lockfile 2>/dev/null`
  
-@@ -905,34 +1315,22 @@
+@@ -905,34 +1316,22 @@
  avoid parallel builds (make -j) in this platform, or get a better
  compiler."
  
@@ -54682,7 +52491,7 @@
  
      # Only build a PIC object if we are building libtool libraries.
      if test "$build_libtool_libs" = yes; then
-@@ -946,32 +1344,19 @@
+@@ -946,32 +1345,19 @@
  	command="$base_compile $qsrcfile"
        fi
  
@@ -54719,7 +52528,7 @@
  *** ERROR, $lockfile contains:
  `cat $lockfile 2>/dev/null`
  
-@@ -985,45 +1370,27 @@
+@@ -985,45 +1371,27 @@
  avoid parallel builds (make -j) in this platform, or get a better
  compiler."
  
@@ -54770,7 +52579,7 @@
        else
  	command="$base_compile $qsrcfile $pic_flag"
        fi
-@@ -1033,17 +1400,12 @@
+@@ -1033,17 +1401,12 @@
  
        # Suppress compiler output if we already did a PIC compilation.
        command="$command$suppress_output"
@@ -54791,7 +52600,7 @@
  *** ERROR, $lockfile contains:
  `cat $lockfile 2>/dev/null`
  
-@@ -1057,3460 +1419,2569 @@
+@@ -1057,5485 +1420,6783 @@
  avoid parallel builds (make -j) in this platform, or get a better
  compiler."
  
@@ -55564,24 +53373,31 @@
 -        finalize_command="$finalize_command $arg"
 -        compiler_flags="$compiler_flags $arg"
 -        continue
--        ;;
 +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."
+         ;;
  
 -      -shrext)
 -	prev=shrext
 -	continue
 -	;;
-+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_fatal_help "invalid operation mode \`$mode'"
++        ;;
++    esac
  
 -      -no-fast-install)
 -	fast_install=no
 -	continue
 -	;;
-+If FILE is a libtool library, all the files associated with it are deleted.
-+Otherwise, only FILE itself is deleted using RM."
-+        ;;
++    $ECHO
++    $ECHO "Try \`$progname --help' for more information about other modes."
  
 -      -no-install)
 -	case $host in
@@ -55596,38 +53412,22 @@
 -	esac
 -	continue
 -	;;
-+      *)
-+        func_fatal_help "invalid operation mode \`$mode'"
-+        ;;
-+    esac
++    exit $?
++}
  
 -      -no-undefined)
 -	allow_undefined=no
 -	continue
 -	;;
-+    $ECHO
-+    $ECHO "Try \`$progname --help' for more information about other modes."
++  # Now that we've collected a possible --mode arg, show help if necessary
++  $opt_help && func_mode_help
  
 -      -objectlist)
 -	prev=objectlist
 -	continue
 -	;;
-+    exit $?
-+}
  
 -      -o) prev=output ;;
-+  # Now that we've collected a possible --mode arg, show help if necessary
-+  $opt_help && func_mode_help
- 
--      -precious-files-regex)
--	prev=precious_regex
--	continue
--	;;
- 
--      -release)
--	prev=release
--	continue
--	;;
 +# func_mode_execute arg...
 +func_mode_execute ()
 +{
@@ -55637,8 +53437,8 @@
 +    test -z "$cmd" && \
 +      func_fatal_help "you must specify a COMMAND"
  
--      -rpath)
--	prev=rpath
+-      -precious-files-regex)
+-	prev=precious_regex
 -	continue
 -	;;
 +    # Handle -dlopen flags immediately.
@@ -55646,16 +53446,37 @@
 +      test -f "$file" \
 +	|| func_fatal_help "\`$file' is not a file"
  
+-      -release)
+-	prev=release
+-	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"
+ 
+-      -rpath)
+-	prev=rpath
+-	continue
+-	;;
++	# Read the libtool library.
++	dlname=
++	library_names=
++	func_source "$file"
+ 
 -      -R)
 -	prev=xrpath
 -	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"
++	# 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
++	fi
  
 -      -R*)
 -	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
@@ -55673,10 +53494,8 @@
 -	esac
 -	continue
 -	;;
-+	# Read the libtool library.
-+	dlname=
-+	library_names=
-+	func_source "$file"
++	func_dirname "$file" "" "."
++	dir="$func_dirname_result"
  
 -      -static | -static-libtool-libs)
 -	# The effects of -static are defined in a previous loop.
@@ -55685,21 +53504,6 @@
 -	# would be equivalent was wrong.  It would break on at least
 -	# Digital Unix and AIX.
 -	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
-+	fi
- 
--      -thread-safe)
--	thread_safe=yes
--	continue
-+	func_dirname "$file" "" "."
-+	dir="$func_dirname_result"
-+
 +	if test -f "$dir/$objdir/$dlname"; then
 +	  dir="$dir/$objdir"
 +	else
@@ -55709,18 +53513,22 @@
 +	fi
  	;;
  
+-      -thread-safe)
+-	thread_safe=yes
+-	continue
++      *.lo)
++	# Just add the directory containing the .lo file.
++	func_dirname "$file" "" "."
++	dir="$func_dirname_result"
+ 	;;
+ 
 -      -version-info)
 -	prev=vinfo
 -	continue
-+      *.lo)
-+	# Just add the directory containing the .lo file.
-+	func_dirname "$file" "" "."
-+	dir="$func_dirname_result"
- 	;;
+-	;;
 -      -version-number)
 -	prev=vinfo
 -	vinfo_number=yes
-+
 +      *)
 +	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
  	continue
@@ -56359,7 +54167,7 @@
 +	      'exit $?'
 +	  tstripme="$stripme"
 +	  case $host_os in
-+	  cygwin* | mingw* | pw32*)
++	  cygwin* | mingw* | pw32* | cegcc*)
 +	    case $realname in
 +	    *.dll.a)
 +	      tstripme=""
@@ -56725,13 +54533,14 @@
 -	if test -z "$linklib"; then
 -	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
 -	  exit $EXIT_FAILURE
+-	fi
 +	# 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
++	fi
 +	exit $EXIT_SUCCESS
 +	;;
  
@@ -56783,7 +54592,7 @@
 +
 +	# Do a test to see if this is really a libtool program.
 +	case $host in
-+	*cygwin*|*mingw*)
++	*cygwin* | *mingw*)
 +	    if func_ltwrapper_executable_p "$file"; then
 +	      func_ltwrapper_scriptname "$file"
 +	      wrapper=$func_ltwrapper_scriptname_result
@@ -57012,7 +54821,7 @@
 +	      $RM $export_symbols
 +	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
 +	      case $host in
-+	      *cygwin* | *mingw* )
++	      *cygwin* | *mingw* | *cegcc* )
 +                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
 +                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
 +	        ;;
@@ -57028,7 +54837,7 @@
 +	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
 +	      eval '$MV "$nlist"T "$nlist"'
 +	      case $host in
-+	        *cygwin | *mingw* )
++	        *cygwin | *mingw* | *cegcc* )
 +	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
 +	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
 +	          ;;
@@ -57113,7 +54922,7 @@
 +} lt_dlsymlist;
 +"
 +	  case $host in
-+	  *cygwin* | *mingw* )
++	  *cygwin* | *mingw* | *cegcc* )
 +	    $ECHO >> "$output_objdir/$my_dlsyms" "\
 +/* DATA imports from DLLs on WIN32 con't be const, because
 +   runtime relocations are performed -- see ld's documentation
@@ -57316,7 +55125,7 @@
 +	# Transform the symbol file into the correct name.
 +	symfileobj="$output_objdir/${my_outputname}S.$objext"
 +	case $host in
-+	*cygwin* | *mingw* )
++	*cygwin* | *mingw* | *cegcc* )
 +	  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%"`
@@ -57877,25 +55686,16 @@
 -	    esac
 -	  done
 -	  newlib_search_path=
-+# 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_part1 [arg=no]
++#
++# Emit the first part of a libtool wrapper script on stdout.
++# For more information, see the description associated with
++# func_emit_wrapper(), below.
++func_emit_wrapper_part1 ()
 +{
-+	func_emit_wrapper_arg1=no
++	func_emit_wrapper_part1_arg1=no
 +	if test -n "$1" ; then
-+	  func_emit_wrapper_arg1=$1
++	  func_emit_wrapper_part1_arg1=$1
  	fi
  
 -	if test "$linkmode,$pass" != "prog,link"; then
@@ -58067,13 +55867,30 @@
 +    file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
 +    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
 +  done
++"
++}
++# end: func_emit_wrapper_part1
  
 -      if test -n "$rpath"; then
 -	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
 -      fi
++# func_emit_wrapper_part2 [arg=no]
++#
++# Emit the second part of a libtool wrapper script on stdout.
++# For more information, see the description associated with
++# func_emit_wrapper(), below.
++func_emit_wrapper_part2 ()
++{
++	func_emit_wrapper_part2_arg1=no
++	if test -n "$1" ; then
++	  func_emit_wrapper_part2_arg1=$1
++	fi
++
++	$ECHO "\
++
 +  # Usually 'no', except on cygwin/mingw when embedded into
 +  # the cwrapper.
-+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
++  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
 +  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
 +    # special case for '.'
 +    if test \"\$thisdir\" = \".\"; then
@@ -58210,13 +56027,13 @@
 +	  $ECHO "\
 +    # Add our own library path to $shlibpath_var
 +    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-+
+ 
+-	if test -n "$vinfo"; then
+-	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
 +    # 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 -n "$vinfo"; then
--	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
++
 +    export $shlibpath_var
 +"
  	fi
@@ -58242,17 +56059,12 @@
 +"
 +	case $host in
 +	# Backslashes separate directories on plain windows
-+	*-*-mingw | *-*-os2*)
++	*-*-mingw | *-*-os2* | *-cegcc*)
 +	  $ECHO "\
 +      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
 +"
 +	  ;;
- 
--	if test -n "$8"; then
--	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
--	  $echo "$help" 1>&2
--	  exit $EXIT_FAILURE
--	fi
++
 +	*)
 +	  $ECHO "\
 +      exec \"\$progdir/\$program\" \${1+\"\$@\"}
@@ -58273,18 +56085,42 @@
 +fi\
 +"
 +}
-+# end: func_emit_wrapper
++# end: func_emit_wrapper_part2
+ 
+-	if test -n "$8"; then
+-	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
+-	  $echo "$help" 1>&2
+-	  exit $EXIT_FAILURE
++
++# func_emit_wrapper [arg=no]
++#
++# 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 variables
++# 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 $objdir 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
+ 	fi
  
 -	# 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_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
++	# split this up so that func_emit_cwrapperexe_src
++	# can call each part independently.
++	func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
++	func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
++}
  
 -	case $vinfo_number in
 -	yes)
@@ -58328,8 +56164,6 @@
 -	  age="$4"
 -	  ;;
 -	esac
-+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-+   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
  
 -	# Check that each of the things are valid numbers.
 -	case $current in
@@ -58340,28 +56174,235 @@
 -	  exit $EXIT_FAILURE
 -	  ;;
 -	esac
++# func_to_host_path arg
++#
++# Convert paths to host format when used with build tools.
++# Intended for use with "native" mingw (where libtool itself
++# is running under the msys shell), or in the following cross-
++# build environments:
++#    $build          $host
++#    mingw (msys)    mingw  [e.g. native]
++#    cygwin          mingw
++#    *nix + wine     mingw
++# where wine is equipped with the `winepath' executable.
++# In the native mingw case, the (msys) shell automatically
++# converts paths for any non-msys applications it launches,
++# but that facility isn't available from inside the cwrapper.
++# Similar accommodations are necessary for $host mingw and
++# $build cygwin.  Calling this function does no harm for other
++# $host/$build combinations not listed above.
++#
++# ARG is the path (on $build) that should be converted to
++# the proper representation for $host. The result is stored
++# in $func_to_host_path_result.
++func_to_host_path ()
++{
++  func_to_host_path_result="$1"
++  if test -n "$1" ; then
++    case $host in
++      *mingw* )
++        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
++        case $build in
++          *mingw* ) # actually, msys
++            # awkward: cmd appends spaces to result
++            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
++            func_to_host_path_tmp1=`( cmd //c echo "$1" |\
++              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
++            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
++              $SED -e "$lt_sed_naive_backslashify"`
++            ;;
++          *cygwin* )
++            func_to_host_path_tmp1=`cygpath -w "$1"`
++            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
++              $SED -e "$lt_sed_naive_backslashify"`
++            ;;
++          * )
++            # Unfortunately, winepath does not exit with a non-zero
++            # error code, so we are forced to check the contents of
++            # stdout. On the other hand, if the command is not
++            # found, the shell will set an exit code of 127 and print
++            # *an error message* to stdout. So we must check for both
++            # error code of zero AND non-empty stdout, which explains
++            # the odd construction:
++            func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
++            if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
++              func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
++                $SED -e "$lt_sed_naive_backslashify"`
++            else
++              # Allow warning below.
++              func_to_host_path_result=""
++            fi
++            ;;
++        esac
++        if test -z "$func_to_host_path_result" ; then
++          func_error "Could not determine host path corresponding to"
++          func_error "  '$1'"
++          func_error "Continuing, but uninstalled executables may not work."
++          # Fallback:
++          func_to_host_path_result="$1"
++        fi
++        ;;
++    esac
++  fi
++}
++# end: func_to_host_path
+ 
+-	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
++# func_to_host_pathlist arg
++#
++# Convert pathlists to host format when used with build tools.
++# See func_to_host_path(), above. This function supports the
++# following $build/$host combinations (but does no harm for
++# combinations not listed here):
++#    $build          $host
++#    mingw (msys)    mingw  [e.g. native]
++#    cygwin          mingw
++#    *nix + wine     mingw
++#
++# Path separators are also converted from $build format to
++# $host format. If ARG begins or ends with a path separator
++# character, it is preserved (but converted to $host format)
++# on output.
++#
++# ARG is a pathlist (on $build) that should be converted to
++# the proper representation on $host. The result is stored
++# in $func_to_host_pathlist_result.
++func_to_host_pathlist ()
++{
++  func_to_host_pathlist_result="$1"
++  if test -n "$1" ; then
++    case $host in
++      *mingw* )
++        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
++        # Remove leading and trailing path separator characters from
++        # ARG. msys behavior is inconsistent here, cygpath turns them
++        # into '.;' and ';.', and winepath ignores them completely.
++        func_to_host_pathlist_tmp2="$1"
++        # Once set for this call, this variable should not be
++        # reassigned. It is used in tha fallback case.
++        func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
++          $SED -e 's|^:*||' -e 's|:*$||'`
++        case $build in
++          *mingw* ) # Actually, msys.
++            # Awkward: cmd appends spaces to result.
++            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
++            func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
++              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
++            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
++              $SED -e "$lt_sed_naive_backslashify"`
++            ;;
++          *cygwin* )
++            func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
++            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
++              $SED -e "$lt_sed_naive_backslashify"`
++            ;;
++          * )
++            # unfortunately, winepath doesn't convert pathlists
++            func_to_host_pathlist_result=""
++            func_to_host_pathlist_oldIFS=$IFS
++            IFS=:
++            for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
++              IFS=$func_to_host_pathlist_oldIFS
++              if test -n "$func_to_host_pathlist_f" ; then
++                func_to_host_path "$func_to_host_pathlist_f"
++                if test -n "$func_to_host_path_result" ; then
++                  if test -z "$func_to_host_pathlist_result" ; then
++                    func_to_host_pathlist_result="$func_to_host_path_result"
++                  else
++                    func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
++                  fi
++                fi
++              fi
++              IFS=:
++            done
++            IFS=$func_to_host_pathlist_oldIFS
++            ;;
++        esac
++        if test -z "$func_to_host_pathlist_result" ; then
++          func_error "Could not determine the host path(s) corresponding to"
++          func_error "  '$1'"
++          func_error "Continuing, but uninstalled executables may not work."
++          # Fallback. This may break if $1 contains DOS-style drive
++          # specifications. The fix is not to complicate the expression
++          # below, but for the user to provide a working wine installation
++          # with winepath so that path translation in the cross-to-mingw
++          # case works properly.
++          lt_replace_pathsep_nix_to_dos="s|:|;|g"
++          func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
++            $SED -e "$lt_replace_pathsep_nix_to_dos"`
++        fi
++        # Now, add the leading and trailing path separators back
++        case "$1" in
++          :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
++            ;;
++        esac
++        case "$1" in
++          *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
++            ;;
++        esac
++        ;;
++    esac
++  fi
++}
++# end: func_to_host_pathlist
+ 
+-	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
++# 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
+ 
+-	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
++/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
++   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+ 
+-	# Calculate the version variables.
+-	major=
+-	versuffix=
+-	verstring=
+-	case $version_type in
+-	none) ;;
 +   The $output program cannot be directly executed until all the libtool
 +   libraries that it depends on are installed.
  
--	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
+-	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"
 -	  ;;
--	esac
 +   This wrapper executable should never be moved out of the build directory.
 +   If it is, it will not operate correctly.
  
--	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
+-	freebsd-aout)
+-	  major=".$current"
+-	  versuffix=".$current.$revision";
 -	  ;;
--	esac
 +   Currently, it simply execs the wrapper *script* "$SHELL $output",
 +   but could eventually absorb all of the scripts functionality and
 +   exec $objdir/$outputname directly.
@@ -58380,6 +56421,12 @@
 +# include <stdint.h>
 +# ifdef __CYGWIN__
 +#  include <io.h>
++#  define HAVE_SETENV
++#  ifdef __STRICT_ANSI__
++char *realpath (const char *, char *);
++int putenv (char *);
++int setenv (const char *, const char *, int);
++#  endif
 +# endif
 +#endif
 +#include <malloc.h>
@@ -58391,11 +56438,10 @@
 +#include <fcntl.h>
 +#include <sys/stat.h>
  
--	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
+-	freebsd-elf)
+-	  major=".$current"
+-	  versuffix=".$current";
+-	  ;;
 +#if defined(PATH_MAX)
 +# define LT_PATHMAX PATH_MAX
 +#elif defined(MAXPATHLEN)
@@ -58404,12 +56450,17 @@
 +# define LT_PATHMAX 1024
 +#endif
  
--	# Calculate the version variables.
--	major=
--	versuffix=
--	verstring=
--	case $version_type in
--	none) ;;
+-	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"
 +#ifndef S_IXOTH
 +# define S_IXOTH 0
 +#endif
@@ -58417,16 +56468,13 @@
 +# define S_IXGRP 0
 +#endif
  
--	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"
--	  ;;
+-	  # 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
 +#ifdef _MSC_VER
 +# define S_IXUSR _S_IEXEC
 +# define stat _stat
@@ -58435,18 +56483,18 @@
 +# endif
 +#endif
  
--	freebsd-aout)
--	  major=".$current"
--	  versuffix=".$current.$revision";
+-	  # Before this point, $major must not contain `.'.
+-	  major=.$major
+-	  versuffix="$major.$revision"
 -	  ;;
 +#ifndef DIR_SEPARATOR
 +# define DIR_SEPARATOR '/'
 +# define PATH_SEPARATOR ':'
 +#endif
  
--	freebsd-elf)
--	  major=".$current"
--	  versuffix=".$current";
+-	linux)
+-	  major=.`expr $current - $age`
+-	  versuffix="$major.$age.$revision"
 -	  ;;
 +#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
 +  defined (__OS2__)
@@ -58460,17 +56508,10 @@
 +# endif
 +#endif
  
--	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"
+-	osf)
+-	  major=.`expr $current - $age`
+-	  versuffix=".$current.$age.$revision"
+-	  verstring="$current.$age.$revision"
 +#ifndef DIR_SEPARATOR_2
 +# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
 +#else /* DIR_SEPARATOR_2 */
@@ -58479,11 +56520,11 @@
 +#endif /* DIR_SEPARATOR_2 */
  
 -	  # Add in all the interfaces that we are compatible with.
--	  loop=$revision
+-	  loop=$age
 -	  while test "$loop" -ne 0; do
--	    iface=`expr $revision - $loop`
+-	    iface=`expr $current - $loop`
 -	    loop=`expr $loop - 1`
--	    verstring="$verstring_prefix$major.$iface:$verstring"
+-	    verstring="$verstring:${iface}.0"
 -	  done
 +#ifndef PATH_SEPARATOR_2
 +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
@@ -58491,17 +56532,16 @@
 +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
 +#endif /* PATH_SEPARATOR_2 */
  
--	  # Before this point, $major must not contain `.'.
--	  major=.$major
--	  versuffix="$major.$revision"
+-	  # Make executables depend on our current version.
+-	  verstring="$verstring:${current}.0"
 -	  ;;
 +#ifdef __CYGWIN__
 +# define FOPEN_WB "wb"
 +#endif
  
--	linux)
--	  major=.`expr $current - $age`
--	  versuffix="$major.$age.$revision"
+-	sunos)
+-	  major=".$current"
+-	  versuffix=".$current.$revision"
 -	  ;;
 +#ifndef FOPEN_WB
 +# define FOPEN_WB "w"
@@ -58510,22 +56550,23 @@
 +# define _O_BINARY 0
 +#endif
  
--	osf)
--	  major=.`expr $current - $age`
--	  versuffix=".$current.$age.$revision"
--	  verstring="$current.$age.$revision"
+-	windows)
+-	  # Use '-' rather than '.', since we only want one
+-	  # extension on DOS 8.3 filesystems.
+-	  major=`expr $current - $age`
+-	  versuffix="-$major"
+-	  ;;
 +#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
 +#define XFREE(stale) do { \
 +  if (stale) { free ((void *) stale); stale = 0; } \
 +} while (0)
  
--	  # 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
+-	*)
+-	  $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
 +#undef LTWRAPPER_DEBUGPRINTF
 +#if defined DEBUGWRAPPER
 +# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
@@ -58541,45 +56582,6 @@
 +# define LTWRAPPER_DEBUGPRINTF(args)
 +#endif
  
--	  # Make executables depend on our current version.
--	  verstring="$verstring:${current}.0"
--	  ;;
-+const char *program_name = NULL;
- 
--	sunos)
--	  major=".$current"
--	  versuffix=".$current.$revision"
--	  ;;
-+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, ...);
- 
--	windows)
--	  # Use '-' rather than '.', since we only want one
--	  # extension on DOS 8.3 filesystems.
--	  major=`expr $current - $age`
--	  versuffix="-$major"
--	  ;;
-+static const char *script_text =
-+EOF
- 
--	*)
--	  $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
-+	    func_emit_wrapper yes |
-+	        $SED -e 's/\([\\"]\)/\\\1/g' \
-+	             -e 's/^/  "/' -e 's/$/\\n"/'
-+	    echo ";"
- 
 -	# Clear the version info if we defaulted, and they specified a release.
 -	if test -z "$vinfo" && test -n "$release"; then
 -	  major=
@@ -58599,8 +56601,7 @@
 -	    versuffix=".0.0"
 -	  fi
 -	fi
-+	    cat <<EOF
-+const char * MAGIC_EXE = "$magic_exe";
++const char *program_name = NULL;
  
 -	# Remove version info from name if versioning should be avoided
 -	if test "$avoid_version" = yes && test "$need_version" = no; then
@@ -58608,15 +56609,23 @@
 -	  versuffix=
 -	  verstring=""
 -	fi
-+int
-+main (int argc, char *argv[])
-+{
-+  char **newargz;
-+  char *tmp_pathspec;
-+  char *actual_cwrapper_path;
-+  char *shwrapper_name;
-+  intptr_t rval = 127;
-+  FILE *shwrapper;
++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, ...);
++void lt_setenv (const char *name, const char *value);
++char *lt_extend_str (const char *orig_value, const char *add, int to_end);
++void lt_opt_process_env_set (const char *arg);
++void lt_opt_process_env_prepend (const char *arg);
++void lt_opt_process_env_append (const char *arg);
++int lt_split_name_value (const char *arg, char** name, char** value);
++void lt_update_exe_path (const char *name, const char *value);
++void lt_update_lib_path (const char *name, const char *value);
  
 -	# Check to see if the archive will have undefined symbols.
 -	if test "$allow_undefined" = yes; then
@@ -58630,8 +56639,8 @@
 -	  allow_undefined_flag="$no_undefined_flag"
 -	fi
 -      fi
-+  const char *dumpscript_opt = "--lt-dump-script";
-+  int i;
++static const char *script_text_part1 =
++EOF
  
 -      if test "$mode" != relink; then
 -	# Remove our outputs, but don't remove object files since they
@@ -58659,34 +56668,40 @@
 -	  $run ${rm}r $removelist
 -	fi
 -      fi
-+  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));
++	    func_emit_wrapper_part1 yes |
++	        $SED -e 's/\([\\"]\)/\\\1/g' \
++	             -e 's/^/  "/' -e 's/$/\\n"/'
++	    echo ";"
++	    cat <<EOF
  
 -      # 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"
-+  /* 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
++static const char *script_text_part2 =
++EOF
++	    func_emit_wrapper_part2 yes |
++	        $SED -e 's/\([\\"]\)/\\\1/g' \
++	             -e 's/^/  "/' -e 's/$/\\n"/'
++	    echo ";"
++
++	    cat <<EOF
++const char * MAGIC_EXE = "$magic_exe";
++const char * LIB_PATH_VARNAME = "$shlibpath_var";
++EOF
  
 -	# Transform .lo files to .o files.
 -	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
 -      fi
-+	    cat <<EOF
-+	  printf ("%s", script_text);
-+	  return 0;
-+	}
-+    }
++	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
++              func_to_host_pathlist "$temp_rpath"
++	      cat <<EOF
++const char * LIB_PATH_VALUE   = "$func_to_host_pathlist_result";
++EOF
++	    else
++	      cat <<"EOF"
++const char * LIB_PATH_VALUE   = "";
++EOF
++	    fi
  
 -      # Eliminate all temporary directories.
 -      #for path in $notinst_path; do
@@ -58694,8 +56709,18 @@
 -      #	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
 -      #	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
 -      #done
-+  newargz = XMALLOC (char *, argc + 2);
-+EOF
++	    if test -n "$dllsearchpath"; then
++              func_to_host_pathlist "$dllsearchpath:"
++	      cat <<EOF
++const char * EXE_PATH_VARNAME = "PATH";
++const char * EXE_PATH_VALUE   = "$func_to_host_pathlist_result";
++EOF
++	    else
++	      cat <<"EOF"
++const char * EXE_PATH_VARNAME = "";
++const char * EXE_PATH_VALUE   = "";
++EOF
++	    fi
  
 -      if test -n "$xrpath"; then
 -	# If the user specified any rpath flags, then add them.
@@ -58711,22 +56736,14 @@
 -	  dependency_libs="$temp_xrpath $dependency_libs"
 -	fi
 -      fi
-+	    if test -n "$TARGETSHELL" ; then
-+	      # no path translation at all
-+	      lt_newargv0=$TARGETSHELL
++	    if test "$fast_install" = yes; then
++	      cat <<EOF
++const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
++EOF
 +	    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
++	      cat <<EOF
++const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
++EOF
 +	    fi
  
 -      # Make sure dlfiles contains only unique files that won't be dlpreopened
@@ -58738,9 +56755,6 @@
 -	*) dlfiles="$dlfiles $lib" ;;
 -	esac
 -      done
-+		cat <<EOF
-+  newargz[0] = (char *) xstrdup ("$lt_newargv0");
-+EOF
  
 -      # Make sure dlprefiles contains only unique files
 -      old_dlprefiles="$dlprefiles"
@@ -58752,32 +56766,6 @@
 -	esac
 -      done
 +	    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
  
 -      if test "$build_libtool_libs" = yes; then
 -	if test -n "$rpath"; then
@@ -58806,23 +56794,130 @@
 -	    if test "$build_libtool_need_lc" = "yes"; then
 -	      deplibs="$deplibs -lc"
 -	    fi
++#define LTWRAPPER_OPTION_PREFIX         "--lt-"
++#define LTWRAPPER_OPTION_PREFIX_LENGTH  5
++
++static const size_t opt_prefix_len         = LTWRAPPER_OPTION_PREFIX_LENGTH;
++static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
++
++static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
++
++static const size_t env_set_opt_len     = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
++static const char *env_set_opt          = LTWRAPPER_OPTION_PREFIX "env-set";
++  /* argument is putenv-style "foo=bar", value of foo is set to bar */
++
++static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
++static const char *env_prepend_opt      = LTWRAPPER_OPTION_PREFIX "env-prepend";
++  /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
++
++static const size_t env_append_opt_len  = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
++static const char *env_append_opt       = LTWRAPPER_OPTION_PREFIX "env-append";
++  /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
++
++int
++main (int argc, char *argv[])
++{
++  char **newargz;
++  int  newargc;
++  char *tmp_pathspec;
++  char *actual_cwrapper_path;
++  char *actual_cwrapper_name;
++  char *target_name;
++  char *lt_argv_zero;
++  intptr_t rval = 127;
++
++  int i;
++
++  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));
++
++  /* 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
++
++	    cat <<"EOF"
++	  printf ("%s", script_text_part1);
++	  printf ("%s", script_text_part2);
++	  return 0;
++	}
++    }
++
++  newargz = XMALLOC (char *, argc + 1);
++  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);
++
++  actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
++  strendzap (actual_cwrapper_path, actual_cwrapper_name);
++
++  /* wrapper name transforms */
++  strendzap (actual_cwrapper_name, ".exe");
++  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
++  XFREE (actual_cwrapper_name);
++  actual_cwrapper_name = tmp_pathspec;
++  tmp_pathspec = 0;
++
++  /* target_name transforms -- use actual target program name; might have lt- prefix */
++  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
++  strendzap (target_name, ".exe");
++  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
++  XFREE (target_name);
++  target_name = tmp_pathspec;
++  tmp_pathspec = 0;
++
++  LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
++			  target_name));
++EOF
++
 +	    cat <<EOF
-+  newargz[1] =
++  newargz[0] =
 +    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
-+
++		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
++  strcpy (newargz[0], actual_cwrapper_path);
++  strcat (newargz[0], "$objdir");
++  strcat (newargz[0], "/");
++EOF
++
++	    cat <<"EOF"
++  /* stop here, and copy so we don't have to do this twice */
++  tmp_pathspec = xstrdup (newargz[0]);
++
++  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
++  strcat (newargz[0], actual_cwrapper_name);
++
++  /* DO want the lt- prefix here if it exists, so use target_name */
++  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
++  XFREE (tmp_pathspec);
++  tmp_pathspec = NULL;
++EOF
 +
 +	    case $host_os in
 +	      mingw*)
 +	    cat <<"EOF"
 +  {
 +    char* p;
-+    while ((p = strchr (newargz[1], '\\')) != NULL)
++    while ((p = strchr (newargz[0], '\\')) != NULL)
++      {
++	*p = '/';
++      }
++    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
 +      {
 +	*p = '/';
 +      }
@@ -58834,26 +56929,86 @@
 +	    esac
 +
 +	    cat <<"EOF"
-+  XFREE (shwrapper_name);
++  XFREE (target_name);
 +  XFREE (actual_cwrapper_path);
-+
-+  /* 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_executable (newargz[1]);
-+
++  XFREE (actual_cwrapper_name);
++
++  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
++  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
++  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
++  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
++
++  newargc=0;
 +  for (i = 1; i < argc; i++)
-+    newargz[i + 1] = xstrdup (argv[i]);
-+  newargz[argc + 1] = NULL;
++    {
++      if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
++        {
++          if (argv[i][env_set_opt_len] == '=')
++            {
++              const char *p = argv[i] + env_set_opt_len + 1;
++              lt_opt_process_env_set (p);
++            }
++          else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
++            {
++              lt_opt_process_env_set (argv[++i]); /* don't copy */
++            }
++          else
++            lt_fatal ("%s missing required argument", env_set_opt);
++          continue;
++        }
++      if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
++        {
++          if (argv[i][env_prepend_opt_len] == '=')
++            {
++              const char *p = argv[i] + env_prepend_opt_len + 1;
++              lt_opt_process_env_prepend (p);
++            }
++          else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
++            {
++              lt_opt_process_env_prepend (argv[++i]); /* don't copy */
++            }
++          else
++            lt_fatal ("%s missing required argument", env_prepend_opt);
++          continue;
++        }
++      if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
++        {
++          if (argv[i][env_append_opt_len] == '=')
++            {
++              const char *p = argv[i] + env_append_opt_len + 1;
++              lt_opt_process_env_append (p);
++            }
++          else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
++            {
++              lt_opt_process_env_append (argv[++i]); /* don't copy */
++            }
++          else
++            lt_fatal ("%s missing required argument", env_append_opt);
++          continue;
++        }
++      if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
++        {
++          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
++             namespace, but it is not one of the ones we know about and
++             have already dealt with, above (inluding dump-script), then
++             report an error. Otherwise, targets might begin to believe
++             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
++             namespace. The first time any user complains about this, we'll
++             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
++             or a configure.ac-settable value.
++           */
++          lt_fatal ("Unrecognized option in %s namespace: '%s'",
++                    ltwrapper_option_prefix, argv[i]);
++        }
++      /* otherwise ... */
++      newargz[++newargc] = xstrdup (argv[i]);
++    }
++  newargz[++newargc] = NULL;
 +
-+  for (i = 0; i < argc + 1; i++)
++  LTWRAPPER_DEBUGPRINTF     (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
++  for (i = 0; i < newargc; i++)
 +    {
-+      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, newargz[i]));
++      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
 +    }
  
 -	# Transform deplibs into only deplibs that can be linked in shared.
@@ -58921,180 +57076,7 @@
 -		    $echo "*** its dynamic dependency list that programs get resolved with at runtime."
 -		  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;
-+
-+  LTWRAPPER_DEBUGPRINTF (("(check_executable)  : %s\n",
-+			  path ? (*path ? path : "EMPTY!") : "NULL!"));
-+  if ((!path) || (!*path))
-+    return 0;
-+
-+  if ((stat (path, &st) >= 0)
-+      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
-+    return 1;
-+  else
-+    return 0;
-+}
-+
-+int
-+make_executable (const char *path)
-+{
-+  int rval = 0;
-+  struct stat st;
-+
-+  LTWRAPPER_DEBUGPRINTF (("(make_executable)   : %s\n",
-+			  path ? (*path ? path : "EMPTY!") : "NULL!"));
-+  if ((!path) || (!*path))
-+    return 0;
-+
-+  if (stat (path, &st) >= 0)
-+    {
-+      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
-+    }
-+  return rval;
-+}
-+
-+/* 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;
-+
-+  LTWRAPPER_DEBUGPRINTF (("(find_executable)   : %s\n",
-+			  wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
-+
-+  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
+-	      else
 -		newdeplibs="$newdeplibs $i"
 -	      fi
 -	    done
@@ -59297,28 +57279,6 @@
 -	release=$release_save
 -	libname=$libname_save
 -	name=$name_save
-+		{
-+		  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);
  
 -	case $host in
 -	*-*-rhapsody* | *-*-darwin1.[012])
@@ -59326,11 +57286,27 @@
 -	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
 -	  ;;
 -	esac
-+  if (check_executable (concat_name))
-+    return concat_name;
-+  XFREE (concat_name);
-+  return NULL;
-+}
++	    case $host_os in
++	      mingw*)
++		cat <<"EOF"
++  /* execv doesn't actually work on mingw as expected on unix */
++  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
++  if (rval == -1)
++    {
++      /* failed to start process */
++      LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
++      return 127;
++    }
++  return rval;
++EOF
++		;;
++	      *)
++		cat <<"EOF"
++  execv (lt_argv_zero, newargz);
++  return rval; /* =127, but avoids unused variable warning */
++EOF
++		;;
++	    esac
  
 -	if test "$droppeddeps" = yes; then
 -	  if test "$module" = yes; then
@@ -59357,28 +57333,8 @@
 -	    $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."
-+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;
-+	    }
++	    cat <<"EOF"
++}
  
 -	    if test "$allow_undefined" = no; then
 -	      $echo
@@ -59399,29 +57355,15 @@
 -	# Done checking deplibs!
 -	deplibs=$newdeplibs
 -      fi
-+	  /* 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);
++void *
++xmalloc (size_t num)
++{
++  void *p = (void *) malloc (num);
++  if (!p)
++    lt_fatal ("Memory exhausted");
  
-+  if (!has_symlinks)
-+    {
-+      return xstrdup (pathspec);
-+    }
++  return p;
++}
  
 -      # move library search paths that coincide with paths to not yet
 -      # installed libraries to the beginning of the library search list
@@ -59449,26 +57391,27 @@
 -	esac
 -      done
 -      deplibs="$new_libs"
-+  tmp_pathspec = realpath (pathspec, buf);
-+  if (tmp_pathspec == 0)
-+    {
-+      lt_fatal ("Could not follow symlinks for %s", pathspec);
-+    }
-+  return xstrdup (tmp_pathspec);
-+#endif
++char *
++xstrdup (const char *string)
++{
++  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
++			  string) : NULL;
 +}
  
-+char *
-+strendzap (char *str, const char *pat)
++const char *
++base_name (const char *name)
 +{
-+  size_t len, patlen;
++  const char *base;
  
 -      # All the library-specific variables (install_libdir is set above).
 -      library_names=
 -      old_library=
 -      dlname=
-+  assert (str != NULL);
-+  assert (pat != NULL);
++#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
  
 -      # Test again, we may have decided not to build it any more
 -      if test "$build_libtool_libs" = yes; then
@@ -59527,29 +57470,32 @@
 -	  fi
 -	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
 -	fi
-+  len = strlen (str);
-+  patlen = strlen (pat);
++  for (base = name; *name; name++)
++    if (IS_DIR_SEPARATOR (*name))
++      base = name + 1;
++  return base;
++}
  
 -	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
--
++int
++check_executable (const char *path)
++{
++  struct stat st;
+ 
 -	# 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 (patlen <= len)
-+    {
-+      str += len - patlen;
-+      if (strcmp (str, pat) == 0)
-+	*str = '\0';
-+    }
-+  return str;
-+}
++  LTWRAPPER_DEBUGPRINTF (("(check_executable)  : %s\n",
++			  path ? (*path ? path : "EMPTY!") : "NULL!"));
++  if ((!path) || (!*path))
++    return 0;
  
 -	if test -n "$soname_spec"; then
 -	  eval soname=\"$soname_spec\"
@@ -59559,13 +57505,12 @@
 -	if test -z "$dlname"; then
 -	  dlname=$soname
 -	fi
-+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 ((stat (path, &st) >= 0)
++      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
++    return 1;
++  else
++    return 0;
++}
  
 -	lib="$output_objdir/$realname"
 -	linknames=
@@ -59573,23 +57518,18 @@
 -	do
 -	  linknames="$linknames $link"
 -	done
-+  if (exit_status >= 0)
-+    exit (exit_status);
-+}
++int
++make_executable (const char *path)
++{
++  int rval = 0;
++  struct stat st;
  
 -	# Use standard objects if they are pic
 -	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+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
++  LTWRAPPER_DEBUGPRINTF (("(make_executable)   : %s\n",
++			  path ? (*path ? path : "EMPTY!") : "NULL!"));
++  if ((!path) || (!*path))
++    return 0;
  
 -	# Prepare the list of exported symbols
 -	if test -z "$export_symbols"; then
@@ -59625,36 +57565,30 @@
 -	    fi
 -	  fi
 -	fi
-+# 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
++  if (stat (path, &st) >= 0)
++    {
++      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
++    }
++  return rval;
++}
  
 -	if test -n "$export_symbols" && test -n "$include_expsyms"; then
 -	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
 -	fi
-+      # 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
++/* 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;
  
 -	tmp_deplibs=
 -	for test_deplib in $deplibs; do
@@ -59666,20 +57600,8 @@
 -		esac
 -	done
 -	deplibs="$tmp_deplibs"
-+    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=
++  LTWRAPPER_DEBUGPRINTF (("(find_executable)   : %s\n",
++			  wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
  
 -	if test -n "$convenience"; then
 -	  if test -n "$whole_archive_flag_spec"; then
@@ -59688,67 +57610,102 @@
 -	  else
 -	    gentop="$output_objdir/${outputname}x"
 -	    generated="$generated $gentop"
-+    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
++  if ((wrapper == NULL) || (*wrapper == '\0'))
++    return NULL;
  
 -	    func_extract_archives $gentop $convenience
 -	    libobjs="$libobjs $func_extract_archives_result"
-+    # 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"
- 	  fi
+-	  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"
 -	fi
--
++  /* 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
+ 
 -	# 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
--
++  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);
+ 
 -	# 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
@@ -59757,9 +57714,7 @@
 -	  else
 -	    eval test_cmds=\"$module_cmds\"
 -	    cmds=$module_cmds
-+	  if test -n "$link_static_flag"; then
-+	    dlopen_self=$dlopen_self_static
- 	  fi
+-	  fi
 -	else
 -	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
 -	  eval test_cmds=\"$archive_expsym_cmds\"
@@ -59767,14 +57722,14 @@
 -	else
 -	  eval test_cmds=\"$archive_cmds\"
 -	  cmds=$archive_cmds
-+	  prefer_static_libs=yes
-+	  ;;
-+	-static)
-+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-+	    dlopen_self=$dlopen_self_static
- 	  fi
+-	  fi
 -	fi
--
++  if (check_executable (concat_name))
++    return concat_name;
++  XFREE (concat_name);
++  return NULL;
++}
+ 
 -	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
@@ -59782,7 +57737,29 @@
 -	else
 -	  # The command line is too long to link in one step, link piecewise.
 -	  $echo "creating reloadable object files..."
--
++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;
++	    }
+ 
 -	  # 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
@@ -59793,15 +57770,28 @@
 -	  # the spec.
 -	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
 -	    save_libobjs=$libobjs
-+	  prefer_static_libs=built
-+	  ;;
-+	-static-libtool-libs)
-+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-+	    dlopen_self=$dlopen_self_static
- 	  fi
+-	  fi
 -	  save_output=$output
 -	  output_la=`$echo "X$output" | $Xsed -e "$basename"`
--
++	  /* 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);
+ 
 -	  # Clear the reloadable object creation command queue and
 -	  # initialize k to one.
 -	  test_cmds=
@@ -59842,7 +57832,11 @@
 -	  # 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 (!has_symlinks)
++    {
++      return xstrdup (pathspec);
++    }
+ 
 -	  if ${skipped_export-false}; then
 -	    $show "generating symbol list for \`$libname.la'"
 -	    export_symbols="$output_objdir/$libname.exp"
@@ -59860,19 +57854,20 @@
 -	    i=`expr $i + 1`
 -	    delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
 -	  done
-+	  prefer_static_libs=yes
-+	  ;;
-+	esac
-+	build_libtool_libs=no
-+	build_old_libs=yes
-+	break
-+	;;
-+      esac
-+    done
++  tmp_pathspec = realpath (pathspec, buf);
++  if (tmp_pathspec == 0)
++    {
++      lt_fatal ("Could not follow symlinks for %s", pathspec);
++    }
++  return xstrdup (tmp_pathspec);
++#endif
++}
  
 -	  $echo "creating a temporary reloadable object file: $output"
-+    # See if our shared archives depend on static archives.
-+    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
++char *
++strendzap (char *str, const char *pat)
++{
++  size_t len, patlen;
  
 -	  # Loop through the commands generated above and execute them.
 -	  save_ifs="$IFS"; IFS='~'
@@ -59882,72 +57877,51 @@
 -	    $run eval "$cmd" || exit $?
 -	  done
 -	  IFS="$save_ifs"
-+    # 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"
++  assert (str != NULL);
++  assert (pat != NULL);
  
 -	  libobjs=$output
 -	  # Restore the value of output.
 -	  output=$save_output
-+      # 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
++  len = strlen (str);
++  patlen = strlen (pat);
  
 -	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
 -	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
 -	  fi
 -	  # Expand the library linking commands again to reset the
 -	  # value of $libobjs for piecewise linking.
--
++  if (patlen <= len)
++    {
++      str += len - patlen;
++      if (strcmp (str, pat) == 0)
++	*str = '\0';
++    }
++  return str;
++}
+ 
 -	  # 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
 -	      cmds=$module_cmds
-+	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
-+	  fi
-+	  case $arg in
-+	  *.la | *.lo) ;;  # We handle these cases below.
-+	  force)
-+	    if test "$dlself" = no; then
-+	      dlself=needless
-+	      export_dynamic=yes
- 	    fi
+-	    fi
 -	  else
 -	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
 -	    cmds=$archive_expsym_cmds
 -	  else
 -	    cmds=$archive_cmds
-+	    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
+-	    fi
 -	  fi
--
++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");
+ 
 -	  # Append the command to remove the reloadable object files
 -	  # to the just-reset $cmds.
 -	  eval cmds=\"\$cmds~\$rm $delfiles\"
@@ -59959,78 +57933,79 @@
 -	  $show "$cmd"
 -	  $run eval "$cmd" || {
 -	    lt_exit=$?
--
++  if (exit_status >= 0)
++    exit (exit_status);
++}
+ 
 -	    # Restore the uninstalled library and exit
 -	    if test "$mode" = relink; then
 -	      $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-+	    prev=
-+	    continue
-+	    ;;
-+	  *)
-+	    if test "$prev" = dlfiles; then
-+	      dlfiles="$dlfiles $arg"
-+	    else
-+	      dlprefiles="$dlprefiles $arg"
- 	    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
++void
++lt_fatal (const char *message, ...)
++{
++  va_list ap;
++  va_start (ap, message);
++  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
++  va_end (ap);
++}
  
 -	    exit $lt_exit
 -	  }
 -	done
 -	IFS="$save_ifs"
-+	      # Check to see that this really is a libtool object.
-+	      if func_lalib_unsafe_p "$arg"; then
-+		pic_object=
-+		non_pic_object=
++void
++lt_setenv (const char *name, const char *value)
++{
++  LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
++                          (name ? name : "<NULL>"),
++                          (value ? value : "<NULL>")));
++  {
++#ifdef HAVE_SETENV
++    /* always make a copy, for consistency with !HAVE_SETENV */
++    char *str = xstrdup (value);
++    setenv (name, str, 1);
++#else
++    int len = strlen (name) + 1 + strlen (value) + 1;
++    char *str = XMALLOC (char, len);
++    sprintf (str, "%s=%s", name, value);
++    if (putenv (str) != EXIT_SUCCESS)
++      {
++        XFREE (str);
++      }
++#endif
++  }
++}
  
 -	# 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 $?
-+		# Read the .lo file
-+		func_source "$arg"
++char *
++lt_extend_str (const char *orig_value, const char *add, int to_end)
++{
++  char *new_value;
++  if (orig_value && *orig_value)
++    {
++      int orig_value_len = strlen (orig_value);
++      int add_len = strlen (add);
++      new_value = XMALLOC (char, add_len + orig_value_len + 1);
++      if (to_end)
++        {
++          strcpy (new_value, orig_value);
++          strcpy (new_value + orig_value_len, add);
++        }
++      else
++        {
++          strcpy (new_value, add);
++          strcpy (new_value + add_len, orig_value);
++        }
++    }
++  else
++    {
++      new_value = xstrdup (add);
++    }
++  return new_value;
++}
  
 -	  if test -n "$convenience"; then
 -	    if test -z "$whole_archive_flag_spec"; then
@@ -60038,18 +58013,17 @@
 -	      $run ${rm}r "$gentop"
 -	    fi
 -	  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
++int
++lt_split_name_value (const char *arg, char** name, char** value)
++{
++  const char *p;
++  int len;
++  if (!arg || !*arg)
++    return 1;
  
 -	  exit $EXIT_SUCCESS
 -	fi
-+		# Extract subdirectory from the argument.
-+		func_dirname "$arg" "/" ""
-+		xdir="$func_dirname_result"
++  p = strchr (arg, (int)'=');
  
 -	# Create links to the real library.
 -	for linkname in $linknames; do
@@ -60058,10 +58032,7 @@
 -	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
 -	  fi
 -	done
-+		if test "$pic_object" != none; then
-+		  # Prepend the subdirectory the object is found in.
-+		  pic_object="$xdir$pic_object"
- 
+-
 -	# 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.
@@ -60069,193 +58040,87 @@
 -	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
++  if (!p)
++    return 1;
  
 -    obj)
 -      case " $deplibs" in
 -      *\ -l* | *\ -L*)
 -	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
 -      esac
-+		  # CHECK ME:  I think I busted this.  -Ossama
-+		  if test "$prev" = dlprefiles; then
-+		    # Preload the old-style object.
-+		    dlprefiles="$dlprefiles $pic_object"
-+		    prev=
-+		  fi
++  *value = xstrdup (++p);
  
 -      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
 -	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
 -      fi
-+		  # A PIC object.
-+		  func_append libobjs " $pic_object"
-+		  arg="$pic_object"
-+		fi
++  len = strlen (arg) - strlen (*value);
++  *name = XMALLOC (char, len);
++  strncpy (*name, arg, len-1);
++  (*name)[len - 1] = '\0';
  
 -      if test -n "$rpath"; then
 -	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
 -      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"
++  return 0;
++}
  
 -      if test -n "$xrpath"; then
 -	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
 -      fi
-+		  # 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"
++void
++lt_opt_process_env_set (const char *arg)
++{
++  char *name = NULL;
++  char *value = NULL;
  
 -      if test -n "$vinfo"; then
 -	$echo "$modename: warning: \`-version-info' 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 (lt_split_name_value (arg, &name, &value) != 0)
++    {
++      XFREE (name);
++      XFREE (value);
++      lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
++    }
  
 -      if test -n "$release"; then
 -	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
 -      fi
-+      prevarg="$arg"
++  lt_setenv (name, value);
++  XFREE (name);
++  XFREE (value);
++}
  
 -      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
-+      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"
- 	fi
+-	fi
 -	libobj="$output"
 -	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-+	continue
- 	;;
+-	;;
 -      *)
 -	libobj=
 -	obj="$output"
-+
-+      -allow-undefined)
-+	# FIXME: remove this flag sometime in the future.
-+	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
- 	;;
+-	;;
 -      esac
++void
++lt_opt_process_env_prepend (const char *arg)
++{
++  char *name = NULL;
++  char *value = NULL;
++  char *new_value = NULL;
  
 -      # Delete the old objects.
 -      $run $rm $obj $libobj
--
++  if (lt_split_name_value (arg, &name, &value) != 0)
++    {
++      XFREE (name);
++      XFREE (value);
++      lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
++    }
+ 
 -      # 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
@@ -60266,7 +58131,13 @@
 -      # -Wl from whole_archive_flag_spec and hope we can get by with
 -      # turning comma into space..
 -      wl=
--
++  new_value = lt_extend_str (getenv (name), value, 0);
++  lt_setenv (name, new_value);
++  XFREE (new_value);
++  XFREE (name);
++  XFREE (value);
++}
+ 
 -      if test -n "$convenience"; then
 -	if test -n "$whole_archive_flag_spec"; then
 -	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
@@ -60274,18 +58145,32 @@
 -	else
 -	  gentop="$output_objdir/${obj}x"
 -	  generated="$generated $gentop"
--
++void
++lt_opt_process_env_append (const char *arg)
++{
++  char *name = NULL;
++  char *value = NULL;
++  char *new_value = NULL;
+ 
 -	  func_extract_archives $gentop $convenience
 -	  reload_conv_objs="$reload_objs $func_extract_archives_result"
 -	fi
 -      fi
--
++  if (lt_split_name_value (arg, &name, &value) != 0)
++    {
++      XFREE (name);
++      XFREE (value);
++      lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
++    }
+ 
 -      # 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
-+      -avoid-version)
-+	avoid_version=yes
-+	continue
-+	;;
++  new_value = lt_extend_str (getenv (name), value, 1);
++  lt_setenv (name, new_value);
++  XFREE (new_value);
++  XFREE (name);
++  XFREE (value);
++}
  
 -      output="$obj"
 -      cmds=$reload_cmds
@@ -60297,10 +58182,12 @@
 -	$run eval "$cmd" || exit $?
 -      done
 -      IFS="$save_ifs"
-+      -dlopen)
-+	prev=dlfiles
-+	continue
-+	;;
++void
++lt_update_exe_path (const char *name, const char *value)
++{
++  LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
++                          (name ? name : "<NULL>"),
++                          (value ? value : "<NULL>")));
  
 -      # Exit if we aren't doing a library object file.
 -      if test -z "$libobj"; then
@@ -60308,34 +58195,49 @@
 -	  $show "${rm}r $gentop"
 -	  $run ${rm}r $gentop
 -	fi
-+      -dlpreopen)
-+	prev=dlprefiles
-+	continue
-+	;;
++  if (name && *name && value && *value)
++    {
++      char *new_value = lt_extend_str (getenv (name), value, 0);
++      /* some systems can't cope with a ':'-terminated path #' */
++      int len = strlen (new_value);
++      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
++        {
++          new_value[len-1] = '\0';
++        }
++      lt_setenv (name, new_value);
++      XFREE (new_value);
++    }
++}
  
 -	exit $EXIT_SUCCESS
 -      fi
-+      -export-dynamic)
-+	export_dynamic=yes
-+	continue
-+	;;
++void
++lt_update_lib_path (const char *name, const char *value)
++{
++  LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
++                          (name ? name : "<NULL>"),
++                          (value ? value : "<NULL>")));
  
 -      if test "$build_libtool_libs" != yes; then
 -	if test -n "$gentop"; then
 -	  $show "${rm}r $gentop"
 -	  $run ${rm}r $gentop
-+      -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"
- 	fi
--
+-	fi
++  if (name && *name && value && *value)
++    {
++      char *new_value = lt_extend_str (getenv (name), value, 0);
++      lt_setenv (name, new_value);
++      XFREE (new_value);
++    }
++}
+ 
 -	# 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
--
+ 
 -      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"
@@ -60350,15 +58252,43 @@
 -	done
 -	IFS="$save_ifs"
 -      fi
--
++EOF
++}
++# end: func_emit_cwrapperexe_src
+ 
 -      if test -n "$gentop"; then
 -	$show "${rm}r $gentop"
 -	$run ${rm}r $gentop
 -      fi
--
++# func_mode_link arg...
++func_mode_link ()
++{
++    $opt_debug
++    case $host in
++    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
++      # 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
+ 
 -      exit $EXIT_SUCCESS
--      ;;
--
++      # 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
+ 
 -    prog)
 -      case $host in
 -	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
@@ -60370,30 +58300,103 @@
 -      if test -n "$release"; then
 -	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
 -      fi
--
++    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=
+ 
 -      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."
-+	if test "X$arg" = "X-export-symbols"; then
-+	  prev=expsyms
-+	else
-+	  prev=expsyms_regex
- 	fi
+-	fi
 -      fi
-+	continue
-+	;;
++    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
  
 -      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 /'`
-+      -framework)
-+	prev=framework
-+	continue
++    # 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"
++	  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
+       esac
++    done
  
 -      case $host in
 -      *darwin*)
@@ -60404,22 +58407,16 @@
 -        fi
 -        ;;
 -      esac
-+      -inst-prefix-dir)
-+	prev=inst_prefix
-+	continue
-+	;;
++    # See if our shared archives depend on static archives.
++    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
  
-+      # 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
-+	;;
++    # 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"
  
 -      # move library search paths that coincide with paths to not yet
 -      # installed libraries to the beginning of the library search list
@@ -60427,23 +58424,13 @@
 -      for path in $notinst_path; do
 -	case " $new_libs " in
 -	*" -L$path/$objdir "*) ;;
-+      -L*)
-+	func_stripname '-L' '' "$arg"
-+	dir=$func_stripname_result
-+	# We need an absolute path.
-+	case $dir in
-+	[\\/]* | [A-Za-z]:[\\/]*) ;;
- 	*)
+-	*)
 -	  case " $compile_deplibs " in
 -	  *" -L$path/$objdir "*)
 -	    new_libs="$new_libs -L$path/$objdir" ;;
 -	  esac
-+	  absdir=`cd "$dir" && pwd`
-+	  test -z "$absdir" && \
-+	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
-+	  dir="$absdir"
- 	  ;;
- 	esac
+-	  ;;
+-	esac
 -      done
 -      for deplib in $compile_deplibs; do
 -	case $deplib in
@@ -60452,17 +58439,18 @@
 -	  *" $deplib "*) ;;
 -	  *) new_libs="$new_libs $deplib" ;;
 -	  esac
-+	case "$deplibs " in
-+	*" -L$dir "*) ;;
-+	*)
-+	  deplibs="$deplibs -L$dir"
-+	  lib_search_path="$lib_search_path $dir"
++      # 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@"
  	  ;;
 -	*) new_libs="$new_libs $deplib" ;;
  	esac
 -      done
 -      compile_deplibs="$new_libs"
--
+ 
 -
 -      compile_command="$compile_command $compile_deplibs"
 -      finalize_command="$finalize_command $finalize_deplibs"
@@ -60486,7 +58474,30 @@
 -	  if test -n "$hardcode_libdir_separator"; then
 -	    if test -z "$hardcode_libdirs"; then
 -	      hardcode_libdirs="$libdir"
--	    else
++	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
++	  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
 -	      # Just accumulate the unique libdirs.
 -	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
 -	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
@@ -60495,7 +58506,9 @@
 -		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
 -		;;
 -	      esac
--	    fi
++	      dlself=needless
++	      export_dynamic=yes
+ 	    fi
 -	  else
 -	    eval flag=\"$hardcode_libdir_flag_spec\"
 -	    rpath="$rpath $flag"
@@ -60506,22 +58519,31 @@
 -	  *) perm_rpath="$perm_rpath $libdir" ;;
 -	  esac
 -	fi
- 	case $host in
- 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+-	case $host in
+-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
 -	  testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
-+	  testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
- 	  case :$dllsearchpath: in
+-	  case :$dllsearchpath: in
 -	  *":$libdir:"*) ;;
 -	  *) dllsearchpath="$dllsearchpath:$libdir";;
-+	  *":$dir:"*) ;;
-+	  *) dllsearchpath="$dllsearchpath:$dir";;
- 	  esac
- 	  case :$dllsearchpath: in
- 	  *":$testbindir:"*) ;;
-@@ -4518,2024 +3989,3682 @@
+-	  esac
+-	  case :$dllsearchpath: in
+-	  *":$testbindir:"*) ;;
+-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
++	    prev=
++	    continue
++	    ;;
++	  *)
++	    if test "$prev" = dlfiles; then
++	      dlfiles="$dlfiles $arg"
++	    else
++	      dlprefiles="$dlprefiles $arg"
++	    fi
++	    prev=
++	    continue
++	    ;;
  	  esac
  	  ;;
- 	esac
+-	esac
 -      done
 -      # Substitute the hardcoded libdirs into the rpath.
 -      if test -n "$hardcode_libdir_separator" &&
@@ -60546,7 +58568,26 @@
 -	      *)
 -		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
 -		;;
--	      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
 -	    fi
 -	  else
 -	    eval flag=\"$hardcode_libdir_flag_spec\"
@@ -60556,7 +58597,8 @@
 -	  case "$finalize_perm_rpath " in
 -	  *" $libdir "*) ;;
 -	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
--	  esac
++	      ;;
+ 	  esac
 -	fi
 -      done
 -      # Substitute the hardcoded libdirs into the rpath.
@@ -60572,7 +58614,24 @@
 -	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
 -	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
 -      fi
--
++	  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.
+ 
 -      dlsyms=
 -      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
 -	if test -n "$NM" && test -n "$global_symbol_pipe"; then
@@ -60581,116 +58640,114 @@
 -	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
 -	fi
 -      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 -n "$dlsyms"; then
 -	case $dlsyms in
 -	"") ;;
 -	*.c)
 -	  # Discover the nlist of each of the dlfiles.
 -	  nlist="$output_objdir/${outputname}.nm"
--
++		# Read the .lo file
++		func_source "$arg"
+ 
 -	  $show "$rm $nlist ${nlist}S ${nlist}T"
 -	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
--
++		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
+ 
 -	  # Parse the name list into a source file.
 -	  $show "creating $output_objdir/$dlsyms"
--
++		# Extract subdirectory from the argument.
++		func_dirname "$arg" "/" ""
++		xdir="$func_dirname_result"
+ 
 -	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
 -/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
 -/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
-+	continue
-+	;;
++		if test "$pic_object" != none; then
++		  # Prepend the subdirectory the object is found in.
++		  pic_object="$xdir$pic_object"
  
 -#ifdef __cplusplus
 -extern \"C\" {
 -#endif
--
++		  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
+ 
 -/* Prevent the only kind of declaration conflicts we can make. */
 -#define lt_preloaded_symbols some_other_symbol
-+      -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
-+	;;
++		  # CHECK ME:  I think I busted this.  -Ossama
++		  if test "$prev" = dlprefiles; then
++		    # Preload the old-style object.
++		    dlprefiles="$dlprefiles $pic_object"
++		    prev=
++		  fi
  
 -/* External symbol declarations for the compiler. */\
 -"
-+      -module)
-+	module=yes
-+	continue
-+	;;
++		  # A PIC object.
++		  func_append libobjs " $pic_object"
++		  arg="$pic_object"
++		fi
  
 -	  if test "$dlself" = yes; then
 -	    $show "generating symbol list for \`$output'"
-+      # 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
-+	;;
++		# 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"
  
 -	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
-+      -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
-+	;;
++		  # 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"
  
 -	    # 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
-+      -multi_module)
-+	single_module="${wl}-multi_module"
-+	continue
-+	;;
- 
++		  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
+-
 -	    if test -n "$exclude_expsyms"; then
 -	      $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
 -	      $run eval '$mv "$nlist"T "$nlist"'
@@ -60723,32 +58780,17 @@
 -                ;;
 -              esac
 -	    fi
--	  fi
-+      -no-fast-install)
-+	fast_install=no
-+	continue
-+	;;
- 
++	  else
++	    func_fatal_error "link input file \`$arg' does not exist"
+ 	  fi
+-
 -	  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
-+      -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
-+	;;
- 
+-
 -	  if test -z "$run"; then
 -	    # Make sure we have at least an empty file.
 -	    test -f "$nlist" || : > "$nlist"
@@ -60757,11 +58799,7 @@
 -	      $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
 -	      $mv "$nlist"T "$nlist"
 -	    fi
-+      -no-undefined)
-+	allow_undefined=no
-+	continue
-+	;;
- 
+-
 -	    # Try sorting and uniquifying the output.
 -	    if grep -v "^: " < "$nlist" |
 -		if sort -k 3 </dev/null >/dev/null 2>&1; then
@@ -60774,48 +58812,27 @@
 -	    else
 -	      grep -v "^: " < "$nlist" > "$nlist"S
 -	    fi
-+      -objectlist)
-+	prev=objectlist
-+	continue
-+	;;
- 
+-
 -	    if test -f "$nlist"S; then
 -	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
 -	    else
 -	      $echo '/* NONE */' >> "$output_objdir/$dlsyms"
 -	    fi
-+      -o) prev=output ;;
- 
+-
 -	    $echo >> "$output_objdir/$dlsyms" "\
-+      -precious-files-regex)
-+	prev=precious_regex
-+	continue
-+	;;
- 
+-
 -#undef lt_preloaded_symbols
-+      -release)
-+	prev=release
-+	continue
-+	;;
- 
+-
 -#if defined (__STDC__) && __STDC__
 -# define lt_ptr void *
 -#else
 -# define lt_ptr char *
 -# define const
 -#endif
-+      -rpath)
-+	prev=rpath
-+	continue
-+	;;
- 
+-
 -/* The mapping between symbol names and symbols. */
 -"
-+      -R)
-+	prev=xrpath
-+	continue
-+	;;
- 
+-
 -	    case $host in
 -	    *cygwin* | *mingw* )
 -	  $echo >> "$output_objdir/$dlsyms" "\
@@ -60831,28 +58848,8 @@
 -"
 -	      ;;
 -	    esac
-+      -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
-+	;;
- 
-+      -shared)
-+	# The effects of -shared are defined in a previous loop.
-+	continue
-+	;;
- 
+-
+-
 -	  $echo >> "$output_objdir/$dlsyms" "\
 -  const char *name;
 -  lt_ptr address;
@@ -60860,51 +58857,26 @@
 -lt_preloaded_symbols[] =
 -{\
 -"
-+      -shrext)
-+	prev=shrext
-+	continue
-+	;;
- 
+-
 -	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
-+      -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
-+	;;
- 
+-
 -	    $echo >> "$output_objdir/$dlsyms" "\
 -  {0, (lt_ptr) 0}
 -};
-+      -thread-safe)
-+	thread_safe=yes
-+	continue
-+	;;
- 
+-
 -/* This works around a problem in FreeBSD linker */
 -#ifdef FREEBSD_WORKAROUND
 -static const void *lt_preloaded_setup() {
 -  return lt_preloaded_symbols;
 -}
 -#endif
-+      -version-info)
-+	prev=vinfo
-+	continue
-+	;;
- 
+-
 -#ifdef __cplusplus
 -}
 -#endif\
 -"
 -	  fi
-+      -version-number)
-+	prev=vinfo
-+	vinfo_number=yes
-+	continue
-+	;;
- 
+-
 -	  pic_flag_for_symtable=
 -	  case $host in
 -	  # compiling the symbol table file with pic_flag works around
@@ -60922,12 +58894,29 @@
 -	    *" -static "*) ;;
 -	    *) pic_flag_for_symtable=" $pic_flag";;
 -	    esac
--	  esac
-+      -weak)
-+        prev=weak
-+	continue
-+	;;
- 
++	  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
+-
 -	  # 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 $?
@@ -60952,89 +58941,100 @@
 -            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
 -            ;;
 -          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
+ 	  ;;
+ 	*)
 -	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
 -	  exit $EXIT_FAILURE
--	  ;;
--	esac
++	  eval "$prev=\"\$arg\""
++	  prev=
++	  continue
+ 	  ;;
+ 	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.
-+      -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
-+	;;
- 
+-
 -	# 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
-+      -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
-+	;;
- 
+-
 -      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"
-+      -Xcompiler)
-+	prev=xcompiler
-+	continue
-+	;;
++      fi # test -n "$prev"
  
 -	# We have no uninstalled library dependencies, so finalize right now.
 -	$show "$link_command"
 -	$run eval "$link_command"
 -	exit_status=$?
-+      -Xlinker)
-+	prev=xlinker
-+	continue
-+	;;
++      prevarg="$arg"
  
 -	# Delete the generated files.
 -	if test -n "$dlsyms"; then
 -	  $show "$rm $output_objdir/${outputname}S.${objext}"
 -	  $run $rm "$output_objdir/${outputname}S.${objext}"
--	fi
-+      -XCClinker)
-+	prev=xcclinker
++      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"
+ 	fi
 +	continue
 +	;;
  
 -	exit $exit_status
 -      fi
-+      # -msg_* for osf cc
-+      -msg_*)
-+	func_quote_for_eval "$arg"
-+	arg="$func_quote_for_eval_result"
-+	;;
- 
+-
 -      if test -n "$shlibpath_var"; then
 -	# We should set the shlibpath_var
 -	rpath=
@@ -61052,25 +59052,10 @@
 -	done
 -	temp_rpath="$rpath"
 -      fi
-+      # -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
-+        ;;
++      -allow-undefined)
++	# FIXME: remove this flag sometime in the future.
++	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
++	;;
  
 -      if test -n "$compile_shlibpath$finalize_shlibpath"; then
 -	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
@@ -61078,10 +59063,9 @@
 -      if test -n "$finalize_shlibpath"; then
 -	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
 -      fi
-+      # Some other compiler flag.
-+      -* | +*)
-+        func_quote_for_eval "$arg"
-+	arg="$func_quote_for_eval_result"
++      -avoid-version)
++	avoid_version=yes
++	continue
 +	;;
  
 -      compile_var=
@@ -61104,9 +59088,9 @@
 -	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
 -	fi
 -      fi
-+      *.$objext)
-+	# A standard object.
-+	objs="$objs $arg"
++      -dlopen)
++	prev=dlfiles
++	continue
 +	;;
  
 -      if test "$no_install" = yes; then
@@ -61121,17 +59105,19 @@
 -	$run eval "$link_command" || exit $?
 -	exit $EXIT_SUCCESS
 -      fi
-+      *.lo)
-+	# A libtool-controlled object.
++      -dlpreopen)
++	prev=dlprefiles
++	continue
++	;;
  
 -      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"
-+	# Check to see that this really is a libtool object.
-+	if func_lalib_unsafe_p "$arg"; then
-+	  pic_object=
-+	  non_pic_object=
++      -export-dynamic)
++	export_dynamic=yes
++	continue
++	;;
  
 -	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
 -	$echo "$modename: \`$output' will be relinked during installation" 1>&2
@@ -61143,54 +59129,52 @@
 -	  else
 -	    # fast_install is set to needless
 -	    relink_command=
-+	  # Read the .lo file
-+	  func_source "$arg"
-+
-+	  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
--	else
+-	  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"
++	fi
++	if test "X$arg" = "X-export-symbols"; then
++	  prev=expsyms
+ 	else
 -	  link_command="$compile_var$compile_command$compile_rpath"
 -	  relink_command="$finalize_var$finalize_command$finalize_rpath"
--	fi
++	  prev=expsyms_regex
+ 	fi
 -      fi
- 
+-
 -      # Replace the output file specification.
 -      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-+	  # Extract subdirectory from the argument.
-+	  func_dirname "$arg" "/" ""
-+	  xdir="$func_dirname_result"
++	continue
++	;;
  
 -      # Delete the old output files.
 -      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
-+	  if test "$pic_object" != none; then
-+	    # Prepend the subdirectory the object is found in.
-+	    pic_object="$xdir$pic_object"
++      -framework)
++	prev=framework
++	continue
++	;;
  
 -      $show "$link_command"
 -      $run eval "$link_command" || exit $?
-+	    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
++      -inst-prefix-dir)
++	prev=inst_prefix
++	continue
++	;;
  
 -      # Now create the wrapper script.
 -      $show "creating $output"
-+	    # CHECK ME:  I think I busted this.  -Ossama
-+	    if test "$prev" = dlprefiles; then
-+	      # Preload the old-style object.
-+	      dlprefiles="$dlprefiles $pic_object"
-+	      prev=
-+	    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
++	;;
  
 -      # Quote the relink command for shipping.
 -      if test -n "$relink_command"; then
@@ -61200,12 +59184,16 @@
 -	    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
++      -L*)
++	func_stripname '-L' '' "$arg"
++	dir=$func_stripname_result
++	if test -z "$dir"; then
++	  if test "$#" -gt 0; then
++	    func_fatal_error "require no space between \`-L' and \`$1'"
+ 	  else
 -	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
 -	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
-+	    # A PIC object.
-+	    func_append libobjs " $pic_object"
-+	    arg="$pic_object"
++	    func_fatal_error "need path for \`-L' option"
  	  fi
 -	done
 -	relink_command="(cd `pwd`; $relink_command)"
@@ -61217,26 +59205,55 @@
 -	case $progpath in
 -	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
 -	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
--	esac
++	fi
++	# We need an absolute path.
++	case $dir in
++	[\\/]* | [A-Za-z]:[\\/]*) ;;
++	*)
++	  absdir=`cd "$dir" && pwd`
++	  test -z "$absdir" && \
++	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
++	  dir="$absdir"
++	  ;;
+ 	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 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
++	case "$deplibs " in
++	*" -L$dir "*) ;;
++	*)
++	  deplibs="$deplibs -L$dir"
++	  lib_search_path="$lib_search_path $dir"
++	  ;;
+ 	esac
 -	# test for cygwin because mv fails w/o .exe extensions
--	case $host in
+ 	case $host in
 -	  *cygwin*)
 -	    exeext=.exe
 -	    outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
 -	  *) exeext= ;;
--	esac
++	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
++	  testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
++	  case :$dllsearchpath: in
++	  *":$dir:"*) ;;
++	  ::) dllsearchpath=$dir;;
++	  *) dllsearchpath="$dllsearchpath:$dir";;
++	  esac
++	  case :$dllsearchpath: in
++	  *":$testbindir:"*) ;;
++	  ::) dllsearchpath=$testbindir;;
++	  *) dllsearchpath="$dllsearchpath:$testbindir";;
++	  esac
++	  ;;
+ 	esac
 -	case $host in
 -	  *cygwin* | *mingw* )
 -            output_name=`basename $output`
@@ -61245,56 +59262,83 @@
 -            cwrapper="$output_path/$output_name.exe"
 -            $rm $cwrappersource $cwrapper
 -            trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-+	  # 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"
++	continue
++	;;
  
 -	    cat > $cwrappersource <<EOF
-+	    # 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"
++      -l*)
++	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
++	  case $host in
++	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
++	    # 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
++	;;
  
 -/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
 -   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-+	    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
++      -module)
++	module=yes
++	continue
 +	;;
  
 -   The $output program cannot be directly executed until all the libtool
 -   libraries that it depends on are installed.
-+      *.$libext)
-+	# An archive.
-+	deplibs="$deplibs $arg"
-+	old_deplibs="$old_deplibs $arg"
++      # 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
 +	;;
  
 -   This wrapper executable should never be moved out of the build directory.
 -   If it is, it will not operate correctly.
-+      *.la)
-+	# A libtool-controlled library.
++      -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
++	;;
  
 -   Currently, it simply execs the wrapper *script* "/bin/sh $output",
 -   but could eventually absorb all of the scripts functionality and
@@ -61311,17 +59355,8 @@
 -#include <string.h>
 -#include <ctype.h>
 -#include <sys/stat.h>
-+	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
++      -multi_module)
++	single_module="${wl}-multi_module"
 +	continue
 +	;;
  
@@ -61332,25 +59367,28 @@
 -#else
 -# define LT_PATHMAX 1024
 -#endif
-+      # 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"
++      -no-fast-install)
++	fast_install=no
++	continue
 +	;;
-+      esac # arg
  
 -#ifndef DIR_SEPARATOR
 -# define DIR_SEPARATOR '/'
 -# define PATH_SEPARATOR ':'
 -#endif
-+      # Now actually substitute the argument into the commands.
-+      if test -n "$arg"; then
-+	func_append compile_command " $arg"
-+	func_append finalize_command " $arg"
-+      fi
-+    done # argument parsing loop
++      -no-install)
++	case $host in
++	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
++	  # 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
++	;;
  
 -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
 -  defined (__OS2__)
@@ -61362,8 +59400,10 @@
 -#  define PATH_SEPARATOR_2 ';'
 -# endif
 -#endif
-+    test -n "$prev" && \
-+      func_fatal_help "the \`$prevarg' option requires an argument"
++      -no-undefined)
++	allow_undefined=no
++	continue
++	;;
  
 -#ifndef DIR_SEPARATOR_2
 -# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
@@ -61371,35 +59411,26 @@
 -# define IS_DIR_SEPARATOR(ch) \
 -        (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
 -#endif /* DIR_SEPARATOR_2 */
-+    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
++      -objectlist)
++	prev=objectlist
++	continue
++	;;
  
 -#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 */
-+    oldlibs=
-+    # calculate the name of the file, without its directory
-+    func_basename "$output"
-+    outputname="$func_basename_result"
-+    libobjs_save="$libobjs"
++      -o) prev=output ;;
  
 -#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 "$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\"
++      -precious-files-regex)
++	prev=precious_regex
++	continue
++	;;
  
 -/* -DDEBUG is fairly common in CFLAGS.  */
 -#undef DEBUG
@@ -61408,22 +59439,16 @@
 -#else
 -# define DEBUG(format, ...)
 -#endif
-+    func_dirname "$output" "/" ""
-+    output_objdir="$func_dirname_result$objdir"
-+    # Create the object directory.
-+    func_mkdir_p "$output_objdir"
++      -release)
++	prev=release
++	continue
++	;;
  
 -const char *program_name = NULL;
-+    # 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
++      -rpath)
++	prev=rpath
++	continue
++	;;
  
 -void * xmalloc (size_t num);
 -char * xstrdup (const char *string);
@@ -61432,24 +59457,51 @@
 -int    check_executable(const char *path);
 -char * strendzap(char *str, const char *pat);
 -void lt_fatal (const char *message, ...);
-+    specialdeplibs=
++      -R)
++	prev=xrpath
++	continue
++	;;
  
 -int
 -main (int argc, char *argv[])
 -{
 -  char **newargz;
 -  int i;
--
++      -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
++	;;
+ 
 -  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
--
++      -shared)
++	# The effects of -shared are defined in a previous loop.
++	continue
++	;;
+ 
 -            cat >> $cwrappersource <<EOF
 -  newargz[0] = (char *) xstrdup("$SHELL");
 -EOF
--
++      -shrext)
++	prev=shrext
++	continue
++	;;
+ 
 -            cat >> $cwrappersource <<"EOF"
 -  newargz[1] = find_executable(argv[0]);
 -  if (newargz[1] == NULL)
@@ -61461,15 +59513,31 @@
 -  for (i = 1; i < argc; i++)
 -    newargz[i+1] = xstrdup(argv[i]);
 -  newargz[argc+1] = NULL;
--
++      -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
++	;;
+ 
 -  for (i=0; i<argc+1; i++)
 -  {
 -    DEBUG("(main) newargz[%d]   : %s\n",i,newargz[i]);
 -    ;
 -  }
--
++      -thread-safe)
++	thread_safe=yes
++	continue
++	;;
+ 
 -EOF
--
++      -version-info)
++	prev=vinfo
++	continue
++	;;
+ 
 -            case $host_os in
 -              mingw*)
 -                cat >> $cwrappersource <<EOF
@@ -61482,54 +59550,135 @@
 -EOF
 -              ;;
 -            esac
--
++      -version-number)
++	prev=vinfo
++	vinfo_number=yes
++	continue
++	;;
+ 
 -            cat >> $cwrappersource <<"EOF"
 -  return 127;
 -}
--
++      -weak)
++        prev=weak
++	continue
++	;;
+ 
 -void *
 -xmalloc (size_t num)
 -{
 -  void * p = (void *) malloc (num);
 -  if (!p)
 -    lt_fatal ("Memory exhausted");
--
++      -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
++	;;
+ 
 -  return p;
 -}
--
++      -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
++	;;
+ 
 -char *
 -xstrdup (const char *string)
 -{
 -  return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
 -;
 -}
--
++      -Xcompiler)
++	prev=xcompiler
++	continue
++	;;
+ 
 -const char *
 -base_name (const char *name)
 -{
 -  const char *base;
--
++      -Xlinker)
++	prev=xlinker
++	continue
++	;;
+ 
 -#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
--
++      -XCClinker)
++	prev=xcclinker
++	continue
++	;;
+ 
 -  for (base = name; *name; name++)
 -    if (IS_DIR_SEPARATOR (*name))
 -      base = name + 1;
 -  return base;
 -}
--
++      # -msg_* for osf cc
++      -msg_*)
++	func_quote_for_eval "$arg"
++	arg="$func_quote_for_eval_result"
++	;;
+ 
 -int
 -check_executable(const char * path)
 -{
 -  struct stat st;
--
++      # -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
++        ;;
+ 
 -  DEBUG("(check_executable)  : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
 -  if ((!path) || (!*path))
 -    return 0;
--
++      # Some other compiler flag.
++      -* | +*)
++        func_quote_for_eval "$arg"
++	arg="$func_quote_for_eval_result"
++	;;
+ 
 -  if ((stat (path, &st) >= 0) &&
 -      (
 -        /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
@@ -61545,7 +59694,11 @@
 -  else
 -    return 0;
 -}
--
++      *.$objext)
++	# A standard object.
++	objs="$objs $arg"
++	;;
+ 
 -/* Searches for the full path of the wrapper.  Returns
 -   newly allocated full path name if found, NULL otherwise */
 -char *
@@ -61558,12 +59711,20 @@
 -  char tmp[LT_PATHMAX + 1];
 -  int tmp_len;
 -  char* concat_name;
--
++      *.lo)
++	# A libtool-controlled object.
+ 
 -  DEBUG("(find_executable)  : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
--
++	# Check to see that this really is a libtool object.
++	if func_lalib_unsafe_p "$arg"; then
++	  pic_object=
++	  non_pic_object=
+ 
 -  if ((wrapper == NULL) || (*wrapper == '\0'))
 -    return NULL;
--
++	  # Read the .lo file
++	  func_source "$arg"
+ 
 -  /* Absolute path? */
 -#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
 -  if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
@@ -61586,7 +59747,13 @@
 -#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
 -  }
 -#endif
--
++	  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
+ 
 -  for (p = wrapper; *p; p++)
 -    if (*p == '/')
 -    {
@@ -61641,24 +59808,50 @@
 -  memcpy (concat_name, tmp, tmp_len);
 -  concat_name[tmp_len] = '/';
 -  strcpy (concat_name + tmp_len + 1, wrapper);
--
++	  # Extract subdirectory from the argument.
++	  func_dirname "$arg" "/" ""
++	  xdir="$func_dirname_result"
+ 
 -  if (check_executable(concat_name))
 -    return concat_name;
 -  XFREE(concat_name);
 -  return NULL;
 -}
--
++	  if test "$pic_object" != none; then
++	    # Prepend the subdirectory the object is found in.
++	    pic_object="$xdir$pic_object"
+ 
 -char *
 -strendzap(char *str, const char *pat)
 -{
 -  size_t len, patlen;
--
++	    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
+ 
 -  assert(str != NULL);
 -  assert(pat != NULL);
--
++	    # CHECK ME:  I think I busted this.  -Ossama
++	    if test "$prev" = dlprefiles; then
++	      # Preload the old-style object.
++	      dlprefiles="$dlprefiles $pic_object"
++	      prev=
++	    fi
+ 
 -  len = strlen(str);
 -  patlen = strlen(pat);
--
++	    # A PIC object.
++	    func_append libobjs " $pic_object"
++	    arg="$pic_object"
++	  fi
+ 
 -  if (patlen <= len)
 -  {
 -    str += len - patlen;
@@ -61667,7 +59860,11 @@
 -  }
 -  return str;
 -}
--
++	  # 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"
+ 
 -static void
 -lt_error_core (int exit_status, const char * mode,
 -          const char * message, va_list ap)
@@ -61675,21 +59872,37 @@
 -  fprintf (stderr, "%s: %s: ", program_name, mode);
 -  vfprintf (stderr, message, ap);
 -  fprintf (stderr, ".\n");
--
++	    # 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 (exit_status >= 0)
 -    exit (exit_status);
 -}
-+    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
++	    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
++	;;
  
 -void
 -lt_fatal (const char *message, ...)
@@ -61710,11 +59923,162 @@
 -        esac
 -        $rm $output
 -        trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
++      *.$libext)
++	# An archive.
++	deplibs="$deplibs $arg"
++	old_deplibs="$old_deplibs $arg"
++	continue
++	;;
+ 
+-	$echo > $output "\
+-#! $SHELL
++      *.la)
++	# A libtool-controlled library.
+ 
+-# $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.
++	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
++	;;
+ 
+-# 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'
++      # 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
+ 
+-# 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
++      # Now actually substitute the argument into the commands.
++      if test -n "$arg"; then
++	func_append compile_command " $arg"
++	func_append finalize_command " $arg"
++      fi
++    done # argument parsing loop
+ 
+-# 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
++    test -n "$prev" && \
++      func_fatal_help "the \`$prevarg' option requires an argument"
+ 
+-relink_command=\"$relink_command\"
++    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
+ 
+-# 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!
+-      :
++    oldlibs=
++    # calculate the name of the file, without its directory
++    func_basename "$output"
++    outputname="$func_basename_result"
++    libobjs_save="$libobjs"
++
++    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
+-      # Restart under the correct shell, and then maybe \$echo will work.
+-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
++      shlib_search_path=
+     fi
+-  fi\
+-"
+-	$echo >> $output "\
++    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
++    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+ 
+-  # Find the directory that this script lives in.
+-  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
++    func_dirname "$output" "/" ""
++    output_objdir="$func_dirname_result$objdir"
++    # Create the object directory.
++    func_mkdir_p "$output_objdir"
+ 
+-  # 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%/[^/]*\$%%'\`
++    # 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
++
++    specialdeplibs=
++
++    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
++
 +    if test "$linkmode" = lib; then
 +      libs="$predeps $libs $compiler_lib_search_path $postdeps"
- 
--	$echo > $output "\
--#! $SHELL
++
 +      # 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).
@@ -61729,26 +60093,14 @@
 +      fi
 +      pre_post_deps=
 +    fi
- 
--# $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.
++
 +    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
- 
--# 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'
++
 +    case $linkmode in
 +    lib)
 +	passes="conv dlpreopen link"
@@ -61772,20 +60124,7 @@
 +    *)  passes="conv"
 +	;;
 +    esac
- 
--# 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
++
 +    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...
@@ -61798,10 +60137,7 @@
 +	done
 +	deplibs="$tmp_deplibs"
 +      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 "$linkmode,$pass" = "lib,link" ||
 +	 test "$linkmode,$pass" = "prog,scan"; then
 +	libs="$deplibs"
@@ -61825,8 +60161,7 @@
 +	  case $lib in
 +	  *.la)	func_source "$lib" ;;
 +	  esac
- 
--relink_command=\"$relink_command\"
++
 +	  # Collect preopened libtool deplibs, except any this library
 +	  # has declared as weak libs
 +	  for deplib in $dependency_libs; do
@@ -61844,56 +60179,7 @@
 +	save_deplibs="$deplibs"
 +	deplibs=
 +      fi
- 
--# 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 "\
--
--  # Find the directory that this script lives in.
--  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
--  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
--
--  # 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 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
--
--    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
--    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
--  done
--
--  # Try to get the absolute directory name.
--  absdir=\`cd \"\$thisdir\" && pwd\`
--  test -n \"\$absdir\" && thisdir=\"\$absdir\"
--"
++
 +      for deplib in $libs; do
 +	lib=
 +	found=no
@@ -62117,32 +60403,19 @@
 +	  continue
 +	  ;;
 +	esac # case $deplib
- 
--	if test "$fast_install" = yes; then
--	  $echo >> $output "\
--  program=lt-'$outputname'$exeext
--  progdir=\"\$thisdir/$objdir\"
++
 +	if test "$found" = yes || test -f "$lib"; then :
 +	else
 +	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
 +	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
++
 +	# 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"
- 
--    file=\"\$\$-\$program\"
++
 +	func_dirname "$lib" "" "."
 +	ladir="$func_dirname_result"
- 
--    if test ! -d \"\$progdir\"; then
--      $mkdir \"\$progdir\"
--    else
--      $rm \"\$progdir/\$file\"
--    fi"
++
 +	dlname=
 +	dlopen=
 +	dlpreopen=
@@ -62155,31 +60428,11 @@
 +	installed=yes
 +	shouldnotlink=no
 +	avoidtemprpath=
- 
--	  $echo >> $output "\
- 
--    # 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
++
++
 +	# Read the .la file
 +	func_source "$lib"
- 
--    $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\"
--"
++
 +	# 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'`
@@ -62196,9 +60449,8 @@
 +	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
 +	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
 +	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
- 	fi
- 
--	$echo >> $output "\
++	fi
++
 +	if test "$pass" = conv; then
 +	  # Only check for convenience libraries
 +	  deplibs="$lib $deplibs"
@@ -62421,7 +60673,7 @@
 +	if test -n "$library_names" &&
 +	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
 +	  case $host in
-+	  *cygwin* | *mingw*)
++	  *cygwin* | *mingw* | *cegcc*)
 +	      # No point in relinking DLLs because paths are not encoded
 +	      notinst_deplibs="$notinst_deplibs $lib"
 +	      need_relink=no
@@ -62491,7 +60743,7 @@
 +	    elif test -n "$soname_spec"; then
 +	      # bleh windows
 +	      case $host in
-+	      *cygwin* | mingw*)
++	      *cygwin* | mingw* | *cegcc*)
 +	        func_arith $current - $age
 +		major=$func_arith_result
 +		versuffix="-$major"
@@ -63273,7 +61525,7 @@
 +	tempremovelist=`$ECHO "$output_objdir/*"`
 +	for p in $tempremovelist; do
 +	  case $p in
-+	    *.$objext)
++	    *.$objext | *.gcno)
 +	       ;;
 +	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
 +	       if test "X$precious_files_regex" != "X"; then
@@ -63344,7 +61596,7 @@
 +      if test "$build_libtool_libs" = yes; then
 +	if test -n "$rpath"; then
 +	  case $host in
-+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
++	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
 +	    # these systems don't actually have a c library (as such)!
 +	    ;;
 +	  *-*-rhapsody* | *-*-darwin1.[012])
@@ -63651,7 +61903,12 @@
 +	release=$release_save
 +	libname=$libname_save
 +	name=$name_save
-+
+ 
+-    # 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\" ;;
 +	case $host in
 +	*-*-rhapsody* | *-*-darwin1.[012])
 +	  # On Rhapsody replace the C library with the System framework
@@ -63711,8 +61968,12 @@
 +	  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
-+
+       esac
+-    fi
+ 
+-    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
+-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+-  done
 +      # move library search paths that coincide with paths to not yet
 +      # installed libraries to the beginning of the library search list
 +      new_libs=
@@ -63739,13 +62000,16 @@
 +	esac
 +      done
 +      deplibs="$new_libs"
-+
+ 
+-  # Try to get the absolute directory name.
+-  absdir=\`cd \"\$thisdir\" && pwd\`
+-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
+-"
 +      # All the library-specific variables (install_libdir is set above).
 +      library_names=
 +      old_library=
 +      dlname=
- 
--  if test -f \"\$progdir/\$program\"; then"
++
 +      # 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
@@ -63801,20 +62065,19 @@
 +	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
 +	fi
  
--	# Export our shlibpath_var if we have one.
--	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+-	if test "$fast_install" = yes; then
 -	  $echo >> $output "\
--    # Add our own library path to $shlibpath_var
--    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+-  program=lt-'$outputname'$exeext
+-  progdir=\"\$thisdir/$objdir\"
 +	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
  
--    # 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 ! -f \"\$progdir/\$program\" || \\
+-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
 +	# Get the real and link names of the library.
 +	eval shared_ext=\"$shrext_cmds\"
 +	eval library_names=\"$library_names_spec\"
@@ -63823,35 +62086,21 @@
 +	realname="$1"
 +	shift
  
--    export $shlibpath_var
--"
+-    file=\"\$\$-\$program\"
 +	if test -n "$soname_spec"; then
 +	  eval soname=\"$soname_spec\"
 +	else
 +	  soname="$realname"
- 	fi
--
--	# 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
 +	if test -z "$dlname"; then
 +	  dlname=$soname
- 	fi
++	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 test ! -d \"\$progdir\"; then
+-      $mkdir \"\$progdir\"
+-    else
+-      $rm \"\$progdir/\$file\"
+-    fi"
 +	lib="$output_objdir/$realname"
 +	linknames=
 +	for link
@@ -63859,14 +62108,20 @@
 +	  linknames="$linknames $link"
 +	done
  
--	*)
 -	  $echo >> $output "\
--      exec \"\$progdir/\$program\" \${1+\"\$@\"}
--"
 +	# 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=
-+
+ 
+-    # 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
 +	delfiles=
 +	if test -n "$export_symbols" && test -n "$include_expsyms"; then
 +	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
@@ -63876,7 +62131,7 @@
 +
 +	orig_export_symbols=
 +	case $host_os in
-+	cygwin* | mingw*)
++	cygwin* | mingw* | cegcc*)
 +	  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
@@ -63891,40 +62146,19 @@
 +	      always_export_symbols=yes
 +	    fi
 +	  fi
- 	  ;;
- 	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
--
--    # See if we need to build an old-fashioned archive.
--    for oldlib in $oldlibs; do
++	  ;;
++	esac
  
--      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
+-    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+-    { $rm \"\$progdir/\$program\";
+-      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+-    $rm \"\$progdir/\$file\"
+-  fi"
 -	else
--	  oldobjs="$old_deplibs $non_pic_objects"
+-	  $echo >> $output "\
+-  program='$outputname'
+-  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
@@ -63957,16 +62191,10 @@
 +	    fi
 +	  fi
  	fi
--	addlibs="$old_convenience"
--      fi
+ 
+-	$echo >> $output "\
 -
--      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
+-  if test -f \"\$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"
@@ -63987,23 +62215,11 @@
 +	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
 +	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..."
+-	# 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\"
 +	tmp_deplibs=
 +	for test_deplib in $deplibs; do
 +	  case " $convenience " in
@@ -64015,7 +62231,9 @@
 +	done
 +	deplibs="$tmp_deplibs"
  
--	  if test -z "$gentop"; then
+-    # 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 -n "$convenience"; then
 +	  if test -n "$whole_archive_flag_spec" &&
 +	    test "$compiler_needs_object" = yes &&
@@ -64029,169 +62247,118 @@
 +	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
 +	    test "X$libobjs" = "X " && libobjs=
 +	  else
- 	    gentop="$output_objdir/${outputname}x"
- 	    generated="$generated $gentop"
++	    gentop="$output_objdir/${outputname}x"
++	    generated="$generated $gentop"
  
--	    $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
+-    export $shlibpath_var
+-"
 +	    func_extract_archives $gentop $convenience
 +	    libobjs="$libobjs $func_extract_archives_result"
 +	    test "X$libobjs" = "X " && libobjs=
- 	  fi
--
--	  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
  	fi
  
--	eval cmds=\"$old_archive_cmds\"
+-	# 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
+-"
 +	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
 +	  eval flag=\"$thread_safe_flag_spec\"
 +	  linker_flags="$linker_flags $flag"
-+	fi
+ 	fi
  
--	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
+-	$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+\"\$@\"}
+-"
+-	  ;;
+-
+-	*)
+-	  $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
+-
+-    # See if we need to build an old-fashioned archive.
+-    for oldlib in $oldlibs; do
 +	# 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
  
--	  # 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
--	      # 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\"
+-      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
 +	# 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 cmds=\"\$concat_cmds~\$old_archive_cmds\"
++	  else
 +	    eval test_cmds=\"$module_cmds\"
 +	    cmds=$module_cmds
 +	  fi
-+	else
+ 	else
+-	  oldobjs="$old_deplibs $non_pic_objects"
 +	  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
  	fi
+-	addlibs="$old_convenience"
 -      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
--
--    if test -n "$generated"; then
--      $show "${rm}r$generated"
--      $run ${rm}r$generated
--    fi
--
--    # Now create the libtool archive.
--    case $output in
--    *.la)
--      old_library=
--      test "$build_old_libs" = yes && old_library="$libname.$libext"
--      $show "creating $output"
  
--      # 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"
+-      if test -n "$addlibs"; then
+-	gentop="$output_objdir/${outputname}x"
+-	generated="$generated $gentop"
 +	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
--	  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
++	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.
-+
+ 
+-	func_extract_archives $gentop $addlibs
+-	oldobjs="$oldobjs $func_extract_archives_result"
+-      fi
 +	  # 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
@@ -64206,6 +62373,17 @@
 +	  save_output=$output
 +	  output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
  
+-      # 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
 +	  # Clear the reloadable object creation command queue and
 +	  # initialize k to one.
 +	  test_cmds=
@@ -64213,19 +62391,18 @@
 +	  objlist=
 +	  last_robj=
 +	  k=1
- 
--      # 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
++
 +	  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
+ 	    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..."
 +	      $ECHO "$obj" >> $output
 +	    done
 +	    $ECHO ')' >> $output
@@ -64240,35 +62417,11 @@
 +	    if test "$compiler_needs_object" = yes; then
 +	      firstobj="$1 "
 +	      shift
- 	    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
++	    fi
 +	    for obj
 +	    do
 +	      $ECHO "$obj" >> $output
- 	    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
++	    done
 +	    delfiles="$delfiles $output"
 +	    output=$firstobj\"$file_list_spec$output\"
 +	  else
@@ -64317,19 +62470,12 @@
 +	      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
--	      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
 +	      delfiles="$delfiles $output"
-+
+ 
+-	  if test -z "$gentop"; then
+-	    gentop="$output_objdir/${outputname}x"
+-	    generated="$generated $gentop"
 +	    else
 +	      output=
 +	    fi
@@ -64344,27 +62490,7 @@
 +	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
 +	      if test -n "$last_robj"; then
 +		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
- 	      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"
++	      fi
 +	    fi
 +
 +	    test -n "$save_libobjs" &&
@@ -64390,30 +62516,50 @@
 +
 +		exit $lt_exit
 +	      }
- 	    done
--	    dlprefiles="$newdlprefiles"
++	    done
 +	    IFS="$save_ifs"
-+
+ 
+-	    $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
 +	    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
  	  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.
  
--# The name that we can dlopen(3).
--dlname='$tdlname'
+-	  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 ${skipped_export-false}; then
 +	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
 +	      tmp_export_symbols="$export_symbols"
@@ -64436,14 +62582,22 @@
 +	    fi
 +	  fi
  
--# Names of this library.
--library_names='$library_names'
+-	eval cmds=\"$old_archive_cmds\"
 +	  libobjs=$output
 +	  # Restore the value of output.
 +	  output=$save_output
  
--# The name of the static archive.
--old_library='$old_library'
+-	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
 +	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
 +	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
 +	    test "X$libobjs" = "X " && libobjs=
@@ -64451,50 +62605,100 @@
 +	  # Expand the library linking commands again to reset the
 +	  # value of $libobjs for piecewise linking.
  
--# Libraries that this one depends upon.
--dependency_libs='$dependency_libs'
+-	  # 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
+-	      :
 +	  # 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
+ 	    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=
 +	      cmds=$module_cmds
-+	    fi
-+	  else
+ 	    fi
+-	  done
+-	  RANLIB=$save_RANLIB
+-	  oldobjs=$objlist
+-	  if test "X$oldobjs" = "X" ; then
+-	    eval cmds=\"\$concat_cmds\"
+ 	  else
+-	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
 +	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
 +	      cmds=$archive_expsym_cmds
 +	    else
 +	      cmds=$archive_cmds
 +	    fi
-+	  fi
-+	fi
+ 	  fi
+ 	fi
+-      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
  
--# Version information for $libname.
--current=$current
--age=$age
--revision=$revision
+-    if test -n "$generated"; then
+-      $show "${rm}r$generated"
+-      $run ${rm}r$generated
+-    fi
 +	if test -n "$delfiles"; then
 +	  # Append the command to remove temporary files to $cmds.
 +	  eval cmds=\"\$cmds~\$RM $delfiles\"
 +	fi
  
--# Is this an already installed library?
--installed=$installed
+-    # Now create the libtool archive.
+-    case $output in
+-    *.la)
+-      old_library=
+-      test "$build_old_libs" = yes && old_library="$libname.$libext"
+-      $show "creating $output"
 +	# Add any objects from preloaded convenience libraries
 +	if test -n "$dlprefiles"; then
 +	  gentop="$output_objdir/${outputname}x"
 +	  generated="$generated $gentop"
  
--# Should we warn about portability when linking against -modules?
--shouldnotlink=$module
+-      # 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"
 +	  func_extract_archives $gentop $dlprefiles
 +	  libobjs="$libobjs $func_extract_archives_result"
 +	  test "X$libobjs" = "X " && libobjs=
-+	fi
+ 	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
  
--# Files to dlopen/dlpreopen
--dlopen='$dlfiles'
--dlpreopen='$dlprefiles'
 +	save_ifs="$IFS"; IFS='~'
 +	for cmd in $cmds; do
 +	  IFS="$save_ifs"
@@ -64506,24 +62710,163 @@
 +	  $opt_dry_run || eval "$cmd" || {
 +	    lt_exit=$?
  
--# 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
+-      # 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
 +	    # Restore the uninstalled library and exit
 +	    if test "$mode" = relink; then
 +	      ( cd "$output_objdir" && \
 +	        $RM "${realname}T" && \
 +		$MV "${realname}U" "$realname" )
-+	    fi
-+
+ 	    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.
+ 
+-# The name that we can dlopen(3).
+-dlname='$tdlname'
 +	    exit $lt_exit
 +	  }
- 	done
++	done
++	IFS="$save_ifs"
+ 
+-# Names of this library.
+-library_names='$library_names'
++	# 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 $?
+ 
+-# The name of the static archive.
+-old_library='$old_library'
++	  if test -n "$convenience"; then
++	    if test -z "$whole_archive_flag_spec"; then
++	      func_show_eval '${RM}r "$gentop"'
++	    fi
++	  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
++	# 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
+ 
+-# Is this an already installed library?
+-installed=$installed
++	# 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
++      ;;
+ 
+-# Should we warn about portability when linking against -modules?
+-shouldnotlink=$module
++    obj)
++      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
++	func_warning "\`-dlopen' is ignored for objects"
++      fi
+ 
+-# Files to dlopen/dlpreopen
+-dlopen='$dlfiles'
+-dlpreopen='$dlprefiles'
++      case " $deplibs" in
++      *\ -l* | *\ -L*)
++	func_warning "\`-l' and \`-L' are ignored for objects" ;;
++      esac
+ 
+-# 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
-+	IFS="$save_ifs"
++      test -n "$rpath" && \
++	func_warning "\`-rpath' is ignored for objects"
  
 -      # Do a symbolic link so that the libtool archive can be found in
 -      # LD_LIBRARY_PATH before the program is installed.
@@ -64533,18 +62876,14 @@
 -    esac
 -    exit $EXIT_SUCCESS
 -    ;;
-+	# 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 $?
++      test -n "$xrpath" && \
++	func_warning "\`-R' is ignored for objects"
  
 -  # libtool install mode
 -  install)
 -    modename="$modename: install"
-+	  if test -n "$convenience"; then
-+	    if test -z "$whole_archive_flag_spec"; then
-+	      func_show_eval '${RM}r "$gentop"'
-+	    fi
-+	  fi
++      test -n "$vinfo" && \
++	func_warning "\`-version-info' is ignored for objects"
  
 -    # There may be an optional sh(1) argument at the beginning of
 -    # install_prog (especially on Windows NT).
@@ -64556,8 +62895,23 @@
 -      case $arg in
 -      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
 -	arg="\"$arg\""
--	;;
--      esac
++      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
 -      install_prog="$arg "
 -      arg="$1"
 -      shift
@@ -64565,8 +62919,6 @@
 -      install_prog=
 -      arg=$nonopt
 -    fi
-+	  exit $EXIT_SUCCESS
-+	fi
  
 -    # The real first argument should be the name of the installation program.
 -    # Aesthetically quote it.
@@ -64577,12 +62929,8 @@
 -      ;;
 -    esac
 -    install_prog="$install_prog$arg"
-+	# 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
++      # Delete the old objects.
++      $opt_dry_run || $RM $obj $libobj
  
 -    # We need to accept at least all the BSD install flags.
 -    dest=
@@ -64598,13 +62946,17 @@
 -	files="$files $dest"
 -	dest=$arg
 -	continue
-+	# 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
-+      ;;
+-      fi
++      # 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=
  
 -      case $arg in
 -      -d) isdir=yes ;;
@@ -64620,49 +62972,27 @@
 -	continue
 -	;;
 -      -*)
-+    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
- 	;;
-       *)
+-	;;
+-      *)
 -	# If the previous option needed an argument, then skip it.
 -	if test -n "$prev"; then
 -	  prev=
--	else
++      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
 -	  dest=$arg
 -	  continue
--	fi
-+	libobj=
-+	obj="$output"
- 	;;
-       esac
++	  gentop="$output_objdir/${obj}x"
++	  generated="$generated $gentop"
++
++	  func_extract_archives $gentop $convenience
++	  reload_conv_objs="$reload_objs $func_extract_archives_result"
+ 	fi
+-	;;
+-      esac
++      fi
  
 -      # Aesthetically quote the argument.
 -      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
@@ -64673,46 +63003,34 @@
 -      esac
 -      install_prog="$install_prog $arg"
 -    done
-+      # Delete the old objects.
-+      $opt_dry_run || $RM $obj $libobj
++      # 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
  
 -    if test -z "$install_prog"; then
 -      $echo "$modename: you must specify an install program" 1>&2
 -      $echo "$help" 1>&2
 -      exit $EXIT_FAILURE
 -    fi
-+      # 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=
++      output="$obj"
++      func_execute_cmds "$reload_cmds" 'exit $?'
  
 -    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 -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"
++      # 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
  
 -    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
-+	  func_extract_archives $gentop $convenience
-+	  reload_conv_objs="$reload_objs $func_extract_archives_result"
-+	fi
++	exit $EXIT_SUCCESS
        fi
 -      $echo "$help" 1>&2
 -      exit $EXIT_FAILURE
@@ -64720,8 +63038,10 @@
  
 -    # Strip any trailing slash from the destination.
 -    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
-+      # 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
++      if test "$build_libtool_libs" != yes; then
++	if test -n "$gentop"; then
++	  func_show_eval '${RM}r "$gentop"'
++	fi
  
 -    # Check to see that the destination is a directory.
 -    test -d "$dest" && isdir=yes
@@ -64732,56 +63052,39 @@
 -      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
 -      test "X$destdir" = "X$dest" && destdir=.
 -      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
-+      output="$obj"
-+      func_execute_cmds "$reload_cmds" 'exit $?'
- 
--      # 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
-+      # 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
-+
-+	exit $EXIT_SUCCESS
-       fi
--    fi
--    case $destdir in
--    [\\/]* | [A-Za-z]:[\\/]*) ;;
--    *)
--      for file in $files; do
--	case $file in
--	*.lo) ;;
--	*)
--	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
--	  $echo "$help" 1>&2
--	  exit $EXIT_FAILURE
--	  ;;
--	esac
--      done
-+
-+      if test "$build_libtool_libs" != yes; then
-+	if test -n "$gentop"; then
-+	  func_show_eval '${RM}r "$gentop"'
-+	fi
-+
 +	# 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
-+
+ 
+-      # 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
 +      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
+       fi
+-    fi
+-    case $destdir in
+-    [\\/]* | [A-Za-z]:[\\/]*) ;;
+-    *)
+-      for file in $files; do
+-	case $file in
+-	*.lo) ;;
+-	*)
+-	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
+-	  $echo "$help" 1>&2
+-	  exit $EXIT_FAILURE
+-	  ;;
+-	esac
+-      done
 +
 +      if test -n "$gentop"; then
 +	func_show_eval '${RM}r "$gentop"'
@@ -64964,14 +63267,16 @@
 +	  esac
 +	fi
 +	case $host in
-+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
 +	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
 +	  case :$dllsearchpath: in
 +	  *":$libdir:"*) ;;
++	  ::) dllsearchpath=$libdir;;
 +	  *) dllsearchpath="$dllsearchpath:$libdir";;
 +	  esac
 +	  case :$dllsearchpath: in
 +	  *":$testbindir:"*) ;;
++	  ::) dllsearchpath=$testbindir;;
 +	  *) dllsearchpath="$dllsearchpath:$testbindir";;
 +	  esac
 +	  ;;
@@ -65074,6 +63379,10 @@
 +          wrappers_required=no
 +        fi
 +        ;;
++      *cegcc)
++        # Disable wrappers for cegcc, we are cross compiling anyway.
++        wrappers_required=no
++        ;;
 +      *)
 +        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
 +          wrappers_required=no
@@ -65412,11 +63721,10 @@
 +
 +	    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.
++	    # The wrapper executable is built using the $host compiler,
++	    # because it contains $host paths and files. If cross-
++	    # compiling, it, like the target executable, must be
++	    # executed on the $host or under an emulation environment.
 +	    $opt_dry_run || {
 +	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
 +	      $STRIP $cwrapper
@@ -65689,11 +63997,11 @@
 -    $echo "X----------------------------------------------------------------------" | $Xsed
 -    exit $EXIT_SUCCESS
 -    ;;
- 
+-
 -  # libtool execute mode
 -  execute)
 -    modename="$modename: execute"
--
+ 
 -    # The first argument is the command name.
 -    cmd="$nonopt"
 -    if test -z "$cmd"; then
@@ -65829,7 +64137,7 @@
 +	  # 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 ;;
++	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
 +	  esac
 +	  $ECHO > $output "\
 +# $outputname - a libtool library file
@@ -65996,7 +64304,7 @@
      files=
      rmforce=
      exit_status=0
-@@ -6547,30 +7676,28 @@
+@@ -6547,30 +8208,28 @@
      for arg
      do
        case $arg in
@@ -66036,7 +64344,7 @@
        test "$mode" = uninstall && objdir="$dir"
  
        # Remember objdir for removal later, being careful to avoid duplicates
-@@ -6582,9 +7709,9 @@
+@@ -6582,9 +8241,9 @@
        fi
  
        # Don't error if the file doesn't exist and rm -f was used.
@@ -66049,7 +64357,7 @@
  	:
        elif test -d "$file"; then
  	exit_status=1
-@@ -6598,8 +7725,8 @@
+@@ -6598,8 +8257,8 @@
        case $name in
        *.la)
  	# Possibly a libtool archive, so verify it.
@@ -66060,7 +64368,7 @@
  
  	  # Delete the libtool libraries and symlinks.
  	  for n in $library_names; do
-@@ -6614,39 +7741,17 @@
+@@ -6614,39 +8273,17 @@
  	    *" $dlname "*) ;;
  	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
  	    esac
@@ -66103,7 +64411,7 @@
  	    fi
  	    # FIXME: should reinstall the best remaining shared library.
  	    ;;
-@@ -6656,20 +7761,20 @@
+@@ -6656,20 +8293,20 @@
  
        *.lo)
  	# Possibly a libtool object, so verify it.
@@ -66130,7 +64438,7 @@
  	    rmfiles="$rmfiles $dir/$non_pic_object"
  	  fi
  	fi
-@@ -6680,17 +7785,26 @@
+@@ -6680,17 +8317,26 @@
  	  noexename=$name
  	  case $file in
  	  *.exe)
@@ -66162,7 +64470,7 @@
  
  	    # note $name still contains .exe if it was in $file originally
  	    # as does the version of $file that was added into $rmfiles
-@@ -6705,239 +7819,38 @@
+@@ -6705,239 +8351,38 @@
  	fi
  	;;
        esac
@@ -66416,7 +64724,7 @@
  
  # The TAGs below are defined such that we never get into a situation
  # in which we disable both kinds of libraries.  Given conflicting
-@@ -6951,14 +7864,17 @@
+@@ -6951,14 +8396,17 @@
  # configuration.  But we'll never go from static-only to shared-only.
  
  # ### BEGIN LIBTOOL TAG CONFIG: disable-shared
@@ -66436,9 +64744,22 @@
  # End:
 +# vi:sw=2
 +
+diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/m4/gnome-doc-utils.m4 fast-user-switch-applet-2.24.0.new/m4/gnome-doc-utils.m4
+--- fast-user-switch-applet-2.24.0/m4/gnome-doc-utils.m4	2008-09-22 09:25:26.000000000 -0500
++++ fast-user-switch-applet-2.24.0.new/m4/gnome-doc-utils.m4	2009-03-04 17:19:35.000000000 -0600
+@@ -36,7 +36,8 @@
+ # GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
+ #
+ AC_DEFUN([GNOME_DOC_INIT],
+-[
++[AC_REQUIRE([AC_PROG_LN_S])dnl
++
+ ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1])
+ 
+ PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required],
 diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/m4/intltool.m4 fast-user-switch-applet-2.24.0.new/m4/intltool.m4
---- fast-user-switch-applet-2.24.0/m4/intltool.m4	2008-09-22 15:25:25.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/m4/intltool.m4	2009-02-09 19:51:47.000000000 +0000
+--- fast-user-switch-applet-2.24.0/m4/intltool.m4	2008-09-22 09:25:25.000000000 -0500
++++ fast-user-switch-applet-2.24.0.new/m4/intltool.m4	2009-03-04 17:19:35.000000000 -0600
 @@ -23,9 +23,10 @@
  ## the same distribution terms that you use for the rest of that program.
  
@@ -66577,9 +64898,9 @@
  AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
  # A hint is needed for aclocal from Automake <= 1.9.4:
 diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/m4/libtool.m4 fast-user-switch-applet-2.24.0.new/m4/libtool.m4
---- fast-user-switch-applet-2.24.0/m4/libtool.m4	1970-01-01 01:00:00.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/m4/libtool.m4	2009-02-09 19:52:01.000000000 +0000
-@@ -0,0 +1,7325 @@
+--- fast-user-switch-applet-2.24.0/m4/libtool.m4	1969-12-31 18:00:00.000000000 -0600
++++ fast-user-switch-applet-2.24.0.new/m4/libtool.m4	2009-03-04 17:19:35.000000000 -0600
+@@ -0,0 +1,7373 @@
 +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 +#
 +#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -66962,12 +65283,12 @@
 +# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
 +# ---------------------------------------------------
 +m4_define([lt_decl_varnames_tagged],
-+[_$0(m4_quote(m4_default([$1], [[, ]])),
-+     m4_quote(m4_if([$2], [],
-+		     m4_quote(lt_decl_tag_varnames),
-+		  m4_quote(m4_shift($@)))),
-+     m4_split(m4_normalize(m4_quote(_LT_TAGS))))])
-+m4_define([_lt_decl_varnames_tagged], [lt_combine([$1], [$2], [_], $3)])
++[m4_assert([$# <= 2])dnl
++_$0(m4_quote(m4_default([$1], [[, ]])),
++    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
++    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
++m4_define([_lt_decl_varnames_tagged],
++[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
 +
 +
 +# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
@@ -67527,10 +65848,10 @@
 +      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
 +    darwin1.*)
 +      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+    darwin*) # darwin 5.x on 
++    darwin*) # darwin 5.x on
 +      # 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? 
++      # 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' ;;
@@ -67572,7 +65893,11 @@
 +  _LT_TAGVAR(whole_archive_flag_spec, $1)=''
 +  _LT_TAGVAR(link_all_deplibs, $1)=yes
 +  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-+  if test "$GCC" = "yes"; then
++  case $cc_basename in
++     ifort*) _lt_dar_can_shared=yes ;;
++     *) _lt_dar_can_shared=$GCC ;;
++  esac
++  if test "$_lt_dar_can_shared" = "yes"; then
 +    output_verbose_link_cmd=echo
 +    _LT_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_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
@@ -68094,7 +66419,7 @@
 +    lt_cv_sys_max_cmd_len=-1;
 +    ;;
 +
-+  cygwin* | mingw*)
++  cygwin* | mingw* | cegcc*)
 +    # 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,
@@ -68262,10 +66587,6 @@
 +#  endif
 +#endif
 +
-+#ifdef __cplusplus
-+extern "C" void exit (int);
-+#endif
-+
 +void fnord() { int i=42;}
 +int main ()
 +{
@@ -68281,7 +66602,7 @@
 +  else
 +    puts (dlerror ());
 +
-+    exit (status);
++  return status;
 +}]
 +_LT_EOF
 +  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -68320,7 +66641,7 @@
 +    lt_cv_dlopen_self=yes
 +    ;;
 +
-+  mingw* | pw32*)
++  mingw* | pw32* | cegcc*)
 +    lt_cv_dlopen="LoadLibrary"
 +    lt_cv_dlopen_libs=
 +    ;;
@@ -68617,6 +66938,7 @@
 +[AC_REQUIRE([AC_CANONICAL_HOST])dnl
 +m4_require([_LT_DECL_EGREP])dnl
 +m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++m4_require([_LT_DECL_OBJDUMP])dnl
 +m4_require([_LT_DECL_SED])dnl
 +AC_MSG_CHECKING([dynamic linker characteristics])
 +m4_if([$1],
@@ -68781,14 +67103,14 @@
 +  # libtool to hard-code these into programs
 +  ;;
 +
-+cygwin* | mingw* | pw32*)
++cygwin* | mingw* | pw32* | cegcc*)
 +  version_type=windows
 +  shrext_cmds=".dll"
 +  need_version=no
 +  need_lib_prefix=no
 +
 +  case $GCC,$host_os in
-+  yes,cygwin* | yes,mingw* | yes,pw32*)
++  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
 +    library_names_spec='$libname.dll.a'
 +    # DLL is installed to $(libdir)/../bin by postinstall_cmds
 +    postinstall_cmds='base_file=`basename \${file}`~
@@ -68811,7 +67133,7 @@
 +      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* | cegcc*)
 +      # 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"`
@@ -69249,7 +67571,7 @@
 +  version_type=linux
 +  need_lib_prefix=no
 +  need_version=no
-+  library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=no
 +  hardcode_into_libs=yes
@@ -69273,7 +67595,7 @@
 +if test "$GCC" = yes; then
 +  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 +fi
-+ 
++
 +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
 +  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
 +fi
@@ -69550,6 +67872,7 @@
 +#  -- PORTME fill in with the dynamic library characteristics
 +m4_defun([_LT_CHECK_MAGIC_METHOD],
 +[m4_require([_LT_DECL_EGREP])
++m4_require([_LT_DECL_OBJDUMP])
 +AC_CACHE_CHECK([how to recognize dependent libraries],
 +lt_cv_deplibs_check_method,
 +[lt_cv_file_magic_cmd='$MAGIC_CMD'
@@ -69600,6 +67923,12 @@
 +  fi
 +  ;;
 +
++cegcc)
++  # use the weaker test based on 'objdump'. See mingw*.
++  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
++  lt_cv_file_magic_cmd='$OBJDUMP -f'
++  ;;
++
 +darwin* | rhapsody*)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
@@ -69911,7 +68240,7 @@
 +aix*)
 +  symcode='[[BCDT]]'
 +  ;;
-+cygwin* | mingw* | pw32*)
++cygwin* | mingw* | pw32* | cegcc*)
 +  symcode='[[ABCDGISTW]]'
 +  ;;
 +hpux*)
@@ -70157,7 +68486,7 @@
 +    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
 +      # PIC is the default for these OSes.
 +      ;;
-+    mingw* | cygwin* | os2* | pw32*)
++    mingw* | cygwin* | os2* | pw32* | cegcc*)
 +      # 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
@@ -70184,10 +68513,11 @@
 +      fi
 +      ;;
 +    hpux*)
-+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+      # not for PA HP-UX.
++      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
++      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
++      # sets the default TLS model and affects inlining.
 +      case $host_cpu in
-+      hppa*64*|ia64*)
++      hppa*64*)
 +	;;
 +      *)
 +	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
@@ -70285,12 +68615,19 @@
 +	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
 +	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 +	    ;;
-+	  icpc* | ecpc* )
-+	    # Intel C++
++	  ecpc* )
++	    # old Intel C++ for x86_64 which still supported -KPIC.
 +	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 +	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 +	    ;;
++	  icpc* )
++	    # Intel C++, used to be incompatible with GCC.
++	    # ICC 10 doesn't accept -KPIC any more.
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
++	    ;;
 +	  pgCC* | pgcpp*)
 +	    # Portland Group C++ compiler
 +	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -70456,7 +68793,7 @@
 +      # PIC is the default for these OSes.
 +      ;;
 +
-+    mingw* | cygwin* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2* | cegcc*)
 +      # 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
@@ -70472,10 +68809,11 @@
 +      ;;
 +
 +    hpux*)
-+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+      # not for PA HP-UX.
++      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
++      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
++      # sets the default TLS model and affects inlining.
 +      case $host_cpu in
-+      hppa*64*|ia64*)
++      hppa*64*)
 +	# +Z the default
 +	;;
 +      *)
@@ -70525,7 +68863,7 @@
 +      fi
 +      ;;
 +
-+    mingw* | cygwin* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2* | cegcc*)
 +      # 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], [],
@@ -70556,11 +68894,25 @@
 +
 +    linux* | k*bsd*-gnu)
 +      case $cc_basename in
-+      icc* | ecc* | ifort*)
++      # old Intel for x86_64 which still supported -KPIC.
++      ecc*)
 +	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 +	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 +        ;;
++      # icc used to be incompatible with GCC.
++      # ICC 10 doesn't accept -KPIC any more.
++      icc* | ifort*)
++	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
++        ;;
++      # Lahey Fortran 8.1.
++      lf95*)
++	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
++	_LT_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)
@@ -70742,7 +69094,7 @@
 +  pw32*)
 +    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
 +  ;;
-+  cygwin* | mingw*)
++  cygwin* | mingw* | cegcc*)
 +    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
 +  ;;
 +  linux* | k*bsd*-gnu)
@@ -70797,7 +69149,7 @@
 +  extract_expsyms_cmds=
 +
 +  case $host_os in
-+  cygwin* | mingw* | pw32*)
++  cygwin* | mingw* | pw32* | cegcc*)
 +    # 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++.
@@ -70884,7 +69236,7 @@
 +      fi
 +      ;;
 +
-+    cygwin* | mingw* | pw32*)
++    cygwin* | mingw* | pw32* | cegcc*)
 +      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
 +      # as there is no search path for DLLs.
 +      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -70950,6 +69302,9 @@
 +	  tmp_addflag=' -i_dynamic -nofor_main' ;;
 +	ifc* | ifort*)			# Intel Fortran compiler
 +	  tmp_addflag=' -nofor_main' ;;
++	lf95*)				# Lahey Fortran 8.1
++	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
++	  tmp_sharedflag='--shared' ;;
 +	xl[[cC]]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
 +	  tmp_sharedflag='-qmkshrobj'
 +	  tmp_addflag= ;;
@@ -71182,6 +69537,7 @@
 +	fi
 +      fi
 +
++      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
 +      # It seems that -bexpall does not export symbols beginning with
 +      # underscore (_), so it is better to generate a list of symbols to export.
 +      _LT_TAGVAR(always_export_symbols, $1)=yes
@@ -71236,7 +69592,7 @@
 +      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
 +      ;;
 +
-+    cygwin* | mingw* | pw32*)
++    cygwin* | mingw* | pw32* | cegcc*)
 +      # When not using gcc, we currently assume that we are using
 +      # Microsoft Visual C++.
 +      # hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -71340,7 +69696,7 @@
 +	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	ia64*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	*)
 +	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
@@ -72125,6 +70481,7 @@
 +          fi
 +        fi
 +
++        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
 +        # It seems that -bexpall does not export symbols beginning with
 +        # underscore (_), so it is better to generate a list of symbols to
 +	# export.
@@ -72183,7 +70540,7 @@
 +        esac
 +        ;;
 +
-+      cygwin* | mingw* | pw32*)
++      cygwin* | mingw* | pw32* | cegcc*)
 +        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
 +        # as there is no search path for DLLs.
 +        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -73568,6 +71925,18 @@
 +])
 +
 +
++# _LT_DECL_OBJDUMP
++# --------------
++# If we don't have a new enough Autoconf to choose the best objdump
++# available, choose the one first in the user's PATH.
++m4_defun([_LT_DECL_OBJDUMP],
++[AC_CHECK_TOOL(OBJDUMP, objdump, false)
++test -z "$OBJDUMP" && OBJDUMP=objdump
++_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
++AC_SUBST([OBJDUMP])
++])
++
++
 +# _LT_DECL_SED
 +# ------------
 +# Check for a fully-functional sed program, that truncates
@@ -73906,8 +72275,8 @@
 +  esac
 +])
 diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/m4/lt~obsolete.m4 fast-user-switch-applet-2.24.0.new/m4/lt~obsolete.m4
---- fast-user-switch-applet-2.24.0/m4/lt~obsolete.m4	1970-01-01 01:00:00.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/m4/lt~obsolete.m4	2009-02-09 19:52:01.000000000 +0000
+--- fast-user-switch-applet-2.24.0/m4/lt~obsolete.m4	1969-12-31 18:00:00.000000000 -0600
++++ fast-user-switch-applet-2.24.0.new/m4/lt~obsolete.m4	2009-03-04 17:19:35.000000000 -0600
 @@ -0,0 +1,92 @@
 +# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 +#
@@ -74002,8 +72371,8 @@
 +m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
 +m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
 diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/m4/ltoptions.m4 fast-user-switch-applet-2.24.0.new/m4/ltoptions.m4
---- fast-user-switch-applet-2.24.0/m4/ltoptions.m4	1970-01-01 01:00:00.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/m4/ltoptions.m4	2009-02-09 19:52:01.000000000 +0000
+--- fast-user-switch-applet-2.24.0/m4/ltoptions.m4	1969-12-31 18:00:00.000000000 -0600
++++ fast-user-switch-applet-2.24.0.new/m4/ltoptions.m4	2009-03-04 17:19:35.000000000 -0600
 @@ -0,0 +1,368 @@
 +# Helper functions for option handling.                    -*- Autoconf -*-
 +#
@@ -74132,7 +72501,7 @@
 +[enable_win32_dll=yes
 +
 +case $host in
-+*-*-cygwin* | *-*-mingw* | *-*-pw32*)
++*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
 +  AC_CHECK_TOOL(AS, as, false)
 +  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
 +  AC_CHECK_TOOL(OBJDUMP, objdump, false)
@@ -74374,19 +72743,19 @@
 +LT_OPTION_DEFINE([LTDL_INIT], [convenience],
 +		 [m4_define([_LTDL_TYPE], [convenience])])
 diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/m4/ltsugar.m4 fast-user-switch-applet-2.24.0.new/m4/ltsugar.m4
---- fast-user-switch-applet-2.24.0/m4/ltsugar.m4	1970-01-01 01:00:00.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/m4/ltsugar.m4	2009-02-09 19:52:01.000000000 +0000
+--- fast-user-switch-applet-2.24.0/m4/ltsugar.m4	1969-12-31 18:00:00.000000000 -0600
++++ fast-user-switch-applet-2.24.0.new/m4/ltsugar.m4	2009-03-04 17:19:35.000000000 -0600
 @@ -0,0 +1,123 @@
 +# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
 +#
-+#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
-+#   Written by Gary V. Vaughan, 2004
++# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
++# Written by Gary V. Vaughan, 2004
 +#
 +# This file is free software; the Free Software Foundation gives
 +# unlimited permission to copy and/or distribute it, with or without
 +# modifications, as long as this notice is preserved.
 +
-+# serial 5 ltsugar.m4
++# serial 6 ltsugar.m4
 +
 +# This is to help aclocal find these macros, as it can't see m4_define.
 +AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
@@ -74442,14 +72811,14 @@
 +# Produce a SEP delimited list of all paired combinations of elements of
 +# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
 +# has the form PREFIXmINFIXSUFFIXn.
++# Needed until we can rely on m4_combine added in Autoconf 2.62.
 +m4_define([lt_combine],
-+[m4_if([$2], [], [],
-+  [m4_if([$4], [], [],
-+    [lt_join(m4_quote(m4_default([$1], [[, ]])),
-+      lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_prefix, [$2],
-+		   [m4_foreach(_Lt_suffix, lt_car([m4_shiftn(3, $@)]),
-+			       [_Lt_prefix[]$3[]_Lt_suffix ])])))))])])dnl
-+])
++[m4_if(m4_eval([$# > 3]), [1],
++       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
++[[m4_foreach([_Lt_prefix], [$2],
++	     [m4_foreach([_Lt_suffix],
++		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
++	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
 +
 +
 +# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
@@ -74501,8 +72870,8 @@
 +		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
 +])
 diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/m4/ltversion.m4 fast-user-switch-applet-2.24.0.new/m4/ltversion.m4
---- fast-user-switch-applet-2.24.0/m4/ltversion.m4	1970-01-01 01:00:00.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/m4/ltversion.m4	2009-02-09 19:52:01.000000000 +0000
+--- fast-user-switch-applet-2.24.0/m4/ltversion.m4	1969-12-31 18:00:00.000000000 -0600
++++ fast-user-switch-applet-2.24.0.new/m4/ltversion.m4	2009-03-04 17:19:35.000000000 -0600
 @@ -0,0 +1,23 @@
 +# ltversion.m4 -- version numbers			-*- Autoconf -*-
 +#
@@ -74515,32 +72884,40 @@
 +
 +# Generated from ltversion.in.
 +
-+# serial 2976 ltversion.m4
++# serial 3012 ltversion.m4
 +# This file is part of GNU Libtool
 +
-+m4_define([LT_PACKAGE_VERSION], [2.2.4])
-+m4_define([LT_PACKAGE_REVISION], [1.2976])
++m4_define([LT_PACKAGE_VERSION], [2.2.6])
++m4_define([LT_PACKAGE_REVISION], [1.3012])
 +
 +AC_DEFUN([LTVERSION_VERSION],
-+[macro_version='2.2.4'
-+macro_revision='1.2976'
++[macro_version='2.2.6'
++macro_revision='1.3012'
 +_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 +_LT_DECL(, macro_revision, 0)
 +])
 diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/Makefile.in fast-user-switch-applet-2.24.0.new/Makefile.in
---- fast-user-switch-applet-2.24.0/Makefile.in	2008-09-22 15:25:39.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/Makefile.in	2009-02-09 19:52:09.000000000 +0000
-@@ -40,8 +40,7 @@
- 	TODO config.guess config.sub depcomp install-sh ltmain.sh \
+--- fast-user-switch-applet-2.24.0/Makefile.in	2008-09-22 09:25:39.000000000 -0500
++++ fast-user-switch-applet-2.24.0.new/Makefile.in	2009-03-04 17:19:46.000000000 -0600
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -41,7 +41,10 @@
  	missing mkinstalldirs
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
 -	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
-+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
++	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
++	$(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-@@ -91,10 +90,6 @@
+@@ -91,10 +94,6 @@
  CFLAGS = @CFLAGS@
  CPP = @CPP@
  CPPFLAGS = @CPPFLAGS@
@@ -74551,7 +72928,7 @@
  CYGPATH_W = @CYGPATH_W@
  DATADIRNAME = @DATADIRNAME@
  DEFS = @DEFS@
-@@ -105,15 +100,14 @@
+@@ -105,15 +104,14 @@
  
  DOC_USER_FORMATS = @DOC_USER_FORMATS@
  DSYMUTIL = @DSYMUTIL@
@@ -74569,7 +72946,7 @@
  GCONFTOOL = @GCONFTOOL@
  GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
  GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-@@ -156,11 +150,13 @@
+@@ -156,11 +154,13 @@
  INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
  INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
  INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
@@ -74583,12 +72960,13 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MAINT = @MAINT@
-@@ -170,9 +166,12 @@
+@@ -170,9 +170,13 @@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
  MSGMERGE = @MSGMERGE@
 +NM = @NM@
  NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
  OBJEXT = @OBJEXT@
  OMF_DIR = @OMF_DIR@
 +OTOOL = @OTOOL@
@@ -74596,7 +72974,7 @@
  PACKAGE = @PACKAGE@
  PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
-@@ -206,8 +205,7 @@
+@@ -206,8 +210,7 @@
  abs_top_builddir = @abs_top_builddir@
  abs_top_srcdir = @abs_top_srcdir@
  ac_ct_CC = @ac_ct_CC@
@@ -74606,7 +72984,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -239,6 +237,7 @@
+@@ -239,6 +242,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -74614,7 +72992,15 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
-@@ -289,8 +288,7 @@
+@@ -251,6 +255,7 @@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ users_admin = @users_admin@
+@@ -289,8 +294,7 @@
  	intltool-extract		\
  	intltool-merge			\
  	intltool-update			\
@@ -74624,9 +73010,27 @@
  
  MAINTAINERCLEANFILES = \
  	intltool-*.in	\
+@@ -372,7 +376,7 @@
+ 	-rm -rf .libs _libs
+ 
+ distclean-libtool:
+-	-rm -f libtool
++	-rm -f libtool config.lt
+ 
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+@@ -449,7 +453,7 @@
+ 	unique=`for i in $$list; do \
+ 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ 	  done | \
+-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ 	mkid -fID $$unique
+ tags: TAGS
 diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/po/Makefile.in.in fast-user-switch-applet-2.24.0.new/po/Makefile.in.in
---- fast-user-switch-applet-2.24.0/po/Makefile.in.in	2008-09-22 15:25:25.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/po/Makefile.in.in	2009-02-09 19:51:47.000000000 +0000
+--- fast-user-switch-applet-2.24.0/po/Makefile.in.in	2008-09-22 09:25:25.000000000 -0500
++++ fast-user-switch-applet-2.24.0.new/po/Makefile.in.in	2009-03-04 17:19:35.000000000 -0600
 @@ -54,16 +54,16 @@
  
  ALL_LINGUAS = @ALL_LINGUAS@
@@ -74659,30 +73063,40 @@
  	for lang in $$linguas; do \
  	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
 diff -Nur -x '*.orig' -x '*~' fast-user-switch-applet-2.24.0/src/Makefile.in fast-user-switch-applet-2.24.0.new/src/Makefile.in
---- fast-user-switch-applet-2.24.0/src/Makefile.in	2008-09-22 15:25:39.000000000 +0100
-+++ fast-user-switch-applet-2.24.0.new/src/Makefile.in	2009-02-09 19:52:09.000000000 +0000
-@@ -42,8 +42,7 @@
- subdir = src
+--- fast-user-switch-applet-2.24.0/src/Makefile.in	2008-09-22 09:25:39.000000000 -0500
++++ fast-user-switch-applet-2.24.0.new/src/Makefile.in	2009-03-04 17:19:46.000000000 -0600
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -43,7 +43,10 @@
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
 -	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
-+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
++	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
++	$(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -59,7 +58,9 @@
+@@ -59,7 +62,11 @@
  	fast_user_switch_applet-fusa-user.$(OBJEXT) \
  	fast_user_switch_applet-fusa-user-menu-item.$(OBJEXT) \
  	fast_user_switch_applet-fusa-utils.$(OBJEXT) \
 -	fast_user_switch_applet-gdm-queue.$(OBJEXT)
 +	fast_user_switch_applet-gdm-queue.$(OBJEXT) \
 +	fast_user_switch_applet-status-manager-marshal.$(OBJEXT) \
-+	fast_user_switch_applet-status-manager.$(OBJEXT)
++	fast_user_switch_applet-status-manager.$(OBJEXT) \
++	fast_user_switch_applet-fade-and-grab.$(OBJEXT) \
++	fast_user_switch_applet-logout-dialog.$(OBJEXT)
  fast_user_switch_applet_OBJECTS =  \
  	$(am_fast_user_switch_applet_OBJECTS)
  am__DEPENDENCIES_1 =
-@@ -99,10 +100,6 @@
+@@ -99,10 +106,6 @@
  CFLAGS = @CFLAGS@
  CPP = @CPP@
  CPPFLAGS = @CPPFLAGS@
@@ -74693,7 +73107,7 @@
  CYGPATH_W = @CYGPATH_W@
  DATADIRNAME = @DATADIRNAME@
  DEFS = @DEFS@
-@@ -110,15 +107,14 @@
+@@ -110,15 +113,14 @@
  DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
  DOC_USER_FORMATS = @DOC_USER_FORMATS@
  DSYMUTIL = @DSYMUTIL@
@@ -74711,7 +73125,7 @@
  GCONFTOOL = @GCONFTOOL@
  GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
  GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-@@ -161,11 +157,13 @@
+@@ -161,11 +163,13 @@
  INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
  INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
  INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
@@ -74725,12 +73139,13 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MAINT = @MAINT@
-@@ -175,9 +173,12 @@
+@@ -175,9 +179,13 @@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
  MSGMERGE = @MSGMERGE@
 +NM = @NM@
  NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
  OBJEXT = @OBJEXT@
  OMF_DIR = @OMF_DIR@
 +OTOOL = @OTOOL@
@@ -74738,7 +73153,7 @@
  PACKAGE = @PACKAGE@
  PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
-@@ -211,8 +212,7 @@
+@@ -211,8 +219,7 @@
  abs_top_builddir = @abs_top_builddir@
  abs_top_srcdir = @abs_top_srcdir@
  ac_ct_CC = @ac_ct_CC@
@@ -74748,7 +73163,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -244,6 +244,7 @@
+@@ -244,6 +251,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -74756,7 +73171,15 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
-@@ -267,6 +268,8 @@
+@@ -256,6 +264,7 @@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ users_admin = @users_admin@
+@@ -267,6 +276,8 @@
  	Makefile.in
  
  EXTRA_DIST = \
@@ -74765,14 +73188,17 @@
  	fusa-display.h			\
  	fusa-display-private.h		\
  	fusa-manager.h			\
-@@ -275,7 +278,13 @@
+@@ -275,7 +286,16 @@
  	fusa-user-menu-item.h		\
  	fusa-user-private.h		\
  	fusa-utils.h			\
 -	gdm-queue.h
++	applet.h			\
 +	gdm-queue.h			\
 +	status-manager-marshal.h	\
-+	status-manager.h
++	status-manager.h		\
++	fade-and-grab.h			\
++	logout-dialog.h
 +
 +DISTCLEANFILES = \
 +	status-manager-marshal.c	\
@@ -74780,27 +73206,48 @@
  
  fast_user_switch_applet_CPPFLAGS = \
  	-DG_LOG_DOMAIN=\""Fast-User-Switch-Applet"\"	\
-@@ -290,7 +299,9 @@
+@@ -290,7 +310,11 @@
  	fusa-user.c					\
  	fusa-user-menu-item.c				\
  	fusa-utils.c					\
 -	gdm-queue.c
 +	gdm-queue.c					\
 +	status-manager-marshal.c			\
-+	status-manager.c
++	status-manager.c				\
++	fade-and-grab.c					\
++	logout-dialog.c
  
  fast_user_switch_applet_LDADD = \
  	$(APPLET_LIBS)					\
-@@ -374,6 +385,8 @@
+@@ -304,8 +328,8 @@
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+ 	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
++	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++	        && { if test -f $@; then exit 0; else break; fi; }; \
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+@@ -368,12 +392,16 @@
+ 	-rm -f *.tab.c
+ 
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fast_user_switch_applet-applet.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fast_user_switch_applet-fade-and-grab.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fast_user_switch_applet-fusa-display.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fast_user_switch_applet-fusa-manager.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fast_user_switch_applet-fusa-user-menu-item.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fast_user_switch_applet-fusa-user.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fast_user_switch_applet-fusa-utils.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fast_user_switch_applet-gdm-queue.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fast_user_switch_applet-logout-dialog.Po@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fast_user_switch_applet-status-manager-marshal.Po@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fast_user_switch_applet-status-manager.Po@am__quote@
  
  .c.o:
  @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -494,6 +507,34 @@
+@@ -494,6 +522,62 @@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fast_user_switch_applet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fast_user_switch_applet-gdm-queue.obj `if test -f 'gdm-queue.c'; then $(CYGPATH_W) 'gdm-queue.c'; else $(CYGPATH_W) '$(srcdir)/gdm-queue.c'; fi`
  
@@ -74832,10 +73279,47 @@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fast_user_switch_applet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fast_user_switch_applet-status-manager.obj `if test -f 'status-manager.c'; then $(CYGPATH_W) 'status-manager.c'; else $(CYGPATH_W) '$(srcdir)/status-manager.c'; fi`
 +
++fast_user_switch_applet-fade-and-grab.o: fade-and-grab.c
++@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fast_user_switch_applet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fast_user_switch_applet-fade-and-grab.o -MD -MP -MF $(DEPDIR)/fast_user_switch_applet-fade-and-grab.Tpo -c -o fast_user_switch_applet-fade-and-grab.o `test -f 'fade-and-grab.c' || echo '$(srcdir)/'`fade-and-grab.c
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/fast_user_switch_applet-fade-and-grab.Tpo $(DEPDIR)/fast_user_switch_applet-fade-and-grab.Po
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fade-and-grab.c' object='fast_user_switch_applet-fade-and-grab.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fast_user_switch_applet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fast_user_switch_applet-fade-and-grab.o `test -f 'fade-and-grab.c' || echo '$(srcdir)/'`fade-and-grab.c
++
++fast_user_switch_applet-fade-and-grab.obj: fade-and-grab.c
++@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fast_user_switch_applet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fast_user_switch_applet-fade-and-grab.obj -MD -MP -MF $(DEPDIR)/fast_user_switch_applet-fade-and-grab.Tpo -c -o fast_user_switch_applet-fade-and-grab.obj `if test -f 'fade-and-grab.c'; then $(CYGPATH_W) 'fade-and-grab.c'; else $(CYGPATH_W) '$(srcdir)/fade-and-grab.c'; fi`
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/fast_user_switch_applet-fade-and-grab.Tpo $(DEPDIR)/fast_user_switch_applet-fade-and-grab.Po
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fade-and-grab.c' object='fast_user_switch_applet-fade-and-grab.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fast_user_switch_applet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fast_user_switch_applet-fade-and-grab.obj `if test -f 'fade-and-grab.c'; then $(CYGPATH_W) 'fade-and-grab.c'; else $(CYGPATH_W) '$(srcdir)/fade-and-grab.c'; fi`
++
++fast_user_switch_applet-logout-dialog.o: logout-dialog.c
++@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fast_user_switch_applet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fast_user_switch_applet-logout-dialog.o -MD -MP -MF $(DEPDIR)/fast_user_switch_applet-logout-dialog.Tpo -c -o fast_user_switch_applet-logout-dialog.o `test -f 'logout-dialog.c' || echo '$(srcdir)/'`logout-dialog.c
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/fast_user_switch_applet-logout-dialog.Tpo $(DEPDIR)/fast_user_switch_applet-logout-dialog.Po
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='logout-dialog.c' object='fast_user_switch_applet-logout-dialog.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fast_user_switch_applet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fast_user_switch_applet-logout-dialog.o `test -f 'logout-dialog.c' || echo '$(srcdir)/'`logout-dialog.c
++
++fast_user_switch_applet-logout-dialog.obj: logout-dialog.c
++@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fast_user_switch_applet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fast_user_switch_applet-logout-dialog.obj -MD -MP -MF $(DEPDIR)/fast_user_switch_applet-logout-dialog.Tpo -c -o fast_user_switch_applet-logout-dialog.obj `if test -f 'logout-dialog.c'; then $(CYGPATH_W) 'logout-dialog.c'; else $(CYGPATH_W) '$(srcdir)/logout-dialog.c'; fi`
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/fast_user_switch_applet-logout-dialog.Tpo $(DEPDIR)/fast_user_switch_applet-logout-dialog.Po
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='logout-dialog.c' object='fast_user_switch_applet-logout-dialog.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fast_user_switch_applet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fast_user_switch_applet-logout-dialog.obj `if test -f 'logout-dialog.c'; then $(CYGPATH_W) 'logout-dialog.c'; else $(CYGPATH_W) '$(srcdir)/logout-dialog.c'; fi`
++
  mostlyclean-libtool:
  	-rm -f *.lo
  
-@@ -600,6 +641,7 @@
+@@ -505,7 +589,7 @@
+ 	unique=`for i in $$list; do \
+ 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ 	  done | \
+-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ 	mkid -fID $$unique
+ tags: TAGS
+@@ -600,6 +684,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -74843,7 +73327,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -681,6 +723,10 @@
+@@ -681,6 +766,10 @@
  	tags uninstall uninstall-am uninstall-libexecPROGRAMS
  
  

=== modified file 'debian/patches/94_user_manager_signals.patch'
--- debian/patches/94_user_manager_signals.patch	2008-10-29 20:12:28 +0000
+++ debian/patches/94_user_manager_signals.patch	2009-03-05 15:56:04 +0000
@@ -1,7 +1,7 @@
 === modified file 'src/applet.c'
---- src/applet.c	2008-10-28 21:54:31 +0000
-+++ src/applet.c	2008-10-28 21:54:50 +0000
-@@ -3022,6 +3022,8 @@
+--- src/applet.c	2009-03-05 02:18:33 +0000
++++ src/applet.c	2009-03-05 02:18:45 +0000
+@@ -3442,6 +3442,8 @@
  static void
  fusa_applet_data_free (FusaAppletData *adata)
  {
@@ -10,7 +10,7 @@
    if (adata->prefs)
      gtk_widget_destroy (adata->prefs);
  
-@@ -3033,10 +3035,36 @@
+@@ -3453,10 +3455,36 @@
    g_object_unref (adata->client);
  
    /* User manager */