r16531 - in /desktop/unstable/gnome-applets/debian: changelog control control.in patches/01_distclean.patch patches/09_modemlights_use_new_gst.patch patches/80_mixer_user_gstreamer_signals.patch patches/98_autoreconf.patch patches/series rules

joss at users.alioth.debian.org joss at users.alioth.debian.org
Tue Jul 15 09:30:32 UTC 2008


Author: joss
Date: Tue Jul 15 09:30:32 2008
New Revision: 16531

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16531
Log:
* NACK 2.22.3-1.1 NMU.
* Switch to quilt for patch handling, refresh patches, build-depend on 
  quilt.
* 01_distclean.patch: patch from Peter Eisentraut to fix FTBFS if 
  built twice in a row. Closes: #424337.
* 98_autoreconf.patch: regenerated.

Added:
    desktop/unstable/gnome-applets/debian/patches/01_distclean.patch
    desktop/unstable/gnome-applets/debian/patches/series
Modified:
    desktop/unstable/gnome-applets/debian/changelog
    desktop/unstable/gnome-applets/debian/control
    desktop/unstable/gnome-applets/debian/control.in
    desktop/unstable/gnome-applets/debian/patches/09_modemlights_use_new_gst.patch
    desktop/unstable/gnome-applets/debian/patches/80_mixer_user_gstreamer_signals.patch
    desktop/unstable/gnome-applets/debian/patches/98_autoreconf.patch
    desktop/unstable/gnome-applets/debian/rules

Modified: desktop/unstable/gnome-applets/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/changelog?rev=16531&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/changelog (original)
+++ desktop/unstable/gnome-applets/debian/changelog Tue Jul 15 09:30:32 2008
@@ -1,3 +1,14 @@
+gnome-applets (2.22.3-2) UNRELEASED; urgency=low
+
+  * NACK 2.22.3-1.1 NMU.
+  * Switch to quilt for patch handling, refresh patches, build-depend on 
+    quilt.
+  * 01_distclean.patch: patch from Peter Eisentraut to fix FTBFS if 
+    built twice in a row. Closes: #424337.
+  * 98_autoreconf.patch: regenerated.
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 15 Jul 2008 11:22:23 +0200
+
 gnome-applets (2.22.3-1) unstable; urgency=low
 
   [ Josselin Mouette ]

Modified: desktop/unstable/gnome-applets/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/control?rev=16531&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/control (original)
+++ desktop/unstable/gnome-applets/debian/control Tue Jul 15 09:30:32 2008
@@ -7,6 +7,7 @@
 Build-Depends: cdbs (>= 0.4.41),
                autotools-dev,
                debhelper (>= 5.0.13),
+               quilt,
                patchutils,
                type-handling,
                libgtk2.0-dev (>= 2.11.0),

Modified: desktop/unstable/gnome-applets/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/control.in?rev=16531&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/control.in (original)
+++ desktop/unstable/gnome-applets/debian/control.in Tue Jul 15 09:30:32 2008
@@ -7,6 +7,7 @@
 Build-Depends: cdbs (>= 0.4.41),
                autotools-dev,
                debhelper (>= 5.0.13),
+               quilt,
                patchutils,
                type-handling,
                libgtk2.0-dev (>= 2.11.0),

Added: desktop/unstable/gnome-applets/debian/patches/01_distclean.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/patches/01_distclean.patch?rev=16531&op=file
==============================================================================
--- desktop/unstable/gnome-applets/debian/patches/01_distclean.patch (added)
+++ desktop/unstable/gnome-applets/debian/patches/01_distclean.patch Tue Jul 15 09:30:32 2008
@@ -1,0 +1,15 @@
+Index: gnome-applets-2.22.3/invest-applet/data/Makefile.am
+===================================================================
+--- gnome-applets-2.22.3.orig/invest-applet/data/Makefile.am	2008-07-15 11:24:07.958681051 +0200
++++ gnome-applets-2.22.3/invest-applet/data/Makefile.am	2008-07-15 11:24:19.893239425 +0200
+@@ -46,8 +46,8 @@
+ #endif
+ 
+ DISTCLEANFILES = \
+-	$(server_DATA) \
+-	$(server_in_files)
++	$(server_in_files) \
++	$(server_in_files:.server.in=.server)
+ 
+ EXTRA_DIST = \
+ 	Invest_Applet.server.in.in \

Modified: desktop/unstable/gnome-applets/debian/patches/09_modemlights_use_new_gst.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/patches/09_modemlights_use_new_gst.patch?rev=16531&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/patches/09_modemlights_use_new_gst.patch (original)
+++ desktop/unstable/gnome-applets/debian/patches/09_modemlights_use_new_gst.patch Tue Jul 15 09:30:32 2008
@@ -1,7 +1,8 @@
-diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.1/configure.in gnome-applets-2.21.1.new/configure.in
---- gnome-applets-2.21.1/configure.in	2007-11-18 17:38:50.000000000 +0100
-+++ gnome-applets-2.21.1.new/configure.in	2007-11-18 17:39:03.000000000 +0100
-@@ -24,6 +24,7 @@
+Index: gnome-applets-2.22.3/configure.in
+===================================================================
+--- gnome-applets-2.22.3.orig/configure.in	2008-06-30 11:27:15.000000000 +0200
++++ gnome-applets-2.22.3/configure.in	2008-07-15 11:22:58.350681152 +0200
+@@ -25,6 +25,7 @@
  LIBGAIL_REQUIRED=1.1.0
  LIBXKLAVIER_REQUIRED=2.91
  LIBWNCK_REQUIRED=2.9.3
@@ -9,7 +10,7 @@
  SYSTEM_TOOLS_BACKENDS_REQUIRED=1.1.3
  LIBGNOME_DESKTOP_REQUIRED=2.11.1
  LIBNOTIFY_REQUIRED=0.3.2
-@@ -509,25 +510,21 @@
+@@ -515,25 +516,21 @@
  dnl *** modemlights applet check                                            ***
  dnl ***************************************************************************
  
@@ -44,9 +45,10 @@
  AM_CONDITIONAL(APPLET_MODEMLIGHTS, test "x$BUILD_MODEM_LIGHTS" = "xyes")
  
  dnl ***************************************************************************
-diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.1/modemlights/Makefile.am gnome-applets-2.21.1.new/modemlights/Makefile.am
---- gnome-applets-2.21.1/modemlights/Makefile.am	2007-07-28 04:03:06.000000000 +0200
-+++ gnome-applets-2.21.1.new/modemlights/Makefile.am	2007-11-18 17:39:03.000000000 +0100
+Index: gnome-applets-2.22.3/modemlights/Makefile.am
+===================================================================
+--- gnome-applets-2.22.3.orig/modemlights/Makefile.am	2008-05-27 13:39:34.000000000 +0200
++++ gnome-applets-2.22.3/modemlights/Makefile.am	2008-07-15 11:22:58.350681152 +0200
 @@ -1,7 +1,8 @@
  #SUBDIRS = docs
  
@@ -58,9 +60,10 @@
  	$(LIBGLADE_CFLAGS)
  
  libexec_PROGRAMS = modem_applet
-diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.1/modemlights/modem-applet.c gnome-applets-2.21.1.new/modemlights/modem-applet.c
---- gnome-applets-2.21.1/modemlights/modem-applet.c	2007-10-13 11:41:35.000000000 +0200
-+++ gnome-applets-2.21.1.new/modemlights/modem-applet.c	2007-11-18 17:39:03.000000000 +0100
+Index: gnome-applets-2.22.3/modemlights/modem-applet.c
+===================================================================
+--- gnome-applets-2.22.3.orig/modemlights/modem-applet.c	2008-05-27 13:39:34.000000000 +0200
++++ gnome-applets-2.22.3/modemlights/modem-applet.c	2008-07-15 11:22:58.350681152 +0200
 @@ -1,5 +1,5 @@
 -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 2 -*- */
 -/* Copyright (C) 2004 Carlos Garnacho
@@ -156,7 +159,7 @@
  };
  
  static void modem_applet_class_init (ModemAppletClass *class);
-@@ -138,8 +92,6 @@
+@@ -138,8 +91,6 @@
  					   gboolean     backend_alive,
  					   gboolean     already_waiting);
  
@@ -165,7 +168,7 @@
  static const BonoboUIVerb menu_verbs[] = {
    BONOBO_UI_UNSAFE_VERB ("Activate",   on_modem_applet_activate),
    BONOBO_UI_UNSAFE_VERB ("Deactivate", on_modem_applet_deactivate),
-@@ -159,7 +111,6 @@
+@@ -159,7 +110,6 @@
  
    object_class = G_OBJECT_CLASS (class);
    applet_class = PANEL_APPLET_CLASS (class);
@@ -173,7 +176,7 @@
  
    object_class->finalize    = modem_applet_finalize;
    applet_class->change_size = modem_applet_change_size;
-@@ -168,6 +119,43 @@
+@@ -168,6 +118,43 @@
    g_type_class_add_private (object_class, sizeof (ModemAppletPrivate));
  }
  
@@ -217,7 +220,7 @@
  static void
  modem_applet_init (ModemApplet *applet)
  {
-@@ -183,9 +184,9 @@
+@@ -183,9 +170,9 @@
    priv->icon_theme = gtk_icon_theme_get_default ();
    priv->image = gtk_image_new ();
  
@@ -230,7 +233,7 @@
  
    priv->report_window          = glade_xml_get_widget (priv->xml, "report_window");
    priv->report_window_image    = glade_xml_get_widget (priv->xml, "report_window_image");
-@@ -197,20 +199,8 @@
+@@ -197,20 +184,8 @@
    pixbuf = gtk_icon_theme_load_icon (priv->icon_theme, "gnome-modem-monitor-applet", 48, 0, NULL);
    gtk_image_set_from_pixbuf (GTK_IMAGE (priv->report_window_image), pixbuf);
    gdk_pixbuf_unref (pixbuf);
@@ -252,7 +255,7 @@
    gtk_container_add (GTK_CONTAINER (applet), priv->image);
  }
  
-@@ -221,18 +211,25 @@
+@@ -221,18 +196,25 @@
  
    if (priv)
      {
@@ -263,15 +266,15 @@
 +      g_object_unref (priv->xml);
        g_object_unref (priv->icon);
 +      gtk_widget_destroy (priv->image);
- 
--      g_free (priv->dev);
--      g_free (priv->lock_file);
++
 +      if (priv->pulse_id)
 +	{
 +	  g_source_remove (priv->pulse_id);
 +	  priv->pulse_id = 0;
 +	}
-+
+ 
+-      g_free (priv->dev);
+-      g_free (priv->lock_file);
 +      if (priv->tooltip_id)
 +	{
 +	  g_source_remove (priv->tooltip_id);
@@ -286,7 +289,7 @@
  }
  
  static void
-@@ -287,401 +284,26 @@
+@@ -287,401 +269,26 @@
      }
  }
  
@@ -692,7 +695,7 @@
  static gint
  get_connection_time (const gchar *lock_file)
  {
-@@ -700,30 +322,30 @@
+@@ -700,30 +307,30 @@
    gchar *text;
    gint   t, t1, t2;
  
@@ -743,7 +746,7 @@
  
    gtk_widget_set_tooltip_text (GTK_WIDGET (applet), text);
    g_free (text);
-@@ -731,165 +353,8 @@
+@@ -731,165 +338,8 @@
    return TRUE;
  }
  
@@ -812,7 +815,7 @@
 -  update_popup_buttons (applet);
 -}
 -
- static gboolean
+-static gboolean
 -update_info (ModemApplet *applet)
 -{
 -  queue_directive (applet, update_info_callback,
@@ -820,7 +823,7 @@
 -  return TRUE;
 -}
 -
--static gboolean
+ static gboolean
 -check_backend (ModemApplet *applet)
 -{
 -  ModemAppletPrivate *priv = MODEM_APPLET_GET_PRIVATE (applet);
@@ -910,7 +913,7 @@
  {
    gchar    *argv[4], *application;
    gboolean  ret;
-@@ -900,8 +365,8 @@
+@@ -900,8 +350,8 @@
      return FALSE;
  
    argv[0] = application;
@@ -921,7 +924,7 @@
    argv[3] = NULL;
  
    ret = gdk_spawn_on_screen (screen, NULL, argv, NULL, 0,
-@@ -910,52 +375,48 @@
+@@ -910,52 +360,48 @@
    return ret;
  }
  
@@ -1003,7 +1006,7 @@
  }
  
  static void
-@@ -963,7 +424,14 @@
+@@ -963,7 +409,14 @@
  			  ModemApplet       *applet,
  			  const gchar       *verb)
  {
@@ -1019,7 +1022,7 @@
  }
  
  static void
-@@ -971,7 +439,12 @@
+@@ -971,7 +424,12 @@
  			    ModemApplet       *applet,
  			    const gchar       *verb)
  {
@@ -1033,7 +1036,7 @@
  }
  
  static void
-@@ -985,7 +458,7 @@
+@@ -985,7 +443,7 @@
  
    screen = gtk_widget_get_screen (GTK_WIDGET (applet));
  
@@ -1042,9 +1045,10 @@
      {
        dialog = gtk_message_dialog_new (NULL,
  				       GTK_DIALOG_DESTROY_WITH_PARENT,
-diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.1/modemlights/modemlights.glade gnome-applets-2.21.1.new/modemlights/modemlights.glade
---- gnome-applets-2.21.1/modemlights/modemlights.glade	2007-07-28 04:03:06.000000000 +0200
-+++ gnome-applets-2.21.1.new/modemlights/modemlights.glade	2007-11-18 17:39:03.000000000 +0100
+Index: gnome-applets-2.22.3/modemlights/modemlights.glade
+===================================================================
+--- gnome-applets-2.22.3.orig/modemlights/modemlights.glade	2008-05-27 13:39:34.000000000 +0200
++++ gnome-applets-2.22.3/modemlights/modemlights.glade	2008-07-15 11:22:58.350681152 +0200
 @@ -2,222 +2,6 @@
  <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
  

Modified: desktop/unstable/gnome-applets/debian/patches/80_mixer_user_gstreamer_signals.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/patches/80_mixer_user_gstreamer_signals.patch?rev=16531&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/patches/80_mixer_user_gstreamer_signals.patch (original)
+++ desktop/unstable/gnome-applets/debian/patches/80_mixer_user_gstreamer_signals.patch Tue Jul 15 09:30:32 2008
@@ -1,9 +1,10 @@
-diff -ur gnome-applets-2.19.1/mixer/applet.c gnome-applets-2.19.1.new/mixer/applet.c
---- gnome-applets-2.19.1/mixer/applet.c	2007-07-28 03:02:35.000000000 +0100
-+++ gnome-applets-2.19.1.new/mixer/applet.c	2007-08-30 20:36:22.000000000 +0100
+Index: gnome-applets-2.22.3/mixer/applet.c
+===================================================================
+--- gnome-applets-2.22.3.orig/mixer/applet.c	2008-05-27 13:15:41.000000000 +0200
++++ gnome-applets-2.22.3/mixer/applet.c	2008-07-15 11:23:03.678676540 +0200
 @@ -80,6 +80,9 @@
  
- static void	gnome_volume_applet_refresh	(GnomeVolumeApplet *applet,
+ static gboolean	gnome_volume_applet_refresh	(GnomeVolumeApplet *applet,
  						 gboolean           force_refresh);
 +
 +static void     cb_notify_message (GstBus *bus, GstMessage *message, gpointer data);
@@ -11,7 +12,7 @@
  static gboolean	cb_check			(gpointer   data);
  
  static void	cb_volume			(GtkAdjustment *adj,
-@@ -242,6 +245,12 @@
+@@ -218,6 +221,12 @@
    /* i18n */
    ao = gtk_widget_get_accessible (GTK_WIDGET (applet));
    atk_object_set_name (ao, _("Volume Control"));
@@ -24,7 +25,7 @@
  }
  
  /* Parse the list of tracks that are stored in GConf */
-@@ -368,12 +377,33 @@
+@@ -344,12 +353,33 @@
      return FALSE;
  
    applet->mixer = g_object_ref (active_element);
@@ -58,7 +59,7 @@
  gboolean
  gnome_volume_applet_setup (GnomeVolumeApplet *applet,
  			   GList *elements)
-@@ -436,9 +466,8 @@
+@@ -412,9 +442,8 @@
    g_signal_connect (component, "ui-event", G_CALLBACK (cb_ui_event), applet);
  
    gnome_volume_applet_refresh (applet, TRUE);
@@ -70,7 +71,7 @@
  
    if (res) {
      /* gconf */
-@@ -479,6 +508,11 @@
+@@ -455,6 +484,11 @@
      g_list_free (applet->elements);
      applet->elements = NULL;
    }
@@ -82,7 +83,7 @@
  
    if (applet->tracks) {
      g_list_foreach (applet->tracks, (GFunc) g_object_unref, NULL);
-@@ -1049,6 +1083,8 @@
+@@ -1025,6 +1059,8 @@
  
    applet->lock = FALSE;
    applet->force_next_update = TRUE;
@@ -91,8 +92,8 @@
  }
  
  /*
-@@ -1152,6 +1188,36 @@
- 				"state", mute ? "1" : "0", NULL);
+@@ -1129,6 +1165,36 @@
+   return did_change;
  }
  
 +static void
@@ -128,7 +129,7 @@
  static gboolean
  cb_check (gpointer data)
  {
-@@ -1214,6 +1280,8 @@
+@@ -1227,6 +1293,8 @@
              /* save */
              gst_object_replace ((GstObject **) &applet->mixer, item->data);
              gst_element_set_state (old_element, GST_STATE_NULL);
@@ -137,9 +138,10 @@
              newdevice = TRUE;
            }
            break;
-diff -ur gnome-applets-2.19.1/mixer/applet.h gnome-applets-2.19.1.new/mixer/applet.h
---- gnome-applets-2.19.1/mixer/applet.h	2007-07-28 03:02:35.000000000 +0100
-+++ gnome-applets-2.19.1.new/mixer/applet.h	2007-08-30 20:21:10.000000000 +0100
+Index: gnome-applets-2.22.3/mixer/applet.h
+===================================================================
+--- gnome-applets-2.22.3.orig/mixer/applet.h	2008-05-27 13:15:41.000000000 +0200
++++ gnome-applets-2.22.3/mixer/applet.h	2008-07-15 11:23:03.678676540 +0200
 @@ -71,6 +71,7 @@
  
    /* element */

Modified: desktop/unstable/gnome-applets/debian/patches/98_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/patches/98_autoreconf.patch?rev=16531&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/patches/98_autoreconf.patch (original)
+++ desktop/unstable/gnome-applets/debian/patches/98_autoreconf.patch Tue Jul 15 09:30:32 2008
@@ -1,6 +1,12 @@
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/accessx-status/docs/Makefile.in gnome-applets-2.22.3/accessx-status/docs/Makefile.in
---- gnome-applets-2.22.3.old/accessx-status/docs/Makefile.in	2008-06-30 11:29:36.000000000 +0200
-+++ gnome-applets-2.22.3/accessx-status/docs/Makefile.in	2008-06-30 12:57:41.000000000 +0200
+libtoolize --force --copy
+aclocal-1.10 -I m4
+automake-1.10 -acf
+autoconf
+
+Index: gnome-applets-2.22.3/accessx-status/docs/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/accessx-status/docs/Makefile.in	2008-07-15 11:23:14.046671286 +0200
++++ gnome-applets-2.22.3/accessx-status/docs/Makefile.in	2008-07-15 11:27:05.458680493 +0200
 @@ -62,7 +62,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -27,17 +33,10 @@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -319,6 +317,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/accessx-status/Makefile.in gnome-applets-2.22.3/accessx-status/Makefile.in
---- gnome-applets-2.22.3.old/accessx-status/Makefile.in	2008-06-30 11:29:36.000000000 +0200
-+++ gnome-applets-2.22.3/accessx-status/Makefile.in	2008-06-30 12:57:41.000000000 +0200
+Index: gnome-applets-2.22.3/accessx-status/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/accessx-status/Makefile.in	2008-07-15 11:23:14.034685684 +0200
++++ gnome-applets-2.22.3/accessx-status/Makefile.in	2008-07-15 11:27:05.322669771 +0200
 @@ -41,7 +41,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -64,17 +63,10 @@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -340,6 +338,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = docs pixmaps
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/accessx-status/pixmaps/Makefile.in gnome-applets-2.22.3/accessx-status/pixmaps/Makefile.in
---- gnome-applets-2.22.3.old/accessx-status/pixmaps/Makefile.in	2008-06-30 11:29:36.000000000 +0200
-+++ gnome-applets-2.22.3/accessx-status/pixmaps/Makefile.in	2008-06-30 12:57:42.000000000 +0200
+Index: gnome-applets-2.22.3/accessx-status/pixmaps/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/accessx-status/pixmaps/Makefile.in	2008-07-15 11:23:14.030701309 +0200
++++ gnome-applets-2.22.3/accessx-status/pixmaps/Makefile.in	2008-07-15 11:27:05.546696708 +0200
 @@ -38,7 +38,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -101,28 +93,10 @@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -306,6 +304,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- accessx_status_iconsdir = $(iconsdir)/hicolor/48x48/apps
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/aclocal.m4 gnome-applets-2.22.3/aclocal.m4
---- gnome-applets-2.22.3.old/aclocal.m4	2008-06-30 11:29:33.000000000 +0200
-+++ gnome-applets-2.22.3/aclocal.m4	2008-06-30 12:57:24.000000000 +0200
-@@ -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(AC_AUTOCONF_VERSION, [2.62],,
-+[m4_warning([this file was generated for autoconf 2.62.
- 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'.])])
+Index: gnome-applets-2.22.3/aclocal.m4
+===================================================================
+--- gnome-applets-2.22.3.orig/aclocal.m4	2008-07-15 11:23:14.022671448 +0200
++++ gnome-applets-2.22.3/aclocal.m4	2008-07-15 11:26:11.642714218 +0200
 @@ -636,7 +636,7 @@
  
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -137,9 +111,10 @@
  m4_include([m4/intltool.m4])
  m4_include([m4/python.m4])
 -m4_include([m4/system-tools-backends.m4])
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/battstat/apmlib/Makefile.in gnome-applets-2.22.3/battstat/apmlib/Makefile.in
---- gnome-applets-2.22.3.old/battstat/apmlib/Makefile.in	2008-06-30 11:29:36.000000000 +0200
-+++ gnome-applets-2.22.3/battstat/apmlib/Makefile.in	2008-06-30 12:57:45.000000000 +0200
+Index: gnome-applets-2.22.3/battstat/apmlib/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/battstat/apmlib/Makefile.in	2008-07-15 11:23:14.006691903 +0200
++++ gnome-applets-2.22.3/battstat/apmlib/Makefile.in	2008-07-15 11:27:05.766696457 +0200
 @@ -44,7 +44,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -166,17 +141,10 @@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -321,6 +319,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = \
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/battstat/docs/Makefile.in gnome-applets-2.22.3/battstat/docs/Makefile.in
---- gnome-applets-2.22.3.old/battstat/docs/Makefile.in	2008-06-30 11:29:37.000000000 +0200
-+++ gnome-applets-2.22.3/battstat/docs/Makefile.in	2008-06-30 12:57:45.000000000 +0200
+Index: gnome-applets-2.22.3/battstat/docs/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/battstat/docs/Makefile.in	2008-07-15 11:23:13.998697940 +0200
++++ gnome-applets-2.22.3/battstat/docs/Makefile.in	2008-07-15 11:27:05.890680580 +0200
 @@ -62,7 +62,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -203,17 +171,10 @@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -319,6 +317,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/battstat/Makefile.in gnome-applets-2.22.3/battstat/Makefile.in
---- gnome-applets-2.22.3.old/battstat/Makefile.in	2008-06-30 11:29:36.000000000 +0200
-+++ gnome-applets-2.22.3/battstat/Makefile.in	2008-06-30 12:57:44.000000000 +0200
+Index: gnome-applets-2.22.3/battstat/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/battstat/Makefile.in	2008-07-15 11:23:13.986671132 +0200
++++ gnome-applets-2.22.3/battstat/Makefile.in	2008-07-15 11:27:05.666696317 +0200
 @@ -40,7 +40,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -240,17 +201,10 @@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -347,6 +345,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- glade_DATA = battstat_applet.glade
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/battstat/sounds/Makefile.in gnome-applets-2.22.3/battstat/sounds/Makefile.in
---- gnome-applets-2.22.3.old/battstat/sounds/Makefile.in	2008-06-30 11:29:37.000000000 +0200
-+++ gnome-applets-2.22.3/battstat/sounds/Makefile.in	2008-06-30 12:57:46.000000000 +0200
+Index: gnome-applets-2.22.3/battstat/sounds/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/battstat/sounds/Makefile.in	2008-07-15 11:23:13.978671442 +0200
++++ gnome-applets-2.22.3/battstat/sounds/Makefile.in	2008-07-15 11:27:05.974697543 +0200
 @@ -38,7 +38,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -277,17 +231,10 @@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -304,6 +302,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- soundlistdir = $(sysconfdir)/sound/events
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/charpick/help/Makefile.in gnome-applets-2.22.3/charpick/help/Makefile.in
---- gnome-applets-2.22.3.old/charpick/help/Makefile.in	2008-06-30 11:29:37.000000000 +0200
-+++ gnome-applets-2.22.3/charpick/help/Makefile.in	2008-06-30 12:57:48.000000000 +0200
+Index: gnome-applets-2.22.3/charpick/help/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/charpick/help/Makefile.in	2008-07-15 11:23:13.970696476 +0200
++++ gnome-applets-2.22.3/charpick/help/Makefile.in	2008-07-15 11:27:06.227690869 +0200
 @@ -62,7 +62,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -314,17 +261,10 @@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -319,6 +317,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/charpick/Makefile.in gnome-applets-2.22.3/charpick/Makefile.in
---- gnome-applets-2.22.3.old/charpick/Makefile.in	2008-06-30 11:29:37.000000000 +0200
-+++ gnome-applets-2.22.3/charpick/Makefile.in	2008-06-30 12:57:47.000000000 +0200
+Index: gnome-applets-2.22.3/charpick/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/charpick/Makefile.in	2008-07-15 11:23:13.962671433 +0200
++++ gnome-applets-2.22.3/charpick/Makefile.in	2008-07-15 11:27:06.090698947 +0200
 @@ -40,7 +40,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -351,17 +291,10 @@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -343,6 +341,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = help
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/config.h.in gnome-applets-2.22.3/config.h.in
---- gnome-applets-2.22.3.old/config.h.in	2008-06-30 11:29:36.000000000 +0200
-+++ gnome-applets-2.22.3/config.h.in	2008-06-30 12:57:35.000000000 +0200
+Index: gnome-applets-2.22.3/config.h.in
+===================================================================
+--- gnome-applets-2.22.3.orig/config.h.in	2008-07-15 11:23:13.954670975 +0200
++++ gnome-applets-2.22.3/config.h.in	2008-07-15 11:25:19.831700947 +0200
 @@ -135,15 +135,9 @@
  /* install prefix */
  #undef PREFIX
@@ -378,263 +311,11 @@
  /* sysconfdir */
  #undef SYSCONFDIR
  
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/configure gnome-applets-2.22.3/configure
---- gnome-applets-2.22.3.old/configure	2008-06-30 11:29:35.000000000 +0200
-+++ gnome-applets-2.22.3/configure	2008-06-30 12:57:33.000000000 +0200
-@@ -1,9 +1,9 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.61 for gnome-applets 2.22.3.
-+# Generated by GNU Autoconf 2.62 for gnome-applets 2.22.3.
- #
- # 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 at gnu.org about your system,
--  echo including any error possibly output before this
--  echo message
-+  echo Please tell bug-autoconf at 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
-@@ -818,6 +840,7 @@
- install_sh
- STRIP
- INSTALL_STRIP_PROGRAM
-+MKDIR_P
- mkdir_p
- AWK
- SET_MAKE
-@@ -828,6 +851,9 @@
+Index: gnome-applets-2.22.3/configure
+===================================================================
+--- gnome-applets-2.22.3.orig/configure	2008-07-15 11:23:13.946670377 +0200
++++ gnome-applets-2.22.3/configure	2008-07-15 11:27:14.138669640 +0200
+@@ -828,6 +828,9 @@
  MAINTAINER_MODE_TRUE
  MAINTAINER_MODE_FALSE
  MAINT
@@ -644,7 +325,7 @@
  INTLTOOL_DESKTOP_RULE
  INTLTOOL_DIRECTORY_RULE
  INTLTOOL_KEYS_RULE
-@@ -850,9 +876,6 @@
+@@ -850,9 +853,6 @@
  XGETTEXT
  MSGMERGE
  MSGFMT
@@ -654,7 +335,7 @@
  INTLTOOL_PERL
  ALL_LINGUAS
  CC
-@@ -1029,8 +1052,7 @@
+@@ -1029,8 +1029,7 @@
  HAVE_XKB
  APPLET_ACCESSX_TRUE
  APPLET_ACCESSX_FALSE
@@ -664,46 +345,7 @@
  MODEMLIGHTS_LIBS
  APPLET_MODEMLIGHTS_TRUE
  APPLET_MODEMLIGHTS_FALSE
-@@ -1062,6 +1084,38 @@
- LIBOBJS
- LTLIBOBJS'
- ac_subst_files=''
-+ac_user_opts='
-+enable_option_checking
-+enable_maintainer_mode
-+enable_dependency_tracking
-+enable_shared
-+enable_static
-+enable_fast_install
-+with_gnu_ld
-+enable_libtool_lock
-+with_pic
-+with_tags
-+with_x
-+enable_compile_warnings
-+enable_iso_c
-+enable_more_warnings
-+with_hal
-+with_gconf_source
-+with_gconf_schema_file_dir
-+enable_schemas_install
-+with_help_dir
-+with_omf_dir
-+with_help_formats
-+enable_scrollkeeper
-+enable_flags
-+enable_battstat
-+enable_mini_commander
-+with_gstreamer
-+enable_cpufreq
-+enable_frequency_selector
-+enable_suid
-+enable_ipv6
-+'
-       ac_precious_vars='build_alias
- host_alias
- target_alias
-@@ -1120,12 +1174,16 @@
+@@ -1120,7 +1119,9 @@
  LIBGWEATHER_CFLAGS
  LIBGWEATHER_LIBS
  MIXER_CFLAGS
@@ -714,309 +356,7 @@
  
  
  # 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
-@@ -1224,13 +1282,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 ;;
-@@ -1243,13 +1309,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- \
-@@ -1440,22 +1514,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.
-@@ -1475,7 +1565,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; }; }
-     ;;
-@@ -1484,16 +1574,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}
-     ;;
- 
-@@ -1502,22 +1592,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
- 
-@@ -1532,7 +1638,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
-@@ -1548,10 +1654,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; }; }
- 
- 
-@@ -1559,12 +1665,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
-@@ -1591,12 +1697,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=.
-@@ -1645,9 +1751,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
-@@ -1657,25 +1763,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/gnome-applets]
--  --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/gnome-applets]
-+  --htmldir=DIR           html documentation [DOCDIR]
-+  --dvidir=DIR            dvi documentation [DOCDIR]
-+  --pdfdir=DIR            pdf documentation [DOCDIR]
-+  --psdir=DIR             ps documentation [DOCDIR]
- _ACEOF
- 
-   cat <<\_ACEOF
-@@ -1702,6 +1808,7 @@
-   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
-@@ -1839,6 +1946,10 @@
+@@ -1839,6 +1840,10 @@
    MIXER_CFLAGS
                C compiler flags for MIXER, overriding pkg-config
    MIXER_LIBS  linker flags for MIXER, overriding pkg-config
@@ -1027,581 +367,7 @@
  
  Use these variables to override the choices made by `configure' or to help
  it to find libraries and programs with nonstandard names/locations.
-@@ -1850,15 +1961,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/ ;;
-@@ -1894,7 +2007,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
-@@ -1904,10 +2017,10 @@
- if $ac_init_version; then
-   cat <<\_ACEOF
- gnome-applets configure 2.22.3
--generated by GNU Autoconf 2.61
-+generated by GNU Autoconf 2.62
- 
- 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
-@@ -1918,7 +2031,7 @@
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by gnome-applets $as_me 2.22.3, which was
--generated by GNU Autoconf 2.61.  Invocation command line was
-+generated by GNU Autoconf 2.62.  Invocation command line was
- 
-   $ $0 $@
- 
-@@ -1954,7 +2067,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
- 
-@@ -1989,7 +2102,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'" ;;
-@@ -2041,11 +2154,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
-@@ -2075,9 +2189,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
- 
-@@ -2092,9 +2206,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
-@@ -2110,8 +2224,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 &&
-@@ -2153,21 +2267,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
-@@ -2177,16 +2294,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
- 
-@@ -2200,29 +2317,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
-@@ -2232,10 +2358,10 @@
-   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: 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
- 
-@@ -2293,8 +2419,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
- 
-@@ -2320,11 +2446,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
-@@ -2353,17 +2480,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
-@@ -2376,8 +2515,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.
-@@ -2387,8 +2526,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
-@@ -2411,9 +2550,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
-@@ -2424,26 +2563,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`
-@@ -2454,15 +2590,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
-@@ -2497,8 +2633,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
-@@ -2510,10 +2646,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.
-@@ -2526,7 +2662,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
-@@ -2537,22 +2673,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
-@@ -2569,12 +2706,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
- 
-@@ -2593,8 +2730,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
-@@ -2649,10 +2786,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.
-@@ -2665,7 +2802,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
-@@ -2676,11 +2813,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
- 
- 
-@@ -2689,10 +2826,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.
-@@ -2705,7 +2842,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
-@@ -2716,11 +2853,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
-@@ -2728,10 +2865,10 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+{ $as_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 at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+$as_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 at gnu.org." >&2;}
- ac_tool_warned=yes ;;
-@@ -2773,6 +2910,7 @@
+@@ -2773,6 +2778,7 @@
  LIBGAIL_REQUIRED=1.1.0
  LIBXKLAVIER_REQUIRED=2.91
  LIBWNCK_REQUIRED=2.9.3
@@ -1609,863 +375,8 @@
  SYSTEM_TOOLS_BACKENDS_REQUIRED=1.1.3
  LIBGNOME_DESKTOP_REQUIRED=2.11.1
  LIBNOTIFY_REQUIRED=0.3.2
-@@ -2785,8 +2923,8 @@
- GNOME_ICON_THEME_REQUIRED=2.15.91
- GWEATHER_REQUIRED=2.22.1
- 
--{ 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
-@@ -2794,8 +2932,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='#'
-@@ -2820,8 +2958,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
-@@ -2848,8 +2986,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.
-@@ -2878,10 +3016,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.
-@@ -2894,7 +3032,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
-@@ -2905,11 +3043,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
- 
- 
-@@ -2918,10 +3056,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.
-@@ -2934,7 +3072,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
-@@ -2945,11 +3083,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
-@@ -2957,10 +3095,10 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+{ $as_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 at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+$as_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 at gnu.org." >&2;}
- ac_tool_warned=yes ;;
-@@ -2975,10 +3113,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.
-@@ -2991,7 +3129,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
-@@ -3002,11 +3140,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
- 
- 
-@@ -3015,10 +3153,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.
-@@ -3036,7 +3174,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
-@@ -3059,11 +3197,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
- 
- 
-@@ -3074,10 +3212,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.
-@@ -3090,7 +3228,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
-@@ -3101,11 +3239,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
- 
- 
-@@ -3118,10 +3256,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.
-@@ -3134,7 +3272,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
-@@ -3145,11 +3283,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
- 
- 
-@@ -3161,10 +3299,10 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+{ $as_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 at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+$as_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 at gnu.org." >&2;}
- ac_tool_warned=yes ;;
-@@ -3176,44 +3314,48 @@
- 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: 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; }; }
- 
- # 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
-@@ -3232,27 +3374,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
-@@ -3263,10 +3400,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'
-@@ -3277,7 +3415,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
-@@ -3304,15 +3442,15 @@
-   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: 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; }; }
- fi
-@@ -3321,8 +3459,8 @@
- 
- # 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
-@@ -3331,49 +3469,51 @@
-   *\"* | *\`* | *\\*) 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: 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; }; }
-     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
-@@ -3382,31 +3522,31 @@
- 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: 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; }; }
- 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.  */
-@@ -3429,40 +3569,41 @@
-   *\"* | *\`* | *\\*) 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: 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; }; }
- 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.  */
-@@ -3488,20 +3629,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
-@@ -3511,15 +3653,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
-@@ -3546,20 +3692,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=""
-@@ -3584,20 +3731,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
-@@ -3623,20 +3771,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
- 
- 
-@@ -3651,8 +3800,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
-@@ -3668,10 +3817,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
-@@ -3742,20 +3891,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
- 
- 
-@@ -3771,15 +3921,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
- 
- 
-@@ -3791,10 +3941,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
-@@ -3882,8 +4032,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
-@@ -3901,8 +4051,8 @@
- 
- case "$am__api_version" in
-     1.01234)
--	{ { 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; }; }
-     ;;
-     *)
-@@ -3910,18 +4060,144 @@
- 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; }
+@@ -3914,8 +3920,8 @@
+ echo $ECHO_N "checking for intltool >= 0.35.0... $ECHO_C" >&6; }
  
      INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
 -    INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
@@ -2473,24 +384,18 @@
 +    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; }
-+    { $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
-+
+     { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
+ echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }
+@@ -3925,6 +3931,132 @@
+    { (exit 1); exit 1; }; }
+ fi
+ 
 +# Extract the first word of "intltool-update", so it can be a program name with args.
 +set dummy intltool-update; ac_word=$2
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 +if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
-+  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
 +else
 +  case $INTLTOOL_UPDATE in
 +  [\\/]* | ?:[\\/]*)
@@ -2505,7 +410,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_UPDATE="$as_dir/$ac_word$ac_exec_ext"
-+    $as_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
 +    break 2
 +  fi
 +done
@@ -2517,20 +422,20 @@
 +fi
 +INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
 +if test -n "$INTLTOOL_UPDATE"; then
-+  { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
-+$as_echo "$INTLTOOL_UPDATE" >&6; }
++  { echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
++echo "${ECHO_T}$INTLTOOL_UPDATE" >&6; }
 +else
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
 +fi
 +
 +
 +# Extract the first word of "intltool-merge", so it can be a program name with args.
 +set dummy intltool-merge; ac_word=$2
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 +if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
-+  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
 +else
 +  case $INTLTOOL_MERGE in
 +  [\\/]* | ?:[\\/]*)
@@ -2545,7 +450,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_MERGE="$as_dir/$ac_word$ac_exec_ext"
-+    $as_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
 +    break 2
 +  fi
 +done
@@ -2557,20 +462,20 @@
 +fi
 +INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
 +if test -n "$INTLTOOL_MERGE"; then
-+  { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
-+$as_echo "$INTLTOOL_MERGE" >&6; }
++  { echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
++echo "${ECHO_T}$INTLTOOL_MERGE" >&6; }
 +else
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
 +fi
 +
 +
 +# Extract the first word of "intltool-extract", so it can be a program name with args.
 +set dummy intltool-extract; ac_word=$2
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 +if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
-+  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
 +else
 +  case $INTLTOOL_EXTRACT in
 +  [\\/]* | ?:[\\/]*)
@@ -2585,7 +490,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_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
-+    $as_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
 +    break 2
 +  fi
 +done
@@ -2597,151 +502,27 @@
 +fi
 +INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
 +if test -n "$INTLTOOL_EXTRACT"; then
-+  { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
-+$as_echo "$INTLTOOL_EXTRACT" >&6; }
++  { echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
++echo "${ECHO_T}$INTLTOOL_EXTRACT" >&6; }
 +else
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
 +fi
 +
 +
 +if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-+    { { $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;}
++    { { echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
++echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
+   INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+      INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+@@ -4100,14 +4232,6 @@
     { (exit 1); exit 1; }; }
  fi
  
-@@ -3968,10 +4244,10 @@
- # 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; }
-+{ $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   case $XGETTEXT in
-   [\\/]* | ?:[\\/]*)
-@@ -3986,7 +4262,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_XGETTEXT="$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
-@@ -3998,20 +4274,20 @@
- fi
- XGETTEXT=$ac_cv_path_XGETTEXT
- if test -n "$XGETTEXT"; then
--  { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
--echo "${ECHO_T}$XGETTEXT" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-+$as_echo "$XGETTEXT" >&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; }
-+{ $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   case $MSGMERGE in
-   [\\/]* | ?:[\\/]*)
-@@ -4026,7 +4302,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_MSGMERGE="$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
-@@ -4038,20 +4314,20 @@
- fi
- MSGMERGE=$ac_cv_path_MSGMERGE
- if test -n "$MSGMERGE"; then
--  { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
--echo "${ECHO_T}$MSGMERGE" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
-+$as_echo "$MSGMERGE" >&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; }
-+{ $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   case $MSGFMT in
-   [\\/]* | ?:[\\/]*)
-@@ -4066,7 +4342,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_MSGFMT="$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
-@@ -4078,42 +4354,34 @@
- fi
- MSGFMT=$ac_cv_path_MSGFMT
- if test -n "$MSGFMT"; then
--  { echo "$as_me:$LINENO: result: $MSGFMT" >&5
--echo "${ECHO_T}$MSGFMT" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
-+$as_echo "$MSGFMT" >&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;}
-+    { { $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
--    { { 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;}
-+    { { $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
- 
 -# Use the tools built into the package, not the ones that are installed.
 -INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
 -
@@ -2752,166 +533,8 @@
 -
  # 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
--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
-   [\\/]* | ?:[\\/]*)
-@@ -4128,7 +4396,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
-@@ -4140,33 +4408,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
-@@ -4199,29 +4467,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.  */
-@@ -4274,31 +4545,35 @@
-   *\"* | *\`* | *\\*) 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; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-+$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
- if test $ac_cv_func_bind_textdomain_codeset = yes; then
-   DATADIRNAME=share
- else
-@@ -4312,6 +4587,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
-@@ -4320,20 +4596,16 @@
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+@@ -4320,10 +4444,6 @@
  
  
  
@@ -2922,10692 +545,183 @@
  
  
  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; }
-+{ $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
-+  $as_echo_n "(cached) " >&6
- else
-   case $PKG_CONFIG in
-   [\\/]* | ?:[\\/]*)
-@@ -4348,7 +4620,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
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -4360,11 +4632,11 @@
- 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; }
-+  { $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; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -4373,10 +4645,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; }
-+{ $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
-+  $as_echo_n "(cached) " >&6
- else
-   case $ac_pt_PKG_CONFIG in
-   [\\/]* | ?:[\\/]*)
-@@ -4391,7 +4663,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
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -4403,11 +4675,11 @@
- 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; }
-+  { $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; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
-   if test "x$ac_pt_PKG_CONFIG" = x; then
-@@ -4415,10 +4687,10 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+{ $as_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 at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+$as_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 at gnu.org." >&2;}
- ac_tool_warned=yes ;;
-@@ -4432,14 +4704,14 @@
- fi
- if test -n "$PKG_CONFIG"; then
- 	_pkg_min_version=0.19
--	{ 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; }
-+	{ $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; }
-+		{ $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; }
-+		{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- 		PKG_CONFIG=""
- 	fi
- 
-@@ -4453,10 +4725,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.
-@@ -4469,7 +4741,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
-@@ -4480,11 +4752,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
- 
- 
-@@ -4493,10 +4765,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.
-@@ -4509,7 +4781,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
-@@ -4520,11 +4792,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
-@@ -4532,10 +4804,10 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+{ $as_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 at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+$as_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 at gnu.org." >&2;}
- ac_tool_warned=yes ;;
-@@ -4550,10 +4822,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.
-@@ -4566,7 +4838,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
-@@ -4577,11 +4849,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
- 
- 
-@@ -4590,10 +4862,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.
-@@ -4611,7 +4883,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
-@@ -4634,11 +4906,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
- 
- 
-@@ -4649,10 +4921,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.
-@@ -4665,7 +4937,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
-@@ -4676,11 +4948,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
- 
- 
-@@ -4693,10 +4965,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.
-@@ -4709,7 +4981,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
-@@ -4720,11 +4992,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
- 
- 
-@@ -4736,10 +5008,10 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+{ $as_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 at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+$as_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 at gnu.org." >&2;}
- ac_tool_warned=yes ;;
-@@ -4751,50 +5023,54 @@
- 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: 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; }; }
- 
- # 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.  */
-@@ -4820,20 +5096,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
-@@ -4843,15 +5120,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
-@@ -4878,20 +5159,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=""
-@@ -4916,20 +5198,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
-@@ -4955,20 +5238,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
- 
- 
-@@ -4983,8 +5267,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
-@@ -5000,10 +5284,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
-@@ -5074,20 +5358,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
- 
- 
-@@ -5103,15 +5388,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
- 
- 
-@@ -5123,10 +5408,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
-@@ -5214,8 +5499,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
-@@ -5229,10 +5514,10 @@
- fi
- 
- 
--{ 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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_func_search_save_LIBS=$LIBS
- cat >conftest.$ac_ext <<_ACEOF
-@@ -5270,26 +5555,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
-@@ -5304,8 +5593,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"
-@@ -5317,15 +5606,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"
-@@ -5357,20 +5646,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.
-@@ -5394,13 +5684,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
-@@ -5408,7 +5699,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.
-@@ -5433,8 +5724,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
-@@ -5462,20 +5753,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.
-@@ -5499,13 +5791,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
-@@ -5513,7 +5806,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.
-@@ -5529,9 +5822,9 @@
- if $ac_preproc_ok; then
-   :
- else
--  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-+  { { $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; }; }
- fi
-@@ -5543,42 +5836,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; }
-+{ $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
--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
--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`
-@@ -5593,74 +5881,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`
-@@ -5675,40 +5949,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.  */
-@@ -5735,20 +6000,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
-@@ -5840,37 +6106,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
-@@ -5953,34 +6222,34 @@
- 
- # 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
--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
-@@ -5997,27 +6266,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
-@@ -6034,10 +6303,10 @@
- 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; }
-+{ $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 "${lt_cv_path_SED+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&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.
-@@ -6090,8 +6359,8 @@
- 
- SED=$lt_cv_path_SED
- 
--{ echo "$as_me:$LINENO: result: $SED" >&5
--echo "${ECHO_T}$SED" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $SED" >&5
-+$as_echo "$SED" >&6; }
- 
- 
- # Check whether --with-gnu-ld was given.
-@@ -6104,8 +6373,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
-@@ -6134,14 +6403,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
-@@ -6171,19 +6440,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
-@@ -6195,20 +6464,20 @@
-   ;;
- 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
- 
- 
--{ 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; }
-+{ $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&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; }
-+{ $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
- "" | " "*) ;;
-@@ -6225,10 +6494,10 @@
-     ;;
- esac
- 
--{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
--echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-+$as_echo_n "checking for BSD-compatible nm... " >&6; }
- if test "${lt_cv_path_NM+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$NM"; then
-   # Let the user override the test.
-@@ -6274,25 +6543,25 @@
-   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
- fi
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
--echo "${ECHO_T}$lt_cv_path_NM" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-+$as_echo "$lt_cv_path_NM" >&6; }
- NM="$lt_cv_path_NM"
- 
--{ 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: 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
- 
--{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
--echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
-+{ $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_file_magic_cmd='$MAGIC_CMD'
- lt_cv_file_magic_test_file=
-@@ -6475,8 +6744,8 @@
- esac
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
--echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
-+{ $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
-@@ -6509,7 +6778,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*)
-@@ -6524,11 +6793,11 @@
+@@ -6524,7 +6644,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
 -  echo '#line 6527 "configure"' > conftest.$ac_ext
-+  echo '#line 6796 "configure"' > conftest.$ac_ext
++  echo '#line 6647 "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
-@@ -6566,7 +6835,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*)
-@@ -6616,10 +6885,10 @@
-   # 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'
-@@ -6648,26 +6917,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
-   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
- 
- 	lt_cv_cc_needs_belf=no
- fi
- 
-+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
-@@ -6677,8 +6950,8 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 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"
-@@ -6690,7 +6963,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*)
-@@ -6727,11 +7000,11 @@
- 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
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -6749,20 +7022,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
-   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
- 
- 	eval "$as_ac_Header=no"
-@@ -6770,12 +7044,14 @@
- 
- 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
-+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; }
-+if test `eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'` = yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
- 
- fi
-@@ -6786,20 +7062,21 @@
- 
- for ac_header in dlfcn.h
- do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+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
--  { echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+  { $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
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+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
-   # Is the header compilable?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+{ $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
-@@ -6815,32 +7092,33 @@
-   *\"* | *\`* | *\\*) 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_header_compiler=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_header_compiler=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; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+{ $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
-@@ -6854,69 +7132,72 @@
-   *\"* | *\`* | *\\*) 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
-   ac_header_preproc=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   ac_header_preproc=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; }
-+{ $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: )
--    { 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;}
-+    { $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:* )
--    { 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;}
-+    { $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
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+{ $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
-   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; }
-+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; }
- 
- fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+if test `eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'` = yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
- 
- fi
-@@ -6937,10 +7218,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_CXX+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$CXX"; then
-   ac_cv_prog_CXX="$CXX" # Let the user override the test.
-@@ -6953,7 +7234,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_CXX="$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
-@@ -6964,11 +7245,11 @@
- fi
- CXX=$ac_cv_prog_CXX
- if test -n "$CXX"; then
--  { echo "$as_me:$LINENO: result: $CXX" >&5
--echo "${ECHO_T}$CXX" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
-+$as_echo "$CXX" >&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
- 
- 
-@@ -6981,10 +7262,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_CXX+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $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.
-@@ -6997,7 +7278,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_CXX="$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
-@@ -7008,11 +7289,11 @@
- fi
- ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
- if test -n "$ac_ct_CXX"; then
--  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
--echo "${ECHO_T}$ac_ct_CXX" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-+$as_echo "$ac_ct_CXX" >&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
- 
- 
-@@ -7024,10 +7305,10 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+{ $as_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 at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+$as_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 at gnu.org." >&2;}
- ac_tool_warned=yes ;;
-@@ -7039,43 +7320,47 @@
-   fi
- fi
- # 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_cxx_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.  */
-@@ -7101,20 +7386,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_cxx_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
-@@ -7124,15 +7410,19 @@
- ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
- 
- 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`
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-+if test $ac_compiler_gnu = yes; then
-+  GXX=yes
-+else
-+  GXX=
-+fi
- ac_test_CXXFLAGS=${CXXFLAGS+set}
- ac_save_CXXFLAGS=$CXXFLAGS
--{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
--echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
- if test "${ac_cv_prog_cxx_g+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-    ac_cxx_werror_flag=yes
-@@ -7159,20 +7449,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_cxx_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_cv_prog_cxx_g=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	CXXFLAGS=""
-@@ -7197,20 +7488,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_cxx_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_cxx_werror_flag=$ac_save_cxx_werror_flag
-@@ -7236,20 +7528,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_cxx_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_cv_prog_cxx_g=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
-@@ -7264,8 +7557,8 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-+$as_echo "$ac_cv_prog_cxx_g" >&6; }
- if test "$ac_test_CXXFLAGS" = set; then
-   CXXFLAGS=$ac_save_CXXFLAGS
- elif test $ac_cv_prog_cxx_g = yes; then
-@@ -7289,10 +7582,10 @@
- 
- depcc="$CXX"  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_CXX_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
-@@ -7380,8 +7673,8 @@
- fi
- 
- fi
--{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
--echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
- CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
- 
-  if
-@@ -7405,11 +7698,11 @@
- 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
--{ 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; }
- if test -z "$CXXCPP"; then
-   if test "${ac_cv_prog_CXXCPP+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-       # Double quotes because CXXCPP needs to be expanded
-     for CXXCPP in "$CXX -E" "/lib/cpp"
-@@ -7441,20 +7734,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_cxx_preproc_warn_flag$ac_cxx_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.
-@@ -7478,13 +7772,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_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -7492,7 +7787,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.
-@@ -7517,8 +7812,8 @@
- else
-   ac_cv_prog_CXXCPP=$CXXCPP
- fi
--{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
--echo "${ECHO_T}$CXXCPP" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
-+$as_echo "$CXXCPP" >&6; }
- ac_preproc_ok=false
- for ac_cxx_preproc_warn_flag in '' yes
- do
-@@ -7546,20 +7841,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_cxx_preproc_warn_flag$ac_cxx_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.
-@@ -7583,13 +7879,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_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -7597,7 +7894,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.
-@@ -7613,9 +7910,9 @@
- if $ac_preproc_ok; then
-   :
- else
--  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-+  { { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
- See \`config.log' for more details." >&5
--echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-+$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
- See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -7638,10 +7935,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_F77+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$F77"; then
-   ac_cv_prog_F77="$F77" # Let the user override the test.
-@@ -7654,7 +7951,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_F77="$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
-@@ -7665,11 +7962,11 @@
- fi
- F77=$ac_cv_prog_F77
- if test -n "$F77"; then
--  { echo "$as_me:$LINENO: result: $F77" >&5
--echo "${ECHO_T}$F77" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $F77" >&5
-+$as_echo "$F77" >&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
- 
- 
-@@ -7682,10 +7979,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_F77+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $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.
-@@ -7698,7 +7995,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_F77="$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
-@@ -7709,11 +8006,11 @@
- 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
--echo "${ECHO_T}$ac_ct_F77" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
-+$as_echo "$ac_ct_F77" >&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
- 
- 
-@@ -7725,10 +8022,10 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+{ $as_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 at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+$as_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 at gnu.org." >&2;}
- ac_tool_warned=yes ;;
-@@ -7739,37 +8036,41 @@
- 
- 
- # 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`
-+$as_echo "$as_me:$LINENO: checking for Fortran 77 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); }
- rm -f a.out
- 
-@@ -7777,10 +8078,10 @@
- # input file.  (Note that this only needs to work for GNU compilers.)
- ac_save_ext=$ac_ext
- ac_ext=F
--{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
-+$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; }
- if test "${ac_cv_f77_compiler_gnu+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-       program main
-@@ -7796,20 +8097,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_f77_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
-@@ -7819,16 +8121,16 @@
- ac_cv_f77_compiler_gnu=$ac_compiler_gnu
- 
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
-+$as_echo "$ac_cv_f77_compiler_gnu" >&6; }
- ac_ext=$ac_save_ext
- ac_test_FFLAGS=${FFLAGS+set}
- ac_save_FFLAGS=$FFLAGS
- FFLAGS=
--{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
--echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
-+$as_echo_n "checking whether $F77 accepts -g... " >&6; }
- if test "${ac_cv_prog_f77_g+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   FFLAGS=-g
- cat >conftest.$ac_ext <<_ACEOF
-@@ -7842,20 +8144,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_f77_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_cv_prog_f77_g=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_prog_f77_g=no
-@@ -7864,8 +8167,8 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
--echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-+$as_echo "$ac_cv_prog_f77_g" >&6; }
- if test "$ac_test_FFLAGS" = set; then
-   FFLAGS=$ac_save_FFLAGS
- elif test $ac_cv_prog_f77_g = yes; then
-@@ -7882,7 +8185,11 @@
-   fi
- fi
- 
--G77=`test $ac_compiler_gnu = yes && echo yes`
-+if test $ac_compiler_gnu = yes; then
-+  G77=yes
-+else
-+  G77=
-+fi
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -7893,10 +8200,10 @@
- 
- # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
- # find the maximum length of command line arguments
--{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
--echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
-+{ $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"
-@@ -8005,11 +8312,11 @@
- 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; }
-+  { $as_echo "$as_me:$LINENO: result: none" >&5
-+$as_echo "none" >&6; }
- fi
- 
- 
-@@ -8017,10 +8324,10 @@
- 
- 
- # 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; }
-+{ $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
-+  $as_echo_n "(cached) " >&6
- else
- 
- # These are sane defaults that work on at least a few old systems.
-@@ -8125,14 +8432,14 @@
-   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
-     # 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
-@@ -8187,7 +8494,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
-@@ -8222,17 +8529,17 @@
-   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
--echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
-+$as_echo_n "checking for objdir... " >&6; }
- if test "${lt_cv_objdir+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   rm -f .libs 2>/dev/null
- mkdir .libs 2>/dev/null
-@@ -8244,8 +8551,8 @@
- fi
- rmdir .libs 2>/dev/null
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
--echo "${ECHO_T}$lt_cv_objdir" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-+$as_echo "$lt_cv_objdir" >&6; }
- objdir=$lt_cv_objdir
- 
- 
-@@ -8296,10 +8603,10 @@
- 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; }
-+{ $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
--  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.
-@@ -8312,7 +8619,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_AR="${ac_tool_prefix}ar"
--    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
-@@ -8323,11 +8630,11 @@
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
--  { echo "$as_me:$LINENO: result: $AR" >&5
--echo "${ECHO_T}$AR" >&6; }
-+  { $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; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -8336,10 +8643,10 @@
-   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; }
-+{ $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
--  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.
-@@ -8352,7 +8659,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_AR="ar"
--    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
-@@ -8363,11 +8670,11 @@
- 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: result: $ac_ct_AR" >&5
-+$as_echo "$ac_ct_AR" >&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_AR" = x; then
-@@ -8375,10 +8682,10 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+{ $as_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 at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+$as_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 at gnu.org." >&2;}
- ac_tool_warned=yes ;;
-@@ -8392,10 +8699,10 @@
- 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; }
-+{ $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
--  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.
-@@ -8408,7 +8715,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_RANLIB="${ac_tool_prefix}ranlib"
--    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
-@@ -8419,11 +8726,11 @@
- fi
- RANLIB=$ac_cv_prog_RANLIB
- if test -n "$RANLIB"; then
--  { echo "$as_me:$LINENO: result: $RANLIB" >&5
--echo "${ECHO_T}$RANLIB" >&6; }
-+  { $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; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -8432,10 +8739,10 @@
-   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; }
-+{ $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
--  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.
-@@ -8448,7 +8755,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_RANLIB="ranlib"
--    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
-@@ -8459,11 +8766,11 @@
- 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; }
-+  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-+$as_echo "$ac_ct_RANLIB" >&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_RANLIB" = x; then
-@@ -8471,10 +8778,10 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+{ $as_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 at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+$as_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 at gnu.org." >&2;}
- ac_tool_warned=yes ;;
-@@ -8488,10 +8795,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.
-@@ -8504,7 +8811,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
-@@ -8515,11 +8822,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
- 
- 
-@@ -8528,10 +8835,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.
-@@ -8544,7 +8851,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
-@@ -8555,11 +8862,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
-@@ -8567,10 +8874,10 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+{ $as_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 at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+$as_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 at gnu.org." >&2;}
- ac_tool_warned=yes ;;
-@@ -8635,10 +8942,10 @@
- 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; }
-+    { $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   case $MAGIC_CMD in
- [\\/*] |  ?:[\\/]*)
-@@ -8688,19 +8995,19 @@
- 
- 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; }
-+  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-+$as_echo "$MAGIC_CMD" >&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 "$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; }
-+    { $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   case $MAGIC_CMD in
- [\\/*] |  ?:[\\/]*)
-@@ -8750,11 +9057,11 @@
- 
- 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; }
-+  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-+$as_echo "$MAGIC_CMD" >&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
- 
-   else
-@@ -8772,10 +9079,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; }
-+{ $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 "$DSYMUTIL"; then
-   ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-@@ -8788,7 +9095,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_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
- done
-@@ -8799,11 +9106,11 @@
- fi
- 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; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -8812,10 +9119,10 @@
-   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; }
-+{ $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_DSYMUTIL"; then
-   ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-@@ -8828,7 +9135,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_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
- done
-@@ -8839,11 +9146,11 @@
- fi
- ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
- if test -n "$ac_ct_DSYMUTIL"; then
--  { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
--echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
-+  { $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; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
-   if test "x$ac_ct_DSYMUTIL" = x; then
-@@ -8851,10 +9158,10 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+{ $as_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 at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+$as_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 at gnu.org." >&2;}
- ac_tool_warned=yes ;;
-@@ -8868,10 +9175,10 @@
-     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; }
-+{ $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 "$NMEDIT"; then
-   ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-@@ -8884,7 +9191,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_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
- done
-@@ -8895,11 +9202,11 @@
- fi
- 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; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -8908,10 +9215,10 @@
-   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; }
-+{ $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_NMEDIT"; then
-   ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-@@ -8924,7 +9231,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_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
- done
-@@ -8935,11 +9242,11 @@
- fi
- ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
- if test -n "$ac_ct_NMEDIT"; then
--  { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
--echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
-+  { $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; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
-   if test "x$ac_ct_NMEDIT" = x; then
-@@ -8947,10 +9254,10 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+{ $as_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 at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+$as_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 at gnu.org." >&2;}
- ac_tool_warned=yes ;;
-@@ -8962,10 +9269,10 @@
- fi
- 
- 
--    { 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
--  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
-@@ -8983,12 +9290,12 @@
-    rm conftest.c
-       fi
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
--echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
--    { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
--echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
-+{ $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
-@@ -9015,33 +9322,37 @@
-   *\"* | *\`* | *\\*) 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"
- 
- fi
--{ 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])
-       _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-@@ -9153,10 +9464,10 @@
-   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
- 
- 
--{ 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; }
-+{ $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_rtti_exceptions=no
-   ac_outfile=conftest.$ac_objext
-@@ -9171,11 +9482,11 @@
+@@ -9171,11 +9291,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9174: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9485: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9294: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:9178: \$? = $ac_status" >&5
-+   echo "$as_me:9489: \$? = $ac_status" >&5
++   echo "$as_me:9298: \$? = $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.
-@@ -9188,8 +9499,8 @@
-    $rm conftest*
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
- 
- 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"
-@@ -9203,8 +9514,8 @@
- lt_prog_compiler_pic=
- lt_prog_compiler_static=
- 
--{ 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; }
-+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- 
-   if test "$GCC" = yes; then
-     lt_prog_compiler_wl='-Wl,'
-@@ -9435,18 +9746,18 @@
-     esac
-   fi
- 
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
-+{ $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
- 
--{ 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; }
-+{ $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_pic_works=no
-   ac_outfile=conftest.$ac_objext
-@@ -9461,11 +9772,11 @@
+@@ -9461,11 +9581,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9464: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9775: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9584: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:9468: \$? = $ac_status" >&5
-+   echo "$as_me:9779: \$? = $ac_status" >&5
++   echo "$as_me:9588: \$? = $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.
-@@ -9478,8 +9789,8 @@
-    $rm conftest*
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
-+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
- 
- if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-     case $lt_prog_compiler_pic in
-@@ -9506,10 +9817,10 @@
- # 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; }
-+{ $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_static_works=no
-    save_LDFLAGS="$LDFLAGS"
-@@ -9534,8 +9845,8 @@
-    LDFLAGS="$save_LDFLAGS"
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
-+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
- 
- if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-     :
-@@ -9544,10 +9855,10 @@
- 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; }
-+{ $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_c_o=no
-    $rm -r conftest 2>/dev/null
-@@ -9565,11 +9876,11 @@
+@@ -9565,11 +9685,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9568: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9879: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9688: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:9572: \$? = $ac_status" >&5
-+   echo "$as_me:9883: \$? = $ac_status" >&5
++   echo "$as_me:9692: \$? = $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
-@@ -9591,34 +9902,34 @@
-    $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; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
- 
- 
- hard_links="nottested"
- if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
-   # do not overwrite the value of need_locks provided by the user
--  { 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; }
-+  { $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
--  { echo "$as_me:$LINENO: result: $hard_links" >&5
--echo "${ECHO_T}$hard_links" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
-+$as_echo "$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;}
-+    { $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
-   need_locks=no
- 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; }
-+{ $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=
-@@ -10049,18 +10360,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_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_aix_libpath_sed='
-     /Import File Strings/,/^$/ {
-@@ -10075,12 +10389,13 @@
-   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
-+  $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
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -10115,18 +10430,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_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_aix_libpath_sed='
-     /Import File Strings/,/^$/ {
-@@ -10141,12 +10459,13 @@
-   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
-+  $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
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -10598,8 +10917,8 @@
-     esac
-   fi
- 
--{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
--echo "${ECHO_T}$ld_shlibs" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-+$as_echo "$ld_shlibs" >&6; }
- test "$ld_shlibs" = no && can_build_shared=no
- 
- #
-@@ -10619,15 +10938,15 @@
-       # 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; }
-+      { $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=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } 2>conftest.err; then
-         soname=conftest
-         lib=conftest
-@@ -10645,7 +10964,7 @@
-         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
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
-         then
- 	  archive_cmds_need_lc=no
-@@ -10657,16 +10976,16 @@
-         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; }
-+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-+$as_echo "$archive_cmds_need_lc" >&6; }
-       ;;
-     esac
-   fi
-   ;;
- esac
- 
--{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+$as_echo_n "checking dynamic linker characteristics... " >&6; }
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
-@@ -11279,19 +11598,19 @@
-   dynamic_linker=no
-   ;;
- esac
--{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--echo "${ECHO_T}$dynamic_linker" >&6; }
-+{ $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
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
- fi
- 
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
- if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
- fi
-@@ -11303,8 +11622,8 @@
-   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
--echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
-+{ $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" || \
-@@ -11328,8 +11647,8 @@
-   # directories.
-   hardcode_action=unsupported
- fi
--{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
--echo "${ECHO_T}$hardcode_action" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
-+$as_echo "$hardcode_action" >&6; }
- 
- if test "$hardcode_action" = relink; then
-   # Fast installation is not supported
-@@ -11342,13 +11661,13 @@
- 
- 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; }
-+{ $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"
--  { 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
- # FIXME - insert some real tests, host_os isn't really good enough
-   case $host_os in
-@@ -11356,16 +11675,16 @@
-        if test -n "$STRIP" ; then
-          striplib="$STRIP -x"
-          old_striplib="$STRIP -S"
--         { 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" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
-        ;;
-    *)
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-     ;;
-   esac
- fi
-@@ -11397,10 +11716,10 @@
- 
-   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; }
-+    { $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
-@@ -11432,32 +11751,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_lib_dl_dlopen=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_lib_dl_dlopen=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_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+$as_echo "$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
-@@ -11471,10 +11794,10 @@
-    ;;
- 
-   *)
--    { echo "$as_me:$LINENO: checking for shl_load" >&5
--echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
-+    { $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -11527,38 +11850,42 @@
-   *\"* | *\`* | *\\*) 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_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
- 
- 	ac_cv_func_shl_load=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_shl_load" >&5
--echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-+$as_echo "$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; }
-+  { $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld  $LIBS"
-@@ -11590,39 +11917,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_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_lib_dld_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
- 
- 	ac_cv_lib_dld_shl_load=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_dld_shl_load" >&5
--echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-+$as_echo "$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; }
-+  { $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -11675,38 +12006,42 @@
-   *\"* | *\`* | *\\*) 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_dlopen=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_dlopen=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_dlopen" >&5
--echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-+$as_echo "$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; }
-+  { $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
-@@ -11738,39 +12073,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_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_lib_dl_dlopen=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_lib_dl_dlopen=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_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+$as_echo "$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; }
-+  { $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsvld  $LIBS"
-@@ -11802,39 +12141,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_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_lib_svld_dlopen=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_lib_svld_dlopen=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_svld_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-+$as_echo "$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; }
-+  { $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld  $LIBS"
-@@ -11866,32 +12209,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_lib_dld_dld_link=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_lib_dld_dld_link=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_dld_dld_link" >&5
--echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-+$as_echo "$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
-@@ -11931,10 +12278,10 @@
-     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; }
-+    { $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   	  if test "$cross_compiling" = yes; then :
-   lt_cv_dlopen_self=cross
-@@ -11942,7 +12289,7 @@
+@@ -11942,7 +12062,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 11945 "configure"
-+#line 12292 "configure"
++#line 12065 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -12008,7 +12355,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} 2>/dev/null; then
-     (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-@@ -12026,15 +12373,15 @@
- 
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-+$as_echo "$lt_cv_dlopen_self" >&6; }
- 
-     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; }
-+      { $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   	  if test "$cross_compiling" = yes; then :
-   lt_cv_dlopen_self_static=cross
-@@ -12042,7 +12389,7 @@
+@@ -12042,7 +12162,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 12045 "configure"
-+#line 12392 "configure"
++#line 12165 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -12108,7 +12455,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} 2>/dev/null; then
-     (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-@@ -12126,8 +12473,8 @@
- 
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-+$as_echo "$lt_cv_dlopen_self_static" >&6; }
-     fi
- 
-     CPPFLAGS="$save_CPPFLAGS"
-@@ -12149,13 +12496,13 @@
- 
- 
- # 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; }
-+{ $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: checking whether to build shared libraries" >&5
--echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
-+{ $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
- 
- # On AIX, shared libraries and static libraries use the same namespace, and
-@@ -12175,15 +12522,15 @@
-   fi
-     ;;
- esac
--{ echo "$as_me:$LINENO: result: $enable_shared" >&5
--echo "${ECHO_T}$enable_shared" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
-+$as_echo "$enable_shared" >&6; }
- 
--{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
--echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
-+{ $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
--{ echo "$as_me:$LINENO: result: $enable_static" >&5
--echo "${ECHO_T}$enable_static" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
-+$as_echo "$enable_static" >&6; }
- 
- # The else clause should only fire when bootstrapping the
- # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -12276,8 +12623,8 @@
- cfgfile="${ofile}T"
-   trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-   $rm -f "$cfgfile"
--  { echo "$as_me:$LINENO: creating $ofile" >&5
--echo "$as_me: creating $ofile" >&6;}
-+  { $as_echo "$as_me:$LINENO: creating $ofile" >&5
-+$as_echo "$as_me: creating $ofile" >&6;}
- 
-   cat <<__EOF__ >> "$cfgfile"
- #! $SHELL
-@@ -12689,18 +13036,18 @@
- 
- 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;}
-+    { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
-+$as_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
--      { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
--echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
-+      { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
-+$as_echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
-     else
--      { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
--echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
-+      { $as_echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
-+$as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
-     fi
-   fi
-   if test -z "$LTCFLAGS"; then
-@@ -12717,16 +13064,16 @@
-     # Check whether tagname contains only valid characters
-     case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
-     "") ;;
--    *)  { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
--echo "$as_me: error: invalid tag name: $tagname" >&2;}
-+    *)  { { $as_echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
-+$as_echo "$as_me: error: invalid tag name: $tagname" >&2;}
-    { (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;}
-+      { { $as_echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
-+$as_echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
-    { (exit 1); exit 1; }; }
-     fi
- 
-@@ -12869,8 +13216,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
-@@ -12899,14 +13246,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
-@@ -12936,19 +13283,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
-@@ -12960,8 +13307,8 @@
-   ;;
- 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
- 
- 
-@@ -13011,8 +13358,8 @@
- 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; }
-+{ $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; }
- ld_shlibs_CXX=yes
- case $host_os in
-   aix3*)
-@@ -13129,18 +13476,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_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_cxx_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_aix_libpath_sed='
-     /Import File Strings/,/^$/ {
-@@ -13155,12 +13505,13 @@
-   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
-+  $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
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -13196,18 +13547,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_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_cxx_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_aix_libpath_sed='
-     /Import File Strings/,/^$/ {
-@@ -13222,12 +13576,13 @@
-   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
-+  $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
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -13957,8 +14312,8 @@
-     ld_shlibs_CXX=no
-     ;;
- esac
--{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
--echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-+$as_echo "$ld_shlibs_CXX" >&6; }
- test "$ld_shlibs_CXX" = no && can_build_shared=no
- 
- GCC_CXX="$GXX"
-@@ -13977,7 +14332,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
-   # Parse the compiler output and extract the necessary
-   # objects, libraries and library flags.
-@@ -14133,8 +14488,8 @@
- lt_prog_compiler_pic_CXX=
- lt_prog_compiler_static_CXX=
- 
--{ 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; }
-+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- 
-   # C++ specific cases for pic, static, wl, etc.
-   if test "$GXX" = yes; then
-@@ -14417,18 +14772,18 @@
-     esac
-   fi
- 
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-+$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
- 
- #
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic_CXX"; then
- 
--{ 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; }
-+{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
- if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_pic_works_CXX=no
-   ac_outfile=conftest.$ac_objext
-@@ -14443,11 +14798,11 @@
+@@ -14443,11 +14563,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:14446: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14801: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14566: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:14450: \$? = $ac_status" >&5
-+   echo "$as_me:14805: \$? = $ac_status" >&5
++   echo "$as_me:14570: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -14460,8 +14815,8 @@
-    $rm conftest*
- 
- 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; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-+$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
- 
- if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
-     case $lt_prog_compiler_pic_CXX in
-@@ -14488,10 +14843,10 @@
- # Check to make sure the static flag actually works.
- #
- wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
--{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
--echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-+{ $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_CXX+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_static_works_CXX=no
-    save_LDFLAGS="$LDFLAGS"
-@@ -14516,8 +14871,8 @@
-    LDFLAGS="$save_LDFLAGS"
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-+$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
- 
- if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
-     :
-@@ -14526,10 +14881,10 @@
- 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; }
-+{ $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_CXX+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_c_o_CXX=no
-    $rm -r conftest 2>/dev/null
-@@ -14547,11 +14902,11 @@
+@@ -14547,11 +14667,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:14550: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14905: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14670: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:14554: \$? = $ac_status" >&5
-+   echo "$as_me:14909: \$? = $ac_status" >&5
++   echo "$as_me:14674: \$? = $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
-@@ -14573,34 +14928,34 @@
-    $rm conftest*
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
- 
- 
- hard_links="nottested"
- if test "$lt_cv_prog_compiler_c_o_CXX" = 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; }
-+  { $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
--  { echo "$as_me:$LINENO: result: $hard_links" >&5
--echo "${ECHO_T}$hard_links" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
-+$as_echo "$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;}
-+    { $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
-   need_locks=no
- 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; }
-+{ $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; }
- 
-   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-   case $host_os in
-@@ -14628,8 +14983,8 @@
-   esac
-   exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
- 
--{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
--echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-+$as_echo "$ld_shlibs_CXX" >&6; }
- test "$ld_shlibs_CXX" = no && can_build_shared=no
- 
- #
-@@ -14649,15 +15004,15 @@
-       # 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; }
-+      { $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=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } 2>conftest.err; then
-         soname=conftest
-         lib=conftest
-@@ -14675,7 +15030,7 @@
-         if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-   (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
-         then
- 	  archive_cmds_need_lc_CXX=no
-@@ -14687,16 +15042,16 @@
-         cat conftest.err 1>&5
-       fi
-       $rm conftest*
--      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
--echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
-+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-+$as_echo "$archive_cmds_need_lc_CXX" >&6; }
-       ;;
-     esac
-   fi
-   ;;
- esac
- 
--{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+$as_echo_n "checking dynamic linker characteristics... " >&6; }
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
-@@ -15257,19 +15612,19 @@
-   dynamic_linker=no
-   ;;
- esac
--{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--echo "${ECHO_T}$dynamic_linker" >&6; }
-+{ $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
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
- fi
- 
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
- if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
- fi
-@@ -15281,8 +15636,8 @@
-   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
--echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
-+{ $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_CXX=
- if test -n "$hardcode_libdir_flag_spec_CXX" || \
-    test -n "$runpath_var_CXX" || \
-@@ -15306,8 +15661,8 @@
-   # directories.
-   hardcode_action_CXX=unsupported
- fi
--{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
--echo "${ECHO_T}$hardcode_action_CXX" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-+$as_echo "$hardcode_action_CXX" >&6; }
- 
- if test "$hardcode_action_CXX" = relink; then
-   # Fast installation is not supported
-@@ -15845,13 +16200,13 @@
- cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
- 
--{ 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; }
-+{ $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: checking whether to build shared libraries" >&5
--echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
-+{ $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
- 
- # On AIX, shared libraries and static libraries use the same namespace, and
-@@ -15870,15 +16225,15 @@
-   fi
-   ;;
- esac
--{ echo "$as_me:$LINENO: result: $enable_shared" >&5
--echo "${ECHO_T}$enable_shared" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
-+$as_echo "$enable_shared" >&6; }
- 
--{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
--echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
-+{ $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
--{ echo "$as_me:$LINENO: result: $enable_static" >&5
--echo "${ECHO_T}$enable_static" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
-+$as_echo "$enable_static" >&6; }
- 
- GCC_F77="$G77"
- LD_F77="$LD"
-@@ -15887,8 +16242,8 @@
- lt_prog_compiler_pic_F77=
- lt_prog_compiler_static_F77=
- 
--{ 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; }
-+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- 
-   if test "$GCC" = yes; then
-     lt_prog_compiler_wl_F77='-Wl,'
-@@ -16119,18 +16474,18 @@
-     esac
-   fi
- 
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
-+$as_echo "$lt_prog_compiler_pic_F77" >&6; }
- 
- #
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic_F77"; then
- 
--{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
--echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; }
- if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_pic_works_F77=no
-   ac_outfile=conftest.$ac_objext
-@@ -16145,11 +16500,11 @@
+@@ -16145,11 +16265,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:16148: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16503: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16268: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:16152: \$? = $ac_status" >&5
-+   echo "$as_me:16507: \$? = $ac_status" >&5
++   echo "$as_me:16272: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -16162,8 +16517,8 @@
-    $rm conftest*
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
-+$as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; }
- 
- if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
-     case $lt_prog_compiler_pic_F77 in
-@@ -16190,10 +16545,10 @@
- # Check to make sure the static flag actually works.
- #
- wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
--{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
--echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-+{ $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_F77+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_static_works_F77=no
-    save_LDFLAGS="$LDFLAGS"
-@@ -16218,8 +16573,8 @@
-    LDFLAGS="$save_LDFLAGS"
- 
- 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; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
-+$as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; }
- 
- if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
-     :
-@@ -16228,10 +16583,10 @@
- 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; }
-+{ $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_F77+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_c_o_F77=no
-    $rm -r conftest 2>/dev/null
-@@ -16249,11 +16604,11 @@
+@@ -16249,11 +16369,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:16252: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16607: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16372: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:16256: \$? = $ac_status" >&5
-+   echo "$as_me:16611: \$? = $ac_status" >&5
++   echo "$as_me:16376: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -16275,34 +16630,34 @@
-    $rm conftest*
- 
- 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; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
-+$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; }
- 
- 
- 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
--  { 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; }
-+  { $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
--  { echo "$as_me:$LINENO: result: $hard_links" >&5
--echo "${ECHO_T}$hard_links" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
-+$as_echo "$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;}
-+    { $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
-   need_locks=no
- 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; }
-+{ $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_F77=
-@@ -16723,18 +17078,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_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_f77_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_aix_libpath_sed='
-     /Import File Strings/,/^$/ {
-@@ -16749,12 +17107,13 @@
-   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
-+  $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
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -16779,18 +17138,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_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_f77_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_aix_libpath_sed='
-     /Import File Strings/,/^$/ {
-@@ -16805,12 +17167,13 @@
-   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
-+  $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
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -17262,8 +17625,8 @@
-     esac
-   fi
- 
--{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
--echo "${ECHO_T}$ld_shlibs_F77" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
-+$as_echo "$ld_shlibs_F77" >&6; }
- test "$ld_shlibs_F77" = no && can_build_shared=no
- 
- #
-@@ -17283,15 +17646,15 @@
-       # 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; }
-+      { $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=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } 2>conftest.err; then
-         soname=conftest
-         lib=conftest
-@@ -17309,7 +17672,7 @@
-         if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-   (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
-         then
- 	  archive_cmds_need_lc_F77=no
-@@ -17321,16 +17684,16 @@
-         cat conftest.err 1>&5
-       fi
-       $rm conftest*
--      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
--echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
-+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
-+$as_echo "$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; }
-+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+$as_echo_n "checking dynamic linker characteristics... " >&6; }
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
-@@ -17891,19 +18254,19 @@
-   dynamic_linker=no
-   ;;
- esac
--{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--echo "${ECHO_T}$dynamic_linker" >&6; }
-+{ $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
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
- fi
- 
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
- if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
- fi
-@@ -17915,8 +18278,8 @@
-   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
--echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
-+{ $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_F77=
- if test -n "$hardcode_libdir_flag_spec_F77" || \
-    test -n "$runpath_var_F77" || \
-@@ -17940,8 +18303,8 @@
-   # directories.
-   hardcode_action_F77=unsupported
- fi
--{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
--echo "${ECHO_T}$hardcode_action_F77" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-+$as_echo "$hardcode_action_F77" >&6; }
- 
- if test "$hardcode_action_F77" = relink; then
-   # Fast installation is not supported
-@@ -18451,10 +18814,10 @@
-   lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
- 
- 
--{ 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; }
-+{ $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_rtti_exceptions=no
-   ac_outfile=conftest.$ac_objext
-@@ -18469,11 +18832,11 @@
+@@ -18469,11 +18589,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:18472: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18835: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18592: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:18476: \$? = $ac_status" >&5
-+   echo "$as_me:18839: \$? = $ac_status" >&5
++   echo "$as_me:18596: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -18486,8 +18849,8 @@
-    $rm conftest*
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
- 
- 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"
-@@ -18501,8 +18864,8 @@
- lt_prog_compiler_pic_GCJ=
- lt_prog_compiler_static_GCJ=
- 
--{ 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; }
-+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- 
-   if test "$GCC" = yes; then
-     lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18733,18 +19096,18 @@
-     esac
-   fi
- 
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
-+$as_echo "$lt_prog_compiler_pic_GCJ" >&6; }
- 
- #
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic_GCJ"; then
- 
--{ 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; }
-+{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... " >&6; }
- if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_pic_works_GCJ=no
-   ac_outfile=conftest.$ac_objext
-@@ -18759,11 +19122,11 @@
+@@ -18759,11 +18879,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:18762: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19125: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18882: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:18766: \$? = $ac_status" >&5
-+   echo "$as_me:19129: \$? = $ac_status" >&5
++   echo "$as_me:18886: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -18776,8 +19139,8 @@
-    $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; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
-+$as_echo "$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
- 
- if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
-     case $lt_prog_compiler_pic_GCJ in
-@@ -18804,10 +19167,10 @@
- # Check to make sure the static flag actually works.
- #
- wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
--{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
--echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-+{ $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_GCJ+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_static_works_GCJ=no
-    save_LDFLAGS="$LDFLAGS"
-@@ -18832,8 +19195,8 @@
-    LDFLAGS="$save_LDFLAGS"
- 
- 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; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
-+$as_echo "$lt_cv_prog_compiler_static_works_GCJ" >&6; }
- 
- if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
-     :
-@@ -18842,10 +19205,10 @@
- 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; }
-+{ $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_GCJ+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_c_o_GCJ=no
-    $rm -r conftest 2>/dev/null
-@@ -18863,11 +19226,11 @@
+@@ -18863,11 +18983,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:18866: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19229: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18986: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:18870: \$? = $ac_status" >&5
-+   echo "$as_me:19233: \$? = $ac_status" >&5
++   echo "$as_me:18990: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -18889,34 +19252,34 @@
-    $rm conftest*
- 
- 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; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
-+$as_echo "$lt_cv_prog_compiler_c_o_GCJ" >&6; }
- 
- 
- hard_links="nottested"
- if test "$lt_cv_prog_compiler_c_o_GCJ" = 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; }
-+  { $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
--  { echo "$as_me:$LINENO: result: $hard_links" >&5
--echo "${ECHO_T}$hard_links" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
-+$as_echo "$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;}
-+    { $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
-   need_locks=no
- 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; }
-+{ $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_GCJ=
-@@ -19347,18 +19710,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_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_aix_libpath_sed='
-     /Import File Strings/,/^$/ {
-@@ -19373,12 +19739,13 @@
-   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
-+  $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
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -19413,18 +19780,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_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_aix_libpath_sed='
-     /Import File Strings/,/^$/ {
-@@ -19439,12 +19809,13 @@
-   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
-+  $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
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -19896,8 +20267,8 @@
-     esac
-   fi
- 
--{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
--echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-+$as_echo "$ld_shlibs_GCJ" >&6; }
- test "$ld_shlibs_GCJ" = no && can_build_shared=no
- 
- #
-@@ -19917,15 +20288,15 @@
-       # 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; }
-+      { $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=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } 2>conftest.err; then
-         soname=conftest
-         lib=conftest
-@@ -19943,7 +20314,7 @@
-         if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-   (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
-         then
- 	  archive_cmds_need_lc_GCJ=no
-@@ -19955,16 +20326,16 @@
-         cat conftest.err 1>&5
-       fi
-       $rm conftest*
--      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
--echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
-+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
-+$as_echo "$archive_cmds_need_lc_GCJ" >&6; }
-       ;;
-     esac
-   fi
-   ;;
- esac
- 
--{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+$as_echo_n "checking dynamic linker characteristics... " >&6; }
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
-@@ -20525,19 +20896,19 @@
-   dynamic_linker=no
-   ;;
- esac
--{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--echo "${ECHO_T}$dynamic_linker" >&6; }
-+{ $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
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
- fi
- 
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
- if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
- fi
-@@ -20549,8 +20920,8 @@
-   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
--echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
-+{ $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_GCJ=
- if test -n "$hardcode_libdir_flag_spec_GCJ" || \
-    test -n "$runpath_var_GCJ" || \
-@@ -20574,8 +20945,8 @@
-   # directories.
-   hardcode_action_GCJ=unsupported
- fi
--{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
--echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-+$as_echo "$hardcode_action_GCJ" >&6; }
- 
- if test "$hardcode_action_GCJ" = relink; then
-   # Fast installation is not supported
-@@ -21498,8 +21869,8 @@
- 	;;
- 
-       *)
--	{ { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
--echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
-+	{ { $as_echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
-+$as_echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-       esac
-@@ -21518,8 +21889,8 @@
-     chmod +x "$ofile"
-   else
-     rm -f "${ofile}T"
--    { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
--echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
-+    { { $as_echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
-+$as_echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
-    { (exit 1); exit 1; }; }
-   fi
- fi
-@@ -21553,8 +21924,8 @@
- 
- 
- 
--{ echo "$as_me:$LINENO: checking for X" >&5
--echo $ECHO_N "checking for X... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for X" >&5
-+$as_echo_n "checking for X... " >&6; }
- 
- 
- # Check whether --with-x was given.
-@@ -21568,11 +21939,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;}
-+    *\'*) { { $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
-+  $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
-@@ -21593,7 +21964,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
-+    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
-@@ -21668,13 +22039,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
-@@ -21682,7 +22054,7 @@
-   # We can compile using X headers with no special include directory.
- ac_x_includes=
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   for ac_dir in $ac_x_header_dirs; do
-@@ -21723,30 +22095,33 @@
-   *\"* | *\`* | *\\*) 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
-   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
-+  $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`
-+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; do
-+  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
-@@ -21755,6 +22130,7 @@
- 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
-@@ -21777,8 +22153,8 @@
- fi # $with_x != no
- 
- if test "$have_x" != yes; then
--  { echo "$as_me:$LINENO: result: $have_x" >&5
--echo "${ECHO_T}$have_x" >&6; }
-+  { $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.
-@@ -21788,8 +22164,8 @@
-   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; }
-+  { $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
-@@ -21810,8 +22186,8 @@
-     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; }
-+    { $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
-@@ -21836,23 +22212,26 @@
-   *\"* | *\`* | *\\*) 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
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+       } && 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
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	LIBS="$ac_xsave_LIBS -R $x_libraries"
-@@ -21877,33 +22256,38 @@
-   *\"* | *\`* | *\\*) 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
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+       } && 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
--  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: result: neither works" >&5
--echo "${ECHO_T}neither works" >&6; }
-+	{ $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
-@@ -21949,27 +22333,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
-   :
- 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: checking for dnet_ntoa in -ldnet" >&5
--echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; }
-+	{ $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldnet  $LIBS"
-@@ -22001,41 +22388,45 @@
-   *\"* | *\`* | *\\*) 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_lib_dnet_dnet_ntoa=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_lib_dnet_dnet_ntoa=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_dnet_ntoa" >&5
--echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-+$as_echo "$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
- 
-     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; }
-+      { $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldnet_stub  $LIBS"
-@@ -22067,32 +22458,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_lib_dnet_stub_dnet_ntoa=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_lib_dnet_stub_dnet_ntoa=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; }
-+{ $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 $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
- fi
-@@ -22100,6 +22495,7 @@
-     fi
- 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_xsave_LIBS"
-@@ -22112,10 +22508,10 @@
-     # 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; }
-+    { $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -22168,37 +22564,41 @@
-   *\"* | *\`* | *\\*) 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_gethostbyname=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_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
--{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
--echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; }
-+{ $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
--      { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
--echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; }
-+      { $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lnsl  $LIBS"
-@@ -22230,41 +22630,45 @@
-   *\"* | *\`* | *\\*) 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_lib_nsl_gethostbyname=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_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
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
--echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
-+$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
- if test $ac_cv_lib_nsl_gethostbyname = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
- 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; }
-+	{ $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd  $LIBS"
-@@ -22296,32 +22700,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_lib_bsd_gethostbyname=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_lib_bsd_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
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
--echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
-+$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
- if test $ac_cv_lib_bsd_gethostbyname = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
- fi
-@@ -22336,10 +22744,10 @@
-     # 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; }
-+    { $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -22392,37 +22800,41 @@
-   *\"* | *\`* | *\\*) 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_connect=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_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
--{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
--echo "${ECHO_T}$ac_cv_func_connect" >&6; }
-+{ $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
--      { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
--echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
-+      { $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-@@ -22454,32 +22866,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_lib_socket_connect=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_lib_socket_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
- 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; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-+$as_echo "$ac_cv_lib_socket_connect" >&6; }
- if test $ac_cv_lib_socket_connect = yes; then
-   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
- fi
-@@ -22487,10 +22903,10 @@
-     fi
- 
-     # 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; }
-+    { $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -22543,37 +22959,41 @@
-   *\"* | *\`* | *\\*) 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_remove=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_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
--{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
--echo "${ECHO_T}$ac_cv_func_remove" >&6; }
-+{ $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
--      { echo "$as_me:$LINENO: checking for remove in -lposix" >&5
--echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; }
-+      { $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lposix  $LIBS"
-@@ -22605,32 +23025,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_lib_posix_remove=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_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_posix_remove" >&5
--echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
-+$as_echo "$ac_cv_lib_posix_remove" >&6; }
- if test $ac_cv_lib_posix_remove = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
- fi
-@@ -22638,10 +23062,10 @@
-     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; }
-+    { $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -22694,37 +23118,41 @@
-   *\"* | *\`* | *\\*) 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_shmat=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_shmat=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_shmat" >&5
--echo "${ECHO_T}$ac_cv_func_shmat" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-+$as_echo "$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; }
-+      { $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lipc  $LIBS"
-@@ -22756,32 +23184,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_lib_ipc_shmat=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_lib_ipc_shmat=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_ipc_shmat" >&5
--echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
-+$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
- if test $ac_cv_lib_ipc_shmat = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
- fi
-@@ -22798,10 +23230,10 @@
-   # 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; }
-+  { $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-@@ -22833,32 +23265,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_lib_ICE_IceConnectionNumber=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_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_ICE_IceConnectionNumber" >&5
--echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-+$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
- if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
-   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
- fi
-@@ -22873,8 +23309,8 @@
- 
-         if test -n "$PYTHON"; then
-       # If the user set $PYTHON, use it and don't search something else.
--      { echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.4" >&5
--echo $ECHO_N "checking whether $PYTHON version >= 2.4... $ECHO_C" >&6; }
-+      { $as_echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.4" >&5
-+$as_echo_n "checking whether $PYTHON version >= 2.4... " >&6; }
-       prog="import sys, string
- # split strings by '.' and convert to numeric.  Append some zeros
- # because we need at least 4 digits for the hex conversion.
-@@ -22887,11 +23323,11 @@
-    ac_status=$?
-    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-    (exit $ac_status); }; 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: error: too old" >&5
--echo "$as_me: error: too old" >&2;}
-+  { { $as_echo "$as_me:$LINENO: error: too old" >&5
-+$as_echo "$as_me: error: too old" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
-@@ -22899,10 +23335,10 @@
-     else
-       # Otherwise, try each interpreter until we find one that satisfies
-       # VERSION.
--      { echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.4" >&5
--echo $ECHO_N "checking for a Python interpreter with version >= 2.4... $ECHO_C" >&6; }
-+      { $as_echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.4" >&5
-+$as_echo_n "checking for a Python interpreter with version >= 2.4... " >&6; }
- if test "${am_cv_pathless_PYTHON+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
- 
- 	for am_cv_pathless_PYTHON in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do
-@@ -22924,18 +23360,18 @@
- 
- 	done
- fi
--{ echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5
--echo "${ECHO_T}$am_cv_pathless_PYTHON" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5
-+$as_echo "$am_cv_pathless_PYTHON" >&6; }
-       # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
-       if test "$am_cv_pathless_PYTHON" = none; then
- 	PYTHON=:
-       else
-         # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args.
- set dummy $am_cv_pathless_PYTHON; 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_PYTHON+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   case $PYTHON in
-   [\\/]* | ?:[\\/]*)
-@@ -22950,7 +23386,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_PYTHON="$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
-@@ -22962,11 +23398,11 @@
- fi
- PYTHON=$ac_cv_path_PYTHON
- if test -n "$PYTHON"; then
--  { echo "$as_me:$LINENO: result: $PYTHON" >&5
--echo "${ECHO_T}$PYTHON" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5
-+$as_echo "$PYTHON" >&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
- 
- 
-@@ -22976,21 +23412,21 @@
- 
- 
-   if test "$PYTHON" = :; then
--      { { echo "$as_me:$LINENO: error: no suitable Python interpreter found" >&5
--echo "$as_me: error: no suitable Python interpreter found" >&2;}
-+      { { $as_echo "$as_me:$LINENO: error: no suitable Python interpreter found" >&5
-+$as_echo "$as_me: error: no suitable Python interpreter found" >&2;}
-    { (exit 1); exit 1; }; }
-   else
- 
- 
--  { echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5
--echo $ECHO_N "checking for $am_display_PYTHON version... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5
-+$as_echo_n "checking for $am_display_PYTHON version... " >&6; }
- if test "${am_cv_python_version+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"`
- fi
--{ echo "$as_me:$LINENO: result: $am_cv_python_version" >&5
--echo "${ECHO_T}$am_cv_python_version" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $am_cv_python_version" >&5
-+$as_echo "$am_cv_python_version" >&6; }
-   PYTHON_VERSION=$am_cv_python_version
- 
- 
-@@ -23001,30 +23437,30 @@
- 
- 
- 
--  { echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5
--echo $ECHO_N "checking for $am_display_PYTHON platform... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5
-+$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
- if test "${am_cv_python_platform+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`
- fi
--{ echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5
--echo "${ECHO_T}$am_cv_python_platform" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5
-+$as_echo "$am_cv_python_platform" >&6; }
-   PYTHON_PLATFORM=$am_cv_python_platform
- 
- 
- 
- 
--                { echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5
--echo $ECHO_N "checking for $am_display_PYTHON script directory... $ECHO_C" >&6; }
-+                { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5
-+$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
- if test "${am_cv_python_pythondir+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
-      echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
- fi
--{ echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
--echo "${ECHO_T}$am_cv_python_pythondir" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
-+$as_echo "$am_cv_python_pythondir" >&6; }
-   pythondir=$am_cv_python_pythondir
- 
- 
-@@ -23032,16 +23468,16 @@
-   pkgpythondir=\${pythondir}/$PACKAGE
- 
- 
--            { echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5
--echo $ECHO_N "checking for $am_display_PYTHON extension module directory... $ECHO_C" >&6; }
-+            { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5
-+$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
- if test "${am_cv_python_pyexecdir+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
-      echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
- fi
--{ echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
--echo "${ECHO_T}$am_cv_python_pyexecdir" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
-+$as_echo "$am_cv_python_pyexecdir" >&6; }
-   pyexecdir=$am_cv_python_pyexecdir
- 
- 
-@@ -23054,8 +23490,8 @@
- 
- 
- 
--{ echo "$as_me:$LINENO: checking for headers required to compile python extensions" >&5
--echo $ECHO_N "checking for headers required to compile python extensions... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for headers required to compile python extensions" >&5
-+$as_echo_n "checking for headers required to compile python extensions... " >&6; }
- py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
- py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
- PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
-@@ -23078,26 +23514,27 @@
-   *\"* | *\`* | *\\*) 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
--  { echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: found" >&5
-+$as_echo "found" >&6; }
- HAVE_PYHDRS="yes"
- 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: result: not found" >&5
--echo "${ECHO_T}not found" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: not found" >&5
-+$as_echo "not found" >&6; }
- HAVE_PYHDRS="no"
- fi
- 
-@@ -23142,8 +23579,8 @@
- 	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; }
-+		{ $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
-@@ -23165,20 +23602,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
-   has_option=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	has_option=no
-@@ -23186,8 +23624,8 @@
- 
- 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; }
-+		{ $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
-@@ -23200,16 +23638,16 @@
- 	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;}
-+	{ { $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"
--    { 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; }
-+    { $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
-@@ -23219,8 +23657,8 @@
- fi
- 
- 
--    { 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; }
-+    { $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
-@@ -23234,8 +23672,8 @@
- 	esac
- 	fi
-     fi
--    { echo "$as_me:$LINENO: result: $complCFLAGS" >&5
--echo "${ECHO_T}$complCFLAGS" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: $complCFLAGS" >&5
-+$as_echo "$complCFLAGS" >&6; }
- 
-     WARN_CFLAGS="$warning_flags $complCFLAGS"
- 
-@@ -23245,20 +23683,21 @@
- 
- for ac_header in pty.h values.h
- do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+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
--  { echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+  { $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
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+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
-   # Is the header compilable?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+{ $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
-@@ -23274,32 +23713,33 @@
-   *\"* | *\`* | *\\*) 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_header_compiler=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_header_compiler=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; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+{ $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
-@@ -23313,69 +23753,72 @@
-   *\"* | *\`* | *\\*) 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
-   ac_header_preproc=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   ac_header_preproc=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; }
-+{ $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: )
--    { 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;}
-+    { $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:* )
--    { 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;}
-+    { $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
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+{ $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
-   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; }
-+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; }
- 
- fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+if test `eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'` = yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
- 
- fi
-@@ -23392,11 +23835,11 @@
- 
- fi
- 
--{ echo "$as_me:$LINENO: checking for more warnings" >&5
--echo $ECHO_N "checking for more warnings... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for more warnings" >&5
-+$as_echo_n "checking for more warnings... " >&6; }
- if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; 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; }
-     CFLAGS="\
-     -Wall \
-     -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
-@@ -23408,8 +23851,8 @@
-     for option in -Wno-strict-aliasing -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; }
-+        { $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
-@@ -23431,20 +23874,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
-   has_option=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	has_option=no
-@@ -23454,32 +23898,32 @@
-         if test $has_option = no; then
-             CFLAGS="$SAVE_CFLAGS"
-         fi
--        { echo "$as_me:$LINENO: result: $has_option" >&5
--echo "${ECHO_T}$has_option" >&6; }
-+        { $as_echo "$as_me:$LINENO: result: $has_option" >&5
-+$as_echo "$has_option" >&6; }
-         unset has_option
-         unset SAVE_CFLAGS
-     done
-     unset option
- 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
- 
- 
- 
- pkg_failed=no
--{ echo "$as_me:$LINENO: checking for GIT" >&5
--echo $ECHO_N "checking for GIT... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for GIT" >&5
-+$as_echo_n "checking for GIT... " >&6; }
- 
- if test -n "$PKG_CONFIG"; then
-     if test -n "$GIT_CFLAGS"; then
-         pkg_cv_GIT_CFLAGS="$GIT_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-icon-theme >= \$GNOME_ICON_THEME_REQUIRED\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-icon-theme >= \$GNOME_ICON_THEME_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED") 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_GIT_CFLAGS=`$PKG_CONFIG --cflags "gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED" 2>/dev/null`
- else
-@@ -23494,10 +23938,10 @@
-         pkg_cv_GIT_LIBS="$GIT_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-icon-theme >= \$GNOME_ICON_THEME_REQUIRED\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-icon-theme >= \$GNOME_ICON_THEME_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED") 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_GIT_LIBS=`$PKG_CONFIG --libs "gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED" 2>/dev/null`
- else
-@@ -23525,7 +23969,7 @@
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$GIT_PKG_ERRORS" >&5
- 
--	{ { echo "$as_me:$LINENO: error: Package requirements (gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED) were not met:
-+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED) were not met:
- 
- $GIT_PKG_ERRORS
- 
-@@ -23536,7 +23980,7 @@
- and GIT_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 (gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED) were not met:
-+$as_echo "$as_me: error: Package requirements (gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED) were not met:
- 
- $GIT_PKG_ERRORS
- 
-@@ -23549,7 +23993,7 @@
- " >&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
-+	{ { $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.
- 
-@@ -23559,7 +24003,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
-+$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.
- 
-@@ -23573,25 +24017,25 @@
- else
- 	GIT_CFLAGS=$pkg_cv_GIT_CFLAGS
- 	GIT_LIBS=$pkg_cv_GIT_LIBS
--        { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 	:
- fi
- 
- 
- pkg_failed=no
--{ echo "$as_me:$LINENO: checking for GAILUTIL" >&5
--echo $ECHO_N "checking for GAILUTIL... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for GAILUTIL" >&5
-+$as_echo_n "checking for GAILUTIL... " >&6; }
- 
- if test -n "$PKG_CONFIG"; then
-     if test -n "$GAILUTIL_CFLAGS"; then
-         pkg_cv_GAILUTIL_CFLAGS="$GAILUTIL_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gail >= \$LIBGAIL_REQUIRED\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gail >= \$LIBGAIL_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "gail >= $LIBGAIL_REQUIRED") 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_GAILUTIL_CFLAGS=`$PKG_CONFIG --cflags "gail >= $LIBGAIL_REQUIRED" 2>/dev/null`
- else
-@@ -23606,10 +24050,10 @@
-         pkg_cv_GAILUTIL_LIBS="$GAILUTIL_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gail >= \$LIBGAIL_REQUIRED\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gail >= \$LIBGAIL_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "gail >= $LIBGAIL_REQUIRED") 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_GAILUTIL_LIBS=`$PKG_CONFIG --libs "gail >= $LIBGAIL_REQUIRED" 2>/dev/null`
- else
-@@ -23637,7 +24081,7 @@
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$GAILUTIL_PKG_ERRORS" >&5
- 
--	{ { echo "$as_me:$LINENO: error: Package requirements (gail >= $LIBGAIL_REQUIRED) were not met:
-+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (gail >= $LIBGAIL_REQUIRED) were not met:
- 
- $GAILUTIL_PKG_ERRORS
- 
-@@ -23648,7 +24092,7 @@
- and GAILUTIL_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 (gail >= $LIBGAIL_REQUIRED) were not met:
-+$as_echo "$as_me: error: Package requirements (gail >= $LIBGAIL_REQUIRED) were not met:
- 
- $GAILUTIL_PKG_ERRORS
- 
-@@ -23661,7 +24105,7 @@
- " >&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
-+	{ { $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.
- 
-@@ -23671,7 +24115,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
-+$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.
- 
-@@ -23685,8 +24129,8 @@
- else
- 	GAILUTIL_CFLAGS=$pkg_cv_GAILUTIL_CFLAGS
- 	GAILUTIL_LIBS=$pkg_cv_GAILUTIL_LIBS
--        { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 	:
- fi
- 
-@@ -23694,18 +24138,18 @@
- 
- 
- pkg_failed=no
--{ echo "$as_me:$LINENO: checking for GIO" >&5
--echo $ECHO_N "checking for GIO... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for GIO" >&5
-+$as_echo_n "checking for GIO... " >&6; }
- 
- if test -n "$PKG_CONFIG"; then
-     if test -n "$GIO_CFLAGS"; then
-         pkg_cv_GIO_CFLAGS="$GIO_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= \$GIO_REQUIRED\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= \$GIO_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "gio-2.0 >= $GIO_REQUIRED") 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_GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= $GIO_REQUIRED" 2>/dev/null`
- else
-@@ -23720,10 +24164,10 @@
-         pkg_cv_GIO_LIBS="$GIO_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= \$GIO_REQUIRED\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= \$GIO_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "gio-2.0 >= $GIO_REQUIRED") 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_GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= $GIO_REQUIRED" 2>/dev/null`
- else
-@@ -23751,7 +24195,7 @@
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$GIO_PKG_ERRORS" >&5
- 
--	{ { echo "$as_me:$LINENO: error: Package requirements (gio-2.0 >= $GIO_REQUIRED) were not met:
-+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (gio-2.0 >= $GIO_REQUIRED) were not met:
- 
- $GIO_PKG_ERRORS
- 
-@@ -23762,7 +24206,7 @@
- and GIO_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 (gio-2.0 >= $GIO_REQUIRED) were not met:
-+$as_echo "$as_me: error: Package requirements (gio-2.0 >= $GIO_REQUIRED) were not met:
- 
- $GIO_PKG_ERRORS
- 
-@@ -23775,7 +24219,7 @@
- " >&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
-+	{ { $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.
- 
-@@ -23785,7 +24229,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
-+$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.
- 
-@@ -23799,8 +24243,8 @@
- else
- 	GIO_CFLAGS=$pkg_cv_GIO_CFLAGS
- 	GIO_LIBS=$pkg_cv_GIO_LIBS
--        { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 	:
- fi
- 
-@@ -23808,18 +24252,18 @@
- 
- 
- pkg_failed=no
--{ echo "$as_me:$LINENO: checking for GTK" >&5
--echo $ECHO_N "checking for GTK... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for GTK" >&5
-+$as_echo_n "checking for GTK... " >&6; }
- 
- if test -n "$PKG_CONFIG"; then
-     if test -n "$GTK_CFLAGS"; then
-         pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED") 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_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED" 2>/dev/null`
- else
-@@ -23834,10 +24278,10 @@
-         pkg_cv_GTK_LIBS="$GTK_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED") 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_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED" 2>/dev/null`
- else
-@@ -23865,7 +24309,7 @@
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$GTK_PKG_ERRORS" >&5
- 
--	{ { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED) were not met:
-+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED) were not met:
- 
- $GTK_PKG_ERRORS
- 
-@@ -23876,7 +24320,7 @@
- and GTK_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) were not met:
-+$as_echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED) were not met:
- 
- $GTK_PKG_ERRORS
- 
-@@ -23889,7 +24333,7 @@
- " >&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
-+	{ { $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.
- 
-@@ -23899,7 +24343,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
-+$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.
- 
-@@ -23913,8 +24357,8 @@
- else
- 	GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
- 	GTK_LIBS=$pkg_cv_GTK_LIBS
--        { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 	:
- fi
- 
-@@ -23922,18 +24366,18 @@
- 
- 
- pkg_failed=no
--{ echo "$as_me:$LINENO: checking for GNOME_APPLETS" >&5
--echo $ECHO_N "checking for GNOME_APPLETS... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for GNOME_APPLETS" >&5
-+$as_echo_n "checking for GNOME_APPLETS... " >&6; }
- 
- if test -n "$PKG_CONFIG"; then
-     if test -n "$GNOME_APPLETS_CFLAGS"; then
-         pkg_cv_GNOME_APPLETS_CFLAGS="$GNOME_APPLETS_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpanelapplet-2.0 >= \$LIBPANEL_REQUIRED\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpanelapplet-2.0 >= \$LIBPANEL_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "libpanelapplet-2.0 >= $LIBPANEL_REQUIRED") 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_GNOME_APPLETS_CFLAGS=`$PKG_CONFIG --cflags "libpanelapplet-2.0 >= $LIBPANEL_REQUIRED" 2>/dev/null`
- else
-@@ -23948,10 +24392,10 @@
-         pkg_cv_GNOME_APPLETS_LIBS="$GNOME_APPLETS_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpanelapplet-2.0 >= \$LIBPANEL_REQUIRED\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpanelapplet-2.0 >= \$LIBPANEL_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "libpanelapplet-2.0 >= $LIBPANEL_REQUIRED") 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_GNOME_APPLETS_LIBS=`$PKG_CONFIG --libs "libpanelapplet-2.0 >= $LIBPANEL_REQUIRED" 2>/dev/null`
- else
-@@ -23979,7 +24423,7 @@
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$GNOME_APPLETS_PKG_ERRORS" >&5
- 
--	{ { echo "$as_me:$LINENO: error: Package requirements (libpanelapplet-2.0 >= $LIBPANEL_REQUIRED) were not met:
-+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libpanelapplet-2.0 >= $LIBPANEL_REQUIRED) were not met:
- 
- $GNOME_APPLETS_PKG_ERRORS
- 
-@@ -23990,7 +24434,7 @@
- and GNOME_APPLETS_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 (libpanelapplet-2.0 >= $LIBPANEL_REQUIRED) were not met:
-+$as_echo "$as_me: error: Package requirements (libpanelapplet-2.0 >= $LIBPANEL_REQUIRED) were not met:
- 
- $GNOME_APPLETS_PKG_ERRORS
- 
-@@ -24003,7 +24447,7 @@
- " >&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
-+	{ { $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.
- 
-@@ -24013,7 +24457,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
-+$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.
- 
-@@ -24027,8 +24471,8 @@
- else
- 	GNOME_APPLETS_CFLAGS=$pkg_cv_GNOME_APPLETS_CFLAGS
- 	GNOME_APPLETS_LIBS=$pkg_cv_GNOME_APPLETS_LIBS
--        { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 	:
- fi
- 
-@@ -24036,18 +24480,18 @@
- 
- 
- pkg_failed=no
--{ echo "$as_me:$LINENO: checking for GNOME_LIBS2" >&5
--echo $ECHO_N "checking for GNOME_LIBS2... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for GNOME_LIBS2" >&5
-+$as_echo_n "checking for GNOME_LIBS2... " >&6; }
- 
- if test -n "$PKG_CONFIG"; then
-     if test -n "$GNOME_LIBS2_CFLAGS"; then
-         pkg_cv_GNOME_LIBS2_CFLAGS="$GNOME_LIBS2_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED") 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_GNOME_LIBS2_CFLAGS=`$PKG_CONFIG --cflags "libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED" 2>/dev/null`
- else
-@@ -24062,10 +24506,10 @@
-         pkg_cv_GNOME_LIBS2_LIBS="$GNOME_LIBS2_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED") 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_GNOME_LIBS2_LIBS=`$PKG_CONFIG --libs "libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED" 2>/dev/null`
- else
-@@ -24093,7 +24537,7 @@
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$GNOME_LIBS2_PKG_ERRORS" >&5
- 
--	{ { echo "$as_me:$LINENO: error: Package requirements (libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED) were not met:
-+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED) were not met:
- 
- $GNOME_LIBS2_PKG_ERRORS
- 
-@@ -24104,7 +24548,7 @@
- and GNOME_LIBS2_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 (libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED) were not met:
-+$as_echo "$as_me: error: Package requirements (libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED) were not met:
- 
- $GNOME_LIBS2_PKG_ERRORS
- 
-@@ -24117,7 +24561,7 @@
- " >&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
-+	{ { $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.
- 
-@@ -24127,7 +24571,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
-+$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.
- 
-@@ -24141,8 +24585,8 @@
- else
- 	GNOME_LIBS2_CFLAGS=$pkg_cv_GNOME_LIBS2_CFLAGS
- 	GNOME_LIBS2_LIBS=$pkg_cv_GNOME_LIBS2_LIBS
--        { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 	:
- fi
- 
-@@ -24150,18 +24594,18 @@
- 
- 
- pkg_failed=no
--{ echo "$as_me:$LINENO: checking for GNOMEDESKTOP" >&5
--echo $ECHO_N "checking for GNOMEDESKTOP... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for GNOMEDESKTOP" >&5
-+$as_echo_n "checking for GNOMEDESKTOP... " >&6; }
- 
- if test -n "$PKG_CONFIG"; then
-     if test -n "$GNOMEDESKTOP_CFLAGS"; then
-         pkg_cv_GNOMEDESKTOP_CFLAGS="$GNOMEDESKTOP_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED") 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_GNOMEDESKTOP_CFLAGS=`$PKG_CONFIG --cflags "gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>/dev/null`
- else
-@@ -24176,10 +24620,10 @@
-         pkg_cv_GNOMEDESKTOP_LIBS="$GNOMEDESKTOP_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED") 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_GNOMEDESKTOP_LIBS=`$PKG_CONFIG --libs "gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>/dev/null`
- else
-@@ -24207,7 +24651,7 @@
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$GNOMEDESKTOP_PKG_ERRORS" >&5
- 
--	{ { echo "$as_me:$LINENO: error: Package requirements (gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED) were not met:
-+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED) were not met:
- 
- $GNOMEDESKTOP_PKG_ERRORS
- 
-@@ -24218,7 +24662,7 @@
- and GNOMEDESKTOP_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 (gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED) were not met:
-+$as_echo "$as_me: error: Package requirements (gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED) were not met:
- 
- $GNOMEDESKTOP_PKG_ERRORS
- 
-@@ -24231,7 +24675,7 @@
- " >&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
-+	{ { $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.
- 
-@@ -24241,7 +24685,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
-+$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.
- 
-@@ -24255,8 +24699,8 @@
- else
- 	GNOMEDESKTOP_CFLAGS=$pkg_cv_GNOMEDESKTOP_CFLAGS
- 	GNOMEDESKTOP_LIBS=$pkg_cv_GNOMEDESKTOP_LIBS
--        { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 	:
- fi
- 
-@@ -24265,18 +24709,18 @@
- build_gnome_vfs_applets=false
- 
- pkg_failed=no
--{ echo "$as_me:$LINENO: checking for GNOME_VFS_APPLETS" >&5
--echo $ECHO_N "checking for GNOME_VFS_APPLETS... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for GNOME_VFS_APPLETS" >&5
-+$as_echo_n "checking for GNOME_VFS_APPLETS... " >&6; }
- 
- if test -n "$PKG_CONFIG"; then
-     if test -n "$GNOME_VFS_APPLETS_CFLAGS"; then
-         pkg_cv_GNOME_VFS_APPLETS_CFLAGS="$GNOME_VFS_APPLETS_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= \$GNOME_VFS_REQUIRED\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= \$GNOME_VFS_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED") 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_GNOME_VFS_APPLETS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED" 2>/dev/null`
- else
-@@ -24291,10 +24735,10 @@
-         pkg_cv_GNOME_VFS_APPLETS_LIBS="$GNOME_VFS_APPLETS_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= \$GNOME_VFS_REQUIRED\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= \$GNOME_VFS_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED") 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_GNOME_VFS_APPLETS_LIBS=`$PKG_CONFIG --libs "gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED" 2>/dev/null`
- else
-@@ -24322,7 +24766,7 @@
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$GNOME_VFS_APPLETS_PKG_ERRORS" >&5
- 
--	{ { echo "$as_me:$LINENO: error: Package requirements (gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED) were not met:
-+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED) were not met:
- 
- $GNOME_VFS_APPLETS_PKG_ERRORS
- 
-@@ -24333,7 +24777,7 @@
- and GNOME_VFS_APPLETS_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 (gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED) were not met:
-+$as_echo "$as_me: error: Package requirements (gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED) were not met:
- 
- $GNOME_VFS_APPLETS_PKG_ERRORS
- 
-@@ -24346,7 +24790,7 @@
- " >&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
-+	{ { $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.
- 
-@@ -24356,7 +24800,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
-+$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.
- 
-@@ -24370,8 +24814,8 @@
- else
- 	GNOME_VFS_APPLETS_CFLAGS=$pkg_cv_GNOME_VFS_APPLETS_CFLAGS
- 	GNOME_VFS_APPLETS_LIBS=$pkg_cv_GNOME_VFS_APPLETS_LIBS
--        { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 	build_gnome_vfs_applets=true
- fi
- 
-@@ -24387,18 +24831,18 @@
- 
- 
- pkg_failed=no
--{ echo "$as_me:$LINENO: checking for LIBGLADE" >&5
--echo $ECHO_N "checking for LIBGLADE... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for LIBGLADE" >&5
-+$as_echo_n "checking for LIBGLADE... " >&6; }
- 
- if test -n "$PKG_CONFIG"; then
-     if test -n "$LIBGLADE_CFLAGS"; then
-         pkg_cv_LIBGLADE_CFLAGS="$LIBGLADE_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "libglade-2.0 >= $LIBGLADE_REQUIRED") 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_LIBGLADE_CFLAGS=`$PKG_CONFIG --cflags "libglade-2.0 >= $LIBGLADE_REQUIRED" 2>/dev/null`
- else
-@@ -24413,10 +24857,10 @@
-         pkg_cv_LIBGLADE_LIBS="$LIBGLADE_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "libglade-2.0 >= $LIBGLADE_REQUIRED") 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_LIBGLADE_LIBS=`$PKG_CONFIG --libs "libglade-2.0 >= $LIBGLADE_REQUIRED" 2>/dev/null`
- else
-@@ -24444,7 +24888,7 @@
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$LIBGLADE_PKG_ERRORS" >&5
- 
--	{ { echo "$as_me:$LINENO: error: Package requirements (libglade-2.0 >= $LIBGLADE_REQUIRED) were not met:
-+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libglade-2.0 >= $LIBGLADE_REQUIRED) were not met:
- 
- $LIBGLADE_PKG_ERRORS
- 
-@@ -24455,7 +24899,7 @@
- and LIBGLADE_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 (libglade-2.0 >= $LIBGLADE_REQUIRED) were not met:
-+$as_echo "$as_me: error: Package requirements (libglade-2.0 >= $LIBGLADE_REQUIRED) were not met:
- 
- $LIBGLADE_PKG_ERRORS
- 
-@@ -24468,7 +24912,7 @@
- " >&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
-+	{ { $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.
- 
-@@ -24478,7 +24922,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
-+$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.
- 
-@@ -24492,8 +24936,8 @@
- else
- 	LIBGLADE_CFLAGS=$pkg_cv_LIBGLADE_CFLAGS
- 	LIBGLADE_LIBS=$pkg_cv_LIBGLADE_LIBS
--        { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 	:
- fi
- 
-@@ -24502,18 +24946,18 @@
- build_gtop_applets=false
- 
- pkg_failed=no
--{ echo "$as_me:$LINENO: checking for GTOP_APPLETS" >&5
--echo $ECHO_N "checking for GTOP_APPLETS... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for GTOP_APPLETS" >&5
-+$as_echo_n "checking for GTOP_APPLETS... " >&6; }
- 
- if test -n "$PKG_CONFIG"; then
-     if test -n "$GTOP_APPLETS_CFLAGS"; then
-         pkg_cv_GTOP_APPLETS_CFLAGS="$GTOP_APPLETS_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtop-2.0 >= \$LIBGTOP_REQUIRED\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtop-2.0 >= \$LIBGTOP_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "libgtop-2.0 >= $LIBGTOP_REQUIRED") 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_GTOP_APPLETS_CFLAGS=`$PKG_CONFIG --cflags "libgtop-2.0 >= $LIBGTOP_REQUIRED" 2>/dev/null`
- else
-@@ -24528,10 +24972,10 @@
-         pkg_cv_GTOP_APPLETS_LIBS="$GTOP_APPLETS_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtop-2.0 >= \$LIBGTOP_REQUIRED\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtop-2.0 >= \$LIBGTOP_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "libgtop-2.0 >= $LIBGTOP_REQUIRED") 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_GTOP_APPLETS_LIBS=`$PKG_CONFIG --libs "libgtop-2.0 >= $LIBGTOP_REQUIRED" 2>/dev/null`
- else
-@@ -24559,18 +25003,18 @@
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$GTOP_APPLETS_PKG_ERRORS" >&5
- 
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--                { echo "$as_me:$LINENO: WARNING: libgtop not found. Not building gtop applets." >&5
--echo "$as_me: WARNING: libgtop not found. Not building gtop applets." >&2;}
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-+                { $as_echo "$as_me:$LINENO: WARNING: libgtop not found. Not building gtop applets." >&5
-+$as_echo "$as_me: WARNING: libgtop not found. Not building gtop applets." >&2;}
- elif test $pkg_failed = untried; then
--	{ echo "$as_me:$LINENO: WARNING: libgtop not found. Not building gtop applets." >&5
--echo "$as_me: WARNING: libgtop not found. Not building gtop applets." >&2;}
-+	{ $as_echo "$as_me:$LINENO: WARNING: libgtop not found. Not building gtop applets." >&5
-+$as_echo "$as_me: WARNING: libgtop not found. Not building gtop applets." >&2;}
- else
- 	GTOP_APPLETS_CFLAGS=$pkg_cv_GTOP_APPLETS_CFLAGS
- 	GTOP_APPLETS_LIBS=$pkg_cv_GTOP_APPLETS_LIBS
--        { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 	build_gtop_applets=true
- fi
- 
-@@ -24586,18 +25030,18 @@
- 
- 
- pkg_failed=no
--{ echo "$as_me:$LINENO: checking for LIBGNOMEKBDUI" >&5
--echo $ECHO_N "checking for LIBGNOMEKBDUI... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for LIBGNOMEKBDUI" >&5
-+$as_echo_n "checking for LIBGNOMEKBDUI... " >&6; }
- 
- if test -n "$PKG_CONFIG"; then
-     if test -n "$LIBGNOMEKBDUI_CFLAGS"; then
-         pkg_cv_LIBGNOMEKBDUI_CFLAGS="$LIBGNOMEKBDUI_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomekbdui >= 2.21.4.1\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomekbdui >= 2.21.4.1\"") >&5
-   ($PKG_CONFIG --exists --print-errors "libgnomekbdui >= 2.21.4.1") 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_LIBGNOMEKBDUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomekbdui >= 2.21.4.1" 2>/dev/null`
- else
-@@ -24612,10 +25056,10 @@
-         pkg_cv_LIBGNOMEKBDUI_LIBS="$LIBGNOMEKBDUI_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomekbdui >= 2.21.4.1\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomekbdui >= 2.21.4.1\"") >&5
-   ($PKG_CONFIG --exists --print-errors "libgnomekbdui >= 2.21.4.1") 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_LIBGNOMEKBDUI_LIBS=`$PKG_CONFIG --libs "libgnomekbdui >= 2.21.4.1" 2>/dev/null`
- else
-@@ -24643,16 +25087,16 @@
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$LIBGNOMEKBDUI_PKG_ERRORS" >&5
- 
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-                 HAVE_LIBGNOMEKBD=no
- elif test $pkg_failed = untried; then
- 	HAVE_LIBGNOMEKBD=no
- else
- 	LIBGNOMEKBDUI_CFLAGS=$pkg_cv_LIBGNOMEKBDUI_CFLAGS
- 	LIBGNOMEKBDUI_LIBS=$pkg_cv_LIBGNOMEKBDUI_LIBS
--        { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 	HAVE_LIBGNOMEKBD=yes
- fi
- 
-@@ -24661,8 +25105,8 @@
- 
- if test "x$HAVE_LIBGNOMEKBD" = "xno"; then
-    BUILD_KEYBOARD_APPLET=no
--   { echo "$as_me:$LINENO: WARNING: libgnomekbd was not found and is required to build gnome-keyboard-applet." >&5
--echo "$as_me: WARNING: libgnomekbd was not found and is required to build gnome-keyboard-applet." >&2;}
-+   { $as_echo "$as_me:$LINENO: WARNING: libgnomekbd was not found and is required to build gnome-keyboard-applet." >&5
-+$as_echo "$as_me: WARNING: libgnomekbd was not found and is required to build gnome-keyboard-applet." >&2;}
- else
-    BUILD_KEYBOARD_APPLET=yes
- fi
-@@ -24678,18 +25122,18 @@
- 
- 
- pkg_failed=no
--{ echo "$as_me:$LINENO: checking for GNOME_SETTINGS_DAEMON" >&5
--echo $ECHO_N "checking for GNOME_SETTINGS_DAEMON... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for GNOME_SETTINGS_DAEMON" >&5
-+$as_echo_n "checking for GNOME_SETTINGS_DAEMON... " >&6; }
- 
- if test -n "$PKG_CONFIG"; then
-     if test -n "$GNOME_SETTINGS_DAEMON_CFLAGS"; then
-         pkg_cv_GNOME_SETTINGS_DAEMON_CFLAGS="$GNOME_SETTINGS_DAEMON_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-settings-daemon\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-settings-daemon\"") >&5
-   ($PKG_CONFIG --exists --print-errors "gnome-settings-daemon") 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_GNOME_SETTINGS_DAEMON_CFLAGS=`$PKG_CONFIG --cflags "gnome-settings-daemon" 2>/dev/null`
- else
-@@ -24704,10 +25148,10 @@
-         pkg_cv_GNOME_SETTINGS_DAEMON_LIBS="$GNOME_SETTINGS_DAEMON_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-settings-daemon\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-settings-daemon\"") >&5
-   ($PKG_CONFIG --exists --print-errors "gnome-settings-daemon") 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_GNOME_SETTINGS_DAEMON_LIBS=`$PKG_CONFIG --libs "gnome-settings-daemon" 2>/dev/null`
- else
-@@ -24735,22 +25179,22 @@
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$GNOME_SETTINGS_DAEMON_PKG_ERRORS" >&5
- 
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-                 HAVE_GNOME_SETTINGS_DAEMON=no
- elif test $pkg_failed = untried; then
- 	HAVE_GNOME_SETTINGS_DAEMON=no
- else
- 	GNOME_SETTINGS_DAEMON_CFLAGS=$pkg_cv_GNOME_SETTINGS_DAEMON_CFLAGS
- 	GNOME_SETTINGS_DAEMON_LIBS=$pkg_cv_GNOME_SETTINGS_DAEMON_LIBS
--        { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 	HAVE_GNOME_SETTINGS_DAEMON=yes
- fi
- 
- if test "x$HAVE_GNOME_SETTINGS_DAEMON" = "xno"; then
--	{ echo "$as_me:$LINENO: WARNING: gnome-settings-daemon DBUS API is required to build modem-applet." >&5
--echo "$as_me: WARNING: gnome-settings-daemon DBUS API is required to build modem-applet." >&2;}
-+	{ $as_echo "$as_me:$LINENO: WARNING: gnome-settings-daemon DBUS API is required to build modem-applet." >&5
-+$as_echo "$as_me: WARNING: gnome-settings-daemon DBUS API is required to build modem-applet." >&2;}
- fi
- 
- 
-@@ -24758,18 +25202,18 @@
- 
- 
- pkg_failed=no
--{ echo "$as_me:$LINENO: checking for LIBWNCK" >&5
--echo $ECHO_N "checking for LIBWNCK... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for LIBWNCK" >&5
-+$as_echo_n "checking for LIBWNCK... " >&6; }
- 
- if test -n "$PKG_CONFIG"; then
-     if test -n "$LIBWNCK_CFLAGS"; then
-         pkg_cv_LIBWNCK_CFLAGS="$LIBWNCK_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libwnck-1.0 >= \$LIBWNCK_REQUIRED\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libwnck-1.0 >= \$LIBWNCK_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "libwnck-1.0 >= $LIBWNCK_REQUIRED") 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_LIBWNCK_CFLAGS=`$PKG_CONFIG --cflags "libwnck-1.0 >= $LIBWNCK_REQUIRED" 2>/dev/null`
- else
-@@ -24784,10 +25228,10 @@
-         pkg_cv_LIBWNCK_LIBS="$LIBWNCK_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libwnck-1.0 >= \$LIBWNCK_REQUIRED\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libwnck-1.0 >= \$LIBWNCK_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "libwnck-1.0 >= $LIBWNCK_REQUIRED") 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_LIBWNCK_LIBS=`$PKG_CONFIG --libs "libwnck-1.0 >= $LIBWNCK_REQUIRED" 2>/dev/null`
- else
-@@ -24815,20 +25259,20 @@
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$LIBWNCK_PKG_ERRORS" >&5
- 
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--                { { echo "$as_me:$LINENO: error: libwnck is required to build gnome-applets." >&5
--echo "$as_me: error: libwnck is required to build gnome-applets." >&2;}
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-+                { { $as_echo "$as_me:$LINENO: error: libwnck is required to build gnome-applets." >&5
-+$as_echo "$as_me: error: libwnck is required to build gnome-applets." >&2;}
-    { (exit 1); exit 1; }; }
- elif test $pkg_failed = untried; then
--	{ { echo "$as_me:$LINENO: error: libwnck is required to build gnome-applets." >&5
--echo "$as_me: error: libwnck is required to build gnome-applets." >&2;}
-+	{ { $as_echo "$as_me:$LINENO: error: libwnck is required to build gnome-applets." >&5
-+$as_echo "$as_me: error: libwnck is required to build gnome-applets." >&2;}
-    { (exit 1); exit 1; }; }
- else
- 	LIBWNCK_CFLAGS=$pkg_cv_LIBWNCK_CFLAGS
- 	LIBWNCK_LIBS=$pkg_cv_LIBWNCK_LIBS
--        { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 	:
- fi
- 
-@@ -24839,18 +25283,18 @@
- LIBNOTIFY_LIBS=
- 
- pkg_failed=no
--{ echo "$as_me:$LINENO: checking for LIBNOTIFY" >&5
--echo $ECHO_N "checking for LIBNOTIFY... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for LIBNOTIFY" >&5
-+$as_echo_n "checking for LIBNOTIFY... " >&6; }
- 
- if test -n "$PKG_CONFIG"; then
-     if test -n "$LIBNOTIFY_CFLAGS"; then
-         pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "libnotify >= $LIBNOTIFY_REQUIRED") 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_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= $LIBNOTIFY_REQUIRED" 2>/dev/null`
- else
-@@ -24865,10 +25309,10 @@
-         pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "libnotify >= $LIBNOTIFY_REQUIRED") 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_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= $LIBNOTIFY_REQUIRED" 2>/dev/null`
- else
-@@ -24896,16 +25340,16 @@
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$LIBNOTIFY_PKG_ERRORS" >&5
- 
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-                 HAVE_LIBNOTIFY="no"
- elif test $pkg_failed = untried; then
- 	HAVE_LIBNOTIFY="no"
- else
- 	LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS
- 	LIBNOTIFY_LIBS=$pkg_cv_LIBNOTIFY_LIBS
--        { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 	HAVE_LIBNOTIFY="yes"
- fi
- 
-@@ -24922,18 +25366,18 @@
- 
- 
- pkg_failed=no
--{ echo "$as_me:$LINENO: checking for CPUFREQ_SELECTOR" >&5
--echo $ECHO_N "checking for CPUFREQ_SELECTOR... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for CPUFREQ_SELECTOR" >&5
-+$as_echo_n "checking for CPUFREQ_SELECTOR... " >&6; }
- 
- if test -n "$PKG_CONFIG"; then
-     if test -n "$CPUFREQ_SELECTOR_CFLAGS"; then
-         pkg_cv_CPUFREQ_SELECTOR_CFLAGS="$CPUFREQ_SELECTOR_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED") 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_CPUFREQ_SELECTOR_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED" 2>/dev/null`
- else
-@@ -24948,10 +25392,10 @@
-         pkg_cv_CPUFREQ_SELECTOR_LIBS="$CPUFREQ_SELECTOR_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED") 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_CPUFREQ_SELECTOR_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED" 2>/dev/null`
- else
-@@ -24979,7 +25423,7 @@
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$CPUFREQ_SELECTOR_PKG_ERRORS" >&5
- 
--	{ { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED) were not met:
-+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED) were not met:
- 
- $CPUFREQ_SELECTOR_PKG_ERRORS
- 
-@@ -24990,7 +25434,7 @@
- and CPUFREQ_SELECTOR_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 (glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED) were not met:
-+$as_echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED) were not met:
- 
- $CPUFREQ_SELECTOR_PKG_ERRORS
- 
-@@ -25003,7 +25447,7 @@
- " >&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
-+	{ { $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.
- 
-@@ -25013,7 +25457,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
-+$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.
- 
-@@ -25027,8 +25471,8 @@
- else
- 	CPUFREQ_SELECTOR_CFLAGS=$pkg_cv_CPUFREQ_SELECTOR_CFLAGS
- 	CPUFREQ_SELECTOR_LIBS=$pkg_cv_CPUFREQ_SELECTOR_LIBS
--        { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 	:
- fi
- 
-@@ -25037,18 +25481,18 @@
- if test "x$BUILD_KEYBOARD_APPLET" = "xyes"; then
- 
- pkg_failed=no
--{ echo "$as_me:$LINENO: checking for DBUS" >&5
--echo $ECHO_N "checking for DBUS... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for DBUS" >&5
-+$as_echo_n "checking for DBUS... " >&6; }
- 
- if test -n "$PKG_CONFIG"; then
-     if test -n "$DBUS_CFLAGS"; then
-         pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= \$DBUS_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= \$DBUS_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 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_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null`
- else
-@@ -25063,10 +25507,10 @@
-         pkg_cv_DBUS_LIBS="$DBUS_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= \$DBUS_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= \$DBUS_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 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_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null`
- else
-@@ -25094,22 +25538,22 @@
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$DBUS_PKG_ERRORS" >&5
- 
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-                 HAVE_DBUS=no
- elif test $pkg_failed = untried; then
- 	HAVE_DBUS=no
- else
- 	DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
- 	DBUS_LIBS=$pkg_cv_DBUS_LIBS
--        { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 	HAVE_DBUS=yes
- fi
- 
-   if test "x$HAVE_DBUS" = "xno"; then
--    { { echo "$as_me:$LINENO: error: dbus was not found and is required to build gnome-keyboard-applet." >&5
--echo "$as_me: error: dbus was not found and is required to build gnome-keyboard-applet." >&2;}
-+    { { $as_echo "$as_me:$LINENO: error: dbus was not found and is required to build gnome-keyboard-applet." >&5
-+$as_echo "$as_me: error: dbus was not found and is required to build gnome-keyboard-applet." >&2;}
-    { (exit 1); exit 1; }; }
-   fi
- fi
-@@ -25129,18 +25573,18 @@
- if test "x$with_hal" != xno; then
- 
- pkg_failed=no
--{ echo "$as_me:$LINENO: checking for HAL" >&5
--echo $ECHO_N "checking for HAL... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for HAL" >&5
-+$as_echo_n "checking for HAL... " >&6; }
- 
- if test -n "$PKG_CONFIG"; then
-     if test -n "$HAL_CFLAGS"; then
-         pkg_cv_HAL_CFLAGS="$HAL_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal >= \$HAL_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal >= \$HAL_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "hal >= $HAL_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 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_HAL_CFLAGS=`$PKG_CONFIG --cflags "hal >= $HAL_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null`
- else
-@@ -25155,10 +25599,10 @@
-         pkg_cv_HAL_LIBS="$HAL_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal >= \$HAL_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal >= \$HAL_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "hal >= $HAL_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 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_HAL_LIBS=`$PKG_CONFIG --libs "hal >= $HAL_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null`
- else
-@@ -25186,16 +25630,16 @@
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$HAL_PKG_ERRORS" >&5
- 
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-                 HAVE_HAL="no"
- elif test $pkg_failed = untried; then
- 	HAVE_HAL="no"
- else
- 	HAL_CFLAGS=$pkg_cv_HAL_CFLAGS
- 	HAL_LIBS=$pkg_cv_HAL_LIBS
--        { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 	HAVE_HAL="yes"
- fi
- 
-@@ -25207,8 +25651,8 @@
- 
- 	fi
- else
--	{ echo "$as_me:$LINENO: WARNING: \"Hal support disabled\"" >&5
--echo "$as_me: WARNING: \"Hal support disabled\"" >&2;}
-+	{ $as_echo "$as_me:$LINENO: WARNING: \"Hal support disabled\"" >&5
-+$as_echo "$as_me: WARNING: \"Hal support disabled\"" >&2;}
- fi
- 
- 
-@@ -25218,18 +25662,18 @@
- GUCHARMAP_LIBS=
- 
- pkg_failed=no
--{ echo "$as_me:$LINENO: checking for GUCHARMAP" >&5
--echo $ECHO_N "checking for GUCHARMAP... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for GUCHARMAP" >&5
-+$as_echo_n "checking for GUCHARMAP... " >&6; }
- 
- if test -n "$PKG_CONFIG"; then
-     if test -n "$GUCHARMAP_CFLAGS"; then
-         pkg_cv_GUCHARMAP_CFLAGS="$GUCHARMAP_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gucharmap >= 1.4.0\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gucharmap >= 1.4.0\"") >&5
-   ($PKG_CONFIG --exists --print-errors "gucharmap >= 1.4.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_GUCHARMAP_CFLAGS=`$PKG_CONFIG --cflags "gucharmap >= 1.4.0" 2>/dev/null`
- else
-@@ -25244,10 +25688,10 @@
-         pkg_cv_GUCHARMAP_LIBS="$GUCHARMAP_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gucharmap >= 1.4.0\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gucharmap >= 1.4.0\"") >&5
-   ($PKG_CONFIG --exists --print-errors "gucharmap >= 1.4.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_GUCHARMAP_LIBS=`$PKG_CONFIG --libs "gucharmap >= 1.4.0" 2>/dev/null`
- else
-@@ -25275,16 +25719,16 @@
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$GUCHARMAP_PKG_ERRORS" >&5
- 
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-                 HAVE_GUCHARMAP="no"
- elif test $pkg_failed = untried; then
- 	HAVE_GUCHARMAP="no"
- else
- 	GUCHARMAP_CFLAGS=$pkg_cv_GUCHARMAP_CFLAGS
- 	GUCHARMAP_LIBS=$pkg_cv_GUCHARMAP_LIBS
--        { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 	HAVE_GUCHARMAP="yes"
- fi
- 
-@@ -25295,8 +25739,8 @@
- _ACEOF
- 
- else
--  { echo "$as_me:$LINENO: WARNING: *** 'charpick' applet will not be built with gucharmap support ***" >&5
--echo "$as_me: WARNING: *** 'charpick' applet will not be built with gucharmap support ***" >&2;}
-+  { $as_echo "$as_me:$LINENO: WARNING: *** 'charpick' applet will not be built with gucharmap support ***" >&5
-+$as_echo "$as_me: WARNING: *** 'charpick' applet will not be built with gucharmap support ***" >&2;}
- fi
- 
- 
-@@ -25305,22 +25749,22 @@
- PYGTK_LIBS=
- 
- pkg_failed=no
--{ echo "$as_me:$LINENO: checking for PYGTK" >&5
--echo $ECHO_N "checking for PYGTK... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for PYGTK" >&5
-+$as_echo_n "checking for PYGTK... " >&6; }
- 
- if test -n "$PKG_CONFIG"; then
-     if test -n "$PYGTK_CFLAGS"; then
-         pkg_cv_PYGTK_CFLAGS="$PYGTK_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0	>= \$PYGTK_REQUIRED
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0	>= \$PYGTK_REQUIRED
- 	pygobject-2.0	>= \$PYGOBJECT_REQUIRED
- 	gnome-python-2.0 >= \$GNOME_PYTHON_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "pygtk-2.0	>= $PYGTK_REQUIRED
- 	pygobject-2.0	>= $PYGOBJECT_REQUIRED
- 	gnome-python-2.0 >= $GNOME_PYTHON_REQUIRED") 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_PYGTK_CFLAGS=`$PKG_CONFIG --cflags "pygtk-2.0	>= $PYGTK_REQUIRED
- 	pygobject-2.0	>= $PYGOBJECT_REQUIRED
-@@ -25337,14 +25781,14 @@
-         pkg_cv_PYGTK_LIBS="$PYGTK_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0	>= \$PYGTK_REQUIRED
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0	>= \$PYGTK_REQUIRED
- 	pygobject-2.0	>= \$PYGOBJECT_REQUIRED
- 	gnome-python-2.0 >= \$GNOME_PYTHON_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "pygtk-2.0	>= $PYGTK_REQUIRED
- 	pygobject-2.0	>= $PYGOBJECT_REQUIRED
- 	gnome-python-2.0 >= $GNOME_PYTHON_REQUIRED") 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_PYGTK_LIBS=`$PKG_CONFIG --libs "pygtk-2.0	>= $PYGTK_REQUIRED
- 	pygobject-2.0	>= $PYGOBJECT_REQUIRED
-@@ -25378,16 +25822,16 @@
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$PYGTK_PKG_ERRORS" >&5
- 
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-                 HAVE_PYGTK="no"
- elif test $pkg_failed = untried; then
- 	HAVE_PYGTK="no"
- else
- 	PYGTK_CFLAGS=$pkg_cv_PYGTK_CFLAGS
- 	PYGTK_LIBS=$pkg_cv_PYGTK_LIBS
--        { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 	HAVE_PYGTK="yes"
- fi
- 
-@@ -25395,18 +25839,18 @@
- 
- 
- pkg_failed=no
--{ echo "$as_me:$LINENO: checking for LIBGWEATHER" >&5
--echo $ECHO_N "checking for LIBGWEATHER... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for LIBGWEATHER" >&5
-+$as_echo_n "checking for LIBGWEATHER... " >&6; }
- 
- if test -n "$PKG_CONFIG"; then
-     if test -n "$LIBGWEATHER_CFLAGS"; then
-         pkg_cv_LIBGWEATHER_CFLAGS="$LIBGWEATHER_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gweather >= \$GWEATHER_REQUIRED\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gweather >= \$GWEATHER_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "gweather >= $GWEATHER_REQUIRED") 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_LIBGWEATHER_CFLAGS=`$PKG_CONFIG --cflags "gweather >= $GWEATHER_REQUIRED" 2>/dev/null`
- else
-@@ -25421,10 +25865,10 @@
-         pkg_cv_LIBGWEATHER_LIBS="$LIBGWEATHER_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gweather >= \$GWEATHER_REQUIRED\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gweather >= \$GWEATHER_REQUIRED\"") >&5
-   ($PKG_CONFIG --exists --print-errors "gweather >= $GWEATHER_REQUIRED") 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_LIBGWEATHER_LIBS=`$PKG_CONFIG --libs "gweather >= $GWEATHER_REQUIRED" 2>/dev/null`
- else
-@@ -25452,7 +25896,7 @@
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$LIBGWEATHER_PKG_ERRORS" >&5
- 
--	{ { echo "$as_me:$LINENO: error: Package requirements (gweather >= $GWEATHER_REQUIRED) were not met:
-+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (gweather >= $GWEATHER_REQUIRED) were not met:
- 
- $LIBGWEATHER_PKG_ERRORS
- 
-@@ -25463,7 +25907,7 @@
- and LIBGWEATHER_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 (gweather >= $GWEATHER_REQUIRED) were not met:
-+$as_echo "$as_me: error: Package requirements (gweather >= $GWEATHER_REQUIRED) were not met:
- 
- $LIBGWEATHER_PKG_ERRORS
- 
-@@ -25476,7 +25920,7 @@
- " >&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
-+	{ { $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.
- 
-@@ -25486,7 +25930,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
-+$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.
- 
-@@ -25500,8 +25944,8 @@
- else
- 	LIBGWEATHER_CFLAGS=$pkg_cv_LIBGWEATHER_CFLAGS
- 	LIBGWEATHER_LIBS=$pkg_cv_LIBGWEATHER_LIBS
--        { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 	:
- fi
- 
-@@ -25510,10 +25954,10 @@
- 
- # Extract the first word of "gdk-pixbuf-csource", so it can be a program name with args.
- set dummy gdk-pixbuf-csource; 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_GDK_PIXBUF_CSOURCE+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   case $GDK_PIXBUF_CSOURCE in
-   [\\/]* | ?:[\\/]*)
-@@ -25528,7 +25972,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_GDK_PIXBUF_CSOURCE="$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
-@@ -25541,28 +25985,28 @@
- fi
- GDK_PIXBUF_CSOURCE=$ac_cv_path_GDK_PIXBUF_CSOURCE
- if test -n "$GDK_PIXBUF_CSOURCE"; then
--  { echo "$as_me:$LINENO: result: $GDK_PIXBUF_CSOURCE" >&5
--echo "${ECHO_T}$GDK_PIXBUF_CSOURCE" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $GDK_PIXBUF_CSOURCE" >&5
-+$as_echo "$GDK_PIXBUF_CSOURCE" >&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"$GDK_PIXBUF_CSOURCE" = xno; then
--  { { echo "$as_me:$LINENO: error: gdk-pixbuf-csource executable not found in your path - should be installed with GTK" >&5
--echo "$as_me: error: gdk-pixbuf-csource executable not found in your path - should be installed with GTK" >&2;}
-+  { { $as_echo "$as_me:$LINENO: error: gdk-pixbuf-csource executable not found in your path - should be installed with GTK" >&5
-+$as_echo "$as_me: error: gdk-pixbuf-csource executable not found in your path - should be installed with GTK" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- 
- # 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; }
-+{ $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
-+  $as_echo_n "(cached) " >&6
- else
-   case $GLIB_GENMARSHAL in
-   [\\/]* | ?:[\\/]*)
-@@ -25577,7 +26021,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
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -25589,21 +26033,21 @@
- 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; }
-+  { $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_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
--{ 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_GCONFTOOL+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   case $GCONFTOOL in
-   [\\/]* | ?:[\\/]*)
-@@ -25618,7 +26062,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
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -25631,26 +26075,26 @@
- fi
- GCONFTOOL=$ac_cv_path_GCONFTOOL
- if test -n "$GCONFTOOL"; then
--  { echo "$as_me:$LINENO: result: $GCONFTOOL" >&5
--echo "${ECHO_T}$GCONFTOOL" >&6; }
-+  { $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_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
- if test x"$GCONFTOOL" = xno; then
--  { { echo "$as_me:$LINENO: error: gconftool-2 executable not found in your path - should be installed with GConf" >&5
--echo "$as_me: error: gconftool-2 executable not found in your path - should be installed with GConf" >&2;}
-+  { { $as_echo "$as_me:$LINENO: error: gconftool-2 executable not found in your path - should be installed with GConf" >&5
-+$as_echo "$as_me: error: gconftool-2 executable not found in your path - should be installed with GConf" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- # Extract the first word of "xsltproc", so it can be a program name with args.
- set dummy xsltproc; 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_XSLTPROC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   case $XSLTPROC in
-   [\\/]* | ?:[\\/]*)
-@@ -25665,7 +26109,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_XSLTPROC="$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
-@@ -25678,26 +26122,26 @@
- fi
- XSLTPROC=$ac_cv_path_XSLTPROC
- if test -n "$XSLTPROC"; then
--  { echo "$as_me:$LINENO: result: $XSLTPROC" >&5
--echo "${ECHO_T}$XSLTPROC" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $XSLTPROC" >&5
-+$as_echo "$XSLTPROC" >&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"$XSLTPROC" = xno; then
--  { { echo "$as_me:$LINENO: error: xsltproc executable not found in your path - should be installed with libxslt" >&5
--echo "$as_me: error: xsltproc executable not found in your path - should be installed with libxslt" >&2;}
-+  { { $as_echo "$as_me:$LINENO: error: xsltproc executable not found in your path - should be installed with libxslt" >&5
-+$as_echo "$as_me: error: xsltproc executable not found in your path - should be installed with libxslt" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- # Extract the first word of "scrollkeeper-config", so it can be a program name with args.
- set dummy scrollkeeper-config; 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_SCROLLKEEPER_CONFIG+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   case $SCROLLKEEPER_CONFIG in
-   [\\/]* | ?:[\\/]*)
-@@ -25712,7 +26156,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_SCROLLKEEPER_CONFIG="$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
-@@ -25725,27 +26169,27 @@
- fi
- SCROLLKEEPER_CONFIG=$ac_cv_path_SCROLLKEEPER_CONFIG
- if test -n "$SCROLLKEEPER_CONFIG"; then
--  { echo "$as_me:$LINENO: result: $SCROLLKEEPER_CONFIG" >&5
--echo "${ECHO_T}$SCROLLKEEPER_CONFIG" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $SCROLLKEEPER_CONFIG" >&5
-+$as_echo "$SCROLLKEEPER_CONFIG" >&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$SCROLLKEEPER_CONFIG = xno; then
--  { { echo "$as_me:$LINENO: error: Couldn't find scrollkeeper-config" >&5
--echo "$as_me: error: Couldn't find scrollkeeper-config" >&2;}
-+  { { $as_echo "$as_me:$LINENO: error: Couldn't find scrollkeeper-config" >&5
-+$as_echo "$as_me: error: Couldn't find scrollkeeper-config" >&2;}
-    { (exit please install the Scrollkeeper 0.1.4 package); exit please install the Scrollkeeper 0.1.4 package; }; }
- fi
- 
- 
- # Extract the first word of "jw", so it can be a program name with args.
- set dummy jw; 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_JW+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   case $JW in
-   [\\/]* | ?:[\\/]*)
-@@ -25760,7 +26204,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_JW="$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
-@@ -25773,11 +26217,11 @@
- fi
- JW=$ac_cv_path_JW
- if test -n "$JW"; then
--  { echo "$as_me:$LINENO: result: $JW" >&5
--echo "${ECHO_T}$JW" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $JW" >&5
-+$as_echo "$JW" >&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
- 
- 
-@@ -25811,8 +26255,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; }
-+  { $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'
-@@ -25826,15 +26270,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; }
-+  { $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;}
-+       *) { { $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
-@@ -25874,20 +26318,21 @@
- 
- for ac_header in locale.h
- do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+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
--  { echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+  { $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
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+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
-   # Is the header compilable?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+{ $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
-@@ -25903,32 +26348,33 @@
-   *\"* | *\`* | *\\*) 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_header_compiler=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_header_compiler=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; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+{ $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
-@@ -25942,69 +26388,72 @@
-   *\"* | *\`* | *\\*) 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
-   ac_header_preproc=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   ac_header_preproc=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; }
-+{ $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: )
--    { 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;}
-+    { $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:* )
--    { 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;}
-+    { $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
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+{ $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
-   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; }
-+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; }
- 
- fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+if test `eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'` = yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
- 
- fi
-@@ -26012,10 +26461,10 @@
- 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; }
-+    { $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -26038,31 +26487,35 @@
-   *\"* | *\`* | *\\*) 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
-   am_cv_val_LC_MESSAGES=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	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
- fi
--{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
--echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; }
-+{ $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
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -26081,17 +26534,17 @@
-     INTLLIBS=
- 
-     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; }
-+  { $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
--echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
-+{ $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?
--{ echo "$as_me:$LINENO: checking libintl.h usability" >&5
--echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; }
-+{ $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
-@@ -26107,32 +26560,33 @@
-   *\"* | *\`* | *\\*) 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_header_compiler=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_header_compiler=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; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ echo "$as_me:$LINENO: checking libintl.h presence" >&5
--echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; }
-+{ $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
-@@ -26146,63 +26600,64 @@
-   *\"* | *\`* | *\\*) 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
-   ac_header_preproc=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   ac_header_preproc=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; }
-+{ $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: )
--    { 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;}
-+    { $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:* )
--    { 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;}
-+    { $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;}
- 
-     ;;
- esac
--{ echo "$as_me:$LINENO: checking for libintl.h" >&5
--echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
-+{ $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&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; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-+$as_echo "$ac_cv_header_libintl_h" >&6; }
- 
- fi
- if test $ac_cv_header_libintl_h = yes; then
-@@ -26212,10 +26667,10 @@
-       #
-       # 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; }
-+      { $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -26240,38 +26695,42 @@
-   *\"* | *\`* | *\\*) 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
-   gt_cv_func_ngettext_libc=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	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
- 
- fi
--{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
--echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6; }
-+{ $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
--	      { echo "$as_me:$LINENO: checking for dgettext in libc" >&5
--echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; }
-+	      { $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -26296,43 +26755,47 @@
-   *\"* | *\`* | *\\*) 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
-   gt_cv_func_dgettext_libc=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	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
--{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
--echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6; }
-+{ $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=`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; }
-+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
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -26385,35 +26848,41 @@
-   *\"* | *\`* | *\\*) 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
-   eval "$as_ac_var=yes"
- else
--  echo "$as_me: failed program was:" >&5
-+  $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
-+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; }
-+if test `eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'` = yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
- 
- fi
-@@ -26428,10 +26897,10 @@
- 	 || 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; }
-+        { $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl  $LIBS"
-@@ -26463,37 +26932,41 @@
-   *\"* | *\`* | *\\*) 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_lib_intl_bindtextdomain=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_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: $ac_cv_lib_intl_bindtextdomain" >&5
--echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
-+$as_echo "$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; }
-+  { $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl  $LIBS"
-@@ -26525,37 +26998,41 @@
-   *\"* | *\`* | *\\*) 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_lib_intl_ngettext=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_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: $ac_cv_lib_intl_ngettext" >&5
--echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
-+$as_echo "$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; }
-+  { $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl  $LIBS"
-@@ -26587,32 +27064,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_lib_intl_dgettext=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_lib_intl_dgettext=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_intl_dgettext" >&5
--echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
-+$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
- if test $ac_cv_lib_intl_dgettext = yes; then
-   gt_cv_func_dgettext_libintl=yes
- fi
-@@ -26623,14 +27104,14 @@
- 
- 
- 	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; }
-+	  { $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl -liconv $LIBS"
-@@ -26662,37 +27143,41 @@
-   *\"* | *\`* | *\\*) 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_lib_intl_ngettext=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_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: $ac_cv_lib_intl_ngettext" >&5
--echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
-+$as_echo "$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; }
-+  { $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl -liconv $LIBS"
-@@ -26724,32 +27209,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_lib_intl_dcgettext=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_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
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
--echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
-+$as_echo "$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
-@@ -26775,11 +27264,11 @@
- 
- 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; }
-+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
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -26832,35 +27321,41 @@
-   *\"* | *\`* | *\\*) 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
-   eval "$as_ac_var=yes"
- else
--  echo "$as_me: failed program was:" >&5
-+  $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
-+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; }
-+if test `eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'` = yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
- 
- fi
-@@ -26896,10 +27391,10 @@
- 
- 	# 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; }
-+{ $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   case "$MSGFMT" in
-   /*)
-@@ -26923,11 +27418,11 @@
- fi
- MSGFMT="$ac_cv_path_MSGFMT"
- if test "$MSGFMT" != "no"; then
--  { echo "$as_me:$LINENO: result: $MSGFMT" >&5
--echo "${ECHO_T}$MSGFMT" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
-+$as_echo "$MSGFMT" >&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 "$MSGFMT" != "no"; then
-           glib_save_LIBS="$LIBS"
-@@ -26935,11 +27430,11 @@
- 
- 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; }
-+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
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -26992,43 +27487,49 @@
-   *\"* | *\`* | *\\*) 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
-   eval "$as_ac_var=yes"
- else
--  echo "$as_me: failed program was:" >&5
-+  $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
-+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; }
-+if test `eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'` = yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
- 
- 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; }
-+	  { $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 ""
-@@ -27042,25 +27543,25 @@
- "Content-Transfer-Encoding: 8bit\n"
- 
- _ACEOF
--if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
-+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=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_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; }
-+  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
--{ 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
-   [\\/]* | ?:[\\/]*)
-@@ -27075,7 +27576,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_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
-@@ -27088,20 +27589,20 @@
- fi
- GMSGFMT=$ac_cv_path_GMSGFMT
- if test -n "$GMSGFMT"; then
--  { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
--echo "${ECHO_T}$GMSGFMT" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-+$as_echo "$GMSGFMT" >&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 "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; }
-+{ $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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   case "$XGETTEXT" in
-   /*)
-@@ -27125,11 +27626,11 @@
- fi
- XGETTEXT="$ac_cv_path_XGETTEXT"
- if test "$XGETTEXT" != ":"; then
--  { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
--echo "${ECHO_T}$XGETTEXT" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-+$as_echo "$XGETTEXT" >&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
- 
- 	  cat >conftest.$ac_ext <<_ACEOF
-@@ -27154,30 +27655,33 @@
-   *\"* | *\`* | *\\*) 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
-   CATOBJEXT=.gmo
-              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.  */
-@@ -27230,31 +27734,35 @@
-   *\"* | *\`* | *\\*) 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; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-+$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
- if test $ac_cv_func_bind_textdomain_codeset = yes; then
-   CATOBJEXT=.gmo
-                DATADIRNAME=share
-@@ -27271,6 +27779,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
-           LIBS="$glib_save_LIBS"
-@@ -27296,8 +27805,8 @@
-                   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; }
-+        { $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
-@@ -27329,8 +27838,8 @@
-      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; }
-+       { $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
-@@ -27354,8 +27863,8 @@
-          fi
-        done
-        LINGUAS=$NEW_LINGUAS
--       { echo "$as_me:$LINENO: result: $LINGUAS" >&5
--echo "${ECHO_T}$LINGUAS" >&6; }
-+       { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5
-+$as_echo "$LINGUAS" >&6; }
-      fi
- 
-           if test -n "$LINGUAS"; then
-@@ -27395,10 +27904,10 @@
- gdu_cv_version_required=0.3.2
- 
- if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
-+    { ($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=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   gdu_cv_have_gdu=yes
- else
-@@ -27408,8 +27917,8 @@
- 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;}
-+	{ { $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
- 
-@@ -27527,20 +28036,21 @@
- 
- for ac_header in err.h sys/sysctl.h
- do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+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
--  { echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+  { $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
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+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
-   # Is the header compilable?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+{ $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
-@@ -27556,32 +28066,33 @@
-   *\"* | *\`* | *\\*) 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_header_compiler=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_header_compiler=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; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+{ $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
-@@ -27595,69 +28106,72 @@
-   *\"* | *\`* | *\\*) 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
-   ac_header_preproc=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   ac_header_preproc=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; }
-+{ $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: )
--    { 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;}
-+    { $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:* )
--    { 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;}
-+    { $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
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+{ $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
-   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; }
-+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; }
- 
- fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+if test `eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'` = yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
- 
- fi
-@@ -27667,10 +28181,10 @@
-    case "${host}" in
-        powerpc-*-linux*)
-            NEED_LIBAPM=yes
--           { echo "$as_me:$LINENO: checking for apm_read in -lapm" >&5
--echo $ECHO_N "checking for apm_read in -lapm... $ECHO_C" >&6; }
-+           { $as_echo "$as_me:$LINENO: checking for apm_read in -lapm" >&5
-+$as_echo_n "checking for apm_read in -lapm... " >&6; }
- if test "${ac_cv_lib_apm_apm_read+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lapm  $LIBS"
-@@ -27702,32 +28216,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_lib_apm_apm_read=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_lib_apm_apm_read=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_apm_apm_read" >&5
--echo "${ECHO_T}$ac_cv_lib_apm_apm_read" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_apm_apm_read" >&5
-+$as_echo "$ac_cv_lib_apm_apm_read" >&6; }
- if test $ac_cv_lib_apm_apm_read = yes; then
-   HAVE_LIBAPM=yes
- else
-@@ -27738,10 +28256,10 @@
-        # list of supported OS cores that use libapm
-        *-*-linux*)
- 	   NEED_LIBAPM=yes
--	   { echo "$as_me:$LINENO: checking for apm_read in -lapm" >&5
--echo $ECHO_N "checking for apm_read in -lapm... $ECHO_C" >&6; }
-+	   { $as_echo "$as_me:$LINENO: checking for apm_read in -lapm" >&5
-+$as_echo_n "checking for apm_read in -lapm... " >&6; }
- if test "${ac_cv_lib_apm_apm_read+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lapm  $LIBS"
-@@ -27773,32 +28291,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_lib_apm_apm_read=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_lib_apm_apm_read=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_apm_apm_read" >&5
--echo "${ECHO_T}$ac_cv_lib_apm_apm_read" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_apm_apm_read" >&5
-+$as_echo "$ac_cv_lib_apm_apm_read" >&6; }
- if test $ac_cv_lib_apm_apm_read = yes; then
-   HAVE_LIBAPM=yes
- else
-@@ -27817,17 +28339,17 @@
- 	   savecppflags=$CPPFLAGS
- 	   CPPFLAGS="$CPPFLAGS $ACPIINC"
- 	   if test "${ac_cv_header_dev_acpica_acpiio_h+set}" = set; then
--  { echo "$as_me:$LINENO: checking for dev/acpica/acpiio.h" >&5
--echo $ECHO_N "checking for dev/acpica/acpiio.h... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for dev/acpica/acpiio.h" >&5
-+$as_echo_n "checking for dev/acpica/acpiio.h... " >&6; }
- if test "${ac_cv_header_dev_acpica_acpiio_h+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_header_dev_acpica_acpiio_h" >&5
--echo "${ECHO_T}$ac_cv_header_dev_acpica_acpiio_h" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_dev_acpica_acpiio_h" >&5
-+$as_echo "$ac_cv_header_dev_acpica_acpiio_h" >&6; }
- else
-   # Is the header compilable?
--{ echo "$as_me:$LINENO: checking dev/acpica/acpiio.h usability" >&5
--echo $ECHO_N "checking dev/acpica/acpiio.h usability... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking dev/acpica/acpiio.h usability" >&5
-+$as_echo_n "checking dev/acpica/acpiio.h usability... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -27843,32 +28365,33 @@
-   *\"* | *\`* | *\\*) 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_header_compiler=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_header_compiler=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; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ echo "$as_me:$LINENO: checking dev/acpica/acpiio.h presence" >&5
--echo $ECHO_N "checking dev/acpica/acpiio.h presence... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking dev/acpica/acpiio.h presence" >&5
-+$as_echo_n "checking dev/acpica/acpiio.h presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -27882,63 +28405,64 @@
-   *\"* | *\`* | *\\*) 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
-   ac_header_preproc=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   ac_header_preproc=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; }
-+{ $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: )
--    { echo "$as_me:$LINENO: WARNING: dev/acpica/acpiio.h: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: dev/acpica/acpiio.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: dev/acpica/acpiio.h: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: dev/acpica/acpiio.h: proceeding with the compiler's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: dev/acpica/acpiio.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: dev/acpica/acpiio.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: dev/acpica/acpiio.h: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: dev/acpica/acpiio.h: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: dev/acpica/acpiio.h: present but cannot be compiled" >&5
--echo "$as_me: WARNING: dev/acpica/acpiio.h: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: dev/acpica/acpiio.h:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: dev/acpica/acpiio.h:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: dev/acpica/acpiio.h: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: dev/acpica/acpiio.h: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: dev/acpica/acpiio.h:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: dev/acpica/acpiio.h:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: dev/acpica/acpiio.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: dev/acpica/acpiio.h: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: dev/acpica/acpiio.h: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: dev/acpica/acpiio.h: in the future, the compiler will take precedence" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: dev/acpica/acpiio.h: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: dev/acpica/acpiio.h: present but cannot be compiled" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: dev/acpica/acpiio.h:     check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: dev/acpica/acpiio.h:     check for missing prerequisite headers?" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: dev/acpica/acpiio.h: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: dev/acpica/acpiio.h: see the Autoconf documentation" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: dev/acpica/acpiio.h:     section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: dev/acpica/acpiio.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: dev/acpica/acpiio.h: proceeding with the preprocessor's result" >&5
-+$as_echo "$as_me: WARNING: dev/acpica/acpiio.h: proceeding with the preprocessor's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: dev/acpica/acpiio.h: in the future, the compiler will take precedence" >&5
-+$as_echo "$as_me: WARNING: dev/acpica/acpiio.h: in the future, the compiler will take precedence" >&2;}
- 
-     ;;
- esac
--{ echo "$as_me:$LINENO: checking for dev/acpica/acpiio.h" >&5
--echo $ECHO_N "checking for dev/acpica/acpiio.h... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for dev/acpica/acpiio.h" >&5
-+$as_echo_n "checking for dev/acpica/acpiio.h... " >&6; }
- if test "${ac_cv_header_dev_acpica_acpiio_h+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_cv_header_dev_acpica_acpiio_h=$ac_header_preproc
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_header_dev_acpica_acpiio_h" >&5
--echo "${ECHO_T}$ac_cv_header_dev_acpica_acpiio_h" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_dev_acpica_acpiio_h" >&5
-+$as_echo "$ac_cv_header_dev_acpica_acpiio_h" >&6; }
- 
- fi
- if test $ac_cv_header_dev_acpica_acpiio_h = yes; then
-@@ -28028,13 +28552,13 @@
-   withval=$with_gstreamer; case "${withval}" in
-                0.8) GST_MAJORMINOR=0.8 ;;
-                0.10) GST_MAJORMINOR=0.10 ;;
--               *) { { echo "$as_me:$LINENO: error:
-+               *) { { $as_echo "$as_me:$LINENO: error:
-                                 *** Bad value ${withval} for --with-gstreamer
-                                 *** Please use one of the following:
-                                 ***    --with-gstreamer=0.8
-                                 ***    --with-gstreamer=0.10
-                               " >&5
--echo "$as_me: error:
-+$as_echo "$as_me: error:
-                                 *** Bad value ${withval} for --with-gstreamer
-                                 *** Please use one of the following:
-                                 ***    --with-gstreamer=0.8
-@@ -28056,18 +28580,18 @@
-    MIXER_LIBS=
- 
- pkg_failed=no
--{ echo "$as_me:$LINENO: checking for MIXER" >&5
--echo $ECHO_N "checking for MIXER... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for MIXER" >&5
-+$as_echo_n "checking for MIXER... " >&6; }
- 
- if test -n "$PKG_CONFIG"; then
-     if test -n "$MIXER_CFLAGS"; then
-         pkg_cv_MIXER_CFLAGS="$MIXER_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GST10_PKGS\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GST10_PKGS\"") >&5
-   ($PKG_CONFIG --exists --print-errors "$GST10_PKGS") 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_MIXER_CFLAGS=`$PKG_CONFIG --cflags "$GST10_PKGS" 2>/dev/null`
- else
-@@ -28082,10 +28606,10 @@
-         pkg_cv_MIXER_LIBS="$MIXER_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GST10_PKGS\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GST10_PKGS\"") >&5
-   ($PKG_CONFIG --exists --print-errors "$GST10_PKGS") 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_MIXER_LIBS=`$PKG_CONFIG --libs "$GST10_PKGS" 2>/dev/null`
- else
-@@ -28113,16 +28637,16 @@
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$MIXER_PKG_ERRORS" >&5
- 
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-                 HAVE_GST_VER=none
- elif test $pkg_failed = untried; then
- 	HAVE_GST_VER=none
- else
- 	MIXER_CFLAGS=$pkg_cv_MIXER_CFLAGS
- 	MIXER_LIBS=$pkg_cv_MIXER_LIBS
--        { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 	HAVE_GST_VER=0.10
- fi
- fi
-@@ -28133,18 +28657,18 @@
-    MIXER_LIBS=
- 
- pkg_failed=no
--{ echo "$as_me:$LINENO: checking for MIXER" >&5
--echo $ECHO_N "checking for MIXER... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for MIXER" >&5
-+$as_echo_n "checking for MIXER... " >&6; }
- 
- if test -n "$PKG_CONFIG"; then
-     if test -n "$MIXER_CFLAGS"; then
-         pkg_cv_MIXER_CFLAGS="$MIXER_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GST8_PKGS\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GST8_PKGS\"") >&5
-   ($PKG_CONFIG --exists --print-errors "$GST8_PKGS") 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_MIXER_CFLAGS=`$PKG_CONFIG --cflags "$GST8_PKGS" 2>/dev/null`
- else
-@@ -28159,10 +28683,10 @@
-         pkg_cv_MIXER_LIBS="$MIXER_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GST8_PKGS\"") >&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GST8_PKGS\"") >&5
-   ($PKG_CONFIG --exists --print-errors "$GST8_PKGS") 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_MIXER_LIBS=`$PKG_CONFIG --libs "$GST8_PKGS" 2>/dev/null`
- else
-@@ -28190,16 +28714,16 @@
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$MIXER_PKG_ERRORS" >&5
- 
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-                 HAVE_GST_VER=none
- elif test $pkg_failed = untried; then
- 	HAVE_GST_VER=none
- else
- 	MIXER_CFLAGS=$pkg_cv_MIXER_CFLAGS
- 	MIXER_LIBS=$pkg_cv_MIXER_LIBS
--        { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 	HAVE_GST_VER=0.8
- fi
- fi
-@@ -28207,19 +28731,19 @@
- case $HAVE_GST_VER in
- 	0.8|0.10)
- 		HAVE_GST="yes"
--		{ echo "$as_me:$LINENO: result:     using GStreamer $HAVE_GST_VER backend" >&5
--echo "${ECHO_T}    using GStreamer $HAVE_GST_VER backend" >&6; }
-+		{ $as_echo "$as_me:$LINENO: result:     using GStreamer $HAVE_GST_VER backend" >&5
-+$as_echo "    using GStreamer $HAVE_GST_VER backend" >&6; }
- 		;;
- 	none)
- 		HAVE_GST="no"
--		{ echo "$as_me:$LINENO: result: GStreamer not found" >&5
--echo "${ECHO_T}GStreamer not found" >&6; }
--		{ echo "$as_me:$LINENO: WARNING: GStreamer unavailable, mixer applet will not be build" >&5
--echo "$as_me: WARNING: GStreamer unavailable, mixer applet will not be build" >&2;}
-+		{ $as_echo "$as_me:$LINENO: result: GStreamer not found" >&5
-+$as_echo "GStreamer not found" >&6; }
-+		{ $as_echo "$as_me:$LINENO: WARNING: GStreamer unavailable, mixer applet will not be build" >&5
-+$as_echo "$as_me: WARNING: GStreamer unavailable, mixer applet will not be build" >&2;}
- 		;;
- 	*)
--		{ { echo "$as_me:$LINENO: error: Something bad happened when determining GStreamer version, aborting!" >&5
--echo "$as_me: error: Something bad happened when determining GStreamer version, aborting!" >&2;}
-+		{ { $as_echo "$as_me:$LINENO: error: Something bad happened when determining GStreamer version, aborting!" >&5
-+$as_echo "$as_me: error: Something bad happened when determining GStreamer version, aborting!" >&2;}
-    { (exit 1); exit 1; }; }
- 		;;
- esac
-@@ -28257,17 +28781,17 @@
- savecppflags=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $X_CFLAGS"
- if test "${ac_cv_header_X11_extensions_XKB_h+set}" = set; then
--  { echo "$as_me:$LINENO: checking for X11/extensions/XKB.h" >&5
--echo $ECHO_N "checking for X11/extensions/XKB.h... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for X11/extensions/XKB.h" >&5
-+$as_echo_n "checking for X11/extensions/XKB.h... " >&6; }
- if test "${ac_cv_header_X11_extensions_XKB_h+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XKB_h" >&5
--echo "${ECHO_T}$ac_cv_header_X11_extensions_XKB_h" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XKB_h" >&5
-+$as_echo "$ac_cv_header_X11_extensions_XKB_h" >&6; }
- else
-   # Is the header compilable?
--{ echo "$as_me:$LINENO: checking X11/extensions/XKB.h usability" >&5
--echo $ECHO_N "checking X11/extensions/XKB.h usability... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking X11/extensions/XKB.h usability" >&5
-+$as_echo_n "checking X11/extensions/XKB.h usability... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -28283,32 +28807,33 @@
-   *\"* | *\`* | *\\*) 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_header_compiler=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_header_compiler=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; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ echo "$as_me:$LINENO: checking X11/extensions/XKB.h presence" >&5
--echo $ECHO_N "checking X11/extensions/XKB.h presence... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking X11/extensions/XKB.h presence" >&5
-+$as_echo_n "checking X11/extensions/XKB.h presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -28322,63 +28847,64 @@
-   *\"* | *\`* | *\\*) 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
-   ac_header_preproc=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   ac_header_preproc=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; }
-+{ $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: )
--    { echo "$as_me:$LINENO: WARNING: X11/extensions/XKB.h: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: X11/extensions/XKB.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: X11/extensions/XKB.h: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: X11/extensions/XKB.h: proceeding with the compiler's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/XKB.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: X11/extensions/XKB.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/XKB.h: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: X11/extensions/XKB.h: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: X11/extensions/XKB.h: present but cannot be compiled" >&5
--echo "$as_me: WARNING: X11/extensions/XKB.h: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: X11/extensions/XKB.h:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: X11/extensions/XKB.h:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: X11/extensions/XKB.h: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: X11/extensions/XKB.h: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: X11/extensions/XKB.h:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: X11/extensions/XKB.h:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: X11/extensions/XKB.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: X11/extensions/XKB.h: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: X11/extensions/XKB.h: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: X11/extensions/XKB.h: in the future, the compiler will take precedence" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/XKB.h: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: X11/extensions/XKB.h: present but cannot be compiled" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/XKB.h:     check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: X11/extensions/XKB.h:     check for missing prerequisite headers?" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/XKB.h: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: X11/extensions/XKB.h: see the Autoconf documentation" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/XKB.h:     section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: X11/extensions/XKB.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/XKB.h: proceeding with the preprocessor's result" >&5
-+$as_echo "$as_me: WARNING: X11/extensions/XKB.h: proceeding with the preprocessor's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/XKB.h: in the future, the compiler will take precedence" >&5
-+$as_echo "$as_me: WARNING: X11/extensions/XKB.h: in the future, the compiler will take precedence" >&2;}
- 
-     ;;
- esac
--{ echo "$as_me:$LINENO: checking for X11/extensions/XKB.h" >&5
--echo $ECHO_N "checking for X11/extensions/XKB.h... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for X11/extensions/XKB.h" >&5
-+$as_echo_n "checking for X11/extensions/XKB.h... " >&6; }
- if test "${ac_cv_header_X11_extensions_XKB_h+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_cv_header_X11_extensions_XKB_h=$ac_header_preproc
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XKB_h" >&5
--echo "${ECHO_T}$ac_cv_header_X11_extensions_XKB_h" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XKB_h" >&5
-+$as_echo "$ac_cv_header_X11_extensions_XKB_h" >&6; }
- 
- fi
- if test $ac_cv_header_X11_extensions_XKB_h = yes; then
-@@ -28399,211 +28925,97 @@
- fi
- 
- if test "x$APPLET_ACCESSX" = "xtrue"; then
--  { echo "$as_me:$LINENO: WARNING: *** keyboard accessibility status applet will not be built ***" >&5
--echo "$as_me: WARNING: *** keyboard accessibility status applet will not be built ***" >&2;}
-+  { $as_echo "$as_me:$LINENO: WARNING: *** keyboard accessibility status applet will not be built ***" >&5
-+$as_echo "$as_me: WARNING: *** keyboard accessibility status applet will not be built ***" >&2;}
- fi
+@@ -28405,198 +28525,82 @@
  CPPFLAGS=$savecppflags
  
  
 -SU_TOOL=
 -P_MODEMLIGHTS=
 -HAVE_LIBUTIL=
--
++MODEMLIGHTS_LIBS=
++MODEMLIGHTS_CFLAGS=
+ 
 -# Extract the first word of "su", so it can be a program name with args.
 -set dummy su; ac_word=$2
 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -13634,8 +748,6 @@
 -done
 -done
 -IFS=$as_save_IFS
-+MODEMLIGHTS_LIBS=
-+MODEMLIGHTS_CFLAGS=
  
 -  ;;
 -esac
@@ -13648,11 +760,8 @@
 -  { echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6; }
 -fi
- 
-+pkg_failed=no
-+{ $as_echo "$as_me:$LINENO: checking for MODEMLIGHTS" >&5
-+$as_echo_n "checking for MODEMLIGHTS... " >&6; }
- 
+-
+-
 -{ echo "$as_me:$LINENO: checking for forkpty in -lutil" >&5
 -echo $ECHO_N "checking for forkpty in -lutil... $ECHO_C" >&6; }
 -if test "${ac_cv_lib_util_forkpty+set}" = set; then
@@ -13666,7 +775,10 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for MODEMLIGHTS" >&5
++echo $ECHO_N "checking for MODEMLIGHTS... $ECHO_C" >&6; }
+ 
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
 -   builtin and then its argument prototype would still apply.  */
@@ -13695,13 +807,13 @@
 +        pkg_cv_MODEMLIGHTS_CFLAGS="$MODEMLIGHTS_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liboobs-1 >= \$LIBOOBS_REQUIRED\"") >&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liboobs-1 >= \$LIBOOBS_REQUIRED\"") >&5
 +  ($PKG_CONFIG --exists --print-errors "liboobs-1 >= $LIBOOBS_REQUIRED") 2>&5
    ac_status=$?
 -  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_c_werror_flag" ||
 -	 test ! -s conftest.err
@@ -13723,7 +835,6 @@
 -echo "${ECHO_T}$ac_cv_lib_util_forkpty" >&6; }
 -if test $ac_cv_lib_util_forkpty = yes; then
 -  HAVE_LIBUTIL=true
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; then
 +  pkg_cv_MODEMLIGHTS_CFLAGS=`$PKG_CONFIG --cflags "liboobs-1 >= $LIBOOBS_REQUIRED" 2>/dev/null`
  else
@@ -13773,10 +884,10 @@
 +        pkg_cv_MODEMLIGHTS_LIBS="$MODEMLIGHTS_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liboobs-1 >= \$LIBOOBS_REQUIRED\"") >&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liboobs-1 >= \$LIBOOBS_REQUIRED\"") >&5
 +  ($PKG_CONFIG --exists --print-errors "liboobs-1 >= $LIBOOBS_REQUIRED") 2>&5
 +  ac_status=$?
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; then
 +  pkg_cv_MODEMLIGHTS_LIBS=`$PKG_CONFIG --libs "liboobs-1 >= $LIBOOBS_REQUIRED" 2>/dev/null`
  else
@@ -13840,26 +951,24 @@
 -cat >>confdefs.h <<_ACEOF
 -#define SU_PATH "${SU_TOOL}"
 -_ACEOF
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
 +                HAVE_LIBOOBS=no
 +elif test $pkg_failed = untried; then
 +	HAVE_LIBOOBS=no
 +else
 +	MODEMLIGHTS_CFLAGS=$pkg_cv_MODEMLIGHTS_CFLAGS
 +	MODEMLIGHTS_LIBS=$pkg_cv_MODEMLIGHTS_LIBS
-+        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
 +	HAVE_LIBOOBS=yes
 +fi
  
 +if test "x$HAVE_LIBOOBS" = "xyes" -a "x$HAVE_GNOME_SETTINGS_DAEMON" = "xyes"; then
    BUILD_MODEM_LIGHTS=yes
  else
--  { echo "$as_me:$LINENO: WARNING: *** modemlights applet will not be built ***" >&5
--echo "$as_me: WARNING: *** modemlights applet will not be built ***" >&2;}
-+  { $as_echo "$as_me:$LINENO: WARNING: *** modemlights applet will not be built ***" >&5
-+$as_echo "$as_me: WARNING: *** modemlights applet will not be built ***" >&2;}
+   { echo "$as_me:$LINENO: WARNING: *** modemlights applet will not be built ***" >&5
+@@ -28604,6 +28608,8 @@
    BUILD_MODEM_LIGHTS=no
  fi
  
@@ -13868,1203 +977,7 @@
   if test "x$BUILD_MODEM_LIGHTS" = "xyes"; then
    APPLET_MODEMLIGHTS_TRUE=
    APPLET_MODEMLIGHTS_FALSE='#'
-@@ -28639,17 +29051,17 @@
- 
- 
- if test "${ac_cv_header_cpufreq_h+set}" = set; then
--  { echo "$as_me:$LINENO: checking for cpufreq.h" >&5
--echo $ECHO_N "checking for cpufreq.h... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for cpufreq.h" >&5
-+$as_echo_n "checking for cpufreq.h... " >&6; }
- if test "${ac_cv_header_cpufreq_h+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_header_cpufreq_h" >&5
--echo "${ECHO_T}$ac_cv_header_cpufreq_h" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cpufreq_h" >&5
-+$as_echo "$ac_cv_header_cpufreq_h" >&6; }
- else
-   # Is the header compilable?
--{ echo "$as_me:$LINENO: checking cpufreq.h usability" >&5
--echo $ECHO_N "checking cpufreq.h usability... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking cpufreq.h usability" >&5
-+$as_echo_n "checking cpufreq.h usability... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -28665,32 +29077,33 @@
-   *\"* | *\`* | *\\*) 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_header_compiler=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_header_compiler=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; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ echo "$as_me:$LINENO: checking cpufreq.h presence" >&5
--echo $ECHO_N "checking cpufreq.h presence... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking cpufreq.h presence" >&5
-+$as_echo_n "checking cpufreq.h presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -28704,63 +29117,64 @@
-   *\"* | *\`* | *\\*) 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
-   ac_header_preproc=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   ac_header_preproc=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; }
-+{ $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: )
--    { echo "$as_me:$LINENO: WARNING: cpufreq.h: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: cpufreq.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: cpufreq.h: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: cpufreq.h: proceeding with the compiler's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: cpufreq.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: cpufreq.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: cpufreq.h: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: cpufreq.h: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: cpufreq.h: present but cannot be compiled" >&5
--echo "$as_me: WARNING: cpufreq.h: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: cpufreq.h:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: cpufreq.h:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: cpufreq.h: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: cpufreq.h: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: cpufreq.h:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: cpufreq.h:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: cpufreq.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: cpufreq.h: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: cpufreq.h: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: cpufreq.h: in the future, the compiler will take precedence" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: cpufreq.h: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: cpufreq.h: present but cannot be compiled" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: cpufreq.h:     check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: cpufreq.h:     check for missing prerequisite headers?" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: cpufreq.h: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: cpufreq.h: see the Autoconf documentation" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: cpufreq.h:     section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: cpufreq.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: cpufreq.h: proceeding with the preprocessor's result" >&5
-+$as_echo "$as_me: WARNING: cpufreq.h: proceeding with the preprocessor's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: cpufreq.h: in the future, the compiler will take precedence" >&5
-+$as_echo "$as_me: WARNING: cpufreq.h: in the future, the compiler will take precedence" >&2;}
- 
-     ;;
- esac
--{ echo "$as_me:$LINENO: checking for cpufreq.h" >&5
--echo $ECHO_N "checking for cpufreq.h... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for cpufreq.h" >&5
-+$as_echo_n "checking for cpufreq.h... " >&6; }
- if test "${ac_cv_header_cpufreq_h+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_cv_header_cpufreq_h=$ac_header_preproc
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_header_cpufreq_h" >&5
--echo "${ECHO_T}$ac_cv_header_cpufreq_h" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cpufreq_h" >&5
-+$as_echo "$ac_cv_header_cpufreq_h" >&6; }
- 
- fi
- if test $ac_cv_header_cpufreq_h = yes; then
-@@ -28797,8 +29211,8 @@
-          build_cpufreq_applet=yes
- 	 ;;
-       *)
--         { echo "$as_me:$LINENO: WARNING: ${host} is not supported by cpufreq applet, not building" >&5
--echo "$as_me: WARNING: ${host} is not supported by cpufreq applet, not building" >&2;}
-+         { $as_echo "$as_me:$LINENO: WARNING: ${host} is not supported by cpufreq applet, not building" >&5
-+$as_echo "$as_me: WARNING: ${host} is not supported by cpufreq applet, not building" >&2;}
- 	 build_cpufreq_applet=no
- 	 ;;
-    esac
-@@ -28833,10 +29247,10 @@
- if test "x$HAVE_PYGTK" = "xyes" -a "x$HAVE_PYHDRS" = "xyes"; then
- 
- py_mod_var=`echo gnomeapplet'_' | sed 'y%./+-%__p_%'`
--{ echo "$as_me:$LINENO: checking for python module gnomeapplet" >&5
--echo $ECHO_N "checking for python module gnomeapplet... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for python module gnomeapplet" >&5
-+$as_echo_n "checking for python module gnomeapplet... " >&6; }
- if { as_var=py_cv_mod_$py_mod_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
- 
- prog="
-@@ -28859,12 +29273,12 @@
- 
- py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
- if test "x$py_val" != xno; 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; }
-   BUILD_INVEST_APPLET="yes"
- 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; }
-   BUILD_INVEST_APPLET="no"
- fi
- 
-@@ -28881,8 +29295,8 @@
- fi
- 
- 
--{ echo "$as_me:$LINENO: checking whether to enable ipv6" >&5
--echo $ECHO_N "checking whether to enable ipv6... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether to enable ipv6" >&5
-+$as_echo_n "checking whether to enable ipv6... " >&6; }
- # Check whether --enable-ipv6 was given.
- if test "${enable_ipv6+set}" = set; then
-   enableval=$enable_ipv6;
-@@ -28917,20 +29331,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
-   have_ipv6=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	have_ipv6=no
-@@ -28938,8 +29353,8 @@
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--  { echo "$as_me:$LINENO: result: $have_ipv6" >&5
--echo "${ECHO_T}$have_ipv6" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $have_ipv6" >&5
-+$as_echo "$have_ipv6" >&6; }
-   if test $have_ipv6 = yes; then
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -28950,10 +29365,10 @@
- fi
- 
- have_getaddrinfo=no
--{ echo "$as_me:$LINENO: checking for getaddrinfo" >&5
--echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for getaddrinfo" >&5
-+$as_echo_n "checking for getaddrinfo... " >&6; }
- if test "${ac_cv_func_getaddrinfo+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -29006,31 +29421,35 @@
-   *\"* | *\`* | *\\*) 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_getaddrinfo=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_getaddrinfo=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_getaddrinfo" >&5
--echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_getaddrinfo" >&5
-+$as_echo "$ac_cv_func_getaddrinfo" >&6; }
- if test $ac_cv_func_getaddrinfo = yes; then
-   have_getaddrinfo=yes
- fi
-@@ -29038,11 +29457,11 @@
- if test $have_getaddrinfo != yes; then
-   # getaddrinfo is not in the default libraries.  See if it's in some other.
-   for lib in bsd socket inet; do
--    as_ac_Lib=`echo "ac_cv_lib_$lib''_getaddrinfo" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for getaddrinfo in -l$lib" >&5
--echo $ECHO_N "checking for getaddrinfo in -l$lib... $ECHO_C" >&6; }
-+    as_ac_Lib=`$as_echo "ac_cv_lib_$lib''_getaddrinfo" | $as_tr_sh`
-+{ $as_echo "$as_me:$LINENO: checking for getaddrinfo in -l$lib" >&5
-+$as_echo_n "checking for getaddrinfo in -l$lib... " >&6; }
- if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-l$lib  $LIBS"
-@@ -29074,34 +29493,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>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
-   eval "$as_ac_Lib=yes"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_Lib=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
--ac_res=`eval echo '${'$as_ac_Lib'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
--if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-+ac_res=`eval 'as_val=${'$as_ac_Lib'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+if test `eval 'as_val=${'$as_ac_Lib'}
-+		 $as_echo "$as_val"'` = yes; then
-   LIBS="$LIBS -l$lib";have_getaddrinfo=yes; break
- fi
- 
-@@ -29115,10 +29540,10 @@
- 
- fi
- 
--{ echo "$as_me:$LINENO: checking for struct tm.tm_gmtoff" >&5
--echo $ECHO_N "checking for struct tm.tm_gmtoff... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for struct tm.tm_gmtoff" >&5
-+$as_echo_n "checking for struct tm.tm_gmtoff... " >&6; }
- if test "${ac_cv_member_struct_tm_tm_gmtoff+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -29144,20 +29569,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_member_struct_tm_tm_gmtoff=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -29184,20 +29610,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_member_struct_tm_tm_gmtoff=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_member_struct_tm_tm_gmtoff=no
-@@ -29208,8 +29635,8 @@
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_gmtoff" >&5
--echo "${ECHO_T}$ac_cv_member_struct_tm_tm_gmtoff" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_gmtoff" >&5
-+$as_echo "$ac_cv_member_struct_tm_tm_gmtoff" >&6; }
- if test $ac_cv_member_struct_tm_tm_gmtoff = yes; then
-   struct_tm_tm_gmtoff=true
- else
-@@ -29225,10 +29652,10 @@
- 
-                 ;;
-         *)
--                { echo "$as_me:$LINENO: checking whether timezone is declared" >&5
--echo $ECHO_N "checking whether timezone is declared... $ECHO_C" >&6; }
-+                { $as_echo "$as_me:$LINENO: checking whether timezone is declared" >&5
-+$as_echo_n "checking whether timezone is declared... " >&6; }
- if test "${ac_cv_have_decl_timezone+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -29257,20 +29684,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_have_decl_timezone=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_have_decl_timezone=no
-@@ -29278,8 +29706,8 @@
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_timezone" >&5
--echo "${ECHO_T}$ac_cv_have_decl_timezone" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_timezone" >&5
-+$as_echo "$ac_cv_have_decl_timezone" >&6; }
- if test $ac_cv_have_decl_timezone = yes; then
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -29291,8 +29719,8 @@
-                 ;;
- esac
- 
--{ echo "$as_me:$LINENO: checking for _NL_MEASUREMENT_MEASUREMENT" >&5
--echo $ECHO_N "checking for _NL_MEASUREMENT_MEASUREMENT... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for _NL_MEASUREMENT_MEASUREMENT" >&5
-+$as_echo_n "checking for _NL_MEASUREMENT_MEASUREMENT... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -29317,30 +29745,34 @@
-   *\"* | *\`* | *\\*) 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
-   gtk_ok=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	gtk_ok=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $gtk_ok" >&5
--echo "${ECHO_T}$gtk_ok" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $gtk_ok" >&5
-+$as_echo "$gtk_ok" >&6; }
- if test "$gtk_ok" = "yes"; then
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -29574,11 +30006,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
-@@ -29611,12 +30044,12 @@
- 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;}
-+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
-+$as_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: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-   fi
- fi
- rm -f confcache
-@@ -29632,7 +30065,7 @@
- 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"`
-+  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"
-@@ -29644,23 +30077,23 @@
- 
- 
- if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-+  { { $as_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.
-+$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
- if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-+  { { $as_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.
-+$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
- if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-+  { { $as_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.
-+$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
-@@ -29669,187 +30102,188 @@
- 
- 
- if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-+  { { $as_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.
-+$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 "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-+$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${BUILD_GNOME_VFS_APPLETS_TRUE}" && test -z "${BUILD_GNOME_VFS_APPLETS_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"BUILD_GNOME_VFS_APPLETS\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_GNOME_VFS_APPLETS\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"BUILD_GNOME_VFS_APPLETS\" was never defined.
-+$as_echo "$as_me: error: conditional \"BUILD_GNOME_VFS_APPLETS\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${BUILD_GTOP_APPLETS_TRUE}" && test -z "${BUILD_GTOP_APPLETS_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"BUILD_GTOP_APPLETS\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_GTOP_APPLETS\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"BUILD_GTOP_APPLETS\" was never defined.
-+$as_echo "$as_me: error: conditional \"BUILD_GTOP_APPLETS\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${BUILD_KEYBOARD_APPLET_TRUE}" && test -z "${BUILD_KEYBOARD_APPLET_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"BUILD_KEYBOARD_APPLET\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_KEYBOARD_APPLET\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"BUILD_KEYBOARD_APPLET\" was never defined.
-+$as_echo "$as_me: error: conditional \"BUILD_KEYBOARD_APPLET\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${HAVE_JW_TRUE}" && test -z "${HAVE_JW_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"HAVE_JW\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_JW\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"HAVE_JW\" was never defined.
-+$as_echo "$as_me: error: conditional \"HAVE_JW\" 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
--  { { echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
-+  { { $as_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.
-+$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
--  { { echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined.
-+  { { $as_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.
-+$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
--  { { echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
-+  { { $as_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.
-+$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 -z "${ENABLE_FLAGS_TRUE}" && test -z "${ENABLE_FLAGS_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"ENABLE_FLAGS\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_FLAGS\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"ENABLE_FLAGS\" was never defined.
-+$as_echo "$as_me: error: conditional \"ENABLE_FLAGS\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${GKB_SUN_TRUE}" && test -z "${GKB_SUN_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"GKB_SUN\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"GKB_SUN\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"GKB_SUN\" was never defined.
-+$as_echo "$as_me: error: conditional \"GKB_SUN\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${HAVE_LIBAPM_TRUE}" && test -z "${HAVE_LIBAPM_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"HAVE_LIBAPM\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_LIBAPM\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"HAVE_LIBAPM\" was never defined.
-+$as_echo "$as_me: error: conditional \"HAVE_LIBAPM\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${NEED_LIBAPM_TRUE}" && test -z "${NEED_LIBAPM_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"NEED_LIBAPM\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"NEED_LIBAPM\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"NEED_LIBAPM\" was never defined.
-+$as_echo "$as_me: error: conditional \"NEED_LIBAPM\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${BUILD_BATTSTAT_APPLET_TRUE}" && test -z "${BUILD_BATTSTAT_APPLET_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"BUILD_BATTSTAT_APPLET\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_BATTSTAT_APPLET\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"BUILD_BATTSTAT_APPLET\" was never defined.
-+$as_echo "$as_me: error: conditional \"BUILD_BATTSTAT_APPLET\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${BUILD_MINICOMMANDER_APPLET_TRUE}" && test -z "${BUILD_MINICOMMANDER_APPLET_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"BUILD_MINICOMMANDER_APPLET\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_MINICOMMANDER_APPLET\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"BUILD_MINICOMMANDER_APPLET\" was never defined.
-+$as_echo "$as_me: error: conditional \"BUILD_MINICOMMANDER_APPLET\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${BUILD_STICKYNOTES_APPLET_TRUE}" && test -z "${BUILD_STICKYNOTES_APPLET_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"BUILD_STICKYNOTES_APPLET\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_STICKYNOTES_APPLET\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"BUILD_STICKYNOTES_APPLET\" was never defined.
-+$as_echo "$as_me: error: conditional \"BUILD_STICKYNOTES_APPLET\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${APPLET_MIXER_TRUE}" && test -z "${APPLET_MIXER_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"APPLET_MIXER\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"APPLET_MIXER\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"APPLET_MIXER\" was never defined.
-+$as_echo "$as_me: error: conditional \"APPLET_MIXER\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${HAVE_GST10_TRUE}" && test -z "${HAVE_GST10_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"HAVE_GST10\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GST10\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"HAVE_GST10\" was never defined.
-+$as_echo "$as_me: error: conditional \"HAVE_GST10\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${APPLET_ACCESSX_TRUE}" && test -z "${APPLET_ACCESSX_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"APPLET_ACCESSX\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"APPLET_ACCESSX\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"APPLET_ACCESSX\" was never defined.
-+$as_echo "$as_me: error: conditional \"APPLET_ACCESSX\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${APPLET_MODEMLIGHTS_TRUE}" && test -z "${APPLET_MODEMLIGHTS_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"APPLET_MODEMLIGHTS\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"APPLET_MODEMLIGHTS\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"APPLET_MODEMLIGHTS\" was never defined.
-+$as_echo "$as_me: error: conditional \"APPLET_MODEMLIGHTS\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${HAVE_LIBCPUFREQ_TRUE}" && test -z "${HAVE_LIBCPUFREQ_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"HAVE_LIBCPUFREQ\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_LIBCPUFREQ\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"HAVE_LIBCPUFREQ\" was never defined.
-+$as_echo "$as_me: error: conditional \"HAVE_LIBCPUFREQ\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${BUILD_CPUFREQ_APPLET_TRUE}" && test -z "${BUILD_CPUFREQ_APPLET_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"BUILD_CPUFREQ_APPLET\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_CPUFREQ_APPLET\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"BUILD_CPUFREQ_APPLET\" was never defined.
-+$as_echo "$as_me: error: conditional \"BUILD_CPUFREQ_APPLET\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${BUILD_CPUFREQ_SELECTOR_TRUE}" && test -z "${BUILD_CPUFREQ_SELECTOR_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"BUILD_CPUFREQ_SELECTOR\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_CPUFREQ_SELECTOR\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"BUILD_CPUFREQ_SELECTOR\" was never defined.
-+$as_echo "$as_me: error: conditional \"BUILD_CPUFREQ_SELECTOR\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${CPUFREQ_SELECTOR_SUID_TRUE}" && test -z "${CPUFREQ_SELECTOR_SUID_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"CPUFREQ_SELECTOR_SUID\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"CPUFREQ_SELECTOR_SUID\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"CPUFREQ_SELECTOR_SUID\" was never defined.
-+$as_echo "$as_me: error: conditional \"CPUFREQ_SELECTOR_SUID\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${BUILD_INVEST_APPLET_TRUE}" && test -z "${BUILD_INVEST_APPLET_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"BUILD_INVEST_APPLET\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_INVEST_APPLET\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"BUILD_INVEST_APPLET\" was never defined.
-+$as_echo "$as_me: error: conditional \"BUILD_INVEST_APPLET\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- : ${CONFIG_STATUS=./config.status}
-+ac_write_fail=0
- 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
-+{ $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.
-@@ -29862,7 +30296,7 @@
- SHELL=\${CONFIG_SHELL-$SHELL}
- _ACEOF
- 
--cat >>$CONFIG_STATUS <<\_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- ## --------------------- ##
- ## M4sh Initialization.  ##
- ## --------------------- ##
-@@ -29872,7 +30306,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
-@@ -29894,17 +30328,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.
-@@ -29920,8 +30382,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.
-@@ -29944,7 +30404,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
- 
-@@ -29957,17 +30417,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 &&
-@@ -29989,7 +30442,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
-@@ -30040,7 +30493,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
-@@ -30068,7 +30521,6 @@
- *)
-   ECHO_N='-n';;
- esac
--
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-    test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
-@@ -30081,19 +30533,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
-@@ -30118,10 +30573,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
-@@ -30144,7 +30599,7 @@
- # values after options handling.
- ac_log="
- This file was extended by gnome-applets $as_me 2.22.3, which was
--generated by GNU Autoconf 2.61.  Invocation command line was
-+generated by GNU Autoconf 2.62.  Invocation command line was
- 
-   CONFIG_FILES    = $CONFIG_FILES
-   CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -30157,7 +30612,7 @@
- 
- _ACEOF
- 
--cat >>$CONFIG_STATUS <<_ACEOF
-+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"
-@@ -30165,7 +30620,7 @@
- 
- _ACEOF
- 
--cat >>$CONFIG_STATUS <<\_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- ac_cs_usage="\
- \`$as_me' instantiates files from templates according to the
- current configuration.
-@@ -30178,9 +30633,9 @@
-   -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
-+                   instantiate the configuration file FILE
-   --header=FILE[:TEMPLATE]
--		   instantiate the configuration header FILE
-+                   instantiate the configuration header FILE
- 
- Configuration files:
- $config_files
-@@ -30194,13 +30649,13 @@
- Report bugs to <bug-autoconf at gnu.org>."
- 
- _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- ac_cs_version="\\
- gnome-applets config.status 2.22.3
--configured by $0, generated by GNU Autoconf 2.61,
--  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.62,
-+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
- 
--Copyright (C) 2006 Free Software Foundation, Inc.
-+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."
- 
-@@ -30208,11 +30663,12 @@
- srcdir='$srcdir'
- INSTALL='$INSTALL'
- MKDIR_P='$MKDIR_P'
-+AWK='$AWK'
-+test -n "\$AWK" || AWK=awk
- _ACEOF
- 
--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.
-+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
-@@ -30234,30 +30690,36 @@
-   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-     ac_cs_recheck=: ;;
-   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
--    echo "$ac_cs_version"; exit ;;
-+    $as_echo "$ac_cs_version"; exit ;;
-   --debug | --debu | --deb | --de | --d | -d )
-     debug=: ;;
-   --file | --fil | --fi | --f )
-     $ac_shift
--    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-+    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
--    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-+    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
--    { echo "$as_me: error: ambiguous option: $1
-+    { $as_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 ;;
-+    $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.
--  -*) { echo "$as_me: error: unrecognized option: $1
-+  -*) { $as_echo "$as_me: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&2
-    { (exit 1); exit 1; }; } ;;
- 
-@@ -30276,39 +30738,38 @@
- fi
- 
- _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- 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
-+  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 $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+  exec "\$@"
- fi
- 
- _ACEOF
--cat >>$CONFIG_STATUS <<\_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
--  echo "$ac_log"
-+  $as_echo "$ac_log"
- } >&5
- 
- _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- #
+@@ -30301,9 +30307,6 @@
  # INIT-COMMANDS
  #
  AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
@@ -15074,13 +987,7 @@
  
  
  _ACEOF
- 
--cat >>$CONFIG_STATUS <<\_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- 
- # Handling of arguments.
- for ac_config_target in $ac_config_targets
-@@ -30316,7 +30777,6 @@
+@@ -30316,7 +30319,6 @@
    case $ac_config_target in
      "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
      "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
@@ -15088,1122 +995,60 @@
      "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
      "gnome-applets.spec") CONFIG_FILES="$CONFIG_FILES gnome-applets.spec" ;;
      "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-@@ -30371,8 +30831,8 @@
-     "null_applet/Makefile") CONFIG_FILES="$CONFIG_FILES null_applet/Makefile" ;;
-     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
- 
--  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
--echo "$as_me: error: invalid argument: $ac_config_target" >&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
-@@ -30413,483 +30873,143 @@
-   (umask 077 && mkdir "$tmp")
- } ||
- {
--   echo "$me: cannot create a temporary directory in ." >&2
-+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
-    { (exit 1); exit 1; }
- }
- 
--#
--# Set up the sed scripts for CONFIG_FILES section.
--#
--
--# No need to generate the scripts if there are no CONFIG_FILES.
--# This happens for instance when ./config.status config.h
-+# 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
- 
--_ACEOF
--
--
--
--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
--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
+@@ -30494,6 +30496,9 @@
+ MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
+ MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
+ MAINT!$MAINT$ac_delim
++INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
++INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
++INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
+ INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim
+ INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim
+ INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim
+@@ -30516,9 +30521,6 @@
+ XGETTEXT!$XGETTEXT$ac_delim
+ MSGMERGE!$MSGMERGE$ac_delim
+ MSGFMT!$MSGFMT$ac_delim
 -INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
 -INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
 -INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
--INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
--ALL_LINGUAS!$ALL_LINGUAS$ac_delim
--CC!$CC$ac_delim
--CFLAGS!$CFLAGS$ac_delim
--LDFLAGS!$LDFLAGS$ac_delim
--CPPFLAGS!$CPPFLAGS$ac_delim
--ac_ct_CC!$ac_ct_CC$ac_delim
--EXEEXT!$EXEEXT$ac_delim
--OBJEXT!$OBJEXT$ac_delim
--DEPDIR!$DEPDIR$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
- 
--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`
-+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
-+  ac_cs_awk_cr=$ac_cr
- 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
-+echo 'BEGIN {' >"$tmp/subs1.awk" &&
+ INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
+ ALL_LINGUAS!$ALL_LINGUAS$ac_delim
+ CC!$CC$ac_delim
+@@ -30777,8 +30779,7 @@
+ HAVE_XKB!$HAVE_XKB$ac_delim
+ APPLET_ACCESSX_TRUE!$APPLET_ACCESSX_TRUE$ac_delim
+ APPLET_ACCESSX_FALSE!$APPLET_ACCESSX_FALSE$ac_delim
+-SU_TOOL!$SU_TOOL$ac_delim
+-STB_SCRIPTS_DIR!$STB_SCRIPTS_DIR$ac_delim
++MODEMLIGHTS_CFLAGS!$MODEMLIGHTS_CFLAGS$ac_delim
+ MODEMLIGHTS_LIBS!$MODEMLIGHTS_LIBS$ac_delim
+ APPLET_MODEMLIGHTS_TRUE!$APPLET_MODEMLIGHTS_TRUE$ac_delim
+ APPLET_MODEMLIGHTS_FALSE!$APPLET_MODEMLIGHTS_FALSE$ac_delim
+@@ -30805,6 +30806,7 @@
+ SYSCONFDIR!$SYSCONFDIR$ac_delim
+ LIBDIR!$LIBDIR$ac_delim
+ PREFIX!$PREFIX$ac_delim
++PYTHONDIR!$PYTHONDIR$ac_delim
  _ACEOF
  
- 
--ac_delim='%!_!# '
--for ac_last_try in false false false false false :; do
--  cat >conf$$subs.sed <<_ACEOF
--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
--PKG_CONFIG!$PKG_CONFIG$ac_delim
--CPP!$CPP$ac_delim
--GREP!$GREP$ac_delim
--EGREP!$EGREP$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
--LN_S!$LN_S$ac_delim
--ECHO!$ECHO$ac_delim
--AR!$AR$ac_delim
--RANLIB!$RANLIB$ac_delim
--DSYMUTIL!$DSYMUTIL$ac_delim
--NMEDIT!$NMEDIT$ac_delim
--CXX!$CXX$ac_delim
--CXXFLAGS!$CXXFLAGS$ac_delim
--ac_ct_CXX!$ac_ct_CXX$ac_delim
--CXXDEPMODE!$CXXDEPMODE$ac_delim
--am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
--am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
--CXXCPP!$CXXCPP$ac_delim
--F77!$F77$ac_delim
--FFLAGS!$FFLAGS$ac_delim
--ac_ct_F77!$ac_ct_F77$ac_delim
--LIBTOOL!$LIBTOOL$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
--PYTHON!$PYTHON$ac_delim
--PYTHON_VERSION!$PYTHON_VERSION$ac_delim
--PYTHON_PREFIX!$PYTHON_PREFIX$ac_delim
--PYTHON_EXEC_PREFIX!$PYTHON_EXEC_PREFIX$ac_delim
--PYTHON_PLATFORM!$PYTHON_PLATFORM$ac_delim
--pythondir!$pythondir$ac_delim
--pkgpythondir!$pkgpythondir$ac_delim
--pyexecdir!$pyexecdir$ac_delim
--pkgpyexecdir!$pkgpyexecdir$ac_delim
--PYTHON_INCLUDES!$PYTHON_INCLUDES$ac_delim
--WARN_CFLAGS!$WARN_CFLAGS$ac_delim
--GIT_CFLAGS!$GIT_CFLAGS$ac_delim
--GIT_LIBS!$GIT_LIBS$ac_delim
--GAILUTIL_CFLAGS!$GAILUTIL_CFLAGS$ac_delim
--GAILUTIL_LIBS!$GAILUTIL_LIBS$ac_delim
--GIO_CFLAGS!$GIO_CFLAGS$ac_delim
--GIO_LIBS!$GIO_LIBS$ac_delim
--GTK_CFLAGS!$GTK_CFLAGS$ac_delim
--GTK_LIBS!$GTK_LIBS$ac_delim
--GTK_FLAGS!$GTK_FLAGS$ac_delim
--GNOME_APPLETS_CFLAGS!$GNOME_APPLETS_CFLAGS$ac_delim
--GNOME_APPLETS_LIBS!$GNOME_APPLETS_LIBS$ac_delim
--GNOME_LIBS2_CFLAGS!$GNOME_LIBS2_CFLAGS$ac_delim
--GNOME_LIBS2_LIBS!$GNOME_LIBS2_LIBS$ac_delim
--GNOMEDESKTOP_CFLAGS!$GNOMEDESKTOP_CFLAGS$ac_delim
--GNOMEDESKTOP_LIBS!$GNOMEDESKTOP_LIBS$ac_delim
--GNOME_VFS_APPLETS_CFLAGS!$GNOME_VFS_APPLETS_CFLAGS$ac_delim
--GNOME_VFS_APPLETS_LIBS!$GNOME_VFS_APPLETS_LIBS$ac_delim
--BUILD_GNOME_VFS_APPLETS_TRUE!$BUILD_GNOME_VFS_APPLETS_TRUE$ac_delim
--BUILD_GNOME_VFS_APPLETS_FALSE!$BUILD_GNOME_VFS_APPLETS_FALSE$ac_delim
--LIBGLADE_CFLAGS!$LIBGLADE_CFLAGS$ac_delim
--LIBGLADE_LIBS!$LIBGLADE_LIBS$ac_delim
--GTOP_APPLETS_CFLAGS!$GTOP_APPLETS_CFLAGS$ac_delim
--GTOP_APPLETS_LIBS!$GTOP_APPLETS_LIBS$ac_delim
--BUILD_GTOP_APPLETS_TRUE!$BUILD_GTOP_APPLETS_TRUE$ac_delim
--BUILD_GTOP_APPLETS_FALSE!$BUILD_GTOP_APPLETS_FALSE$ac_delim
--LIBGNOMEKBDUI_CFLAGS!$LIBGNOMEKBDUI_CFLAGS$ac_delim
--LIBGNOMEKBDUI_LIBS!$LIBGNOMEKBDUI_LIBS$ac_delim
--BUILD_KEYBOARD_APPLET_TRUE!$BUILD_KEYBOARD_APPLET_TRUE$ac_delim
--BUILD_KEYBOARD_APPLET_FALSE!$BUILD_KEYBOARD_APPLET_FALSE$ac_delim
--GNOME_SETTINGS_DAEMON_CFLAGS!$GNOME_SETTINGS_DAEMON_CFLAGS$ac_delim
--GNOME_SETTINGS_DAEMON_LIBS!$GNOME_SETTINGS_DAEMON_LIBS$ac_delim
--LIBWNCK_CFLAGS!$LIBWNCK_CFLAGS$ac_delim
--LIBWNCK_LIBS!$LIBWNCK_LIBS$ac_delim
--LIBNOTIFY_CFLAGS!$LIBNOTIFY_CFLAGS$ac_delim
--LIBNOTIFY_LIBS!$LIBNOTIFY_LIBS$ac_delim
--CPUFREQ_SELECTOR_CFLAGS!$CPUFREQ_SELECTOR_CFLAGS$ac_delim
--CPUFREQ_SELECTOR_LIBS!$CPUFREQ_SELECTOR_LIBS$ac_delim
--DBUS_CFLAGS!$DBUS_CFLAGS$ac_delim
--DBUS_LIBS!$DBUS_LIBS$ac_delim
--HAL_CFLAGS!$HAL_CFLAGS$ac_delim
--HAL_LIBS!$HAL_LIBS$ac_delim
--GUCHARMAP_CFLAGS!$GUCHARMAP_CFLAGS$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;}
-+{
-+  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; }; }
--  else
--    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
--  fi
--done
--
--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-2.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_num=`echo "$ac_subst_vars" | grep -c '$'`
+   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -30846,13 +30848,12 @@
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
--  cat >conf$$subs.sed <<_ACEOF
--GUCHARMAP_LIBS!$GUCHARMAP_LIBS$ac_delim
--PYGTK_CFLAGS!$PYGTK_CFLAGS$ac_delim
--PYGTK_LIBS!$PYGTK_LIBS$ac_delim
--LIBGWEATHER_CFLAGS!$LIBGWEATHER_CFLAGS$ac_delim
--LIBGWEATHER_LIBS!$LIBGWEATHER_LIBS$ac_delim
--GDK_PIXBUF_CSOURCE!$GDK_PIXBUF_CSOURCE$ac_delim
--GLIB_GENMARSHAL!$GLIB_GENMARSHAL$ac_delim
--GCONFTOOL!$GCONFTOOL$ac_delim
--XSLTPROC!$XSLTPROC$ac_delim
--SCROLLKEEPER_CONFIG!$SCROLLKEEPER_CONFIG$ac_delim
--SCROLLKEEPER_REQUIRED!$SCROLLKEEPER_REQUIRED$ac_delim
--JW!$JW$ac_delim
--HAVE_JW_TRUE!$HAVE_JW_TRUE$ac_delim
--HAVE_JW_FALSE!$HAVE_JW_FALSE$ac_delim
--HAVE_JW!$HAVE_JW$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
--GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
--GNOMELOCALEDIR!$GNOMELOCALEDIR$ac_delim
--USE_NLS!$USE_NLS$ac_delim
--MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
--GMSGFMT!$GMSGFMT$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
--gnomelocaledir!$gnomelocaledir$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
--ENABLE_FLAGS_TRUE!$ENABLE_FLAGS_TRUE$ac_delim
--ENABLE_FLAGS_FALSE!$ENABLE_FLAGS_FALSE$ac_delim
--GKB_SUN_TRUE!$GKB_SUN_TRUE$ac_delim
--GKB_SUN_FALSE!$GKB_SUN_FALSE$ac_delim
--HAVE_LIBAPM!$HAVE_LIBAPM$ac_delim
--NEED_LIBAPM!$NEED_LIBAPM$ac_delim
--ACPIINC!$ACPIINC$ac_delim
--HAVE_LIBAPM_TRUE!$HAVE_LIBAPM_TRUE$ac_delim
--HAVE_LIBAPM_FALSE!$HAVE_LIBAPM_FALSE$ac_delim
--NEED_LIBAPM_TRUE!$NEED_LIBAPM_TRUE$ac_delim
--NEED_LIBAPM_FALSE!$NEED_LIBAPM_FALSE$ac_delim
--BUILD_BATTSTAT_APPLET_TRUE!$BUILD_BATTSTAT_APPLET_TRUE$ac_delim
--BUILD_BATTSTAT_APPLET_FALSE!$BUILD_BATTSTAT_APPLET_FALSE$ac_delim
--BUILD_MINICOMMANDER_APPLET_TRUE!$BUILD_MINICOMMANDER_APPLET_TRUE$ac_delim
--BUILD_MINICOMMANDER_APPLET_FALSE!$BUILD_MINICOMMANDER_APPLET_FALSE$ac_delim
--BUILD_STICKYNOTES_APPLET_TRUE!$BUILD_STICKYNOTES_APPLET_TRUE$ac_delim
--BUILD_STICKYNOTES_APPLET_FALSE!$BUILD_STICKYNOTES_APPLET_FALSE$ac_delim
--MIXER_CFLAGS!$MIXER_CFLAGS$ac_delim
--MIXER_LIBS!$MIXER_LIBS$ac_delim
--APPLET_MIXER_TRUE!$APPLET_MIXER_TRUE$ac_delim
--APPLET_MIXER_FALSE!$APPLET_MIXER_FALSE$ac_delim
--HAVE_GST10_TRUE!$HAVE_GST10_TRUE$ac_delim
--HAVE_GST10_FALSE!$HAVE_GST10_FALSE$ac_delim
--HAVE_XKB!$HAVE_XKB$ac_delim
--APPLET_ACCESSX_TRUE!$APPLET_ACCESSX_TRUE$ac_delim
--APPLET_ACCESSX_FALSE!$APPLET_ACCESSX_FALSE$ac_delim
--SU_TOOL!$SU_TOOL$ac_delim
--STB_SCRIPTS_DIR!$STB_SCRIPTS_DIR$ac_delim
--MODEMLIGHTS_LIBS!$MODEMLIGHTS_LIBS$ac_delim
--APPLET_MODEMLIGHTS_TRUE!$APPLET_MODEMLIGHTS_TRUE$ac_delim
--APPLET_MODEMLIGHTS_FALSE!$APPLET_MODEMLIGHTS_FALSE$ac_delim
--HAVE_LIBCPUFREQ_TRUE!$HAVE_LIBCPUFREQ_TRUE$ac_delim
--HAVE_LIBCPUFREQ_FALSE!$HAVE_LIBCPUFREQ_FALSE$ac_delim
--LIBCPUFREQ_LIBS!$LIBCPUFREQ_LIBS$ac_delim
--BUILD_CPUFREQ_APPLET_TRUE!$BUILD_CPUFREQ_APPLET_TRUE$ac_delim
--BUILD_CPUFREQ_APPLET_FALSE!$BUILD_CPUFREQ_APPLET_FALSE$ac_delim
--BUILD_CPUFREQ_SELECTOR_TRUE!$BUILD_CPUFREQ_SELECTOR_TRUE$ac_delim
--BUILD_CPUFREQ_SELECTOR_FALSE!$BUILD_CPUFREQ_SELECTOR_FALSE$ac_delim
--CPUFREQ_SELECTOR_SUID_TRUE!$CPUFREQ_SELECTOR_SUID_TRUE$ac_delim
--CPUFREQ_SELECTOR_SUID_FALSE!$CPUFREQ_SELECTOR_SUID_FALSE$ac_delim
--BUILD_INVEST_APPLET_TRUE!$BUILD_INVEST_APPLET_TRUE$ac_delim
--BUILD_INVEST_APPLET_FALSE!$BUILD_INVEST_APPLET_FALSE$ac_delim
--ACLOCAL_AMFLAGS!$ACLOCAL_AMFLAGS$ac_delim
--iconsdir!$iconsdir$ac_delim
--pixmapsdir!$pixmapsdir$ac_delim
--pkgdatadir!$pkgdatadir$ac_delim
--gladedir!$gladedir$ac_delim
--GNOME_ICONDIR!$GNOME_ICONDIR$ac_delim
--GNOME_PIXMAPSDIR!$GNOME_PIXMAPSDIR$ac_delim
--GNOME_GLADEDIR!$GNOME_GLADEDIR$ac_delim
--DATADIR!$DATADIR$ac_delim
--SYSCONFDIR!$SYSCONFDIR$ac_delim
--LIBDIR!$LIBDIR$ac_delim
--PREFIX!$PREFIX$ac_delim
--_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; }; }
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
+   cat >conf$$subs.sed <<_ACEOF
+-PYTHONDIR!$PYTHONDIR$ac_delim
+ GLADEDIR!$GLADEDIR$ac_delim
+ LIBOBJS!$LIBOBJS$ac_delim
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+ 
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 4; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 3; then
      break
    elif $ac_last_try; then
--    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+    { { $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
- 
--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-3.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
-+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
-+  }
- 
--ac_delim='%!_!# '
--for ac_last_try in false false false false false :; do
--  cat >conf$$subs.sed <<_ACEOF
--PYTHONDIR!$PYTHONDIR$ac_delim
--GLADEDIR!$GLADEDIR$ac_delim
--LIBOBJS!$LIBOBJS$ac_delim
--LTLIBOBJS!$LTLIBOBJS$ac_delim
--_ACEOF
-+  print line
-+}
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 4; 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;}
-+_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
-+  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; }; }
--  else
--    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
--  fi
--done
--
--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-4.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
- 
--
- # 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
-@@ -30905,19 +31025,133 @@
- }'
- fi
- 
--cat >>$CONFIG_STATUS <<\_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- fi # test -n "$CONFIG_FILES"
- 
-+# 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.
-+
-+# 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]
-+  if (D_is_set[macro]) {
-+    # Preserve the white space surrounding the "#".
-+    prefix = substr(line, 1, index(line, defundef) - 1)
-+    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 "/*", line, "*/"
-+      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"
-+
- 
--for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
-+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;;
-@@ -30946,26 +31180,38 @@
- 	   [\\/$]*) 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
- 
-     # 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
- 
-     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
-@@ -30975,7 +31221,7 @@
- 	 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
-@@ -31001,7 +31247,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"
-@@ -31010,7 +31256,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
-@@ -31031,17 +31277,17 @@
-       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=.
- 
- 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/ ;;
-@@ -31086,12 +31332,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
- }
-@@ -31100,13 +31347,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
-@@ -31120,15 +31368,16 @@
- # 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
-+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
-@@ -31139,121 +31388,60 @@
- 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" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.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=' ,'
--
--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
--
--# 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
--
--# Break up conftest.defines:
--ac_max_sed_lines=50
--
--# 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"'
--
--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
--
--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;}
-+    {
-+      $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
-+      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
--    echo "/* $configure_input  */"
--    cat "$ac_result"
-+    $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
--  rm -f "$tmp/out12"
--# Compute $ac_file's index in $config_headers.
--_am_arg=$ac_file
-+# 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
-@@ -31268,7 +31456,7 @@
- 	 X"$_am_arg" : 'X\(//\)[^/]' \| \
- 	 X"$_am_arg" : 'X\(//\)$' \| \
- 	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
--echo X"$_am_arg" |
-+$as_echo X"$_am_arg" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- 	    s//\1/
- 	    q
-@@ -31288,8 +31476,8 @@
- 	  s/.*/./; q'`/stamp-h$_am_stamp_count
-  ;;
- 
--  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
--echo "$as_me: executing $ac_file commands" >&6;}
-+  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
-+$as_echo "$as_me: executing $ac_file commands" >&6;}
-  ;;
-   esac
- 
-@@ -31311,7 +31499,7 @@
- 	 X"$mf" : 'X\(//\)[^/]' \| \
- 	 X"$mf" : 'X\(//\)$' \| \
- 	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
--echo X"$mf" |
-+$as_echo X"$mf" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- 	    s//\1/
- 	    q
-@@ -31355,7 +31543,7 @@
- 	 X"$file" : 'X\(//\)[^/]' \| \
- 	 X"$file" : 'X\(//\)$' \| \
- 	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
--echo X"$file" |
-+$as_echo X"$file" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- 	    s//\1/
- 	    q
-@@ -31381,7 +31569,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"
-@@ -31390,7 +31578,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
-@@ -31411,31 +31599,14 @@
-       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; }; }; }
-     # echo "creating $dirpart/$file"
-     echo '# dummy' > "$dirpart/$file"
+     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+@@ -31419,23 +31420,6 @@
    done
  done
   ;;
@@ -16227,43 +1072,10 @@
      "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)
          sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
        esac ;;
-@@ -31449,8 +31620,8 @@
-       "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES"
- 
-     if test ! -f "po/Makefile"; then
--      { { echo "$as_me:$LINENO: error: po/Makefile is not ready." >&5
--echo "$as_me: error: po/Makefile is not ready." >&2;}
-+      { { $as_echo "$as_me:$LINENO: error: po/Makefile is not ready." >&5
-+$as_echo "$as_me: error: po/Makefile is not ready." >&2;}
-    { (exit 1); exit 1; }; }
-     fi
-     mv "po/Makefile" "po/Makefile.tmp"
-@@ -31472,6 +31643,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.
-@@ -31493,6 +31669,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
- 
- 
- echo "
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/cpufreq/help/Makefile.in gnome-applets-2.22.3/cpufreq/help/Makefile.in
---- gnome-applets-2.22.3.old/cpufreq/help/Makefile.in	2008-06-30 11:29:37.000000000 +0200
-+++ gnome-applets-2.22.3/cpufreq/help/Makefile.in	2008-06-30 12:57:48.000000000 +0200
+Index: gnome-applets-2.22.3/cpufreq/help/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/cpufreq/help/Makefile.in	2008-07-15 11:23:13.938681234 +0200
++++ gnome-applets-2.22.3/cpufreq/help/Makefile.in	2008-07-15 11:27:06.459701502 +0200
 @@ -62,7 +62,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16290,17 +1102,10 @@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -319,6 +317,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/cpufreq/Makefile.in gnome-applets-2.22.3/cpufreq/Makefile.in
---- gnome-applets-2.22.3.old/cpufreq/Makefile.in	2008-06-30 11:29:37.000000000 +0200
-+++ gnome-applets-2.22.3/cpufreq/Makefile.in	2008-06-30 12:57:48.000000000 +0200
+Index: gnome-applets-2.22.3/cpufreq/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/cpufreq/Makefile.in	2008-07-15 11:23:13.930676655 +0200
++++ gnome-applets-2.22.3/cpufreq/Makefile.in	2008-07-15 11:27:06.323695878 +0200
 @@ -39,7 +39,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16327,17 +1132,10 @@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -321,6 +319,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = help pixmaps src
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/cpufreq/pixmaps/Makefile.in gnome-applets-2.22.3/cpufreq/pixmaps/Makefile.in
---- gnome-applets-2.22.3.old/cpufreq/pixmaps/Makefile.in	2008-06-30 11:29:37.000000000 +0200
-+++ gnome-applets-2.22.3/cpufreq/pixmaps/Makefile.in	2008-06-30 12:57:48.000000000 +0200
+Index: gnome-applets-2.22.3/cpufreq/pixmaps/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/cpufreq/pixmaps/Makefile.in	2008-07-15 11:23:13.922702387 +0200
++++ gnome-applets-2.22.3/cpufreq/pixmaps/Makefile.in	2008-07-15 11:27:06.547680281 +0200
 @@ -38,7 +38,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16364,17 +1162,10 @@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -304,6 +302,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- cpufreq_pixmapdir = $(pixmapsdir)/cpufreq-applet
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/cpufreq/src/cpufreq-selector/Makefile.in gnome-applets-2.22.3/cpufreq/src/cpufreq-selector/Makefile.in
---- gnome-applets-2.22.3.old/cpufreq/src/cpufreq-selector/Makefile.in	2008-06-30 11:29:37.000000000 +0200
-+++ gnome-applets-2.22.3/cpufreq/src/cpufreq-selector/Makefile.in	2008-06-30 12:57:49.000000000 +0200
+Index: gnome-applets-2.22.3/cpufreq/src/cpufreq-selector/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/cpufreq/src/cpufreq-selector/Makefile.in	2008-07-15 11:23:13.910675719 +0200
++++ gnome-applets-2.22.3/cpufreq/src/cpufreq-selector/Makefile.in	2008-07-15 11:27:06.763696423 +0200
 @@ -39,7 +39,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16401,17 +1192,10 @@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -331,6 +329,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- cpufreqselectordir = $(bindir)
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/cpufreq/src/Makefile.in gnome-applets-2.22.3/cpufreq/src/Makefile.in
---- gnome-applets-2.22.3.old/cpufreq/src/Makefile.in	2008-06-30 11:29:37.000000000 +0200
-+++ gnome-applets-2.22.3/cpufreq/src/Makefile.in	2008-06-30 12:57:49.000000000 +0200
+Index: gnome-applets-2.22.3/cpufreq/src/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/cpufreq/src/Makefile.in	2008-07-15 11:23:13.902681197 +0200
++++ gnome-applets-2.22.3/cpufreq/src/Makefile.in	2008-07-15 11:27:06.659696963 +0200
 @@ -39,7 +39,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16438,17 +1222,10 @@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -345,6 +343,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- @BUILD_CPUFREQ_SELECTOR_TRUE at selector_SUBDIR = cpufreq-selector
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/drivemount/help/Makefile.in gnome-applets-2.22.3/drivemount/help/Makefile.in
---- gnome-applets-2.22.3.old/drivemount/help/Makefile.in	2008-06-30 11:29:38.000000000 +0200
-+++ gnome-applets-2.22.3/drivemount/help/Makefile.in	2008-06-30 12:57:50.000000000 +0200
+Index: gnome-applets-2.22.3/drivemount/help/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/drivemount/help/Makefile.in	2008-07-15 11:23:13.894671380 +0200
++++ gnome-applets-2.22.3/drivemount/help/Makefile.in	2008-07-15 11:27:07.006691693 +0200
 @@ -62,7 +62,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16475,17 +1252,10 @@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -319,6 +317,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/drivemount/Makefile.in gnome-applets-2.22.3/drivemount/Makefile.in
---- gnome-applets-2.22.3.old/drivemount/Makefile.in	2008-06-30 11:29:37.000000000 +0200
-+++ gnome-applets-2.22.3/drivemount/Makefile.in	2008-06-30 12:57:49.000000000 +0200
+Index: gnome-applets-2.22.3/drivemount/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/drivemount/Makefile.in	2008-07-15 11:23:13.874699778 +0200
++++ gnome-applets-2.22.3/drivemount/Makefile.in	2008-07-15 11:27:06.879695874 +0200
 @@ -41,7 +41,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16512,17 +1282,10 @@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -341,6 +339,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = help
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/geyes/docs/Makefile.in gnome-applets-2.22.3/geyes/docs/Makefile.in
---- gnome-applets-2.22.3.old/geyes/docs/Makefile.in	2008-06-30 11:29:38.000000000 +0200
-+++ gnome-applets-2.22.3/geyes/docs/Makefile.in	2008-06-30 12:57:50.000000000 +0200
+Index: gnome-applets-2.22.3/geyes/docs/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/geyes/docs/Makefile.in	2008-07-15 11:23:13.866700088 +0200
++++ gnome-applets-2.22.3/geyes/docs/Makefile.in	2008-07-15 11:27:07.255690658 +0200
 @@ -62,7 +62,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16549,17 +1312,10 @@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -319,6 +317,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/geyes/Makefile.in gnome-applets-2.22.3/geyes/Makefile.in
---- gnome-applets-2.22.3.old/geyes/Makefile.in	2008-06-30 11:29:38.000000000 +0200
-+++ gnome-applets-2.22.3/geyes/Makefile.in	2008-06-30 12:57:50.000000000 +0200
+Index: gnome-applets-2.22.3/geyes/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/geyes/Makefile.in	2008-07-15 11:23:13.858670715 +0200
++++ gnome-applets-2.22.3/geyes/Makefile.in	2008-07-15 11:27:07.126697378 +0200
 @@ -41,7 +41,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16586,17 +1342,10 @@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -340,6 +338,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = themes docs
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/geyes/themes/Makefile.in gnome-applets-2.22.3/geyes/themes/Makefile.in
---- gnome-applets-2.22.3.old/geyes/themes/Makefile.in	2008-06-30 11:29:38.000000000 +0200
-+++ gnome-applets-2.22.3/geyes/themes/Makefile.in	2008-06-30 12:57:51.000000000 +0200
+Index: gnome-applets-2.22.3/geyes/themes/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/geyes/themes/Makefile.in	2008-07-15 11:23:13.838680256 +0200
++++ gnome-applets-2.22.3/geyes/themes/Makefile.in	2008-07-15 11:27:07.355696246 +0200
 @@ -40,7 +40,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16623,17 +1372,10 @@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -315,6 +313,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- Defaultdir = $(pkgdatadir)/geyes/Default
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/gkb-new/Makefile.in gnome-applets-2.22.3/gkb-new/Makefile.in
---- gnome-applets-2.22.3.old/gkb-new/Makefile.in	2008-06-30 11:29:38.000000000 +0200
-+++ gnome-applets-2.22.3/gkb-new/Makefile.in	2008-06-30 12:57:51.000000000 +0200
+Index: gnome-applets-2.22.3/gkb-new/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/gkb-new/Makefile.in	2008-07-15 11:23:13.830676864 +0200
++++ gnome-applets-2.22.3/gkb-new/Makefile.in	2008-07-15 11:27:07.439680314 +0200
 @@ -38,7 +38,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16660,17 +1402,10 @@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -307,6 +305,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- @GKB_SUN_FALSE at gkb_DDIRS = xmodmap
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/gkb-new/xmodmap/Makefile.in gnome-applets-2.22.3/gkb-new/xmodmap/Makefile.in
---- gnome-applets-2.22.3.old/gkb-new/xmodmap/Makefile.in	2008-06-30 11:29:38.000000000 +0200
-+++ gnome-applets-2.22.3/gkb-new/xmodmap/Makefile.in	2008-06-30 12:57:52.000000000 +0200
+Index: gnome-applets-2.22.3/gkb-new/xmodmap/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/gkb-new/xmodmap/Makefile.in	2008-07-15 11:23:13.822672006 +0200
++++ gnome-applets-2.22.3/gkb-new/xmodmap/Makefile.in	2008-07-15 11:27:07.615669790 +0200
 @@ -38,7 +38,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16697,17 +1432,10 @@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -304,6 +302,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- EXTRA_DIST = $(GKB_MAPS) $(xmm_xml_in_file)
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/gkb-new/xmodmap.sun/Makefile.in gnome-applets-2.22.3/gkb-new/xmodmap.sun/Makefile.in
---- gnome-applets-2.22.3.old/gkb-new/xmodmap.sun/Makefile.in	2008-06-30 11:29:38.000000000 +0200
-+++ gnome-applets-2.22.3/gkb-new/xmodmap.sun/Makefile.in	2008-06-30 12:57:51.000000000 +0200
+Index: gnome-applets-2.22.3/gkb-new/xmodmap.sun/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/gkb-new/xmodmap.sun/Makefile.in	2008-07-15 11:23:13.806699655 +0200
++++ gnome-applets-2.22.3/gkb-new/xmodmap.sun/Makefile.in	2008-07-15 11:27:07.531698643 +0200
 @@ -38,7 +38,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16734,17 +1462,10 @@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -304,6 +302,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- EXTRA_DIST = $(GKB_MAPS) $(xmm_xml_in_file)
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/gswitchit/help/Makefile.in gnome-applets-2.22.3/gswitchit/help/Makefile.in
---- gnome-applets-2.22.3.old/gswitchit/help/Makefile.in	2008-06-30 11:29:38.000000000 +0200
-+++ gnome-applets-2.22.3/gswitchit/help/Makefile.in	2008-06-30 12:57:53.000000000 +0200
+Index: gnome-applets-2.22.3/gswitchit/help/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/gswitchit/help/Makefile.in	2008-07-15 11:23:13.798671959 +0200
++++ gnome-applets-2.22.3/gswitchit/help/Makefile.in	2008-07-15 11:27:07.875680348 +0200
 @@ -62,7 +62,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16771,17 +1492,10 @@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -319,6 +317,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/gswitchit/Makefile.in gnome-applets-2.22.3/gswitchit/Makefile.in
---- gnome-applets-2.22.3.old/gswitchit/Makefile.in	2008-06-30 11:29:38.000000000 +0200
-+++ gnome-applets-2.22.3/gswitchit/Makefile.in	2008-06-30 12:57:53.000000000 +0200
+Index: gnome-applets-2.22.3/gswitchit/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/gswitchit/Makefile.in	2008-07-15 11:23:13.790672199 +0200
++++ gnome-applets-2.22.3/gswitchit/Makefile.in	2008-07-15 11:27:07.747696485 +0200
 @@ -41,7 +41,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16808,17 +1522,10 @@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -359,6 +357,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = help
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/gweather/docs/Makefile.in gnome-applets-2.22.3/gweather/docs/Makefile.in
---- gnome-applets-2.22.3.old/gweather/docs/Makefile.in	2008-06-30 11:29:39.000000000 +0200
-+++ gnome-applets-2.22.3/gweather/docs/Makefile.in	2008-06-30 12:57:54.000000000 +0200
+Index: gnome-applets-2.22.3/gweather/docs/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/gweather/docs/Makefile.in	2008-07-15 11:23:13.782676909 +0200
++++ gnome-applets-2.22.3/gweather/docs/Makefile.in	2008-07-15 11:27:08.119680284 +0200
 @@ -62,7 +62,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16845,17 +1552,10 @@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -319,6 +317,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/gweather/Makefile.in gnome-applets-2.22.3/gweather/Makefile.in
---- gnome-applets-2.22.3.old/gweather/Makefile.in	2008-06-30 11:29:38.000000000 +0200
-+++ gnome-applets-2.22.3/gweather/Makefile.in	2008-06-30 12:57:54.000000000 +0200
+Index: gnome-applets-2.22.3/gweather/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/gweather/Makefile.in	2008-07-15 11:23:13.774698660 +0200
++++ gnome-applets-2.22.3/gweather/Makefile.in	2008-07-15 11:27:07.991680776 +0200
 @@ -41,7 +41,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16882,17 +1582,10 @@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -343,6 +341,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = docs
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/invest-applet/data/art/Makefile.in gnome-applets-2.22.3/invest-applet/data/art/Makefile.in
---- gnome-applets-2.22.3.old/invest-applet/data/art/Makefile.in	2008-06-30 11:29:39.000000000 +0200
-+++ gnome-applets-2.22.3/invest-applet/data/art/Makefile.in	2008-06-30 12:57:55.000000000 +0200
+Index: gnome-applets-2.22.3/invest-applet/data/art/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/invest-applet/data/art/Makefile.in	2008-07-15 11:23:13.766699110 +0200
++++ gnome-applets-2.22.3/invest-applet/data/art/Makefile.in	2008-07-15 11:27:08.391697888 +0200
 @@ -38,7 +38,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16919,17 +1612,10 @@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -309,6 +307,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- pixmaps_DATA = invest-big.png
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/invest-applet/data/Makefile.in gnome-applets-2.22.3/invest-applet/data/Makefile.in
---- gnome-applets-2.22.3.old/invest-applet/data/Makefile.in	2008-06-30 11:29:39.000000000 +0200
-+++ gnome-applets-2.22.3/invest-applet/data/Makefile.in	2008-06-30 12:57:55.000000000 +0200
+Index: gnome-applets-2.22.3/invest-applet/data/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/invest-applet/data/Makefile.in	2008-07-15 11:23:13.742700320 +0200
++++ gnome-applets-2.22.3/invest-applet/data/Makefile.in	2008-07-15 11:27:08.303701159 +0200
 @@ -38,7 +38,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16956,17 +1642,21 @@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -319,6 +317,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = art
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/invest-applet/invest/Makefile.in gnome-applets-2.22.3/invest-applet/invest/Makefile.in
---- gnome-applets-2.22.3.old/invest-applet/invest/Makefile.in	2008-06-30 11:29:39.000000000 +0200
-+++ gnome-applets-2.22.3/invest-applet/invest/Makefile.in	2008-06-30 12:57:56.000000000 +0200
+@@ -361,8 +359,8 @@
+ #		$(GCONFTOOL) --makefile-install-rule $(schema_DATA)
+ #endif
+ DISTCLEANFILES = \
+-	$(server_DATA) \
+-	$(server_in_files)
++	$(server_in_files) \
++	$(server_in_files:.server.in=.server)
+ 
+ EXTRA_DIST = \
+ 	Invest_Applet.server.in.in \
+Index: gnome-applets-2.22.3/invest-applet/invest/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/invest-applet/invest/Makefile.in	2008-07-15 11:23:13.734701049 +0200
++++ gnome-applets-2.22.3/invest-applet/invest/Makefile.in	2008-07-15 11:27:08.487694167 +0200
 @@ -39,7 +39,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -16993,17 +1683,10 @@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -309,6 +307,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- bin_SCRIPTS = invest-chart
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/invest-applet/Makefile.in gnome-applets-2.22.3/invest-applet/Makefile.in
---- gnome-applets-2.22.3.old/invest-applet/Makefile.in	2008-06-30 11:29:39.000000000 +0200
-+++ gnome-applets-2.22.3/invest-applet/Makefile.in	2008-06-30 12:57:54.000000000 +0200
+Index: gnome-applets-2.22.3/invest-applet/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/invest-applet/Makefile.in	2008-07-15 11:23:13.710680957 +0200
++++ gnome-applets-2.22.3/invest-applet/Makefile.in	2008-07-15 11:27:08.207678270 +0200
 @@ -37,7 +37,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -17030,17 +1713,10 @@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -306,6 +304,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = invest data
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/ltmain.sh gnome-applets-2.22.3/ltmain.sh
---- gnome-applets-2.22.3.old/ltmain.sh	2008-02-08 01:57:47.000000000 +0100
-+++ gnome-applets-2.22.3/ltmain.sh	2008-04-29 23:33:55.000000000 +0200
+Index: gnome-applets-2.22.3/ltmain.sh
+===================================================================
+--- gnome-applets-2.22.3.orig/ltmain.sh	2008-07-15 11:23:13.702702848 +0200
++++ gnome-applets-2.22.3/ltmain.sh	2008-04-29 22:21:21.000000000 +0200
 @@ -43,7 +43,7 @@
  
  PROGRAM=ltmain.sh
@@ -17050,9 +1726,10 @@
  TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
  
  # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/m4/intltool.m4 gnome-applets-2.22.3/m4/intltool.m4
---- gnome-applets-2.22.3.old/m4/intltool.m4	2008-06-30 11:29:31.000000000 +0200
-+++ gnome-applets-2.22.3/m4/intltool.m4	2008-06-30 12:56:57.000000000 +0200
+Index: gnome-applets-2.22.3/m4/intltool.m4
+===================================================================
+--- gnome-applets-2.22.3.orig/m4/intltool.m4	2008-07-15 11:23:13.694676409 +0200
++++ gnome-applets-2.22.3/m4/intltool.m4	2008-07-15 11:25:19.863699776 +0200
 @@ -23,7 +23,7 @@
  ## the same distribution terms that you use for the rest of that program.
  
@@ -17143,9 +1820,10 @@
  ])
  
  
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/Makefile.in gnome-applets-2.22.3/Makefile.in
---- gnome-applets-2.22.3.old/Makefile.in	2008-06-30 11:29:41.000000000 +0200
-+++ gnome-applets-2.22.3/Makefile.in	2008-06-30 12:58:09.000000000 +0200
+Index: gnome-applets-2.22.3/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/Makefile.in	2008-07-15 11:23:13.678694420 +0200
++++ gnome-applets-2.22.3/Makefile.in	2008-07-15 11:27:10.490697063 +0200
 @@ -41,7 +41,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -17172,54 +1850,232 @@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -322,6 +320,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
+Index: gnome-applets-2.22.3/man/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/man/Makefile.in	2008-07-15 11:23:13.674701664 +0200
++++ gnome-applets-2.22.3/man/Makefile.in	2008-07-15 11:27:08.571690457 +0200
+@@ -37,7 +37,6 @@
+ 	$(top_srcdir)/m4/acinclude.m4 \
+ 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
+ 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+-	$(top_srcdir)/m4/system-tools-backends.m4 \
+ 	$(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+@@ -191,6 +190,7 @@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -227,9 +227,7 @@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+ STRIP = @STRIP@
+-SU_TOOL = @SU_TOOL@
+ SYSCONFDIR = @SYSCONFDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+Index: gnome-applets-2.22.3/mini-commander/help/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/mini-commander/help/Makefile.in	2008-07-15 11:23:13.662670596 +0200
++++ gnome-applets-2.22.3/mini-commander/help/Makefile.in	2008-07-15 11:27:08.783696732 +0200
+@@ -62,7 +62,6 @@
+ 	$(top_srcdir)/m4/acinclude.m4 \
+ 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
+ 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+-	$(top_srcdir)/m4/system-tools-backends.m4 \
+ 	$(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+@@ -212,6 +211,7 @@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -248,9 +248,7 @@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+ STRIP = @STRIP@
+-SU_TOOL = @SU_TOOL@
+ SYSCONFDIR = @SYSCONFDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+Index: gnome-applets-2.22.3/mini-commander/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/mini-commander/Makefile.in	2008-07-15 11:23:13.654671744 +0200
++++ gnome-applets-2.22.3/mini-commander/Makefile.in	2008-07-15 11:27:08.663680221 +0200
+@@ -39,7 +39,6 @@
+ 	$(top_srcdir)/m4/acinclude.m4 \
+ 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
+ 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+-	$(top_srcdir)/m4/system-tools-backends.m4 \
+ 	$(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+@@ -209,6 +208,7 @@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -245,9 +245,7 @@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+ STRIP = @STRIP@
+-SU_TOOL = @SU_TOOL@
+ SYSCONFDIR = @SYSCONFDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+Index: gnome-applets-2.22.3/mini-commander/src/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/mini-commander/src/Makefile.in	2008-07-15 11:23:13.646699432 +0200
++++ gnome-applets-2.22.3/mini-commander/src/Makefile.in	2008-07-15 11:27:08.911696380 +0200
+@@ -41,7 +41,6 @@
+ 	$(top_srcdir)/m4/acinclude.m4 \
+ 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
+ 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+-	$(top_srcdir)/m4/system-tools-backends.m4 \
+ 	$(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+@@ -240,6 +239,7 @@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -276,9 +276,7 @@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+ STRIP = @STRIP@
+-SU_TOOL = @SU_TOOL@
+ SYSCONFDIR = @SYSCONFDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+Index: gnome-applets-2.22.3/mixer/docs/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/mixer/docs/Makefile.in	2008-07-15 11:23:13.638671386 +0200
++++ gnome-applets-2.22.3/mixer/docs/Makefile.in	2008-07-15 11:27:09.155679972 +0200
+@@ -62,7 +62,6 @@
+ 	$(top_srcdir)/m4/acinclude.m4 \
+ 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
+ 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+-	$(top_srcdir)/m4/system-tools-backends.m4 \
+ 	$(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+@@ -212,6 +211,7 @@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -248,9 +248,7 @@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+ STRIP = @STRIP@
+-SU_TOOL = @SU_TOOL@
+ SYSCONFDIR = @SYSCONFDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+Index: gnome-applets-2.22.3/mixer/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/mixer/Makefile.in	2008-07-15 11:23:13.630670928 +0200
++++ gnome-applets-2.22.3/mixer/Makefile.in	2008-07-15 11:27:09.027696318 +0200
+@@ -42,7 +42,6 @@
+ 	$(top_srcdir)/m4/acinclude.m4 \
+ 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
+ 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+-	$(top_srcdir)/m4/system-tools-backends.m4 \
+ 	$(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+@@ -237,6 +236,7 @@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -273,9 +273,7 @@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+ STRIP = @STRIP@
+-SU_TOOL = @SU_TOOL@
+ SYSCONFDIR = @SYSCONFDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+Index: gnome-applets-2.22.3/modemlights/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/modemlights/Makefile.in	2008-07-15 11:23:13.622672216 +0200
++++ gnome-applets-2.22.3/modemlights/Makefile.in	2008-07-15 11:27:09.267696723 +0200
+@@ -43,7 +43,6 @@
+ 	$(top_srcdir)/m4/acinclude.m4 \
+ 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
+ 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+-	$(top_srcdir)/m4/system-tools-backends.m4 \
+ 	$(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+@@ -226,6 +225,7 @@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -262,9 +262,7 @@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+ STRIP = @STRIP@
+-SU_TOOL = @SU_TOOL@
+ SYSCONFDIR = @SYSCONFDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -335,8 +333,9 @@
  target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
- gtop_applets = multiload
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/man/Makefile.in gnome-applets-2.22.3/man/Makefile.in
---- gnome-applets-2.22.3.old/man/Makefile.in	2008-06-30 11:29:39.000000000 +0200
-+++ gnome-applets-2.22.3/man/Makefile.in	2008-06-30 12:57:57.000000000 +0200
-@@ -37,7 +37,6 @@
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -191,6 +190,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -227,9 +227,7 @@
- SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -298,6 +296,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- man_MANS = \
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/mini-commander/help/Makefile.in gnome-applets-2.22.3/mini-commander/help/Makefile.in
---- gnome-applets-2.22.3.old/mini-commander/help/Makefile.in	2008-06-30 11:29:39.000000000 +0200
-+++ gnome-applets-2.22.3/mini-commander/help/Makefile.in	2008-06-30 12:57:58.000000000 +0200
+-INCLUDES = -I. -I$(srcdir) 				\
+-	$(GNOME_APPLETS_CFLAGS)				\
++INCLUDES = -I. -I$(srcdir) 	\
++	$(GNOME_APPLETS_CFLAGS)	\
++	$(MODEMLIGHTS_CFLAGS)	\
+ 	$(LIBGLADE_CFLAGS)
+ 
+ modem_applet_SOURCES = \
+Index: gnome-applets-2.22.3/multiload/docs/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/multiload/docs/Makefile.in	2008-07-15 11:23:13.614681047 +0200
++++ gnome-applets-2.22.3/multiload/docs/Makefile.in	2008-07-15 11:27:09.514697039 +0200
 @@ -62,7 +62,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -17246,17 +2102,220 @@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -319,6 +317,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/mini-commander/Makefile.in gnome-applets-2.22.3/mini-commander/Makefile.in
---- gnome-applets-2.22.3.old/mini-commander/Makefile.in	2008-06-30 11:29:39.000000000 +0200
-+++ gnome-applets-2.22.3/mini-commander/Makefile.in	2008-06-30 12:57:57.000000000 +0200
+Index: gnome-applets-2.22.3/multiload/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/multiload/Makefile.in	2008-07-15 11:23:13.606671579 +0200
++++ gnome-applets-2.22.3/multiload/Makefile.in	2008-07-15 11:27:09.391698306 +0200
+@@ -41,7 +41,6 @@
+ 	$(top_srcdir)/m4/acinclude.m4 \
+ 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
+ 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+-	$(top_srcdir)/m4/system-tools-backends.m4 \
+ 	$(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+@@ -237,6 +236,7 @@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -273,9 +273,7 @@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+ STRIP = @STRIP@
+-SU_TOOL = @SU_TOOL@
+ SYSCONFDIR = @SYSCONFDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+Index: gnome-applets-2.22.3/null_applet/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/null_applet/Makefile.in	2008-07-15 11:23:13.598670003 +0200
++++ gnome-applets-2.22.3/null_applet/Makefile.in	2008-07-15 11:27:09.622696450 +0200
+@@ -41,7 +41,6 @@
+ 	$(top_srcdir)/m4/acinclude.m4 \
+ 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
+ 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+-	$(top_srcdir)/m4/system-tools-backends.m4 \
+ 	$(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+@@ -220,6 +219,7 @@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -256,9 +256,7 @@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+ STRIP = @STRIP@
+-SU_TOOL = @SU_TOOL@
+ SYSCONFDIR = @SYSCONFDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+Index: gnome-applets-2.22.3/stickynotes/data/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/stickynotes/data/Makefile.in	2008-07-15 11:23:13.590672548 +0200
++++ gnome-applets-2.22.3/stickynotes/data/Makefile.in	2008-07-15 11:27:09.830696140 +0200
+@@ -41,7 +41,6 @@
+ 	$(top_srcdir)/m4/acinclude.m4 \
+ 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
+ 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+-	$(top_srcdir)/m4/system-tools-backends.m4 \
+ 	$(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+@@ -200,6 +199,7 @@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -236,9 +236,7 @@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+ STRIP = @STRIP@
+-SU_TOOL = @SU_TOOL@
+ SYSCONFDIR = @SYSCONFDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+Index: gnome-applets-2.22.3/stickynotes/docs/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/stickynotes/docs/Makefile.in	2008-07-15 11:23:13.582679773 +0200
++++ gnome-applets-2.22.3/stickynotes/docs/Makefile.in	2008-07-15 11:27:09.962696926 +0200
+@@ -62,7 +62,6 @@
+ 	$(top_srcdir)/m4/acinclude.m4 \
+ 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
+ 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+-	$(top_srcdir)/m4/system-tools-backends.m4 \
+ 	$(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+@@ -212,6 +211,7 @@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -248,9 +248,7 @@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+ STRIP = @STRIP@
+-SU_TOOL = @SU_TOOL@
+ SYSCONFDIR = @SYSCONFDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+Index: gnome-applets-2.22.3/stickynotes/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/stickynotes/Makefile.in	2008-07-15 11:23:13.574698242 +0200
++++ gnome-applets-2.22.3/stickynotes/Makefile.in	2008-07-15 11:27:09.742696618 +0200
+@@ -42,7 +42,6 @@
+ 	$(top_srcdir)/m4/acinclude.m4 \
+ 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
+ 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+-	$(top_srcdir)/m4/system-tools-backends.m4 \
+ 	$(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+@@ -249,6 +248,7 @@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -285,9 +285,7 @@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+ STRIP = @STRIP@
+-SU_TOOL = @SU_TOOL@
+ SYSCONFDIR = @SYSCONFDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+Index: gnome-applets-2.22.3/stickynotes/pixmaps/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/stickynotes/pixmaps/Makefile.in	2008-07-15 11:23:13.570678178 +0200
++++ gnome-applets-2.22.3/stickynotes/pixmaps/Makefile.in	2008-07-15 11:27:10.050690162 +0200
+@@ -38,7 +38,6 @@
+ 	$(top_srcdir)/m4/acinclude.m4 \
+ 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
+ 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+-	$(top_srcdir)/m4/system-tools-backends.m4 \
+ 	$(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+@@ -197,6 +196,7 @@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -233,9 +233,7 @@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+ STRIP = @STRIP@
+-SU_TOOL = @SU_TOOL@
+ SYSCONFDIR = @SYSCONFDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+Index: gnome-applets-2.22.3/trashapplet/docs/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/trashapplet/docs/Makefile.in	2008-07-15 11:23:13.562677231 +0200
++++ gnome-applets-2.22.3/trashapplet/docs/Makefile.in	2008-07-15 11:27:10.274669956 +0200
+@@ -62,7 +62,6 @@
+ 	$(top_srcdir)/m4/acinclude.m4 \
+ 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
+ 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+-	$(top_srcdir)/m4/system-tools-backends.m4 \
+ 	$(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+@@ -212,6 +211,7 @@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -248,9 +248,7 @@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+ STRIP = @STRIP@
+-SU_TOOL = @SU_TOOL@
+ SYSCONFDIR = @SYSCONFDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+Index: gnome-applets-2.22.3/trashapplet/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/trashapplet/Makefile.in	2008-07-15 11:23:13.534699234 +0200
++++ gnome-applets-2.22.3/trashapplet/Makefile.in	2008-07-15 11:27:10.146698175 +0200
 @@ -39,7 +39,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -17265,484 +2324,28 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
-@@ -209,6 +208,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -245,9 +245,7 @@
- SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -316,6 +314,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- DIST_SUBDIRS = src help
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/mini-commander/src/Makefile.in gnome-applets-2.22.3/mini-commander/src/Makefile.in
---- gnome-applets-2.22.3.old/mini-commander/src/Makefile.in	2008-06-30 11:29:39.000000000 +0200
-+++ gnome-applets-2.22.3/mini-commander/src/Makefile.in	2008-06-30 12:57:59.000000000 +0200
-@@ -41,7 +41,6 @@
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -240,6 +239,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -276,9 +276,7 @@
- SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -347,6 +345,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = \
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/mixer/docs/Makefile.in gnome-applets-2.22.3/mixer/docs/Makefile.in
---- gnome-applets-2.22.3.old/mixer/docs/Makefile.in	2008-06-30 11:29:40.000000000 +0200
-+++ gnome-applets-2.22.3/mixer/docs/Makefile.in	2008-06-30 12:58:00.000000000 +0200
-@@ -62,7 +62,6 @@
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -212,6 +211,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -248,9 +248,7 @@
- SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -319,6 +317,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/mixer/Makefile.in gnome-applets-2.22.3/mixer/Makefile.in
---- gnome-applets-2.22.3.old/mixer/Makefile.in	2008-06-30 11:29:39.000000000 +0200
-+++ gnome-applets-2.22.3/mixer/Makefile.in	2008-06-30 12:57:59.000000000 +0200
-@@ -42,7 +42,6 @@
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -237,6 +236,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -273,9 +273,7 @@
- SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -344,6 +342,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = docs
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/modemlights/Makefile.in gnome-applets-2.22.3/modemlights/Makefile.in
---- gnome-applets-2.22.3.old/modemlights/Makefile.in	2008-06-30 11:29:40.000000000 +0200
-+++ gnome-applets-2.22.3/modemlights/Makefile.in	2008-06-30 12:58:00.000000000 +0200
-@@ -43,7 +43,6 @@
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -226,6 +225,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -262,9 +262,7 @@
- SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -333,10 +331,12 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = -I. -I$(srcdir) 				\
- 	$(GNOME_APPLETS_CFLAGS)				\
-+	$(MODEMLIGHTS_CFLAGS)				\
- 	$(LIBGLADE_CFLAGS)
- 
- modem_applet_SOURCES = \
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/multiload/docs/Makefile.in gnome-applets-2.22.3/multiload/docs/Makefile.in
---- gnome-applets-2.22.3.old/multiload/docs/Makefile.in	2008-06-30 11:29:40.000000000 +0200
-+++ gnome-applets-2.22.3/multiload/docs/Makefile.in	2008-06-30 12:58:01.000000000 +0200
-@@ -62,7 +62,6 @@
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -212,6 +211,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -248,9 +248,7 @@
- SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -319,6 +317,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/multiload/Makefile.in gnome-applets-2.22.3/multiload/Makefile.in
---- gnome-applets-2.22.3.old/multiload/Makefile.in	2008-06-30 11:29:40.000000000 +0200
-+++ gnome-applets-2.22.3/multiload/Makefile.in	2008-06-30 12:58:01.000000000 +0200
-@@ -41,7 +41,6 @@
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -237,6 +236,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -273,9 +273,7 @@
- SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -344,6 +342,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = docs
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/null_applet/Makefile.in gnome-applets-2.22.3/null_applet/Makefile.in
---- gnome-applets-2.22.3.old/null_applet/Makefile.in	2008-06-30 11:29:40.000000000 +0200
-+++ gnome-applets-2.22.3/null_applet/Makefile.in	2008-06-30 12:58:01.000000000 +0200
-@@ -41,7 +41,6 @@
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -220,6 +219,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -256,9 +256,7 @@
- SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -327,6 +325,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = \
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/stickynotes/data/Makefile.in gnome-applets-2.22.3/stickynotes/data/Makefile.in
---- gnome-applets-2.22.3.old/stickynotes/data/Makefile.in	2008-06-30 11:29:40.000000000 +0200
-+++ gnome-applets-2.22.3/stickynotes/data/Makefile.in	2008-06-30 12:58:04.000000000 +0200
-@@ -41,7 +41,6 @@
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -200,6 +199,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -236,9 +236,7 @@
- SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -307,6 +305,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- server_in_files = \
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/stickynotes/docs/Makefile.in gnome-applets-2.22.3/stickynotes/docs/Makefile.in
---- gnome-applets-2.22.3.old/stickynotes/docs/Makefile.in	2008-06-30 11:29:40.000000000 +0200
-+++ gnome-applets-2.22.3/stickynotes/docs/Makefile.in	2008-06-30 12:58:05.000000000 +0200
-@@ -62,7 +62,6 @@
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -212,6 +211,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -248,9 +248,7 @@
- SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -319,6 +317,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/stickynotes/Makefile.in gnome-applets-2.22.3/stickynotes/Makefile.in
---- gnome-applets-2.22.3.old/stickynotes/Makefile.in	2008-06-30 11:29:40.000000000 +0200
-+++ gnome-applets-2.22.3/stickynotes/Makefile.in	2008-06-30 12:58:04.000000000 +0200
-@@ -42,7 +42,6 @@
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -249,6 +248,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -285,9 +285,7 @@
- SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -356,6 +354,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = pixmaps docs data
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/stickynotes/pixmaps/Makefile.in gnome-applets-2.22.3/stickynotes/pixmaps/Makefile.in
---- gnome-applets-2.22.3.old/stickynotes/pixmaps/Makefile.in	2008-06-30 11:29:41.000000000 +0200
-+++ gnome-applets-2.22.3/stickynotes/pixmaps/Makefile.in	2008-06-30 12:58:06.000000000 +0200
-@@ -38,7 +38,6 @@
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -197,6 +196,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -233,9 +233,7 @@
- SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -304,6 +302,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- stickynotes_applet_pixmapsdir = $(datadir)/pixmaps/stickynotes
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/trashapplet/docs/Makefile.in gnome-applets-2.22.3/trashapplet/docs/Makefile.in
---- gnome-applets-2.22.3.old/trashapplet/docs/Makefile.in	2008-06-30 11:29:41.000000000 +0200
-+++ gnome-applets-2.22.3/trashapplet/docs/Makefile.in	2008-06-30 12:58:07.000000000 +0200
-@@ -62,7 +62,6 @@
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -212,6 +211,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -248,9 +248,7 @@
- SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -319,6 +317,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/trashapplet/Makefile.in gnome-applets-2.22.3/trashapplet/Makefile.in
---- gnome-applets-2.22.3.old/trashapplet/Makefile.in	2008-06-30 11:29:41.000000000 +0200
-+++ gnome-applets-2.22.3/trashapplet/Makefile.in	2008-06-30 12:58:06.000000000 +0200
+@@ -213,6 +212,7 @@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -249,9 +249,7 @@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+ STRIP = @STRIP@
+-SU_TOOL = @SU_TOOL@
+ SYSCONFDIR = @SYSCONFDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+Index: gnome-applets-2.22.3/trashapplet/src/Makefile.in
+===================================================================
+--- gnome-applets-2.22.3.orig/trashapplet/src/Makefile.in	2008-07-15 11:23:13.526699963 +0200
++++ gnome-applets-2.22.3/trashapplet/src/Makefile.in	2008-07-15 11:27:10.382696116 +0200
 @@ -39,7 +39,6 @@
  	$(top_srcdir)/m4/acinclude.m4 \
  	$(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -17751,43 +2354,6 @@
  	$(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
-@@ -213,6 +212,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -249,9 +249,7 @@
- SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -320,6 +318,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = src docs
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.3.old/trashapplet/src/Makefile.in gnome-applets-2.22.3/trashapplet/src/Makefile.in
---- gnome-applets-2.22.3.old/trashapplet/src/Makefile.in	2008-06-30 11:29:41.000000000 +0200
-+++ gnome-applets-2.22.3/trashapplet/src/Makefile.in	2008-06-30 12:58:08.000000000 +0200
-@@ -39,7 +39,6 @@
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
 @@ -211,6 +210,7 @@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
@@ -17806,11 +2372,3 @@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -318,6 +316,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = -I$(top_srcdir)		\

Added: desktop/unstable/gnome-applets/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/patches/series?rev=16531&op=file
==============================================================================
--- desktop/unstable/gnome-applets/debian/patches/series (added)
+++ desktop/unstable/gnome-applets/debian/patches/series Tue Jul 15 09:30:32 2008
@@ -1,0 +1,5 @@
+01_distclean.patch
+09_modemlights_use_new_gst.patch
+80_mixer_user_gstreamer_signals.patch
+98_autoreconf.patch
+99_ltmain_as-needed.patch

Modified: desktop/unstable/gnome-applets/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/rules?rev=16531&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/rules (original)
+++ desktop/unstable/gnome-applets/debian/rules Tue Jul 15 09:30:32 2008
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk




More information about the pkg-gnome-commits mailing list