r19601 - in /desktop/unstable/control-center/debian: changelog patches/02_build_libgnome.patch patches/70_relibtoolize.patch patches/series

joss at users.alioth.debian.org joss at users.alioth.debian.org
Thu Apr 16 08:35:11 UTC 2009


Author: joss
Date: Thu Apr 16 08:35:11 2009
New Revision: 19601

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19601
Log:
* 02_build_libgnome.patch: new patch. Fix build failure by linking 
  explicitly to libgnomeui for stuff incorrectly listing gnome-desktop 
  only as a requirement.
* 70_relibtoolize.patch: regenerated.

Added:
    desktop/unstable/control-center/debian/patches/02_build_libgnome.patch
Modified:
    desktop/unstable/control-center/debian/changelog
    desktop/unstable/control-center/debian/patches/70_relibtoolize.patch
    desktop/unstable/control-center/debian/patches/series

Modified: desktop/unstable/control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/changelog?rev=19601&op=diff
==============================================================================
--- desktop/unstable/control-center/debian/changelog (original)
+++ desktop/unstable/control-center/debian/changelog Thu Apr 16 08:35:11 2009
@@ -1,8 +1,12 @@
-control-center (1:2.24.0.1-4) UNRELEASED; urgency=low
+control-center (1:2.24.0.1-4) unstable; urgency=low
 
   * Set the team as primary maintainer. Closes: #523535.
-
- -- Josselin Mouette <joss at debian.org>  Sat, 11 Apr 2009 00:18:10 +0200
+  * 02_build_libgnome.patch: new patch. Fix build failure by linking 
+    explicitly to libgnomeui for stuff incorrectly listing gnome-desktop 
+    only as a requirement.
+  * 70_relibtoolize.patch: regenerated.
+
+ -- Josselin Mouette <joss at debian.org>  Thu, 16 Apr 2009 10:34:54 +0200
 
 control-center (1:2.24.0.1-3) unstable; urgency=low
 

Added: desktop/unstable/control-center/debian/patches/02_build_libgnome.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/patches/02_build_libgnome.patch?rev=19601&op=file
==============================================================================
--- desktop/unstable/control-center/debian/patches/02_build_libgnome.patch (added)
+++ desktop/unstable/control-center/debian/patches/02_build_libgnome.patch Thu Apr 16 08:35:11 2009
@@ -1,0 +1,13 @@
+Index: gnome-control-center-2.24.0.1/configure.in
+===================================================================
+--- gnome-control-center-2.24.0.1.orig/configure.in	2009-04-16 10:31:56.309352617 +0200
++++ gnome-control-center-2.24.0.1/configure.in	2009-04-16 10:32:14.016853698 +0200
+@@ -98,7 +98,7 @@ PKG_CHECK_MODULES(CAPPLET, $COMMON_MODUL
+ PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0)
+ PKG_CHECK_MODULES(GNOME, libgnomeui-2.0)
+ PKG_CHECK_MODULES(DBUS, dbus-1 dbus-glib-1)
+-PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-2.0)
++PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-2.0 libgnomeui-2.0)
+ PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0)
+ PKG_CHECK_MODULES(METACITY, libmetacity-private >= 2.23.1)
+ PKG_CHECK_MODULES(SLAB, libslab)

Modified: desktop/unstable/control-center/debian/patches/70_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/patches/70_relibtoolize.patch?rev=19601&op=diff
==============================================================================
--- desktop/unstable/control-center/debian/patches/70_relibtoolize.patch (original)
+++ desktop/unstable/control-center/debian/patches/70_relibtoolize.patch Thu Apr 16 08:35:11 2009
@@ -6,8 +6,8 @@
 
 Index: gnome-control-center-2.24.0.1/aclocal.m4
 ===================================================================
---- gnome-control-center-2.24.0.1.orig/aclocal.m4	2008-09-24 18:41:31.000000000 +0200
-+++ gnome-control-center-2.24.0.1/aclocal.m4	2008-12-28 13:26:29.715854737 +0100
+--- gnome-control-center-2.24.0.1.orig/aclocal.m4	2009-04-16 10:31:23.644850418 +0200
++++ gnome-control-center-2.24.0.1/aclocal.m4	2009-04-16 10:32:37.717352097 +0200
 @@ -13,4447 +13,3529 @@
  
  m4_ifndef([AC_AUTOCONF_VERSION],
@@ -11451,8 +11451,8 @@
  m4_include([m4/intltool.m4])
 Index: gnome-control-center-2.24.0.1/capplets/about-me/Makefile.in
 ===================================================================
---- gnome-control-center-2.24.0.1.orig/capplets/about-me/Makefile.in	2008-09-24 18:41:35.000000000 +0200
-+++ gnome-control-center-2.24.0.1/capplets/about-me/Makefile.in	2008-12-28 13:26:32.812355131 +0100
+--- gnome-control-center-2.24.0.1.orig/capplets/about-me/Makefile.in	2009-04-16 10:31:23.636854638 +0200
++++ gnome-control-center-2.24.0.1/capplets/about-me/Makefile.in	2009-04-16 10:32:37.717352097 +0200
 @@ -204,8 +204,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
  LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
  LIBOBJS = @LIBOBJS@
@@ -11481,8 +11481,8 @@
  
 Index: gnome-control-center-2.24.0.1/capplets/accessibility/at-properties/Makefile.in
 ===================================================================
---- gnome-control-center-2.24.0.1.orig/capplets/accessibility/at-properties/Makefile.in	2008-09-24 18:41:36.000000000 +0200
-+++ gnome-control-center-2.24.0.1/capplets/accessibility/at-properties/Makefile.in	2008-12-28 13:26:33.028355070 +0100
+--- gnome-control-center-2.24.0.1.orig/capplets/accessibility/at-properties/Makefile.in	2009-04-16 10:31:23.620854279 +0200
++++ gnome-control-center-2.24.0.1/capplets/accessibility/at-properties/Makefile.in	2009-04-16 10:32:37.717352097 +0200
 @@ -202,8 +202,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
  LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
  LIBOBJS = @LIBOBJS@
@@ -11511,8 +11511,8 @@
  gnome_at_properties_LDADD = $(AT_CAPPLET_LIBS) $(GNOMECC_CAPPLETS_LIBS) $(top_builddir)/capplets/common/libcommon.la
 Index: gnome-control-center-2.24.0.1/capplets/accessibility/Makefile.in
 ===================================================================
---- gnome-control-center-2.24.0.1.orig/capplets/accessibility/Makefile.in	2008-09-24 18:41:35.000000000 +0200
-+++ gnome-control-center-2.24.0.1/capplets/accessibility/Makefile.in	2008-12-28 13:26:32.904355232 +0100
+--- gnome-control-center-2.24.0.1.orig/capplets/accessibility/Makefile.in	2009-04-16 10:31:23.608850589 +0200
++++ gnome-control-center-2.24.0.1/capplets/accessibility/Makefile.in	2009-04-16 10:32:37.717352097 +0200
 @@ -173,8 +173,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
  LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
  LIBOBJS = @LIBOBJS@
@@ -11541,8 +11541,8 @@
  SUBDIRS = at-properties
 Index: gnome-control-center-2.24.0.1/capplets/appearance/data/Makefile.in
 ===================================================================
---- gnome-control-center-2.24.0.1.orig/capplets/appearance/data/Makefile.in	2008-09-24 18:41:36.000000000 +0200
-+++ gnome-control-center-2.24.0.1/capplets/appearance/data/Makefile.in	2008-12-28 13:26:33.284354924 +0100
+--- gnome-control-center-2.24.0.1.orig/capplets/appearance/data/Makefile.in	2009-04-16 10:31:23.600854810 +0200
++++ gnome-control-center-2.24.0.1/capplets/appearance/data/Makefile.in	2009-04-16 10:32:37.721351209 +0200
 @@ -183,8 +183,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
  LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
  LIBOBJS = @LIBOBJS@
@@ -11571,8 +11571,8 @@
  gladedir = $(pkgdatadir)/glade
 Index: gnome-control-center-2.24.0.1/capplets/appearance/Makefile.in
 ===================================================================
---- gnome-control-center-2.24.0.1.orig/capplets/appearance/Makefile.in	2008-09-24 18:41:36.000000000 +0200
-+++ gnome-control-center-2.24.0.1/capplets/appearance/Makefile.in	2008-12-28 13:26:33.172355355 +0100
+--- gnome-control-center-2.24.0.1.orig/capplets/appearance/Makefile.in	2009-04-16 10:31:23.588850142 +0200
++++ gnome-control-center-2.24.0.1/capplets/appearance/Makefile.in	2009-04-16 10:32:37.721351209 +0200
 @@ -209,8 +209,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
  LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
  LIBOBJS = @LIBOBJS@
@@ -11601,8 +11601,8 @@
  SUBDIRS = data
 Index: gnome-control-center-2.24.0.1/capplets/common/Makefile.in
 ===================================================================
---- gnome-control-center-2.24.0.1.orig/capplets/common/Makefile.in	2008-09-24 18:41:36.000000000 +0200
-+++ gnome-control-center-2.24.0.1/capplets/common/Makefile.in	2008-12-28 13:26:33.424355119 +0100
+--- gnome-control-center-2.24.0.1.orig/capplets/common/Makefile.in	2009-04-16 10:31:23.576852807 +0200
++++ gnome-control-center-2.24.0.1/capplets/common/Makefile.in	2009-04-16 10:32:37.721351209 +0200
 @@ -193,8 +193,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
  LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
  LIBOBJS = @LIBOBJS@
@@ -11631,8 +11631,8 @@
  EXTRA_DIST = ChangeLog
 Index: gnome-control-center-2.24.0.1/capplets/default-applications/Makefile.in
 ===================================================================
---- gnome-control-center-2.24.0.1.orig/capplets/default-applications/Makefile.in	2008-09-24 18:41:36.000000000 +0200
-+++ gnome-control-center-2.24.0.1/capplets/default-applications/Makefile.in	2008-12-28 13:26:33.627855145 +0100
+--- gnome-control-center-2.24.0.1.orig/capplets/default-applications/Makefile.in	2009-04-16 10:31:23.564855960 +0200
++++ gnome-control-center-2.24.0.1/capplets/default-applications/Makefile.in	2009-04-16 10:32:37.721351209 +0200
 @@ -226,8 +226,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
  LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
  LIBOBJS = @LIBOBJS@
@@ -11661,8 +11661,8 @@
  
 Index: gnome-control-center-2.24.0.1/capplets/display/Makefile.in
 ===================================================================
---- gnome-control-center-2.24.0.1.orig/capplets/display/Makefile.in	2008-09-24 18:41:37.000000000 +0200
-+++ gnome-control-center-2.24.0.1/capplets/display/Makefile.in	2008-12-28 13:26:33.807855257 +0100
+--- gnome-control-center-2.24.0.1.orig/capplets/display/Makefile.in	2009-04-16 10:31:23.552849825 +0200
++++ gnome-control-center-2.24.0.1/capplets/display/Makefile.in	2009-04-16 10:32:37.721351209 +0200
 @@ -214,8 +214,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
  LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
  LIBOBJS = @LIBOBJS@
@@ -11691,8 +11691,8 @@
  
 Index: gnome-control-center-2.24.0.1/capplets/keybindings/Makefile.in
 ===================================================================
---- gnome-control-center-2.24.0.1.orig/capplets/keybindings/Makefile.in	2008-09-24 18:41:37.000000000 +0200
-+++ gnome-control-center-2.24.0.1/capplets/keybindings/Makefile.in	2008-12-28 13:26:33.983855279 +0100
+--- gnome-control-center-2.24.0.1.orig/capplets/keybindings/Makefile.in	2009-04-16 10:31:23.544855024 +0200
++++ gnome-control-center-2.24.0.1/capplets/keybindings/Makefile.in	2009-04-16 10:32:37.721351209 +0200
 @@ -203,8 +203,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
  LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
  LIBOBJS = @LIBOBJS@
@@ -11721,8 +11721,8 @@
  
 Index: gnome-control-center-2.24.0.1/capplets/keyboard/Makefile.in
 ===================================================================
---- gnome-control-center-2.24.0.1.orig/capplets/keyboard/Makefile.in	2008-09-24 18:41:37.000000000 +0200
-+++ gnome-control-center-2.24.0.1/capplets/keyboard/Makefile.in	2008-12-28 13:26:34.151854634 +0100
+--- gnome-control-center-2.24.0.1.orig/capplets/keyboard/Makefile.in	2009-04-16 10:31:23.532853288 +0200
++++ gnome-control-center-2.24.0.1/capplets/keyboard/Makefile.in	2009-04-16 10:32:37.721351209 +0200
 @@ -206,8 +206,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
  LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
  LIBOBJS = @LIBOBJS@
@@ -11751,8 +11751,8 @@
  
 Index: gnome-control-center-2.24.0.1/capplets/Makefile.in
 ===================================================================
---- gnome-control-center-2.24.0.1.orig/capplets/Makefile.in	2008-09-24 18:41:35.000000000 +0200
-+++ gnome-control-center-2.24.0.1/capplets/Makefile.in	2008-12-28 13:26:32.660356133 +0100
+--- gnome-control-center-2.24.0.1.orig/capplets/Makefile.in	2009-04-16 10:31:23.436852121 +0200
++++ gnome-control-center-2.24.0.1/capplets/Makefile.in	2009-04-16 10:32:37.721351209 +0200
 @@ -175,8 +175,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
  LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
  LIBOBJS = @LIBOBJS@
@@ -11781,8 +11781,8 @@
  always_built_SUBDIRS = \
 Index: gnome-control-center-2.24.0.1/capplets/mouse/Makefile.in
 ===================================================================
---- gnome-control-center-2.24.0.1.orig/capplets/mouse/Makefile.in	2008-09-24 18:41:37.000000000 +0200
-+++ gnome-control-center-2.24.0.1/capplets/mouse/Makefile.in	2008-12-28 13:26:34.311854788 +0100
+--- gnome-control-center-2.24.0.1.orig/capplets/mouse/Makefile.in	2009-04-16 10:31:23.232851484 +0200
++++ gnome-control-center-2.24.0.1/capplets/mouse/Makefile.in	2009-04-16 10:32:37.721351209 +0200
 @@ -198,8 +198,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
  LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
  LIBOBJS = @LIBOBJS@
@@ -11811,8 +11811,8 @@
  
 Index: gnome-control-center-2.24.0.1/capplets/network/Makefile.in
 ===================================================================
---- gnome-control-center-2.24.0.1.orig/capplets/network/Makefile.in	2008-09-24 18:41:37.000000000 +0200
-+++ gnome-control-center-2.24.0.1/capplets/network/Makefile.in	2008-12-28 13:26:34.491857345 +0100
+--- gnome-control-center-2.24.0.1.orig/capplets/network/Makefile.in	2009-04-16 10:31:23.132849729 +0200
++++ gnome-control-center-2.24.0.1/capplets/network/Makefile.in	2009-04-16 10:32:37.721351209 +0200
 @@ -212,8 +212,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
  LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
  LIBOBJS = @LIBOBJS@
@@ -11841,8 +11841,8 @@
  
 Index: gnome-control-center-2.24.0.1/capplets/sound/Makefile.in
 ===================================================================
---- gnome-control-center-2.24.0.1.orig/capplets/sound/Makefile.in	2008-09-24 18:41:37.000000000 +0200
-+++ gnome-control-center-2.24.0.1/capplets/sound/Makefile.in	2008-12-28 13:26:34.671854523 +0100
+--- gnome-control-center-2.24.0.1.orig/capplets/sound/Makefile.in	2009-04-16 10:31:23.120850438 +0200
++++ gnome-control-center-2.24.0.1/capplets/sound/Makefile.in	2009-04-16 10:32:37.721351209 +0200
 @@ -215,8 +215,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
  LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
  LIBOBJS = @LIBOBJS@
@@ -11871,8 +11871,8 @@
  
 Index: gnome-control-center-2.24.0.1/capplets/windows/Makefile.in
 ===================================================================
---- gnome-control-center-2.24.0.1.orig/capplets/windows/Makefile.in	2008-12-28 13:23:47.448358310 +0100
-+++ gnome-control-center-2.24.0.1/capplets/windows/Makefile.in	2008-12-28 13:26:34.831855165 +0100
+--- gnome-control-center-2.24.0.1.orig/capplets/windows/Makefile.in	2009-04-16 10:31:23.108854081 +0200
++++ gnome-control-center-2.24.0.1/capplets/windows/Makefile.in	2009-04-16 10:32:37.721351209 +0200
 @@ -199,8 +199,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
  LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
  LIBOBJS = @LIBOBJS@
@@ -11910,275 +11910,518 @@
  	     -DPIXMAPDIR=\""$(pixmapdir)"\"
 Index: gnome-control-center-2.24.0.1/configure
 ===================================================================
---- gnome-control-center-2.24.0.1.orig/configure	2008-09-24 18:41:34.000000000 +0200
-+++ gnome-control-center-2.24.0.1/configure	2008-12-28 13:26:37.219858180 +0100
-@@ -1,11 +1,11 @@
+--- gnome-control-center-2.24.0.1.orig/configure	2009-04-16 10:31:23.092854212 +0200
++++ gnome-control-center-2.24.0.1/configure	2009-04-16 10:32:47.368847186 +0200
+@@ -1,6 +1,6 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
 -# Generated by GNU Autoconf 2.62 for gnome-control-center 2.24.0.1.
-+# Generated by GNU Autoconf 2.61 for gnome-control-center 2.24.0.1.
++# Generated by GNU Autoconf 2.63 for gnome-control-center 2.24.0.1.
  #
  # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center>.
  #
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
- ## --------------------- ##
-@@ -17,7 +17,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
-   NULLCMD=:
--  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-   # is contrary to our usage.  Disable this feature.
-   alias -g '${1+"$@"}'='"$@"'
-   setopt NO_GLOB_SUBST
-@@ -39,45 +39,17 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
- 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
--  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=';'
--  }
-+  echo "#! /bin/sh" >conf$$.sh
-+  echo  "exit 0"   >>conf$$.sh
-+  chmod +x conf$$.sh
-+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+    PATH_SEPARATOR=';'
-+  else
-+    PATH_SEPARATOR=:
-+  fi
-+  rm -f conf$$.sh
- fi
- 
- # Support unset when possible.
-@@ -93,6 +65,8 @@ fi
- # 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.
-@@ -115,7 +89,7 @@ if test "x$as_myself" = x; then
-   as_myself=$0
- fi
- if test ! -f "$as_myself"; then
--  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-   { (exit 1); exit 1; }
- fi
- 
-@@ -128,10 +102,17 @@ PS2='> '
- PS4='+ '
- 
- # NLS nuisances.
--LC_ALL=C
--export LC_ALL
--LANGUAGE=C
--export LANGUAGE
-+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
- 
- # Required to use basename.
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-@@ -153,7 +134,7 @@ as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- 	 X"$0" : 'X\(//\)$' \| \
- 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
--$as_echo X/"$0" |
-+echo X/"$0" |
-     sed '/^.*\/\([^/][^/]*\)\/*$/{
- 	    s//\1/
- 	    q
-@@ -179,7 +160,7 @@ else
-   as_have_required=no
- fi
- 
--  if test $as_have_required = yes &&	 (eval ":
-+  if test $as_have_required = yes && 	 (eval ":
- (as_func_return () {
-   (exit \$1)
- }
-@@ -261,7 +242,7 @@ IFS=$as_save_IFS
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
-   NULLCMD=:
--  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-   # is contrary to our usage.  Disable this feature.
-   alias -g '${1+"$@"}'='"$@"'
-   setopt NO_GLOB_SUBST
-@@ -282,7 +263,7 @@ _ASEOF
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
-   NULLCMD=:
--  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-   # is contrary to our usage.  Disable this feature.
-   alias -g '${1+"$@"}'='"$@"'
-   setopt NO_GLOB_SUBST
-@@ -362,10 +343,10 @@ fi
- 
-       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
- 
- 
-@@ -434,10 +415,9 @@ fi
- 
- test \$exitcode = 0") || {
-   echo No shell found that supports shell functions.
--  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.
-+  echo Please tell autoconf at gnu.org about your system,
-+  echo including any error possibly output before this
-+  echo message
- }
- 
- 
-@@ -473,7 +453,7 @@ test \$exitcode = 0") || {
-       s/-\n.*//
-     ' >$as_me.lineno &&
-   chmod +x "$as_me.lineno" ||
--    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-+    { 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
-@@ -501,6 +481,7 @@ case `echo -n x` in
- *)
-   ECHO_N='-n';;
- esac
-+
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-    test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
-@@ -513,22 +494,19 @@ if test -d conf$$.dir; then
-   rm -f conf$$.dir/conf$$.file
- else
-   rm -f conf$$.dir
--  mkdir conf$$.dir 2>/dev/null
-+  mkdir conf$$.dir
- fi
--if (echo >conf$$.file) 2>/dev/null; then
--  if ln -s conf$$.file conf$$ 2>/dev/null; then
--    as_ln_s='ln -s'
--    # ... but there are two gotchas:
--    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
--    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
--    # In both cases, we have to default to `cp -p'.
--    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
--      as_ln_s='cp -p'
--  elif ln conf$$.file conf$$ 2>/dev/null; then
--    as_ln_s=ln
--  else
-+echo >conf$$.file
-+if ln -s conf$$.file conf$$ 2>/dev/null; then
-+  as_ln_s='ln -s'
-+  # ... but there are two gotchas:
-+  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+  # In both cases, we have to default to `cp -p'.
-+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-     as_ln_s='cp -p'
--  fi
-+elif ln conf$$.file conf$$ 2>/dev/null; then
-+  as_ln_s=ln
- else
-   as_ln_s='cp -p'
- fi
-@@ -553,10 +531,10 @@ else
-   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
-@@ -843,7 +821,6 @@ MAKEINFO
- install_sh
- STRIP
- INSTALL_STRIP_PROGRAM
+@@ -791,250 +791,248 @@ ac_includes_default="\
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL
+-PATH_SEPARATOR
+-PACKAGE_NAME
+-PACKAGE_TARNAME
+-PACKAGE_VERSION
+-PACKAGE_STRING
+-PACKAGE_BUGREPORT
+-exec_prefix
+-prefix
+-program_transform_name
+-bindir
+-sbindir
+-libexecdir
+-datarootdir
+-datadir
+-sysconfdir
+-sharedstatedir
+-localstatedir
+-includedir
+-oldincludedir
+-docdir
+-infodir
+-htmldir
+-dvidir
+-pdfdir
+-psdir
+-libdir
+-localedir
+-mandir
+-DEFS
+-ECHO_C
+-ECHO_N
+-ECHO_T
+-LIBS
+-build_alias
+-host_alias
+-target_alias
+-INSTALL_PROGRAM
+-INSTALL_SCRIPT
+-INSTALL_DATA
+-am__isrc
+-CYGPATH_W
+-PACKAGE
+-VERSION
+-ACLOCAL
+-AUTOCONF
+-AUTOMAKE
+-AUTOHEADER
+-MAKEINFO
+-install_sh
+-STRIP
+-INSTALL_STRIP_PROGRAM
 -MKDIR_P
- mkdir_p
- AWK
- SET_MAKE
-@@ -963,10 +940,6 @@ SCREENSAVER_LIBS
- HAVE_TYPING_BREAK_TRUE
- HAVE_TYPING_BREAK_FALSE
- XF86MISC_LIBS
+-mkdir_p
+-AWK
+-SET_MAKE
+-am__leading_dot
+-AMTAR
+-am__tar
+-am__untar
+-MAINTAINER_MODE_TRUE
+-MAINTAINER_MODE_FALSE
+-MAINT
+-CC
+-CFLAGS
+-LDFLAGS
+-CPPFLAGS
+-ac_ct_CC
+-EXEEXT
+-OBJEXT
+-DEPDIR
+-am__include
+-am__quote
+-AMDEP_TRUE
+-AMDEP_FALSE
+-AMDEPBACKSLASH
+-CCDEPMODE
+-am__fastdepCC_TRUE
+-am__fastdepCC_FALSE
+-CPP
+-GREP
+-EGREP
+-build
+-build_cpu
+-build_vendor
+-build_os
+-host
+-host_cpu
+-host_vendor
+-host_os
+-SED
+-LN_S
+-ECHO
+-AR
+-RANLIB
+-DSYMUTIL
+-NMEDIT
+-CXX
+-CXXFLAGS
+-ac_ct_CXX
+-CXXDEPMODE
+-am__fastdepCXX_TRUE
+-am__fastdepCXX_FALSE
+-CXXCPP
+-F77
+-FFLAGS
+-ac_ct_F77
+-LIBTOOL
+-PKG_CONFIG
+-HELP_DIR
+-OMF_DIR
+-DOC_USER_FORMATS
+-ENABLE_SK_TRUE
+-ENABLE_SK_FALSE
+-DISTCHECK_CONFIGURE_FLAGS
+-HAVE_GNOME_DOC_UTILS_TRUE
+-HAVE_GNOME_DOC_UTILS_FALSE
+-INTLTOOL_UPDATE
+-INTLTOOL_MERGE
+-INTLTOOL_EXTRACT
+-INTLTOOL_DESKTOP_RULE
+-INTLTOOL_DIRECTORY_RULE
+-INTLTOOL_KEYS_RULE
+-INTLTOOL_PROP_RULE
+-INTLTOOL_OAF_RULE
+-INTLTOOL_PONG_RULE
+-INTLTOOL_SERVER_RULE
+-INTLTOOL_SHEET_RULE
+-INTLTOOL_SOUNDLIST_RULE
+-INTLTOOL_UI_RULE
+-INTLTOOL_XAM_RULE
+-INTLTOOL_KBD_RULE
+-INTLTOOL_XML_RULE
+-INTLTOOL_XML_NOMERGE_RULE
+-INTLTOOL_CAVES_RULE
+-INTLTOOL_SCHEMAS_RULE
+-INTLTOOL_THEME_RULE
+-INTLTOOL_SERVICE_RULE
+-INTLTOOL_POLICY_RULE
+-XGETTEXT
+-MSGMERGE
+-MSGFMT
+-INTLTOOL_PERL
+-ALL_LINGUAS
+-DATADIRNAME
+-GETTEXT_PACKAGE
+-USE_NLS
+-MSGFMT_OPTS
+-GMSGFMT
+-CATALOGS
+-CATOBJEXT
+-GMOFILES
+-INSTOBJEXT
+-INTLLIBS
+-PO_IN_DATADIR_TRUE
+-PO_IN_DATADIR_FALSE
+-POFILES
+-POSUB
+-MKINSTALLDIRS
+-ACLOCAL_AMFLAGS
+-WARN_CFLAGS
+-DISABLE_DEPRECATED
+-XMKMF
+-X_CFLAGS
+-X_PRE_LIBS
+-X_LIBS
+-X_EXTRA_LIBS
+-TYPING_BREAK
+-SCREENSAVER_LIBS
+-HAVE_TYPING_BREAK_TRUE
+-HAVE_TYPING_BREAK_FALSE
+-XF86MISC_LIBS
 -ENABLE_DYNAMIC_LIBSLAB_TRUE
 -ENABLE_DYNAMIC_LIBSLAB_FALSE
+-LIBSLAB_CFLAGS
+-LIBSLAB_LIBS
+-CAPPLET_CFLAGS
+-CAPPLET_LIBS
+-GNOMECC_CFLAGS
+-GNOMECC_LIBS
+-GNOME_CFLAGS
+-GNOME_LIBS
+-DBUS_CFLAGS
+-DBUS_LIBS
+-GNOME_DESKTOP_CFLAGS
+-GNOME_DESKTOP_LIBS
+-DEFAULT_APPLICATIONS_CAPPLET_CFLAGS
+-DEFAULT_APPLICATIONS_CAPPLET_LIBS
+-METACITY_CFLAGS
+-METACITY_LIBS
+-TYPING_CFLAGS
+-TYPING_LIBS
+-GSD_DBUS_CFLAGS
+-GSD_DBUS_LIBS
+-GIO_CFLAGS
+-GIO_LIBS
+-GTK_ENGINE_DIR
+-FONT_CAPPLET_CFLAGS
+-FONT_CAPPLET_LIBS
+-AT_CAPPLET_CFLAGS
+-AT_CAPPLET_LIBS
+-HAVE_RANDR_TRUE
+-HAVE_RANDR_FALSE
+-DISPLAY_CAPPLET_CFLAGS
+-DISPLAY_CAPPLET_LIBS
+-XCURSOR_CFLAGS
+-XCURSOR_LIBS
+-HAVE_XCURSOR_TRUE
+-HAVE_XCURSOR_FALSE
+-LIBGNOMEKBD_CFLAGS
+-LIBGNOMEKBD_LIBS
+-LIBGNOMEKBDUI_CFLAGS
+-LIBGNOMEKBDUI_LIBS
+-LIBEBOOK_CFLAGS
+-LIBEBOOK_LIBS
+-BUILD_ABOUTME_TRUE
+-BUILD_ABOUTME_FALSE
+-HAL_CFLAGS
+-HAL_LIBS
+-GLIB_GENMARSHAL
+-GCONFTOOL
+-GCONF_SCHEMA_CONFIG_SOURCE
+-GCONF_SCHEMA_FILE_DIR
+-GCONF_SCHEMAS_INSTALL_TRUE
+-GCONF_SCHEMAS_INSTALL_FALSE
+-GST_CFLAGS
+-GST_LIBS
+-HAVE_GSTREAMER_TRUE
+-HAVE_GSTREAMER_FALSE
+-CANBERRA_CFLAGS
+-CANBERRA_LIBS
+-SOUND_CAPPLET_LIBS
+-SOUND_CAPPLET_CFLAGS
+-BUILD_SOUND_TRUE
+-BUILD_SOUND_FALSE
+-GNOMECC_CAPPLETS_EXTRA_DIST
+-GNOMECC_CAPPLETS_CLEANFILES
+-GNOMECC_CAPPLETS_CFLAGS
+-GNOMECC_CAPPLETS_LIBS
+-UPDATE_MIME_DATABASE
+-ENABLE_UPDATE_MIMEDB_TRUE
+-ENABLE_UPDATE_MIMEDB_FALSE
++ac_subst_vars='LTLIBOBJS
+ LIBOBJS
+-LTLIBOBJS'
++ENABLE_UPDATE_MIMEDB_FALSE
++ENABLE_UPDATE_MIMEDB_TRUE
++UPDATE_MIME_DATABASE
++GNOMECC_CAPPLETS_LIBS
++GNOMECC_CAPPLETS_CFLAGS
++GNOMECC_CAPPLETS_CLEANFILES
++GNOMECC_CAPPLETS_EXTRA_DIST
++BUILD_SOUND_FALSE
++BUILD_SOUND_TRUE
++SOUND_CAPPLET_CFLAGS
++SOUND_CAPPLET_LIBS
++CANBERRA_LIBS
++CANBERRA_CFLAGS
++HAVE_GSTREAMER_FALSE
++HAVE_GSTREAMER_TRUE
++GST_LIBS
++GST_CFLAGS
++GCONF_SCHEMAS_INSTALL_FALSE
++GCONF_SCHEMAS_INSTALL_TRUE
++GCONF_SCHEMA_FILE_DIR
++GCONF_SCHEMA_CONFIG_SOURCE
++GCONFTOOL
++GLIB_GENMARSHAL
++HAL_LIBS
++HAL_CFLAGS
++BUILD_ABOUTME_FALSE
++BUILD_ABOUTME_TRUE
++LIBEBOOK_LIBS
++LIBEBOOK_CFLAGS
++LIBGNOMEKBDUI_LIBS
++LIBGNOMEKBDUI_CFLAGS
++LIBGNOMEKBD_LIBS
++LIBGNOMEKBD_CFLAGS
++HAVE_XCURSOR_FALSE
++HAVE_XCURSOR_TRUE
++XCURSOR_LIBS
++XCURSOR_CFLAGS
++DISPLAY_CAPPLET_LIBS
++DISPLAY_CAPPLET_CFLAGS
++HAVE_RANDR_FALSE
++HAVE_RANDR_TRUE
++AT_CAPPLET_LIBS
++AT_CAPPLET_CFLAGS
++FONT_CAPPLET_LIBS
++FONT_CAPPLET_CFLAGS
++GTK_ENGINE_DIR
++GIO_LIBS
++GIO_CFLAGS
++GSD_DBUS_LIBS
++GSD_DBUS_CFLAGS
++TYPING_LIBS
++TYPING_CFLAGS
++SLAB_LIBS
++SLAB_CFLAGS
++METACITY_LIBS
++METACITY_CFLAGS
++DEFAULT_APPLICATIONS_CAPPLET_LIBS
++DEFAULT_APPLICATIONS_CAPPLET_CFLAGS
++GNOME_DESKTOP_LIBS
++GNOME_DESKTOP_CFLAGS
++DBUS_LIBS
++DBUS_CFLAGS
++GNOME_LIBS
++GNOME_CFLAGS
++GNOMECC_LIBS
++GNOMECC_CFLAGS
++CAPPLET_LIBS
++CAPPLET_CFLAGS
++XF86MISC_LIBS
++HAVE_TYPING_BREAK_FALSE
++HAVE_TYPING_BREAK_TRUE
++SCREENSAVER_LIBS
++TYPING_BREAK
++X_EXTRA_LIBS
++X_LIBS
++X_PRE_LIBS
++X_CFLAGS
++XMKMF
++DISABLE_DEPRECATED
++WARN_CFLAGS
++ACLOCAL_AMFLAGS
++MKINSTALLDIRS
++POSUB
++POFILES
++PO_IN_DATADIR_FALSE
++PO_IN_DATADIR_TRUE
++INTLLIBS
++INSTOBJEXT
++GMOFILES
++CATOBJEXT
++CATALOGS
++GMSGFMT
++MSGFMT_OPTS
++USE_NLS
++GETTEXT_PACKAGE
++DATADIRNAME
++ALL_LINGUAS
++INTLTOOL_PERL
++MSGFMT
++MSGMERGE
++XGETTEXT
++INTLTOOL_POLICY_RULE
++INTLTOOL_SERVICE_RULE
++INTLTOOL_THEME_RULE
++INTLTOOL_SCHEMAS_RULE
++INTLTOOL_CAVES_RULE
++INTLTOOL_XML_NOMERGE_RULE
++INTLTOOL_XML_RULE
++INTLTOOL_KBD_RULE
++INTLTOOL_XAM_RULE
++INTLTOOL_UI_RULE
++INTLTOOL_SOUNDLIST_RULE
++INTLTOOL_SHEET_RULE
++INTLTOOL_SERVER_RULE
++INTLTOOL_PONG_RULE
++INTLTOOL_OAF_RULE
++INTLTOOL_PROP_RULE
++INTLTOOL_KEYS_RULE
++INTLTOOL_DIRECTORY_RULE
++INTLTOOL_DESKTOP_RULE
++INTLTOOL_EXTRACT
++INTLTOOL_MERGE
++INTLTOOL_UPDATE
++HAVE_GNOME_DOC_UTILS_FALSE
++HAVE_GNOME_DOC_UTILS_TRUE
++DISTCHECK_CONFIGURE_FLAGS
++ENABLE_SK_FALSE
++ENABLE_SK_TRUE
++DOC_USER_FORMATS
++OMF_DIR
++HELP_DIR
++PKG_CONFIG
++LIBTOOL
++ac_ct_F77
++FFLAGS
++F77
++CXXCPP
++am__fastdepCXX_FALSE
++am__fastdepCXX_TRUE
++CXXDEPMODE
++ac_ct_CXX
++CXXFLAGS
++CXX
++NMEDIT
++DSYMUTIL
++RANLIB
++AR
++ECHO
++LN_S
++SED
++host_os
++host_vendor
++host_cpu
++host
++build_os
++build_vendor
++build_cpu
++build
++EGREP
++GREP
++CPP
++am__fastdepCC_FALSE
++am__fastdepCC_TRUE
++CCDEPMODE
++AMDEPBACKSLASH
++AMDEP_FALSE
++AMDEP_TRUE
++am__quote
++am__include
++DEPDIR
++OBJEXT
++EXEEXT
++ac_ct_CC
++CPPFLAGS
++LDFLAGS
++CFLAGS
++CC
++MAINT
++MAINTAINER_MODE_FALSE
++MAINTAINER_MODE_TRUE
++am__untar
++am__tar
++AMTAR
++am__leading_dot
++SET_MAKE
++AWK
++mkdir_p
++MKDIR_P
++INSTALL_STRIP_PROGRAM
++STRIP
++install_sh
++MAKEINFO
++AUTOHEADER
++AUTOMAKE
++AUTOCONF
++ACLOCAL
++VERSION
++PACKAGE
++CYGPATH_W
++am__isrc
++INSTALL_DATA
++INSTALL_SCRIPT
++INSTALL_PROGRAM
++target_alias
++host_alias
++build_alias
++LIBS
++ECHO_T
++ECHO_N
++ECHO_C
++DEFS
++mandir
++localedir
++libdir
++psdir
++pdfdir
++dvidir
++htmldir
++infodir
++docdir
++oldincludedir
++includedir
++localstatedir
++sharedstatedir
++sysconfdir
++datadir
++datarootdir
++libexecdir
++sbindir
++bindir
++program_transform_name
++prefix
++exec_prefix
++PACKAGE_BUGREPORT
++PACKAGE_STRING
++PACKAGE_VERSION
++PACKAGE_TARNAME
++PACKAGE_NAME
++PATH_SEPARATOR
++SHELL'
+ ac_subst_files=''
+ ac_user_opts='
+ enable_option_checking
+@@ -1081,8 +1079,6 @@ F77
+ FFLAGS
+ PKG_CONFIG
+ XMKMF
 -LIBSLAB_CFLAGS
 -LIBSLAB_LIBS
  CAPPLET_CFLAGS
  CAPPLET_LIBS
  GNOMECC_CFLAGS
-@@ -981,6 +954,8 @@ DEFAULT_APPLICATIONS_CAPPLET_CFLAGS
+@@ -1097,6 +1093,8 @@ DEFAULT_APPLICATIONS_CAPPLET_CFLAGS
  DEFAULT_APPLICATIONS_CAPPLET_LIBS
  METACITY_CFLAGS
  METACITY_LIBS
@@ -12187,365 +12430,28 @@
  TYPING_CFLAGS
  TYPING_LIBS
  GSD_DBUS_CFLAGS
-@@ -1036,34 +1011,6 @@ ENABLE_UPDATE_MIMEDB_FALSE
- 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_help_dir
--with_omf_dir
--with_help_formats
--enable_scrollkeeper
--enable_debug
--enable_compile_warnings
--enable_iso_c
--with_x
--enable_aboutme
--enable_hal
--with_gconf_source
--with_gconf_schema_file_dir
--enable_schemas_install
--enable_gstreamer
--with_libcanberra
--enable_update_mimedb
--'
-       ac_precious_vars='build_alias
- host_alias
- target_alias
-@@ -1081,8 +1028,6 @@ F77
- FFLAGS
- PKG_CONFIG
- XMKMF
--LIBSLAB_CFLAGS
--LIBSLAB_LIBS
- CAPPLET_CFLAGS
- CAPPLET_LIBS
- GNOMECC_CFLAGS
-@@ -1097,6 +1042,8 @@ DEFAULT_APPLICATIONS_CAPPLET_CFLAGS
- DEFAULT_APPLICATIONS_CAPPLET_LIBS
- METACITY_CFLAGS
- METACITY_LIBS
-+SLAB_CFLAGS
-+SLAB_LIBS
- TYPING_CFLAGS
- TYPING_LIBS
- GSD_DBUS_CFLAGS
-@@ -1128,8 +1075,6 @@ CANBERRA_LIBS'
- # 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
-@@ -1228,21 +1173,13 @@ do
-     datarootdir=$ac_optarg ;;
- 
-   -disable-* | --disable-*)
--    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-+    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-     # Reject names that are not valid shell variable names.
--    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
--      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-    { (exit 1); exit 1; }; }
--    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 ;;
-+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-+    eval enable_$ac_feature=no ;;
- 
-   -docdir | --docdir | --docdi | --doc | --do)
-     ac_prev=docdir ;;
-@@ -1255,21 +1192,13 @@ do
-     dvidir=$ac_optarg ;;
- 
-   -enable-* | --enable-*)
--    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-+    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-     # Reject names that are not valid shell variable names.
--    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
--      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-    { (exit 1); exit 1; }; }
--    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 ;;
-+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-+    eval enable_$ac_feature=\$ac_optarg ;;
- 
-   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -1460,38 +1389,22 @@ do
-     ac_init_version=: ;;
- 
-   -with-* | --with-*)
--    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-+    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-     # Reject names that are not valid shell variable names.
--    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
--      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+      { echo "$as_me: error: invalid package name: $ac_package" >&2
-    { (exit 1); exit 1; }; }
--    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 ;;
-+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-+    eval with_$ac_package=\$ac_optarg ;;
- 
-   -without-* | --without-*)
--    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-+    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-     # Reject names that are not valid shell variable names.
--    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
--      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+      { echo "$as_me: error: invalid package name: $ac_package" >&2
-    { (exit 1); exit 1; }; }
--    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 ;;
-+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-+    eval with_$ac_package=no ;;
- 
-   --x)
-     # Obsolete; use --with-x.
-@@ -1511,7 +1424,7 @@ do
-   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-     x_libraries=$ac_optarg ;;
- 
--  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
-+  -*) { echo "$as_me: error: unrecognized option: $ac_option
- Try \`$0 --help' for more information." >&2
-    { (exit 1); exit 1; }; }
-     ;;
-@@ -1520,16 +1433,16 @@ Try \`$0 --help' for more information." 
-     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 &&
--      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-+      { 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.
--    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-+    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
--      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-+      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-     ;;
- 
-@@ -1538,38 +1451,22 @@ done
- 
- if test -n "$ac_prev"; then
-   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
--  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
-+  { echo "$as_me: error: missing argument to $ac_option" >&2
-    { (exit 1); exit 1; }; }
- fi
- 
--if test -n "$ac_unrecognized_opts"; then
--  case $enable_option_checking in
--    no) ;;
+@@ -1545,9 +1543,9 @@ fi
+ 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; }; } ;;
++    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.
-+# Be sure to have absolute directory names.
- 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;;
++    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
    esac
--  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-+  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-    { (exit 1); exit 1; }; }
- done
- 
-@@ -1584,7 +1481,7 @@ target=$target_alias
- if test "x$host_alias" != x; then
-   if test "x$build_alias" = x; then
-     cross_compiling=maybe
--    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-+    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
-@@ -1600,10 +1497,10 @@ test "$silent" = yes && exec 6>/dev/null
+ fi
+ 
+@@ -1600,7 +1598,7 @@ test "$silent" = yes && exec 6>/dev/null
  ac_pwd=`pwd` && test -n "$ac_pwd" &&
  ac_ls_di=`ls -di .` &&
  ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
 -  { $as_echo "$as_me: error: Working directory cannot be determined" >&2
-+  { 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" ||
--  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
-+  { echo "$as_me: error: pwd does not report name of working directory" >&2
-    { (exit 1); exit 1; }; }
- 
- 
-@@ -1611,12 +1508,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- if test -z "$srcdir"; then
-   ac_srcdir_defaulted=yes
-   # Try the directory containing this script, then the parent directory.
--  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" |
-+  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" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- 	    s//\1/
- 	    q
-@@ -1643,12 +1540,12 @@ else
- fi
- if test ! -r "$srcdir/$ac_unique_file"; then
-   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
--  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-+  { 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" || { $as_echo "$as_me: error: $ac_msg" >&2
-+	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
-    { (exit 1); exit 1; }; }
- 	pwd)`
- # When building in place, set srcdir=.
-@@ -1697,9 +1594,9 @@ Configuration:
- 
- 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
-@@ -1709,26 +1606,25 @@ for instance \`--prefix=\$HOME'.
- 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-control-center]
--  --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-control-center]
-+  --htmldir=DIR          html documentation [DOCDIR]
-+  --dvidir=DIR           dvi documentation [DOCDIR]
-+  --pdfdir=DIR           pdf documentation [DOCDIR]
-+  --psdir=DIR            ps documentation [DOCDIR]
- _ACEOF
- 
-   cat <<\_ACEOF
-@@ -1755,7 +1651,6 @@ if test -n "$ac_init_help"; then
-   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
-@@ -1812,10 +1707,6 @@ Some influential environment variables:
+   { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
+@@ -1812,10 +1810,6 @@ Some influential environment variables:
    FFLAGS      Fortran 77 compiler flags
    PKG_CONFIG  path to pkg-config utility
    XMKMF       Path to xmkmf, Makefile generator for X Window System
@@ -12556,7 +12462,7 @@
    CAPPLET_CFLAGS
                C compiler flags for CAPPLET, overriding pkg-config
    CAPPLET_LIBS
-@@ -1843,6 +1734,8 @@ Some influential environment variables:
+@@ -1843,6 +1837,8 @@ Some influential environment variables:
                C compiler flags for METACITY, overriding pkg-config
    METACITY_LIBS
                linker flags for METACITY, overriding pkg-config
@@ -12565,2831 +12471,232 @@
    TYPING_CFLAGS
                C compiler flags for TYPING, overriding pkg-config
    TYPING_LIBS linker flags for TYPING, overriding pkg-config
-@@ -1900,17 +1793,15 @@ fi
- 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" ||
--      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
--      continue
-+    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=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-   # A ".." for each directory in $ac_dir_suffix.
--  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-+  ac_top_builddir_sub=`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/ ;;
-@@ -1946,7 +1837,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
-       echo &&
-       $SHELL "$ac_srcdir/configure" --help=recursive
-     else
--      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-+      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-     fi || ac_status=$?
-     cd "$ac_pwd" || { ac_status=$?; break; }
-   done
-@@ -1956,10 +1847,10 @@ test -n "$ac_init_help" && exit $ac_stat
+@@ -1956,7 +1952,7 @@ test -n "$ac_init_help" && exit $ac_stat
  if $ac_init_version; then
    cat <<\_ACEOF
  gnome-control-center configure 2.24.0.1
 -generated by GNU Autoconf 2.62
-+generated by GNU Autoconf 2.61
++generated by GNU Autoconf 2.63
  
  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
-@@ -1970,7 +1861,7 @@ This file contains any messages produced
+ 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+@@ -1970,7 +1966,7 @@ This file contains any messages produced
  running configure, to aid debugging if configure makes a mistake.
  
  It was created by gnome-control-center $as_me 2.24.0.1, which was
 -generated by GNU Autoconf 2.62.  Invocation command line was
-+generated by GNU Autoconf 2.61.  Invocation command line was
++generated by GNU Autoconf 2.63.  Invocation command line was
  
    $ $0 $@
  
-@@ -2006,7 +1897,7 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  $as_echo "PATH: $as_dir"
-+  echo "PATH: $as_dir"
- done
- IFS=$as_save_IFS
- 
-@@ -2041,7 +1932,7 @@ do
-     | -silent | --silent | --silen | --sile | --sil)
-       continue ;;
-     *\'*)
--      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-     esac
-     case $ac_pass in
-     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-@@ -2093,12 +1984,11 @@ _ASBOX
+@@ -2093,8 +2089,8 @@ _ASBOX
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
 -      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
 -$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+      *_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
-@@ -2128,9 +2018,9 @@ _ASBOX
-     do
-       eval ac_val=\$$ac_var
-       case $ac_val in
--      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-       esac
--      $as_echo "$ac_var='\''$ac_val'\''"
-+      echo "$ac_var='\''$ac_val'\''"
-     done | sort
-     echo
- 
-@@ -2145,9 +2035,9 @@ _ASBOX
-       do
- 	eval ac_val=\$$ac_var
- 	case $ac_val in
--	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
- 	esac
--	$as_echo "$ac_var='\''$ac_val'\''"
-+	echo "$ac_var='\''$ac_val'\''"
-       done | sort
-       echo
-     fi
-@@ -2163,8 +2053,8 @@ _ASBOX
-       echo
-     fi
-     test "$ac_signal" != 0 &&
--      $as_echo "$as_me: caught signal $ac_signal"
--    $as_echo "$as_me: exit $exit_status"
-+      echo "$as_me: caught signal $ac_signal"
-+    echo "$as_me: exit $exit_status"
-   } >&5
-   rm -f core *.core core.conftest.* &&
-     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-@@ -2206,24 +2096,21 @@ _ACEOF
- 
- 
- # Let the site file select an alternate cache file if it wants to.
--# Prefer an explicitly selected file to automatically selected ones.
--ac_site_file1=NONE
--ac_site_file2=NONE
-+# Prefer explicitly selected file to automatically selected ones.
- if test -n "$CONFIG_SITE"; then
--  ac_site_file1=$CONFIG_SITE
-+  set x "$CONFIG_SITE"
- elif test "x$prefix" != xNONE; then
--  ac_site_file1=$prefix/share/config.site
--  ac_site_file2=$prefix/etc/config.site
-+  set x "$prefix/share/config.site" "$prefix/etc/config.site"
- else
--  ac_site_file1=$ac_default_prefix/share/config.site
--  ac_site_file2=$ac_default_prefix/etc/config.site
-+  set x "$ac_default_prefix/share/config.site" \
-+	"$ac_default_prefix/etc/config.site"
- fi
--for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-+shift
-+for ac_site_file
- do
--  test "x$ac_site_file" = xNONE && continue
-   if test -r "$ac_site_file"; then
--    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
--$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-+    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-+echo "$as_me: loading site script $ac_site_file" >&6;}
-     sed 's/^/| /' "$ac_site_file" >&5
-     . "$ac_site_file"
-   fi
-@@ -2233,16 +2120,16 @@ if test -r "$cache_file"; then
-   # Some versions of bash will fail to source /dev/null (special
-   # files actually), so we avoid doing that.
-   if test -f "$cache_file"; then
--    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
--$as_echo "$as_me: loading cache $cache_file" >&6;}
-+    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-+echo "$as_me: loading cache $cache_file" >&6;}
-     case $cache_file in
-       [\\/]* | ?:[\\/]* ) . "$cache_file";;
-       *)                      . "./$cache_file";;
-     esac
-   fi
- else
--  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
--$as_echo "$as_me: creating cache $cache_file" >&6;}
-+  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-+echo "$as_me: creating cache $cache_file" >&6;}
-   >$cache_file
- fi
- 
-@@ -2256,38 +2143,29 @@ for ac_var in $ac_precious_vars; do
-   eval ac_new_val=\$ac_env_${ac_var}_value
-   case $ac_old_set,$ac_new_set in
-     set,)
--      { $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;}
-+      { 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;}
-       ac_cache_corrupted=: ;;
-     ,set)
--      { $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;}
-+      { 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;}
-       ac_cache_corrupted=: ;;
-     ,);;
-     *)
-       if test "x$ac_old_val" != "x$ac_new_val"; then
--	# 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;}
-+	{ 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=:
-       fi;;
-   esac
-   # Pass precious variables to config.status.
-   if test "$ac_new_set" = set; then
-     case $ac_new_val in
--    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-     *) ac_arg=$ac_var=$ac_new_val ;;
-     esac
-     case " $ac_configure_args " in
-@@ -2297,10 +2175,10 @@ $as_echo "$as_me:   current value: \`$ac
+@@ -2297,6 +2293,8 @@ $as_echo "$as_me:   current value: \`$ac
    fi
  done
  if $ac_cache_corrupted; then
--  { $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;}
-+  { 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;}
-    { (exit 1); exit 1; }; }
- fi
- 
-@@ -2360,8 +2238,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s
-   fi
- done
- if test -z "$ac_aux_dir"; then
--  { { $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;}
-+  { { 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;}
-    { (exit 1); exit 1; }; }
- fi
- 
-@@ -2387,12 +2265,11 @@ ac_configure="$SHELL $ac_aux_dir/configu
- # 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.
--# 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; }
-+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
- if test -z "$INSTALL"; then
- if test "${ac_cv_path_install+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
-@@ -2421,29 +2298,17 @@ case $as_dir/ in
- 	    # program-specific install script used by HP pwplus--don't use.
- 	    :
- 	  else
--	    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
-+	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-+	    break 3
- 	  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
-@@ -2456,8 +2321,8 @@ fi
-     INSTALL=$ac_install_sh
-   fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
--$as_echo "$INSTALL" >&6; }
-+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-+echo "${ECHO_T}$INSTALL" >&6; }
- 
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
-@@ -2467,8 +2332,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
- 
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
--{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
--$as_echo_n "checking whether build environment is sane... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
- # Just in case
- sleep 1
- echo timestamp > conftest.file
-@@ -2491,9 +2356,9 @@ if (
-       # 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".
--      { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
-+      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
- alias in your environment" >&5
--$as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
-+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
-@@ -2504,23 +2369,26 @@ then
-    # Ok.
-    :
- else
--   { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-+   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
- Check your system clock" >&5
--$as_echo "$as_me: error: newly created file is older than distributed files!
-+echo "$as_me: error: newly created file is older than distributed files!
- Check your system clock" >&2;}
-    { (exit 1); exit 1; }; }
- fi
--{ $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}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 $.
-+# Double any \ or $.  echo might interpret backslashes.
- # By default was `s,x,x', remove it if useless.
--ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
--program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-+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
- 
- # expand $ac_aux_dir to an absolute path
- am_aux_dir=`cd $ac_aux_dir && pwd`
-@@ -2531,15 +2399,15 @@ if eval "$MISSING --run true"; then
-   am_missing_run="$MISSING --run "
- else
-   am_missing_run=
--  { $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;}
-+  { 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;}
- fi
- 
--{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
--$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-+{ 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; }
- if test -z "$MKDIR_P"; then
-   if test "${ac_cv_path_mkdir+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-@@ -2574,8 +2442,8 @@ fi
-     MKDIR_P="$ac_install_sh -d"
-   fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
--$as_echo "$MKDIR_P" >&6; }
-+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-+echo "${ECHO_T}$MKDIR_P" >&6; }
- 
- mkdir_p="$MKDIR_P"
- case $mkdir_p in
-@@ -2587,10 +2455,10 @@ for ac_prog in gawk mawk nawk awk
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; 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_prog_AWK+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -n "$AWK"; then
-   ac_cv_prog_AWK="$AWK" # Let the user override the test.
-@@ -2603,7 +2471,7 @@ do
-   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"
--    $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
-@@ -2614,23 +2482,22 @@ fi
- fi
- AWK=$ac_cv_prog_AWK
- if test -n "$AWK"; then
--  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
--$as_echo "$AWK" >&6; }
-+  { echo "$as_me:$LINENO: result: $AWK" >&5
-+echo "${ECHO_T}$AWK" >&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
- 
- 
-   test -n "$AWK" && break
- done
- 
--{ $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'`
-+{ 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'`
- if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.make <<\_ACEOF
- SHELL = /bin/sh
-@@ -2647,12 +2514,12 @@ esac
- rm -f conftest.make
- fi
- if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
--  { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   SET_MAKE=
- 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; }
-   SET_MAKE="MAKE=${MAKE-make}"
- fi
- 
-@@ -2671,8 +2538,8 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
-   am__isrc=' -I$(srcdir)'
-   # test to see if srcdir already configured
-   if test -f $srcdir/config.status; then
--    { { $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;}
-+    { { 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;}
-    { (exit 1); exit 1; }; }
-   fi
- fi
-@@ -2727,10 +2594,10 @@ if test "$cross_compiling" != no; then
-   if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
- set dummy ${ac_tool_prefix}strip; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_STRIP+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -n "$STRIP"; then
-   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-@@ -2743,7 +2610,7 @@ do
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -2754,11 +2621,11 @@ fi
- fi
- STRIP=$ac_cv_prog_STRIP
- if test -n "$STRIP"; then
--  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
--$as_echo "$STRIP" >&6; }
-+  { echo "$as_me:$LINENO: result: $STRIP" >&5
-+echo "${ECHO_T}$STRIP" >&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
- 
- 
-@@ -2767,10 +2634,10 @@ if test -z "$ac_cv_prog_STRIP"; then
-   ac_ct_STRIP=$STRIP
-   # Extract the first word of "strip", so it can be a program name with args.
- set dummy strip; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -n "$ac_ct_STRIP"; then
-   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-@@ -2783,7 +2650,7 @@ do
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_STRIP="strip"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -2794,11 +2661,11 @@ fi
- fi
- ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
- if test -n "$ac_ct_STRIP"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
--$as_echo "$ac_ct_STRIP" >&6; }
-+  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+echo "${ECHO_T}$ac_ct_STRIP" >&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 "x$ac_ct_STRIP" = x; then
-@@ -2806,10 +2673,10 @@ fi
++  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+   { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+ $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+   { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+@@ -2806,12 +2804,8 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
 -{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+{ 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
+-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
 -$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+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;}
+-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;}
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
-@@ -2830,8 +2697,8 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c
- AMTAR=${AMTAR-"${am_missing_run}tar"}
- 
- 
--{ $as_echo "$as_me:$LINENO: checking how to create a ustar tar archive" >&5
--$as_echo_n "checking how to create a ustar tar archive... " >&6; }
-+{ echo "$as_me:$LINENO: checking how to create a ustar tar archive" >&5
-+echo $ECHO_N "checking how to create a ustar tar archive... $ECHO_C" >&6; }
- # Loop over all known methods to create a tar archive until one works.
- _am_tools='gnutar plaintar pax cpio none'
- _am_tools=${am_cv_prog_tar_ustar-$_am_tools}
-@@ -2904,20 +2771,20 @@ done
- rm -rf conftest.dir
- 
- if test "${am_cv_prog_tar_ustar+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   am_cv_prog_tar_ustar=$_am_tool
- fi
- 
--{ $as_echo "$as_me:$LINENO: result: $am_cv_prog_tar_ustar" >&5
--$as_echo "$am_cv_prog_tar_ustar" >&6; }
-+{ echo "$as_me:$LINENO: result: $am_cv_prog_tar_ustar" >&5
-+echo "${ECHO_T}$am_cv_prog_tar_ustar" >&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; }
-+{ 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; }
-     # Check whether --enable-maintainer-mode was given.
- if test "${enable_maintainer_mode+set}" = set; then
-   enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-@@ -2925,8 +2792,8 @@ else
-   USE_MAINTAINER_MODE=no
- fi
- 
--  { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
--$as_echo "$USE_MAINTAINER_MODE" >&6; }
-+  { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
-    if test $USE_MAINTAINER_MODE = yes; then
-   MAINTAINER_MODE_TRUE=
-   MAINTAINER_MODE_FALSE='#'
-@@ -2951,8 +2818,8 @@ am__doit:
- .PHONY: am__doit
- END
- # If we don't find an include directive, just comment out the code.
--{ $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; }
-+{ 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; }
- am__include="#"
- am__quote=
- _am_result=none
-@@ -2979,8 +2846,8 @@ if test "$am__include" = "#"; then
- fi
- 
- 
--{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
--$as_echo "$_am_result" >&6; }
-+{ echo "$as_me:$LINENO: result: $_am_result" >&5
-+echo "${ECHO_T}$_am_result" >&6; }
- rm -f confinc confmf
- 
- # Check whether --enable-dependency-tracking was given.
-@@ -3009,10 +2876,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 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
--{ $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_prog_CC+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -3025,7 +2892,7 @@ do
-   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"
--    $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
-@@ -3036,11 +2903,11 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { $as_echo "$as_me:$LINENO: result: $CC" >&5
--$as_echo "$CC" >&6; }
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&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
- 
- 
-@@ -3049,10 +2916,10 @@ if test -z "$ac_cv_prog_CC"; then
-   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
--{ $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_prog_ac_ct_CC+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -n "$ac_ct_CC"; then
-   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -3065,7 +2932,7 @@ do
-   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"
--    $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
-@@ -3076,11 +2943,11 @@ fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--$as_echo "$ac_ct_CC" >&6; }
-+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&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 "x$ac_ct_CC" = x; then
-@@ -3088,10 +2955,10 @@ fi
+ esac
+     STRIP=$ac_ct_STRIP
+@@ -3088,12 +3082,8 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
 -{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+{ 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
+-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
 -$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+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;}
+-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;}
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
-@@ -3106,10 +2973,10 @@ if test -z "$CC"; then
-           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
--{ $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_prog_CC+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -3122,7 +2989,7 @@ do
-   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"
--    $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
-@@ -3133,11 +3000,11 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { $as_echo "$as_me:$LINENO: result: $CC" >&5
--$as_echo "$CC" >&6; }
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&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
- 
- 
-@@ -3146,10 +3013,10 @@ fi
- 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
--{ $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_prog_CC+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -3167,7 +3034,7 @@ do
-        continue
-      fi
-     ac_cv_prog_CC="cc"
--    $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
-@@ -3190,11 +3057,11 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { $as_echo "$as_me:$LINENO: result: $CC" >&5
--$as_echo "$CC" >&6; }
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&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
- 
- 
-@@ -3205,10 +3072,10 @@ if test -z "$CC"; then
-   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
--{ $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_prog_CC+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -3221,7 +3088,7 @@ do
-   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"
--    $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
-@@ -3232,11 +3099,11 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { $as_echo "$as_me:$LINENO: result: $CC" >&5
--$as_echo "$CC" >&6; }
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&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
- 
- 
-@@ -3249,10 +3116,10 @@ if test -z "$CC"; then
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; 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_prog_ac_ct_CC+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -n "$ac_ct_CC"; then
-   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -3265,7 +3132,7 @@ do
-   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"
--    $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
-@@ -3276,11 +3143,11 @@ fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--$as_echo "$ac_ct_CC" >&6; }
-+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&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
- 
- 
-@@ -3292,10 +3159,10 @@ done
+ esac
+     CC=$ac_ct_CC
+@@ -3292,12 +3282,8 @@ done
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
 -{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+{ 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
+-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
 -$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+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;}
+-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;}
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
-@@ -3307,48 +3174,44 @@ fi
+ esac
+     CC=$ac_ct_CC
+@@ -3307,11 +3293,13 @@ fi
  fi
  
  
 -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
++test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
  See \`config.log' for more details." >&5
--$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
-+echo "$as_me: error: no acceptable C compiler found in \$PATH
+ $as_echo "$as_me: error: no acceptable C compiler found in \$PATH
  See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
  
  # Provide some information about the compiler.
--$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
--set X $ac_compile
--ac_compiler=$2
-+echo "$as_me:$LINENO: checking for C compiler version" >&5
-+ac_compiler=`set X $ac_compile; echo $2`
- { (ac_try="$ac_compiler --version >&5"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compiler --version >&5") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compiler -v >&5") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compiler -V >&5") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 
- cat >conftest.$ac_ext <<_ACEOF
-@@ -3367,22 +3230,27 @@ main ()
- }
- _ACEOF
- ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-+ac_clean_files="$ac_clean_files a.out 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.
--{ $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.*"
--
-+{ 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.
- ac_rmfiles=
- for ac_file in $ac_files
- do
-   case $ac_file in
--    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-   esac
- done
-@@ -3393,11 +3261,10 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link_default") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  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'
-@@ -3408,7 +3275,7 @@ for ac_file in $ac_files ''
- do
-   test -f "$ac_file" || continue
-   case $ac_file in
--    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
- 	;;
-     [ab].out )
- 	# We found the default executable, but exeext='' is most
-@@ -3435,15 +3302,15 @@ else
-   ac_file=''
- fi
- 
--{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
--$as_echo "$ac_file" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_file" >&5
-+echo "${ECHO_T}$ac_file" >&6; }
- if test -z "$ac_file"; then
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+@@ -3441,11 +3429,13 @@ if test -z "$ac_file"; then
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
--{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
-+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
++{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
  See \`config.log' for more details." >&5
--$as_echo "$as_me: error: C compiler cannot create executables
-+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
-@@ -3452,8 +3319,8 @@ ac_exeext=$ac_cv_exeext
- 
- # Check that the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
--$as_echo_n "checking whether the C compiler works... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&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
-@@ -3462,51 +3329,49 @@ if test "$cross_compiling" != yes; then
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-     cross_compiling=no
-   else
+-   { (exit 77); exit 77; }; }
++   { (exit 77); exit 77; }; }; }
+ fi
+ 
+ ac_exeext=$ac_cv_exeext
+@@ -3473,13 +3463,15 @@ $as_echo "$ac_try_echo") >&5
      if test "$cross_compiling" = maybe; then
  	cross_compiling=yes
      else
 -	{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
-+	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
++	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
  If you meant to cross compile, use \`--host'.
  See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run C compiled programs.
-+echo "$as_me: error: cannot run C compiled programs.
+ $as_echo "$as_me: error: cannot run C compiled programs.
  If you meant to cross compile, use \`--host'.
  See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
      fi
    fi
  fi
--{ $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- 
--rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-+rm -f a.out 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.
--{ $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 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 for suffix of executables" >&5
--$as_echo_n "checking for suffix of executables... " >&6; }
-+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
- if { (ac_try="$ac_link"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  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
-@@ -3515,31 +3380,31 @@ $as_echo "$ac_try_echo") >&5
- 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 | *.dSYM | *.o | *.obj ) ;;
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- 	  break;;
-     * ) break;;
+@@ -3522,11 +3514,13 @@ for ac_file in conftest.exe conftest con
    esac
  done
  else
 -  { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-+  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
++  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
  See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+ $as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
  See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
  fi
  
  rm -f conftest$ac_cv_exeext
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
--$as_echo "$ac_cv_exeext" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-+echo "${ECHO_T}$ac_cv_exeext" >&6; }
- 
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
--{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
--$as_echo_n "checking for suffix of object files... " >&6; }
-+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
- if test "${ac_cv_objext+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -3562,41 +3427,40 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compile") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  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 | *.dSYM ) ;;
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
-     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-        break;;
-   esac
- done
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
+@@ -3580,11 +3574,13 @@ else
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
--{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
++{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
  See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
-+echo "$as_me: error: cannot compute suffix of object files: cannot compile
+ $as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
  See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
  fi
  
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
--$as_echo "$ac_cv_objext" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-+echo "${ECHO_T}$ac_cv_objext" >&6; }
- OBJEXT=$ac_cv_objext
- ac_objext=$OBJEXT
--{ $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; }
-+{ 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; }
- if test "${ac_cv_c_compiler_gnu+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -3622,21 +3486,20 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
-        } && test -s conftest.$ac_objext; then
-   ac_compiler_gnu=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_compiler_gnu=no
-@@ -3646,19 +3509,15 @@ rm -f core conftest.err conftest.$ac_obj
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
- 
- fi
--{ $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
-+{ 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`
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
--{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
--$as_echo_n "checking whether $CC accepts -g... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
- if test "${ac_cv_prog_cc_g+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_save_c_werror_flag=$ac_c_werror_flag
-    ac_c_werror_flag=yes
-@@ -3685,21 +3544,20 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
-        } && test -s conftest.$ac_objext; then
-   ac_cv_prog_cc_g=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	CFLAGS=""
-@@ -3724,21 +3582,20 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
-        } && test -s conftest.$ac_objext; then
-   :
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_c_werror_flag=$ac_save_c_werror_flag
-@@ -3764,21 +3621,20 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
-        } && test -s conftest.$ac_objext; then
-   ac_cv_prog_cc_g=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
-@@ -3793,8 +3649,8 @@ fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    ac_c_werror_flag=$ac_save_c_werror_flag
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
--$as_echo "$ac_cv_prog_cc_g" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+echo "${ECHO_T}$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
-@@ -3810,10 +3666,10 @@ else
-     CFLAGS=
-   fi
- fi
--{ $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; }
-+{ 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; }
- if test "${ac_cv_prog_cc_c89+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_cv_prog_cc_c89=no
- ac_save_CC=$CC
-@@ -3884,21 +3740,20 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
-        } && test -s conftest.$ac_objext; then
-   ac_cv_prog_cc_c89=$ac_arg
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
-@@ -3914,15 +3769,15 @@ fi
- # AC_CACHE_VAL
- case "x$ac_cv_prog_cc_c89" in
-   x)
--    { $as_echo "$as_me:$LINENO: result: none needed" >&5
--$as_echo "none needed" >&6; } ;;
-+    { echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6; } ;;
-   xno)
--    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
--$as_echo "unsupported" >&6; } ;;
-+    { echo "$as_me:$LINENO: result: unsupported" >&5
-+echo "${ECHO_T}unsupported" >&6; } ;;
-   *)
-     CC="$CC $ac_cv_prog_cc_c89"
--    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
--$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-+    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
- esac
- 
- 
-@@ -3934,10 +3789,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- depcc="$CC"   am_compiler_list=
- 
--{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
--$as_echo_n "checking dependency style of $depcc... " >&6; }
-+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
- if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&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
-@@ -4025,8 +3880,8 @@ else
- fi
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
--$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
- CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
- 
-  if
-@@ -4041,10 +3896,10 @@ fi
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5
--$as_echo_n "checking for library containing strerror... " >&6; }
-+{ echo "$as_me:$LINENO: checking for library containing strerror" >&5
-+echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; }
- if test "${ac_cv_search_strerror+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_func_search_save_LIBS=$LIBS
- cat >conftest.$ac_ext <<_ACEOF
-@@ -4082,30 +3937,26 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_search_strerror=$ac_res
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
-@@ -4120,8 +3971,8 @@ fi
- rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
--$as_echo "$ac_cv_search_strerror" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
-+echo "${ECHO_T}$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"
-@@ -4136,10 +3987,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 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
--{ $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_prog_CC+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -4152,7 +4003,7 @@ do
-   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"
--    $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
-@@ -4163,11 +4014,11 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { $as_echo "$as_me:$LINENO: result: $CC" >&5
--$as_echo "$CC" >&6; }
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&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
- 
- 
-@@ -4176,10 +4027,10 @@ if test -z "$ac_cv_prog_CC"; then
-   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
--{ $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_prog_ac_ct_CC+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -n "$ac_ct_CC"; then
-   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -4192,7 +4043,7 @@ do
-   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"
--    $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
-@@ -4203,11 +4054,11 @@ fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--$as_echo "$ac_ct_CC" >&6; }
-+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&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 "x$ac_ct_CC" = x; then
-@@ -4215,10 +4066,10 @@ fi
+@@ -4215,12 +4211,8 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
 -{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+{ 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
+-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
 -$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+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;}
+-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;}
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
-@@ -4233,10 +4084,10 @@ if test -z "$CC"; then
-           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
--{ $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_prog_CC+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -4249,7 +4100,7 @@ do
-   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"
--    $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
-@@ -4260,11 +4111,11 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { $as_echo "$as_me:$LINENO: result: $CC" >&5
--$as_echo "$CC" >&6; }
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&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
- 
- 
-@@ -4273,10 +4124,10 @@ fi
- 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
--{ $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_prog_CC+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -4294,7 +4145,7 @@ do
-        continue
-      fi
-     ac_cv_prog_CC="cc"
--    $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
-@@ -4317,11 +4168,11 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { $as_echo "$as_me:$LINENO: result: $CC" >&5
--$as_echo "$CC" >&6; }
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&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
- 
- 
-@@ -4332,10 +4183,10 @@ if test -z "$CC"; then
-   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
--{ $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_prog_CC+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -4348,7 +4199,7 @@ do
-   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"
--    $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
-@@ -4359,11 +4210,11 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { $as_echo "$as_me:$LINENO: result: $CC" >&5
--$as_echo "$CC" >&6; }
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&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
- 
- 
-@@ -4376,10 +4227,10 @@ if test -z "$CC"; then
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; 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_prog_ac_ct_CC+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -n "$ac_ct_CC"; then
-   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -4392,7 +4243,7 @@ do
-   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"
--    $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
-@@ -4403,11 +4254,11 @@ fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--$as_echo "$ac_ct_CC" >&6; }
-+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&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
- 
- 
-@@ -4419,10 +4270,10 @@ done
+ esac
+     CC=$ac_ct_CC
+@@ -4419,12 +4411,8 @@ done
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
 -{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+{ 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
+-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
 -$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+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;}
+-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;}
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
-@@ -4434,54 +4285,50 @@ fi
+ esac
+     CC=$ac_ct_CC
+@@ -4434,11 +4422,13 @@ fi
  fi
  
  
 -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
++test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
  See \`config.log' for more details." >&5
--$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
-+echo "$as_me: error: no acceptable C compiler found in \$PATH
+ $as_echo "$as_me: error: no acceptable C compiler found in \$PATH
  See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
  
  # Provide some information about the compiler.
--$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
--set X $ac_compile
--ac_compiler=$2
-+echo "$as_me:$LINENO: checking for C compiler version" >&5
-+ac_compiler=`set X $ac_compile; echo $2`
- { (ac_try="$ac_compiler --version >&5"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compiler --version >&5") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compiler -v >&5") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compiler -V >&5") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 
--{ $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; }
-+{ 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; }
- if test "${ac_cv_c_compiler_gnu+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -4507,21 +4354,20 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
-        } && test -s conftest.$ac_objext; then
-   ac_compiler_gnu=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_compiler_gnu=no
-@@ -4531,19 +4377,15 @@ rm -f core conftest.err conftest.$ac_obj
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
- 
- fi
--{ $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
-+{ 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`
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
--{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
--$as_echo_n "checking whether $CC accepts -g... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
- if test "${ac_cv_prog_cc_g+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_save_c_werror_flag=$ac_c_werror_flag
-    ac_c_werror_flag=yes
-@@ -4570,21 +4412,20 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
-        } && test -s conftest.$ac_objext; then
-   ac_cv_prog_cc_g=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	CFLAGS=""
-@@ -4609,21 +4450,20 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
-        } && test -s conftest.$ac_objext; then
-   :
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_c_werror_flag=$ac_save_c_werror_flag
-@@ -4649,21 +4489,20 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
-        } && test -s conftest.$ac_objext; then
-   ac_cv_prog_cc_g=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
-@@ -4678,8 +4517,8 @@ fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    ac_c_werror_flag=$ac_save_c_werror_flag
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
--$as_echo "$ac_cv_prog_cc_g" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+echo "${ECHO_T}$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
-@@ -4695,10 +4534,10 @@ else
-     CFLAGS=
-   fi
- fi
--{ $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; }
-+{ 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; }
- if test "${ac_cv_prog_cc_c89+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_cv_prog_cc_c89=no
- ac_save_CC=$CC
-@@ -4769,21 +4608,20 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
-        } && test -s conftest.$ac_objext; then
-   ac_cv_prog_cc_c89=$ac_arg
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
-@@ -4799,15 +4637,15 @@ fi
- # AC_CACHE_VAL
- case "x$ac_cv_prog_cc_c89" in
-   x)
--    { $as_echo "$as_me:$LINENO: result: none needed" >&5
--$as_echo "none needed" >&6; } ;;
-+    { echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6; } ;;
-   xno)
--    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
--$as_echo "unsupported" >&6; } ;;
-+    { echo "$as_me:$LINENO: result: unsupported" >&5
-+echo "${ECHO_T}unsupported" >&6; } ;;
-   *)
-     CC="$CC $ac_cv_prog_cc_c89"
--    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
--$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-+    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
- esac
- 
- 
-@@ -4819,10 +4657,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- depcc="$CC"   am_compiler_list=
- 
--{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
--$as_echo_n "checking dependency style of $depcc... " >&6; }
-+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
- if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&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
-@@ -4910,8 +4748,8 @@ else
- fi
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
--$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
- CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
- 
-  if
-@@ -4926,16 +4764,16 @@ fi
- 
- 
- if test "x$CC" != xcc; then
--  { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
--$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
-+  { echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
-+echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
--$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
-+  { echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
-+echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6; }
- fi
--set dummy $CC; ac_cc=`$as_echo "$2" |
-+set dummy $CC; ac_cc=`echo $2 |
- 		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
- if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -4961,21 +4799,19 @@ if { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-    test -f conftest2.$ac_objext && { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); };
- then
-   eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-@@ -4986,11 +4822,10 @@ then
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-       ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-       rm -f conftest2.*
-@@ -4998,21 +4833,19 @@ $as_echo "$ac_try_echo") >&5
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
- 	 test -f conftest2.$ac_objext && { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); };
-       then
- 	# cc works too.
-@@ -5030,11 +4863,11 @@ rm -f core conftest*
- 
- fi
- if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
--  { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&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; }
- 
- cat >>confdefs.h <<\_ACEOF
- #define NO_MINUS_C_MINUS_O 1
-@@ -5061,15 +4894,15 @@ ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
--{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
--$as_echo_n "checking how to run the C preprocessor... " >&6; }
-+{ 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; }
- # 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
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-       # Double quotes because CPP needs to be expanded
-     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-@@ -5101,21 +4934,20 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   :
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   # Broken: fails on valid input.
-@@ -5139,14 +4971,13 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -5154,7 +4985,7 @@ $as_echo "$ac_try_echo") >&5
-   # Broken: success on invalid input.
- continue
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   # Passes both tests.
-@@ -5179,8 +5010,8 @@ fi
- else
-   ac_cv_prog_CPP=$CPP
- fi
--{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
--$as_echo "$CPP" >&6; }
-+{ echo "$as_me:$LINENO: result: $CPP" >&5
-+echo "${ECHO_T}$CPP" >&6; }
- ac_preproc_ok=false
- for ac_c_preproc_warn_flag in '' yes
- do
-@@ -5208,21 +5039,20 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   :
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   # Broken: fails on valid input.
-@@ -5246,14 +5076,13 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -5261,7 +5090,7 @@ $as_echo "$ac_try_echo") >&5
-   # Broken: success on invalid input.
- continue
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   # Passes both tests.
-@@ -5277,9 +5106,9 @@ rm -f conftest.err conftest.$ac_ext
+ $as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+@@ -5277,11 +5267,13 @@ rm -f conftest.err conftest.$ac_ext
  if $ac_preproc_ok; then
    :
  else
 -  { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-+  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
++  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
  See \`config.log' for more details." >&5
--$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-+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
-@@ -5291,37 +5120,42 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
--{ $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; }
-+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-+if test "${ac_cv_path_GREP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  # Extract the first word of "grep ggrep" to use in msg output
-+if test -z "$GREP"; then
-+set dummy grep ggrep; ac_prog_name=$2
- if test "${ac_cv_path_GREP+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&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
--  $as_echo_n 0123456789 >"conftest.in"
-+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-   while :
-   do
-     cat "conftest.in" "conftest.in" >"conftest.tmp"
-     mv "conftest.tmp" "conftest.in"
-     cp "conftest.in" "conftest.nl"
--    $as_echo 'GREP' >> "conftest.nl"
-+    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`
-@@ -5336,60 +5170,74 @@ case `"$ac_path_GREP" --version 2>&1` in
-   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
- esac
- 
--      $ac_path_GREP_found && break 3
--    done
-+
-+    $ac_path_GREP_found && break 3
-   done
- done
-+
-+done
- IFS=$as_save_IFS
--  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;}
-+
-+
-+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;}
-    { (exit 1); exit 1; }; }
--  fi
-+fi
-+
- else
-   ac_cv_path_GREP=$GREP
- fi
- 
-+
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
--$as_echo "$ac_cv_path_GREP" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
-  GREP="$ac_cv_path_GREP"
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
--$as_echo_n "checking for egrep... " >&6; }
-+{ echo "$as_me:$LINENO: checking for egrep" >&5
-+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
- if test "${ac_cv_path_EGREP+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-    then ac_cv_path_EGREP="$GREP -E"
-    else
--     if test -z "$EGREP"; then
-+     # 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
-   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
--  $as_echo_n 0123456789 >"conftest.in"
-+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-   while :
-   do
-     cat "conftest.in" "conftest.in" >"conftest.tmp"
-     mv "conftest.tmp" "conftest.in"
-     cp "conftest.in" "conftest.nl"
--    $as_echo 'EGREP' >> "conftest.nl"
-+    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`
-@@ -5404,31 +5252,40 @@ case `"$ac_path_EGREP" --version 2>&1` i
-   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
- esac
- 
--      $ac_path_EGREP_found && break 3
--    done
-+
-+    $ac_path_EGREP_found && break 3
-   done
- done
-+
-+done
- IFS=$as_save_IFS
--  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;}
-+
-+
-+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;}
-    { (exit 1); exit 1; }; }
--  fi
-+fi
-+
- else
-   ac_cv_path_EGREP=$EGREP
- fi
- 
-+
-    fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
--$as_echo "$ac_cv_path_EGREP" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
-  EGREP="$ac_cv_path_EGREP"
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--$as_echo_n "checking for ANSI C header files... " >&6; }
-+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
- if test "${ac_cv_header_stdc+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -5455,21 +5312,20 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
-        } && test -s conftest.$ac_objext; then
-   ac_cv_header_stdc=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_header_stdc=no
-@@ -5561,40 +5417,37 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: program exited with status $ac_status" >&5
-+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
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
--$as_echo "$ac_cv_header_stdc" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
- if test $ac_cv_header_stdc = yes; then
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -5677,34 +5530,34 @@ fi
- 
- # Make sure we can run config.sub.
- $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
--  { { $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;}
-+  { { 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;}
-    { (exit 1); exit 1; }; }
- 
--{ $as_echo "$as_me:$LINENO: checking build system type" >&5
--$as_echo_n "checking build system type... " >&6; }
-+{ echo "$as_me:$LINENO: checking build system type" >&5
-+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
- if test "${ac_cv_build+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&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 &&
--  { { $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;}
-+  { { 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;}
-    { (exit 1); exit 1; }; }
- ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
--  { { $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;}
-+  { { 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;}
-    { (exit 1); exit 1; }; }
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
--$as_echo "$ac_cv_build" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-+echo "${ECHO_T}$ac_cv_build" >&6; }
- case $ac_cv_build in
- *-*-*) ;;
--*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
--$as_echo "$as_me: error: invalid value of canonical build" >&2;}
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-+echo "$as_me: error: invalid value of canonical build" >&2;}
-    { (exit 1); exit 1; }; };;
- esac
- build=$ac_cv_build
-@@ -5721,27 +5574,27 @@ IFS=$ac_save_IFS
- case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
- 
- 
--{ $as_echo "$as_me:$LINENO: checking host system type" >&5
--$as_echo_n "checking host system type... " >&6; }
-+{ echo "$as_me:$LINENO: checking host system type" >&5
-+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
- if test "${ac_cv_host+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&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` ||
--    { { $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;}
-+    { { 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;}
-    { (exit 1); exit 1; }; }
- fi
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
--$as_echo "$ac_cv_host" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-+echo "${ECHO_T}$ac_cv_host" >&6; }
- case $ac_cv_host in
- *-*-*) ;;
--*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
--$as_echo "$as_me: error: invalid value of canonical host" >&2;}
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-+echo "$as_me: error: invalid value of canonical host" >&2;}
-    { (exit 1); exit 1; }; };;
- esac
- host=$ac_cv_host
-@@ -5758,10 +5611,10 @@ IFS=$ac_save_IFS
- case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
- 
- 
--{ $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; }
-+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
- if test "${lt_cv_path_SED+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   # Loop through the user's path and test for sed and gsed.
- # Then use that list of sed's as ones to test for truncation.
-@@ -5814,8 +5667,8 @@ fi
- 
- SED=$lt_cv_path_SED
- 
--{ $as_echo "$as_me:$LINENO: result: $SED" >&5
--$as_echo "$SED" >&6; }
-+{ echo "$as_me:$LINENO: result: $SED" >&5
-+echo "${ECHO_T}$SED" >&6; }
- 
- 
- # Check whether --with-gnu-ld was given.
-@@ -5828,8 +5681,8 @@ fi
- ac_prog=ld
- if test "$GCC" = yes; then
-   # Check if gcc -print-prog-name=ld gives a path.
--  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
--$as_echo_n "checking for ld used by $CC... " >&6; }
-+  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
-   case $host in
-   *-*-mingw*)
-     # gcc leaves a trailing carriage return which upsets mingw
-@@ -5858,14 +5711,14 @@ $as_echo_n "checking for ld used by $CC.
-     ;;
-   esac
- elif test "$with_gnu_ld" = yes; then
--  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
--$as_echo_n "checking for GNU ld... " >&6; }
-+  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
--$as_echo_n "checking for non-GNU ld... " >&6; }
-+  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
- fi
- if test "${lt_cv_path_LD+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -z "$LD"; then
-   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-@@ -5895,19 +5748,19 @@ fi
- 
- LD="$lt_cv_path_LD"
- if test -n "$LD"; then
--  { $as_echo "$as_me:$LINENO: result: $LD" >&5
--$as_echo "$LD" >&6; }
-+  { echo "$as_me:$LINENO: result: $LD" >&5
-+echo "${ECHO_T}$LD" >&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
--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;}
-+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;}
-    { (exit 1); exit 1; }; }
--{ $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; }
-+{ 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; }
- if test "${lt_cv_prog_gnu_ld+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   # I'd rather use --version here, but apparently some GNU lds only accept -v.
- case `$LD -v 2>&1 </dev/null` in
-@@ -5919,20 +5772,20 @@ case `$LD -v 2>&1 </dev/null` in
-   ;;
- esac
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
--$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
- with_gnu_ld=$lt_cv_prog_gnu_ld
- 
- 
--{ $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; }
-+{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-+echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
- if test "${lt_cv_ld_reload_flag+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   lt_cv_ld_reload_flag='-r'
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
--$as_echo "$lt_cv_ld_reload_flag" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
- reload_flag=$lt_cv_ld_reload_flag
- case $reload_flag in
- "" | " "*) ;;
-@@ -5949,10 +5802,10 @@ case $host_os in
-     ;;
- esac
- 
--{ $as_echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
--$as_echo_n "checking for BSD-compatible nm... " >&6; }
-+{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-+echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
- if test "${lt_cv_path_NM+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -n "$NM"; then
-   # Let the user override the test.
-@@ -5998,25 +5851,25 @@ else
-   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
- fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
--$as_echo "$lt_cv_path_NM" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-+echo "${ECHO_T}$lt_cv_path_NM" >&6; }
- NM="$lt_cv_path_NM"
- 
--{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
--$as_echo_n "checking whether ln -s works... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
- LN_S=$as_ln_s
- if test "$LN_S" = "ln -s"; then
--  { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
--$as_echo "no, using $LN_S" >&6; }
-+  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-+echo "${ECHO_T}no, using $LN_S" >&6; }
- fi
- 
--{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
--$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-+{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
-+echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
- if test "${lt_cv_deplibs_check_method+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   lt_cv_file_magic_cmd='$MAGIC_CMD'
- lt_cv_file_magic_test_file=
-@@ -6128,7 +5981,7 @@ linux* | k*bsd*-gnu)
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
+ fi
+ 
+ ac_ext=c
+@@ -6128,7 +6120,7 @@ linux* | k*bsd*-gnu)
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -15398,50 +12705,16 @@
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
    else
-@@ -6199,8 +6052,8 @@ sysv5* | sco3.2v5* | sco5v6* | unixware*
- esac
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
--$as_echo "$lt_cv_deplibs_check_method" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-+echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
- file_magic_cmd=$lt_cv_file_magic_cmd
- deplibs_check_method=$lt_cv_deplibs_check_method
- test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -6233,7 +6086,7 @@ ia64-*-hpux*)
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-     case `/usr/bin/file conftest.$ac_objext` in
-     *ELF-32*)
-@@ -6248,11 +6101,11 @@ ia64-*-hpux*)
+@@ -6248,7 +6240,7 @@ ia64-*-hpux*)
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
 -  echo '#line 6251 "configure"' > conftest.$ac_ext
-+  echo '#line 6104 "configure"' > conftest.$ac_ext
++  echo '#line 6243 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  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
-@@ -6290,7 +6143,7 @@ s390*-*linux*|sparc*-*linux*)
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-     case `/usr/bin/file conftest.o` in
-     *32-bit*)
-@@ -6313,7 +6166,6 @@ s390*-*linux*|sparc*-*linux*)
+@@ -6313,7 +6305,6 @@ s390*-*linux*|sparc*-*linux*)
        esac
        ;;
      *64-bit*)
@@ -15449,1911 +12722,194 @@
        case $host in
          x86_64-*kfreebsd*-gnu)
            LD="${LD-ld} -m elf_x86_64_fbsd"
-@@ -6341,10 +6193,10 @@ s390*-*linux*|sparc*-*linux*)
-   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-   SAVE_CFLAGS="$CFLAGS"
-   CFLAGS="$CFLAGS -belf"
--  { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
--$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-+  { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
- if test "${lt_cv_cc_needs_belf+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -6373,30 +6225,26 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   lt_cv_cc_needs_belf=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
-@@ -6406,8 +6254,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
--$as_echo "$lt_cv_cc_needs_belf" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-+echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
-   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-     CFLAGS="$SAVE_CFLAGS"
-@@ -6419,7 +6267,7 @@ sparc*-*solaris*)
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-     case `/usr/bin/file conftest.o` in
-     *64-bit*)
-@@ -6456,11 +6304,11 @@ need_locks="$enable_libtool_lock"
- 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=`$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; }
-+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; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -6478,21 +6326,20 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
-        } && test -s conftest.$ac_objext; then
-   eval "$as_ac_Header=yes"
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_Header=no"
-@@ -6500,14 +6347,12 @@ fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
+@@ -6504,8 +6495,9 @@ 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
-+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
++as_val=`eval 'as_val=${'$as_ac_Header'}
++		 $as_echo "$as_val"'`
++   if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
- 
- fi
-@@ -6518,21 +6363,20 @@ done
- 
- for ac_header in dlfcn.h
- do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
-   # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
--$as_echo_n "checking $ac_header usability... " >&6; }
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -6548,33 +6392,32 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
-        } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
--$as_echo_n "checking $ac_header presence... " >&6; }
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -6588,52 +6431,51 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   ac_header_preproc=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { $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;}
-+    { 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;}
-     ( cat <<\_ASBOX
- ## ----------------------------------------------------------------------------------- ##
- ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center ##
-@@ -6642,23 +6484,21 @@ _ASBOX
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
--{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
+@@ -6655,8 +6647,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$ac_res" >&6; }
  
  fi
 -if test `eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'` = yes; then
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
++as_val=`eval 'as_val=${'$as_ac_Header'}
++		 $as_echo "$as_val"'`
++   if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
- 
- fi
-@@ -6679,10 +6519,10 @@ if test -z "$CXX"; then
-   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
--{ $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_prog_CXX+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -n "$CXX"; then
-   ac_cv_prog_CXX="$CXX" # Let the user override the test.
-@@ -6695,7 +6535,7 @@ do
-   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"
--    $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
-@@ -6706,11 +6546,11 @@ fi
- fi
- CXX=$ac_cv_prog_CXX
- if test -n "$CXX"; then
--  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
--$as_echo "$CXX" >&6; }
-+  { echo "$as_me:$LINENO: result: $CXX" >&5
-+echo "${ECHO_T}$CXX" >&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
- 
- 
-@@ -6723,10 +6563,10 @@ if test -z "$CXX"; then
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; 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_prog_ac_ct_CXX+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -n "$ac_ct_CXX"; then
-   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-@@ -6739,7 +6579,7 @@ do
-   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"
--    $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
-@@ -6750,11 +6590,11 @@ fi
- fi
- ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
- if test -n "$ac_ct_CXX"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
--$as_echo "$ac_ct_CXX" >&6; }
-+  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-+echo "${ECHO_T}$ac_ct_CXX" >&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
- 
- 
-@@ -6766,10 +6606,10 @@ done
+@@ -6766,12 +6759,8 @@ done
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
 -{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+{ 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
+-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
 -$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+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;}
+-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;}
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
-@@ -6781,47 +6621,43 @@ fi
-   fi
- fi
- # Provide some information about the compiler.
--$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
--set X $ac_compile
--ac_compiler=$2
-+echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-+ac_compiler=`set X $ac_compile; echo $2`
- { (ac_try="$ac_compiler --version >&5"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
  esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compiler --version >&5") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compiler -v >&5") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compiler -V >&5") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 
--{ $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; }
-+{ 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; }
- if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -6847,21 +6683,20 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  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
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_compiler_gnu=no
-@@ -6871,19 +6706,15 @@ rm -f core conftest.err conftest.$ac_obj
- ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
- 
- fi
--{ $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
-+{ 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`
- ac_test_CXXFLAGS=${CXXFLAGS+set}
- ac_save_CXXFLAGS=$CXXFLAGS
--{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
--$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
- if test "${ac_cv_prog_cxx_g+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-    ac_cxx_werror_flag=yes
-@@ -6910,21 +6741,20 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  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
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	CXXFLAGS=""
-@@ -6949,21 +6779,20 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  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
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-@@ -6989,21 +6818,20 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  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
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
-@@ -7018,8 +6846,8 @@ fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
--$as_echo "$ac_cv_prog_cxx_g" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
- if test "$ac_test_CXXFLAGS" = set; then
-   CXXFLAGS=$ac_save_CXXFLAGS
- elif test $ac_cv_prog_cxx_g = yes; then
-@@ -7043,10 +6871,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
- depcc="$CXX"  am_compiler_list=
- 
--{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
--$as_echo_n "checking dependency style of $depcc... " >&6; }
-+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
- if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&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
-@@ -7134,8 +6962,8 @@ else
- fi
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
--$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
-+{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
- CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
- 
-  if
-@@ -7159,11 +6987,11 @@ ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
--$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
-+{ 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; }
- if test -z "$CXXCPP"; then
-   if test "${ac_cv_prog_CXXCPP+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-       # Double quotes because CXXCPP needs to be expanded
-     for CXXCPP in "$CXX -E" "/lib/cpp"
-@@ -7195,21 +7023,20 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  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
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   # Broken: fails on valid input.
-@@ -7233,14 +7060,13 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  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
-@@ -7248,7 +7074,7 @@ $as_echo "$ac_try_echo") >&5
-   # Broken: success on invalid input.
- continue
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   # Passes both tests.
-@@ -7273,8 +7099,8 @@ fi
- else
-   ac_cv_prog_CXXCPP=$CXXCPP
- fi
--{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
--$as_echo "$CXXCPP" >&6; }
-+{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
-+echo "${ECHO_T}$CXXCPP" >&6; }
- ac_preproc_ok=false
- for ac_cxx_preproc_warn_flag in '' yes
- do
-@@ -7302,21 +7128,20 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  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
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   # Broken: fails on valid input.
-@@ -7340,14 +7165,13 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  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
-@@ -7355,7 +7179,7 @@ $as_echo "$ac_try_echo") >&5
-   # Broken: success on invalid input.
- continue
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   # Passes both tests.
-@@ -7371,9 +7195,9 @@ rm -f conftest.err conftest.$ac_ext
+     CXX=$ac_ct_CXX
+@@ -7371,11 +7360,13 @@ rm -f conftest.err conftest.$ac_ext
  if $ac_preproc_ok; then
    :
  else
 -  { { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-+  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
++  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
  See \`config.log' for more details." >&5
--$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-+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
-@@ -7396,10 +7220,10 @@ if test -n "$ac_tool_prefix"; then
-   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
--{ $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_prog_F77+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -n "$F77"; then
-   ac_cv_prog_F77="$F77" # Let the user override the test.
-@@ -7412,7 +7236,7 @@ do
-   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"
--    $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
-@@ -7423,11 +7247,11 @@ fi
- fi
- F77=$ac_cv_prog_F77
- if test -n "$F77"; then
--  { $as_echo "$as_me:$LINENO: result: $F77" >&5
--$as_echo "$F77" >&6; }
-+  { echo "$as_me:$LINENO: result: $F77" >&5
-+echo "${ECHO_T}$F77" >&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
- 
- 
-@@ -7440,10 +7264,10 @@ if test -z "$F77"; then
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; 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_prog_ac_ct_F77+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -n "$ac_ct_F77"; then
-   ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
-@@ -7456,7 +7280,7 @@ do
-   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"
--    $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
-@@ -7467,11 +7291,11 @@ fi
- fi
- ac_ct_F77=$ac_cv_prog_ac_ct_F77
- if test -n "$ac_ct_F77"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
--$as_echo "$ac_ct_F77" >&6; }
-+  { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
-+echo "${ECHO_T}$ac_ct_F77" >&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
- 
- 
-@@ -7483,10 +7307,10 @@ done
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
+ fi
+ 
+ ac_ext=cpp
+@@ -7483,12 +7474,8 @@ done
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
 -{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+{ 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
+-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
 -$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+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;}
+-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;}
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
-@@ -7497,41 +7321,37 @@ fi
- 
- 
- # Provide some information about the compiler.
--$as_echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
--set X $ac_compile
--ac_compiler=$2
-+echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
-+ac_compiler=`set X $ac_compile; echo $2`
- { (ac_try="$ac_compiler --version >&5"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
  esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compiler --version >&5") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compiler -v >&5") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compiler -V >&5") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- rm -f a.out
- 
-@@ -7539,10 +7359,10 @@ rm -f a.out
- # input file.  (Note that this only needs to work for GNU compilers.)
- ac_save_ext=$ac_ext
- ac_ext=F
--{ $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; }
-+{ 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; }
- if test "${ac_cv_f77_compiler_gnu+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-       program main
-@@ -7558,21 +7378,20 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_f77_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_compiler_gnu=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_compiler_gnu=no
-@@ -7582,16 +7401,16 @@ rm -f core conftest.err conftest.$ac_obj
- ac_cv_f77_compiler_gnu=$ac_compiler_gnu
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
--$as_echo "$ac_cv_f77_compiler_gnu" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
- ac_ext=$ac_save_ext
- ac_test_FFLAGS=${FFLAGS+set}
- ac_save_FFLAGS=$FFLAGS
- FFLAGS=
--{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
--$as_echo_n "checking whether $F77 accepts -g... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
-+echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
- if test "${ac_cv_prog_f77_g+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   FFLAGS=-g
- cat >conftest.$ac_ext <<_ACEOF
-@@ -7605,21 +7424,20 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_f77_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_cv_prog_f77_g=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_prog_f77_g=no
-@@ -7628,8 +7446,8 @@ fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
--$as_echo "$ac_cv_prog_f77_g" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-+echo "${ECHO_T}$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
-@@ -7646,11 +7464,7 @@ else
-   fi
- fi
- 
--if test $ac_compiler_gnu = yes; then
--  G77=yes
--else
--  G77=
--fi
-+G77=`test $ac_compiler_gnu = yes && echo yes`
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -7661,10 +7475,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
- # find the maximum length of command line arguments
--{ $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; }
-+{ 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; }
- if test "${lt_cv_sys_max_cmd_len+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-     i=0
-   teststring="ABCD"
-@@ -7773,11 +7587,11 @@ else
- fi
- 
- if test -n $lt_cv_sys_max_cmd_len ; then
--  { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
--$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
-+  { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-+echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: none" >&5
--$as_echo "none" >&6; }
-+  { echo "$as_me:$LINENO: result: none" >&5
-+echo "${ECHO_T}none" >&6; }
- fi
- 
- 
-@@ -7785,10 +7599,10 @@ fi
- 
- 
- # Check for command to grab the raw symbol name followed by C symbol from nm.
--{ $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; }
-+{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-+echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
- if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- # These are sane defaults that work on at least a few old systems.
-@@ -7893,14 +7707,14 @@ EOF
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  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=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  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
-@@ -7955,7 +7769,7 @@ EOF
- 	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext}; then
- 	    pipe_works=yes
- 	  fi
-@@ -7990,17 +7804,17 @@ if test -z "$lt_cv_sys_global_symbol_pip
-   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
--  { $as_echo "$as_me:$LINENO: result: failed" >&5
--$as_echo "failed" >&6; }
-+  { echo "$as_me:$LINENO: result: failed" >&5
-+echo "${ECHO_T}failed" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: ok" >&5
--$as_echo "ok" >&6; }
-+  { echo "$as_me:$LINENO: result: ok" >&5
-+echo "${ECHO_T}ok" >&6; }
- fi
- 
--{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
--$as_echo_n "checking for objdir... " >&6; }
-+{ echo "$as_me:$LINENO: checking for objdir" >&5
-+echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
- if test "${lt_cv_objdir+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   rm -f .libs 2>/dev/null
- mkdir .libs 2>/dev/null
-@@ -8012,8 +7826,8 @@ else
- fi
- rmdir .libs 2>/dev/null
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
--$as_echo "$lt_cv_objdir" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-+echo "${ECHO_T}$lt_cv_objdir" >&6; }
- objdir=$lt_cv_objdir
- 
- 
-@@ -8064,10 +7878,10 @@ with_gnu_ld="$lt_cv_prog_gnu_ld"
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ar; ac_word=$2
--{ $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_prog_AR+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -n "$AR"; then
-   ac_cv_prog_AR="$AR" # Let the user override the test.
-@@ -8080,7 +7894,7 @@ do
-   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"
--    $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
-@@ -8091,11 +7905,11 @@ fi
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
--  { $as_echo "$as_me:$LINENO: result: $AR" >&5
--$as_echo "$AR" >&6; }
-+  { echo "$as_me:$LINENO: result: $AR" >&5
-+echo "${ECHO_T}$AR" >&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
- 
- 
-@@ -8104,10 +7918,10 @@ if test -z "$ac_cv_prog_AR"; then
-   ac_ct_AR=$AR
-   # Extract the first word of "ar", so it can be a program name with args.
- set dummy ar; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -n "$ac_ct_AR"; then
-   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-@@ -8120,7 +7934,7 @@ do
-   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"
--    $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
-@@ -8131,11 +7945,11 @@ fi
- fi
- ac_ct_AR=$ac_cv_prog_ac_ct_AR
- if test -n "$ac_ct_AR"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
--$as_echo "$ac_ct_AR" >&6; }
-+  { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-+echo "${ECHO_T}$ac_ct_AR" >&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 "x$ac_ct_AR" = x; then
-@@ -8143,10 +7957,10 @@ fi
+     F77=$ac_ct_F77
+@@ -8143,12 +8130,8 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
 -{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+{ 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
+-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
 -$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+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;}
+-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;}
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
-@@ -8160,10 +7974,10 @@ fi
- 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
--{ $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_prog_RANLIB+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -n "$RANLIB"; then
-   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-@@ -8176,7 +7990,7 @@ do
-   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"
--    $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
-@@ -8187,11 +8001,11 @@ fi
- fi
- RANLIB=$ac_cv_prog_RANLIB
- if test -n "$RANLIB"; then
--  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
--$as_echo "$RANLIB" >&6; }
-+  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-+echo "${ECHO_T}$RANLIB" >&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
- 
- 
-@@ -8200,10 +8014,10 @@ if test -z "$ac_cv_prog_RANLIB"; then
-   ac_ct_RANLIB=$RANLIB
-   # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -n "$ac_ct_RANLIB"; then
-   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-@@ -8216,7 +8030,7 @@ do
-   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"
--    $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
-@@ -8227,11 +8041,11 @@ fi
- fi
- ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
- if test -n "$ac_ct_RANLIB"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
--$as_echo "$ac_ct_RANLIB" >&6; }
-+  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-+echo "${ECHO_T}$ac_ct_RANLIB" >&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 "x$ac_ct_RANLIB" = x; then
-@@ -8239,10 +8053,10 @@ fi
+ esac
+     AR=$ac_ct_AR
+@@ -8239,12 +8222,8 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
 -{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+{ 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
+-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
 -$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+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;}
+-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;}
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
-@@ -8256,10 +8070,10 @@ fi
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
- set dummy ${ac_tool_prefix}strip; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_STRIP+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -n "$STRIP"; then
-   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-@@ -8272,7 +8086,7 @@ do
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -8283,11 +8097,11 @@ fi
- fi
- STRIP=$ac_cv_prog_STRIP
- if test -n "$STRIP"; then
--  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
--$as_echo "$STRIP" >&6; }
-+  { echo "$as_me:$LINENO: result: $STRIP" >&5
-+echo "${ECHO_T}$STRIP" >&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
- 
- 
-@@ -8296,10 +8110,10 @@ if test -z "$ac_cv_prog_STRIP"; then
-   ac_ct_STRIP=$STRIP
-   # Extract the first word of "strip", so it can be a program name with args.
- set dummy strip; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -n "$ac_ct_STRIP"; then
-   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-@@ -8312,7 +8126,7 @@ do
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_STRIP="strip"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -8323,11 +8137,11 @@ fi
- fi
- ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
- if test -n "$ac_ct_STRIP"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
--$as_echo "$ac_ct_STRIP" >&6; }
-+  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+echo "${ECHO_T}$ac_ct_STRIP" >&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 "x$ac_ct_STRIP" = x; then
-@@ -8335,10 +8149,10 @@ fi
+ esac
+     RANLIB=$ac_ct_RANLIB
+@@ -8335,12 +8314,8 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
 -{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+{ 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
+-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
 -$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+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;}
+-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;}
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
-@@ -8403,10 +8217,10 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
- case $deplibs_check_method in
- file_magic*)
-   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
--    { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
--$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-+    { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-+echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
- if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   case $MAGIC_CMD in
- [\\/*] |  ?:[\\/]*)
-@@ -8456,19 +8270,19 @@ fi
- 
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- if test -n "$MAGIC_CMD"; then
--  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
--$as_echo "$MAGIC_CMD" >&6; }
-+  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-+echo "${ECHO_T}$MAGIC_CMD" >&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 "$lt_cv_path_MAGIC_CMD"; then
-   if test -n "$ac_tool_prefix"; then
--    { $as_echo "$as_me:$LINENO: checking for file" >&5
--$as_echo_n "checking for file... " >&6; }
-+    { echo "$as_me:$LINENO: checking for file" >&5
-+echo $ECHO_N "checking for file... $ECHO_C" >&6; }
- if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   case $MAGIC_CMD in
- [\\/*] |  ?:[\\/]*)
-@@ -8518,11 +8332,11 @@ fi
- 
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- if test -n "$MAGIC_CMD"; then
--  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
--$as_echo "$MAGIC_CMD" >&6; }
-+  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-+echo "${ECHO_T}$MAGIC_CMD" >&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
- 
-   else
-@@ -8540,10 +8354,10 @@ esac
-     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
--{ $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_prog_DSYMUTIL+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -n "$DSYMUTIL"; then
-   ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-@@ -8556,7 +8370,7 @@ do
-   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"
--    $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
-@@ -8567,11 +8381,11 @@ fi
- fi
- DSYMUTIL=$ac_cv_prog_DSYMUTIL
- if test -n "$DSYMUTIL"; then
--  { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
--$as_echo "$DSYMUTIL" >&6; }
-+  { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
-+echo "${ECHO_T}$DSYMUTIL" >&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
- 
- 
-@@ -8580,10 +8394,10 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
-   ac_ct_DSYMUTIL=$DSYMUTIL
-   # Extract the first word of "dsymutil", so it can be a program name with args.
- set dummy dsymutil; ac_word=$2
--{ $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_prog_ac_ct_DSYMUTIL+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -n "$ac_ct_DSYMUTIL"; then
-   ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-@@ -8596,7 +8410,7 @@ do
-   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"
--    $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
-@@ -8607,11 +8421,11 @@ fi
- fi
- ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
- if test -n "$ac_ct_DSYMUTIL"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
--$as_echo "$ac_ct_DSYMUTIL" >&6; }
-+  { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
-+echo "${ECHO_T}$ac_ct_DSYMUTIL" >&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 "x$ac_ct_DSYMUTIL" = x; then
-@@ -8619,10 +8433,10 @@ fi
+ esac
+     STRIP=$ac_ct_STRIP
+@@ -8619,12 +8594,8 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
 -{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+{ 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
+-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
 -$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+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;}
+-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;}
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
-@@ -8636,10 +8450,10 @@ fi
-     if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
- set dummy ${ac_tool_prefix}nmedit; ac_word=$2
--{ $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_prog_NMEDIT+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -n "$NMEDIT"; then
-   ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-@@ -8652,7 +8466,7 @@ do
-   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"
--    $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
-@@ -8663,11 +8477,11 @@ fi
- fi
- NMEDIT=$ac_cv_prog_NMEDIT
- if test -n "$NMEDIT"; then
--  { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
--$as_echo "$NMEDIT" >&6; }
-+  { echo "$as_me:$LINENO: result: $NMEDIT" >&5
-+echo "${ECHO_T}$NMEDIT" >&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
- 
- 
-@@ -8676,10 +8490,10 @@ if test -z "$ac_cv_prog_NMEDIT"; then
-   ac_ct_NMEDIT=$NMEDIT
-   # Extract the first word of "nmedit", so it can be a program name with args.
- set dummy nmedit; ac_word=$2
--{ $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_prog_ac_ct_NMEDIT+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -n "$ac_ct_NMEDIT"; then
-   ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-@@ -8692,7 +8506,7 @@ do
-   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"
--    $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
-@@ -8703,11 +8517,11 @@ fi
- fi
- ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
- if test -n "$ac_ct_NMEDIT"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
--$as_echo "$ac_ct_NMEDIT" >&6; }
-+  { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
-+echo "${ECHO_T}$ac_ct_NMEDIT" >&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 "x$ac_ct_NMEDIT" = x; then
-@@ -8715,10 +8529,10 @@ fi
+ esac
+     DSYMUTIL=$ac_ct_DSYMUTIL
+@@ -8715,12 +8686,8 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
 -{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+{ 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
+-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
 -$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+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;}
+-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;}
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
-@@ -8730,10 +8544,10 @@ else
- fi
- 
- 
--    { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
--$as_echo_n "checking for -single_module linker flag... " >&6; }
-+    { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
-+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
- if test "${lt_cv_apple_cc_single_mod+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   lt_cv_apple_cc_single_mod=no
-       if test -z "${LT_MULTI_MODULE}"; then
-@@ -8751,12 +8565,12 @@ else
-    rm conftest.c
-       fi
- fi
--{ $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; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
-+echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
-+    { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
-+echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
- if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   lt_cv_ld_exported_symbols_list=no
-       save_LDFLAGS=$LDFLAGS
-@@ -8783,37 +8597,33 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
  esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   lt_cv_ld_exported_symbols_list=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
--$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
-+echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
-     case $host_os in
-     rhapsody* | darwin1.[0123])
-       _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-@@ -8925,10 +8735,10 @@ if test "$GCC" = yes; then
-   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
- 
- 
--{ $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; }
-+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   lt_cv_prog_compiler_rtti_exceptions=no
-   ac_outfile=conftest.$ac_objext
-@@ -8943,11 +8753,11 @@ else
+     NMEDIT=$ac_ct_NMEDIT
+@@ -8943,11 +8910,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:8946: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8756: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8913: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:8950: \$? = $ac_status" >&5
-+   echo "$as_me:8760: \$? = $ac_status" >&5
++   echo "$as_me:8917: \$? = $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.
-@@ -8960,8 +8770,8 @@ else
-    $rm conftest*
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
--$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-+echo "${ECHO_T}$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"
-@@ -8975,8 +8785,8 @@ lt_prog_compiler_wl=
- lt_prog_compiler_pic=
- lt_prog_compiler_static=
- 
--{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
--$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
- 
-   if test "$GCC" = yes; then
-     lt_prog_compiler_wl='-Wl,'
-@@ -9207,18 +9017,18 @@ $as_echo_n "checking for $compiler optio
-     esac
-   fi
- 
--{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
--$as_echo "$lt_prog_compiler_pic" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
- 
- #
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic"; then
- 
--{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
--$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   lt_cv_prog_compiler_pic_works=no
-   ac_outfile=conftest.$ac_objext
-@@ -9233,11 +9043,11 @@ else
+@@ -9233,11 +9200,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9236: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9046: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9203: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:9240: \$? = $ac_status" >&5
-+   echo "$as_me:9050: \$? = $ac_status" >&5
++   echo "$as_me:9207: \$? = $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.
-@@ -9250,8 +9060,8 @@ else
-    $rm conftest*
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
--$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
- 
- if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-     case $lt_prog_compiler_pic in
-@@ -9278,10 +9088,10 @@ esac
- # Check to make sure the static flag actually works.
- #
- wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
--{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
--$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_static_works+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   lt_cv_prog_compiler_static_works=no
-    save_LDFLAGS="$LDFLAGS"
-@@ -9306,8 +9116,8 @@ else
-    LDFLAGS="$save_LDFLAGS"
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
--$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
- 
- if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-     :
-@@ -9316,10 +9126,10 @@ else
- fi
- 
- 
--{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_c_o+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   lt_cv_prog_compiler_c_o=no
-    $rm -r conftest 2>/dev/null
-@@ -9337,11 +9147,11 @@ else
+@@ -9337,11 +9304,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9340: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9150: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9307: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:9344: \$? = $ac_status" >&5
-+   echo "$as_me:9154: \$? = $ac_status" >&5
++   echo "$as_me:9311: \$? = $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
-@@ -9363,34 +9173,34 @@ else
-    $rm conftest*
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
--$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-+echo "${ECHO_T}$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
--  { $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; }
-+  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
-   hard_links=yes
-   $rm conftest*
-   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-   touch conftest.a
-   ln conftest.a conftest.b 2>&5 || hard_links=no
-   ln conftest.a conftest.b 2>/dev/null && hard_links=no
--  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
--$as_echo "$hard_links" >&6; }
-+  { echo "$as_me:$LINENO: result: $hard_links" >&5
-+echo "${ECHO_T}$hard_links" >&6; }
-   if test "$hard_links" = no; then
--    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
--$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-     need_locks=warn
-   fi
- else
-   need_locks=no
- fi
- 
--{ $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; }
-+{ 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; }
- 
-   runpath_var=
-   allow_undefined_flag=
-@@ -9602,12 +9412,13 @@ EOF
+@@ -9602,12 +9569,13 @@ EOF
    $echo "local: *; };" >> $output_objdir/$libname.ver~
  	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
  	fi
@@ -17368,89 +12924,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -9820,21 +9631,18 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
- 
- lt_aix_libpath_sed='
-     /Import File Strings/,/^$/ {
-@@ -9849,13 +9657,12 @@ if test -z "$aix_libpath"; then
-   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
-@@ -9890,21 +9697,18 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
- 
- lt_aix_libpath_sed='
-     /Import File Strings/,/^$/ {
-@@ -9919,13 +9723,12 @@ if test -z "$aix_libpath"; then
-   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
-@@ -10158,7 +9961,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10158,7 +10126,7 @@ if test -z "$aix_libpath"; then aix_libp
        link_all_deplibs=yes
        ;;
  
@@ -17459,67 +12933,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -10377,8 +10180,8 @@ if test -z "$aix_libpath"; then aix_libp
-     esac
-   fi
- 
--{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
--$as_echo "$ld_shlibs" >&6; }
-+{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-+echo "${ECHO_T}$ld_shlibs" >&6; }
- test "$ld_shlibs" = no && can_build_shared=no
- 
- #
-@@ -10398,15 +10201,15 @@ x|xyes)
-       # Test whether the compiler implicitly links with -lc since on some
-       # systems, -lgcc has to come before -lc. If gcc already passes -lc
-       # to ld, don't add -lc before -lgcc.
--      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-+      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
-       $rm conftest*
-       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
-       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } 2>conftest.err; then
-         soname=conftest
-         lib=conftest
-@@ -10424,7 +10227,7 @@ $as_echo_n "checking whether -lc should 
-         if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-   (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
-         then
- 	  archive_cmds_need_lc=no
-@@ -10436,16 +10239,16 @@ $as_echo_n "checking whether -lc should 
-         cat conftest.err 1>&5
-       fi
-       $rm conftest*
--      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
--$as_echo "$archive_cmds_need_lc" >&6; }
-+      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-+echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
-       ;;
-     esac
-   fi
-   ;;
- esac
- 
--{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--$as_echo_n "checking dynamic linker characteristics... " >&6; }
-+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
-@@ -10853,13 +10656,11 @@ linux* | k*bsd*-gnu)
+@@ -10853,13 +10821,11 @@ linux* | k*bsd*-gnu)
    # Some rework will be needed to allow for fast_install
    # before this can be enabled.
    hardcode_into_libs=yes
@@ -17534,7 +12948,7 @@
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -10871,6 +10672,18 @@ linux* | k*bsd*-gnu)
+@@ -10871,6 +10837,18 @@ linux* | k*bsd*-gnu)
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -17553,823 +12967,88 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -11048,19 +10861,19 @@ uts4*)
-   dynamic_linker=no
-   ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--$as_echo "$dynamic_linker" >&6; }
-+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
- 
- if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
- fi
- 
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
- if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
- fi
-@@ -11072,8 +10885,8 @@ if test "$GCC" = yes; then
-   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
- fi
- 
--{ $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; }
-+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
- hardcode_action=
- if test -n "$hardcode_libdir_flag_spec" || \
-    test -n "$runpath_var" || \
-@@ -11097,8 +10910,8 @@ else
-   # directories.
-   hardcode_action=unsupported
- fi
--{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
--$as_echo "$hardcode_action" >&6; }
-+{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
-+echo "${ECHO_T}$hardcode_action" >&6; }
- 
- if test "$hardcode_action" = relink; then
-   # Fast installation is not supported
-@@ -11111,13 +10924,13 @@ fi
- 
- striplib=
- old_striplib=
--{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
--$as_echo_n "checking whether stripping libraries is possible... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
- if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
--  { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
- # FIXME - insert some real tests, host_os isn't really good enough
-   case $host_os in
-@@ -11125,16 +10938,16 @@ else
-        if test -n "$STRIP" ; then
-          striplib="$STRIP -x"
-          old_striplib="$STRIP -S"
--         { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+         { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&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
-        ;;
-    *)
--  { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-     ;;
-   esac
- fi
-@@ -11166,10 +10979,10 @@ else
- 
-   darwin*)
-   # if libdl is installed we need to link against it
--    { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--$as_echo_n "checking for dlopen in -ldl... " >&6; }
-+    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
-@@ -11201,36 +11014,32 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_dl_dlopen=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
- if test $ac_cv_lib_dl_dlopen = yes; then
+@@ -11231,7 +11209,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+-if test $ac_cv_lib_dl_dlopen = yes; then
++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
    lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
  else
-@@ -11244,10 +11053,10 @@ fi
-    ;;
- 
-   *)
--    { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
--$as_echo_n "checking for shl_load... " >&6; }
-+    { echo "$as_me:$LINENO: checking for shl_load" >&5
-+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
- if test "${ac_cv_func_shl_load+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -11300,42 +11109,38 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_func_shl_load=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
--$as_echo "$ac_cv_func_shl_load" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-+echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
- if test $ac_cv_func_shl_load = yes; then
+ 
+@@ -11329,7 +11307,7 @@ rm -f core conftest.err conftest.$ac_obj
+ fi
+ { $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
++if test "x$ac_cv_func_shl_load" = x""yes; then
    lt_cv_dlopen="shl_load"
  else
--  { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
--$as_echo_n "checking for shl_load in -ldld... " >&6; }
-+  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dld_shl_load+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld  $LIBS"
-@@ -11367,43 +11172,39 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_dld_shl_load=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
--$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
- if test $ac_cv_lib_dld_shl_load = yes; then
+   { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+@@ -11397,7 +11375,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+ $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+-if test $ac_cv_lib_dld_shl_load = yes; then
++if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
    lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
  else
--  { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
--$as_echo_n "checking for dlopen... " >&6; }
-+  { echo "$as_me:$LINENO: checking for dlopen" >&5
-+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
- if test "${ac_cv_func_dlopen+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -11456,42 +11257,38 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_func_dlopen=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
--$as_echo "$ac_cv_func_dlopen" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
- if test $ac_cv_func_dlopen = yes; then
+   { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
+@@ -11485,7 +11463,7 @@ rm -f core conftest.err conftest.$ac_obj
+ fi
+ { $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
++if test "x$ac_cv_func_dlopen" = x""yes; then
    lt_cv_dlopen="dlopen"
  else
--  { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--$as_echo_n "checking for dlopen in -ldl... " >&6; }
-+  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
-@@ -11523,43 +11320,39 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_dl_dlopen=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
- if test $ac_cv_lib_dl_dlopen = yes; then
+   { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+@@ -11553,7 +11531,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+-if test $ac_cv_lib_dl_dlopen = yes; then
++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
    lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
  else
--  { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
--$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-+  { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
- if test "${ac_cv_lib_svld_dlopen+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsvld  $LIBS"
-@@ -11591,43 +11384,39 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_svld_dlopen=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
--$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
- if test $ac_cv_lib_svld_dlopen = yes; then
+   { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+@@ -11621,7 +11599,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+ $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+-if test $ac_cv_lib_svld_dlopen = yes; then
++if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
    lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
  else
--  { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
--$as_echo_n "checking for dld_link in -ldld... " >&6; }
-+  { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dld_dld_link+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld  $LIBS"
-@@ -11659,36 +11448,32 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_dld_dld_link=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
--$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
- if test $ac_cv_lib_dld_dld_link = yes; then
+   { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+@@ -11689,7 +11667,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+ $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+-if test $ac_cv_lib_dld_dld_link = yes; then
++if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
    lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
  fi
-@@ -11728,10 +11513,10 @@ fi
-     save_LIBS="$LIBS"
-     LIBS="$lt_cv_dlopen_libs $LIBS"
- 
--    { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
--$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-+    { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
- if test "${lt_cv_dlopen_self+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   	  if test "$cross_compiling" = yes; then :
-   lt_cv_dlopen_self=cross
-@@ -11739,7 +11524,7 @@ else
+ 
+@@ -11739,7 +11717,7 @@ else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 11742 "configure"
-+#line 11527 "configure"
++#line 11720 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11805,7 +11590,7 @@ EOF
-   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  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=$?
-@@ -11823,15 +11608,15 @@ rm -fr conftest*
- 
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
--$as_echo "$lt_cv_dlopen_self" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-+echo "${ECHO_T}$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\"
--      { $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; }
-+      { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
- if test "${lt_cv_dlopen_self_static+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   	  if test "$cross_compiling" = yes; then :
-   lt_cv_dlopen_self_static=cross
-@@ -11839,7 +11624,7 @@ else
+@@ -11839,7 +11817,7 @@ else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 11842 "configure"
-+#line 11627 "configure"
++#line 11820 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11905,7 +11690,7 @@ EOF
-   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  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=$?
-@@ -11923,8 +11708,8 @@ rm -fr conftest*
- 
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
--$as_echo "$lt_cv_dlopen_self_static" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
-     fi
- 
-     CPPFLAGS="$save_CPPFLAGS"
-@@ -11946,13 +11731,13 @@ fi
- 
- 
- # Report which library types will actually be built
--{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
--$as_echo_n "checking if libtool supports shared libraries... " >&6; }
--{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
--$as_echo "$can_build_shared" >&6; }
-+{ echo "$as_me:$LINENO: 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 whether to build shared libraries" >&5
--$as_echo_n "checking whether to build shared libraries... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
- test "$can_build_shared" = "no" && enable_shared=no
- 
- # On AIX, shared libraries and static libraries use the same namespace, and
-@@ -11972,15 +11757,15 @@ aix[4-9]*)
-   fi
-     ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
--$as_echo "$enable_shared" >&6; }
-+{ echo "$as_me:$LINENO: result: $enable_shared" >&5
-+echo "${ECHO_T}$enable_shared" >&6; }
- 
--{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
--$as_echo_n "checking whether to build static libraries... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
- # Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
--{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
--$as_echo "$enable_static" >&6; }
-+{ echo "$as_me:$LINENO: result: $enable_static" >&5
-+echo "${ECHO_T}$enable_static" >&6; }
- 
- # The else clause should only fire when bootstrapping the
- # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -12073,8 +11858,8 @@ if test -f "$ltmain"; then
- cfgfile="${ofile}T"
-   trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-   $rm -f "$cfgfile"
--  { $as_echo "$as_me:$LINENO: creating $ofile" >&5
--$as_echo "$as_me: creating $ofile" >&6;}
-+  { echo "$as_me:$LINENO: creating $ofile" >&5
-+echo "$as_me: creating $ofile" >&6;}
- 
-   cat <<__EOF__ >> "$cfgfile"
- #! $SHELL
-@@ -12486,18 +12271,18 @@ fi
- 
- if test -f "$ltmain" && test -n "$tagnames"; then
-   if test ! -f "${ofile}"; then
--    { $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;}
-+    { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
-+echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
-   fi
- 
-   if test -z "$LTCC"; then
-     eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-     if test -z "$LTCC"; then
--      { $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;}
-+      { 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;}
-     else
--      { $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;}
-+      { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
-+echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
-     fi
-   fi
-   if test -z "$LTCFLAGS"; then
-@@ -12514,16 +12299,16 @@ $as_echo "$as_me: WARNING: using \`LTCC=
-     # Check whether tagname contains only valid characters
-     case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
-     "") ;;
--    *)  { { $as_echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
--$as_echo "$as_me: error: invalid tag name: $tagname" >&2;}
-+    *)  { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
-+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
--      { { $as_echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
--$as_echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
-+      { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
-+echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
-    { (exit 1); exit 1; }; }
-     fi
- 
-@@ -12666,8 +12451,8 @@ fi
- ac_prog=ld
- if test "$GCC" = yes; then
-   # Check if gcc -print-prog-name=ld gives a path.
--  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
--$as_echo_n "checking for ld used by $CC... " >&6; }
-+  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
-   case $host in
-   *-*-mingw*)
-     # gcc leaves a trailing carriage return which upsets mingw
-@@ -12696,14 +12481,14 @@ $as_echo_n "checking for ld used by $CC.
-     ;;
-   esac
- elif test "$with_gnu_ld" = yes; then
--  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
--$as_echo_n "checking for GNU ld... " >&6; }
-+  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
--$as_echo_n "checking for non-GNU ld... " >&6; }
-+  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
- fi
- if test "${lt_cv_path_LD+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -z "$LD"; then
-   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-@@ -12733,19 +12518,19 @@ fi
- 
- LD="$lt_cv_path_LD"
- if test -n "$LD"; then
--  { $as_echo "$as_me:$LINENO: result: $LD" >&5
--$as_echo "$LD" >&6; }
-+  { echo "$as_me:$LINENO: result: $LD" >&5
-+echo "${ECHO_T}$LD" >&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
--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;}
-+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;}
-    { (exit 1); exit 1; }; }
--{ $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; }
-+{ 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; }
- if test "${lt_cv_prog_gnu_ld+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   # I'd rather use --version here, but apparently some GNU lds only accept -v.
- case `$LD -v 2>&1 </dev/null` in
-@@ -12757,8 +12542,8 @@ case `$LD -v 2>&1 </dev/null` in
-   ;;
- esac
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
--$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
- with_gnu_ld=$lt_cv_prog_gnu_ld
- 
- 
-@@ -12808,8 +12593,8 @@ else
- fi
- 
- # PORTME: fill in a description of your system's C++ link characteristics
--{ $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; }
-+{ 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; }
- ld_shlibs_CXX=yes
- case $host_os in
-   aix3*)
-@@ -12926,21 +12711,18 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  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 && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
- 
- lt_aix_libpath_sed='
-     /Import File Strings/,/^$/ {
-@@ -12955,13 +12737,12 @@ if test -z "$aix_libpath"; then
-   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
-@@ -12997,21 +12778,18 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  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 && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
- 
- lt_aix_libpath_sed='
-     /Import File Strings/,/^$/ {
-@@ -13026,13 +12804,12 @@ if test -z "$aix_libpath"; then
-   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
-@@ -13435,7 +13212,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -13435,7 +13413,7 @@ if test -z "$aix_libpath"; then aix_libp
  	;;
      esac
      ;;
@@ -18378,38 +13057,7 @@
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
-@@ -13762,8 +13539,8 @@ if test -z "$aix_libpath"; then aix_libp
-     ld_shlibs_CXX=no
-     ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
--$as_echo "$ld_shlibs_CXX" >&6; }
-+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-+echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
- test "$ld_shlibs_CXX" = no && can_build_shared=no
- 
- GCC_CXX="$GXX"
-@@ -13782,7 +13559,7 @@ EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   # Parse the compiler output and extract the necessary
-   # objects, libraries and library flags.
-@@ -13938,8 +13715,8 @@ lt_prog_compiler_wl_CXX=
- lt_prog_compiler_pic_CXX=
- lt_prog_compiler_static_CXX=
- 
--{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
--$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
- 
-   # C++ specific cases for pic, static, wl, etc.
-   if test "$GXX" = yes; then
-@@ -14139,7 +13916,7 @@ $as_echo_n "checking for $compiler optio
+@@ -14139,7 +14117,7 @@ $as_echo_n "checking for $compiler optio
  	    ;;
  	esac
  	;;
@@ -18418,154 +13066,35 @@
  	;;
        osf3* | osf4* | osf5*)
  	case $cc_basename in
-@@ -14222,18 +13999,18 @@ $as_echo_n "checking for $compiler optio
-     esac
-   fi
- 
--{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
--$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
- 
- #
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic_CXX"; then
- 
--{ $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; }
-+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   lt_cv_prog_compiler_pic_works_CXX=no
-   ac_outfile=conftest.$ac_objext
-@@ -14248,11 +14025,11 @@ else
+@@ -14248,11 +14226,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:14251: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14028: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14229: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:14255: \$? = $ac_status" >&5
-+   echo "$as_me:14032: \$? = $ac_status" >&5
++   echo "$as_me:14233: \$? = $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.
-@@ -14265,8 +14042,8 @@ else
-    $rm conftest*
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
--$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
- 
- if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
-     case $lt_prog_compiler_pic_CXX in
-@@ -14293,10 +14070,10 @@ esac
- # 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\"
--{ $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; }
-+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   lt_cv_prog_compiler_static_works_CXX=no
-    save_LDFLAGS="$LDFLAGS"
-@@ -14321,8 +14098,8 @@ else
-    LDFLAGS="$save_LDFLAGS"
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
--$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
- 
- if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
-     :
-@@ -14331,10 +14108,10 @@ else
- fi
- 
- 
--{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   lt_cv_prog_compiler_c_o_CXX=no
-    $rm -r conftest 2>/dev/null
-@@ -14352,11 +14129,11 @@ else
+@@ -14352,11 +14330,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:14355: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14132: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14333: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:14359: \$? = $ac_status" >&5
-+   echo "$as_me:14136: \$? = $ac_status" >&5
++   echo "$as_me:14337: \$? = $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
-@@ -14378,34 +14155,34 @@ else
-    $rm conftest*
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
--$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-+echo "${ECHO_T}$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
--  { $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; }
-+  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
-   hard_links=yes
-   $rm conftest*
-   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-   touch conftest.a
-   ln conftest.a conftest.b 2>&5 || hard_links=no
-   ln conftest.a conftest.b 2>/dev/null && hard_links=no
--  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
--$as_echo "$hard_links" >&6; }
-+  { echo "$as_me:$LINENO: result: $hard_links" >&5
-+echo "${ECHO_T}$hard_links" >&6; }
-   if test "$hard_links" = no; then
--    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
--$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-     need_locks=warn
-   fi
- else
-   need_locks=no
- fi
- 
--{ $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; }
-+{ 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; }
- 
-   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-   case $host_os in
-@@ -14424,14 +14201,17 @@ $as_echo_n "checking whether the $compil
+@@ -14424,6 +14402,9 @@ $as_echo_n "checking whether the $compil
    cygwin* | mingw*)
      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
    ;;
@@ -18575,66 +13104,7 @@
    *)
      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    ;;
-   esac
-   exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
- 
--{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
--$as_echo "$ld_shlibs_CXX" >&6; }
-+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-+echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
- test "$ld_shlibs_CXX" = no && can_build_shared=no
- 
- #
-@@ -14451,15 +14231,15 @@ x|xyes)
-       # Test whether the compiler implicitly links with -lc since on some
-       # systems, -lgcc has to come before -lc. If gcc already passes -lc
-       # to ld, don't add -lc before -lgcc.
--      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-+      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
-       $rm conftest*
-       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
-       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } 2>conftest.err; then
-         soname=conftest
-         lib=conftest
-@@ -14477,7 +14257,7 @@ $as_echo_n "checking whether -lc should 
-         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=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
-         then
- 	  archive_cmds_need_lc_CXX=no
-@@ -14489,16 +14269,16 @@ $as_echo_n "checking whether -lc should 
-         cat conftest.err 1>&5
-       fi
-       $rm conftest*
--      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
--$as_echo "$archive_cmds_need_lc_CXX" >&6; }
-+      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-+echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
-       ;;
-     esac
-   fi
-   ;;
- esac
- 
--{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--$as_echo_n "checking dynamic linker characteristics... " >&6; }
-+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
-@@ -14854,13 +14634,11 @@ linux* | k*bsd*-gnu)
+@@ -14854,13 +14835,11 @@ linux* | k*bsd*-gnu)
    # Some rework will be needed to allow for fast_install
    # before this can be enabled.
    hardcode_into_libs=yes
@@ -18649,7 +13119,7 @@
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -14872,6 +14650,18 @@ linux* | k*bsd*-gnu)
+@@ -14872,6 +14851,18 @@ linux* | k*bsd*-gnu)
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -18668,253 +13138,35 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -15049,19 +14839,19 @@ uts4*)
-   dynamic_linker=no
-   ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--$as_echo "$dynamic_linker" >&6; }
-+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
- 
- if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
- fi
- 
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
- if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
- fi
-@@ -15073,8 +14863,8 @@ if test "$GCC" = yes; then
-   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
- fi
- 
--{ $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; }
-+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
- hardcode_action_CXX=
- if test -n "$hardcode_libdir_flag_spec_CXX" || \
-    test -n "$runpath_var_CXX" || \
-@@ -15098,8 +14888,8 @@ else
-   # directories.
-   hardcode_action_CXX=unsupported
- fi
--{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
--$as_echo "$hardcode_action_CXX" >&6; }
-+{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-+echo "${ECHO_T}$hardcode_action_CXX" >&6; }
- 
- if test "$hardcode_action_CXX" = relink; then
-   # Fast installation is not supported
-@@ -15637,13 +15427,13 @@ done
- cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
- 
--{ $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 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 whether to build shared libraries" >&5
--$as_echo_n "checking whether to build shared libraries... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
- test "$can_build_shared" = "no" && enable_shared=no
- 
- # On AIX, shared libraries and static libraries use the same namespace, and
-@@ -15662,15 +15452,15 @@ aix[4-9]*)
-   fi
-   ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
--$as_echo "$enable_shared" >&6; }
-+{ echo "$as_me:$LINENO: result: $enable_shared" >&5
-+echo "${ECHO_T}$enable_shared" >&6; }
- 
--{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
--$as_echo_n "checking whether to build static libraries... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
- # Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
--{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
--$as_echo "$enable_static" >&6; }
-+{ echo "$as_me:$LINENO: result: $enable_static" >&5
-+echo "${ECHO_T}$enable_static" >&6; }
- 
- GCC_F77="$G77"
- LD_F77="$LD"
-@@ -15679,8 +15469,8 @@ lt_prog_compiler_wl_F77=
- lt_prog_compiler_pic_F77=
- lt_prog_compiler_static_F77=
- 
--{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
--$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-+{ 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; }
- 
-   if test "$GCC" = yes; then
-     lt_prog_compiler_wl_F77='-Wl,'
-@@ -15911,18 +15701,18 @@ $as_echo_n "checking for $compiler optio
-     esac
-   fi
- 
--{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
--$as_echo "$lt_prog_compiler_pic_F77" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
- 
- #
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic_F77"; then
- 
--{ $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; }
-+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   lt_cv_prog_compiler_pic_works_F77=no
-   ac_outfile=conftest.$ac_objext
-@@ -15937,11 +15727,11 @@ else
+@@ -15937,11 +15928,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:15940: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:15730: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15931: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:15944: \$? = $ac_status" >&5
-+   echo "$as_me:15734: \$? = $ac_status" >&5
++   echo "$as_me:15935: \$? = $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.
-@@ -15954,8 +15744,8 @@ else
-    $rm conftest*
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
--$as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }
- 
- if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
-     case $lt_prog_compiler_pic_F77 in
-@@ -15982,10 +15772,10 @@ esac
- # 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\"
--{ $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; }
-+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   lt_cv_prog_compiler_static_works_F77=no
-    save_LDFLAGS="$LDFLAGS"
-@@ -16010,8 +15800,8 @@ else
-    LDFLAGS="$save_LDFLAGS"
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
--$as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }
- 
- if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
-     :
-@@ -16020,10 +15810,10 @@ else
- fi
- 
- 
--{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   lt_cv_prog_compiler_c_o_F77=no
-    $rm -r conftest 2>/dev/null
-@@ -16041,11 +15831,11 @@ else
+@@ -16041,11 +16032,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:16044: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:15834: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16035: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:16048: \$? = $ac_status" >&5
-+   echo "$as_me:15838: \$? = $ac_status" >&5
++   echo "$as_me:16039: \$? = $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
-@@ -16067,34 +15857,34 @@ else
-    $rm conftest*
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
--$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
-+echo "${ECHO_T}$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
--  { $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; }
-+  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
-   hard_links=yes
-   $rm conftest*
-   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-   touch conftest.a
-   ln conftest.a conftest.b 2>&5 || hard_links=no
-   ln conftest.a conftest.b 2>/dev/null && hard_links=no
--  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
--$as_echo "$hard_links" >&6; }
-+  { echo "$as_me:$LINENO: result: $hard_links" >&5
-+echo "${ECHO_T}$hard_links" >&6; }
-   if test "$hard_links" = no; then
--    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
--$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-     need_locks=warn
-   fi
- else
-   need_locks=no
- fi
- 
--{ $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; }
-+{ 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; }
- 
-   runpath_var=
-   allow_undefined_flag_F77=
-@@ -16306,12 +16096,13 @@ EOF
+@@ -16306,12 +16297,13 @@ EOF
    $echo "local: *; };" >> $output_objdir/$libname.ver~
  	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
  	fi
@@ -18929,89 +13181,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -16514,21 +16305,18 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_f77_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
- 
- lt_aix_libpath_sed='
-     /Import File Strings/,/^$/ {
-@@ -16543,13 +16331,12 @@ if test -z "$aix_libpath"; then
-   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
-@@ -16574,21 +16361,18 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_f77_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
- 
- lt_aix_libpath_sed='
-     /Import File Strings/,/^$/ {
-@@ -16603,13 +16387,12 @@ if test -z "$aix_libpath"; then
-   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
-@@ -16842,7 +16625,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -16842,7 +16834,7 @@ if test -z "$aix_libpath"; then aix_libp
        link_all_deplibs_F77=yes
        ;;
  
@@ -19020,67 +13190,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -17061,8 +16844,8 @@ if test -z "$aix_libpath"; then aix_libp
-     esac
-   fi
- 
--{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
--$as_echo "$ld_shlibs_F77" >&6; }
-+{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
-+echo "${ECHO_T}$ld_shlibs_F77" >&6; }
- test "$ld_shlibs_F77" = no && can_build_shared=no
- 
- #
-@@ -17082,15 +16865,15 @@ x|xyes)
-       # Test whether the compiler implicitly links with -lc since on some
-       # systems, -lgcc has to come before -lc. If gcc already passes -lc
-       # to ld, don't add -lc before -lgcc.
--      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-+      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
-       $rm conftest*
-       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
-       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } 2>conftest.err; then
-         soname=conftest
-         lib=conftest
-@@ -17108,7 +16891,7 @@ $as_echo_n "checking whether -lc should 
-         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=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
-         then
- 	  archive_cmds_need_lc_F77=no
-@@ -17120,16 +16903,16 @@ $as_echo_n "checking whether -lc should 
-         cat conftest.err 1>&5
-       fi
-       $rm conftest*
--      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
--$as_echo "$archive_cmds_need_lc_F77" >&6; }
-+      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
-+echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
-       ;;
-     esac
-   fi
-   ;;
- esac
- 
--{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--$as_echo_n "checking dynamic linker characteristics... " >&6; }
-+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
-@@ -17485,13 +17268,11 @@ linux* | k*bsd*-gnu)
+@@ -17485,13 +17477,11 @@ linux* | k*bsd*-gnu)
    # Some rework will be needed to allow for fast_install
    # before this can be enabled.
    hardcode_into_libs=yes
@@ -19095,7 +13205,7 @@
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -17503,6 +17284,18 @@ linux* | k*bsd*-gnu)
+@@ -17503,6 +17493,18 @@ linux* | k*bsd*-gnu)
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -19114,250 +13224,49 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -17680,19 +17473,19 @@ uts4*)
-   dynamic_linker=no
-   ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--$as_echo "$dynamic_linker" >&6; }
-+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
- 
- if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
- fi
- 
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
- if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
- fi
-@@ -17704,8 +17497,8 @@ if test "$GCC" = yes; then
-   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
- fi
- 
--{ $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; }
-+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
- hardcode_action_F77=
- if test -n "$hardcode_libdir_flag_spec_F77" || \
-    test -n "$runpath_var_F77" || \
-@@ -17729,8 +17522,8 @@ else
-   # directories.
-   hardcode_action_F77=unsupported
- fi
--{ $as_echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
--$as_echo "$hardcode_action_F77" >&6; }
-+{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-+echo "${ECHO_T}$hardcode_action_F77" >&6; }
- 
- if test "$hardcode_action_F77" = relink; then
-   # Fast installation is not supported
-@@ -18240,10 +18033,10 @@ if test "$GCC" = yes; then
-   lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
- 
- 
--{ $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; }
-+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   lt_cv_prog_compiler_rtti_exceptions=no
-   ac_outfile=conftest.$ac_objext
-@@ -18258,11 +18051,11 @@ else
+@@ -18258,11 +18260,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:18261: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18054: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18263: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:18265: \$? = $ac_status" >&5
-+   echo "$as_me:18058: \$? = $ac_status" >&5
++   echo "$as_me:18267: \$? = $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.
-@@ -18275,8 +18068,8 @@ else
-    $rm conftest*
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
--$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-+echo "${ECHO_T}$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"
-@@ -18290,8 +18083,8 @@ lt_prog_compiler_wl_GCJ=
- lt_prog_compiler_pic_GCJ=
- lt_prog_compiler_static_GCJ=
- 
--{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
--$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
- 
-   if test "$GCC" = yes; then
-     lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18522,18 +18315,18 @@ $as_echo_n "checking for $compiler optio
-     esac
-   fi
- 
--{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
--$as_echo "$lt_prog_compiler_pic_GCJ" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
- 
- #
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic_GCJ"; then
- 
--{ $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; }
-+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   lt_cv_prog_compiler_pic_works_GCJ=no
-   ac_outfile=conftest.$ac_objext
-@@ -18548,11 +18341,11 @@ else
+@@ -18548,11 +18550,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:18551: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18344: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18553: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:18555: \$? = $ac_status" >&5
-+   echo "$as_me:18348: \$? = $ac_status" >&5
++   echo "$as_me:18557: \$? = $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.
-@@ -18565,8 +18358,8 @@ else
-    $rm conftest*
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
--$as_echo "$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
- 
- if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
-     case $lt_prog_compiler_pic_GCJ in
-@@ -18593,10 +18386,10 @@ esac
- # 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\"
--{ $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; }
-+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   lt_cv_prog_compiler_static_works_GCJ=no
-    save_LDFLAGS="$LDFLAGS"
-@@ -18621,8 +18414,8 @@ else
-    LDFLAGS="$save_LDFLAGS"
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
--$as_echo "$lt_cv_prog_compiler_static_works_GCJ" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }
- 
- if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
-     :
-@@ -18631,10 +18424,10 @@ else
- fi
- 
- 
--{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   lt_cv_prog_compiler_c_o_GCJ=no
-    $rm -r conftest 2>/dev/null
-@@ -18652,11 +18445,11 @@ else
+@@ -18652,11 +18654,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:18655: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18448: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18657: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:18659: \$? = $ac_status" >&5
-+   echo "$as_me:18452: \$? = $ac_status" >&5
++   echo "$as_me:18661: \$? = $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
-@@ -18678,34 +18471,34 @@ else
-    $rm conftest*
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
--$as_echo "$lt_cv_prog_compiler_c_o_GCJ" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
-+echo "${ECHO_T}$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
--  { $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; }
-+  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
-   hard_links=yes
-   $rm conftest*
-   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-   touch conftest.a
-   ln conftest.a conftest.b 2>&5 || hard_links=no
-   ln conftest.a conftest.b 2>/dev/null && hard_links=no
--  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
--$as_echo "$hard_links" >&6; }
-+  { echo "$as_me:$LINENO: result: $hard_links" >&5
-+echo "${ECHO_T}$hard_links" >&6; }
-   if test "$hard_links" = no; then
--    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
--$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-     need_locks=warn
-   fi
- else
-   need_locks=no
- fi
- 
--{ $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; }
-+{ 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; }
- 
-   runpath_var=
-   allow_undefined_flag_GCJ=
-@@ -18917,12 +18710,13 @@ EOF
+@@ -18917,12 +18919,13 @@ EOF
    $echo "local: *; };" >> $output_objdir/$libname.ver~
  	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
  	fi
@@ -19372,89 +13281,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -19135,21 +18929,18 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
- 
- lt_aix_libpath_sed='
-     /Import File Strings/,/^$/ {
-@@ -19164,13 +18955,12 @@ if test -z "$aix_libpath"; then
-   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
-@@ -19205,21 +18995,18 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
- 
- lt_aix_libpath_sed='
-     /Import File Strings/,/^$/ {
-@@ -19234,13 +19021,12 @@ if test -z "$aix_libpath"; then
-   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
-@@ -19473,7 +19259,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -19473,7 +19476,7 @@ if test -z "$aix_libpath"; then aix_libp
        link_all_deplibs_GCJ=yes
        ;;
  
@@ -19463,67 +13290,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -19692,8 +19478,8 @@ if test -z "$aix_libpath"; then aix_libp
-     esac
-   fi
- 
--{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
--$as_echo "$ld_shlibs_GCJ" >&6; }
-+{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-+echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
- test "$ld_shlibs_GCJ" = no && can_build_shared=no
- 
- #
-@@ -19713,15 +19499,15 @@ x|xyes)
-       # Test whether the compiler implicitly links with -lc since on some
-       # systems, -lgcc has to come before -lc. If gcc already passes -lc
-       # to ld, don't add -lc before -lgcc.
--      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-+      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
-       $rm conftest*
-       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
-       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } 2>conftest.err; then
-         soname=conftest
-         lib=conftest
-@@ -19739,7 +19525,7 @@ $as_echo_n "checking whether -lc should 
-         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=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
-         then
- 	  archive_cmds_need_lc_GCJ=no
-@@ -19751,16 +19537,16 @@ $as_echo_n "checking whether -lc should 
-         cat conftest.err 1>&5
-       fi
-       $rm conftest*
--      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
--$as_echo "$archive_cmds_need_lc_GCJ" >&6; }
-+      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
-+echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
-       ;;
-     esac
-   fi
-   ;;
- esac
- 
--{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--$as_echo_n "checking dynamic linker characteristics... " >&6; }
-+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
-@@ -20116,13 +19902,11 @@ linux* | k*bsd*-gnu)
+@@ -20116,13 +20119,11 @@ linux* | k*bsd*-gnu)
    # Some rework will be needed to allow for fast_install
    # before this can be enabled.
    hardcode_into_libs=yes
@@ -19538,7 +13305,7 @@
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -20134,6 +19918,18 @@ linux* | k*bsd*-gnu)
+@@ -20134,6 +20135,18 @@ linux* | k*bsd*-gnu)
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -19557,3565 +13324,306 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -20311,19 +20107,19 @@ uts4*)
-   dynamic_linker=no
-   ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--$as_echo "$dynamic_linker" >&6; }
-+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
- 
- if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
- fi
- 
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
- if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
- fi
-@@ -20335,8 +20131,8 @@ if test "$GCC" = yes; then
-   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
- fi
- 
--{ $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; }
-+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
- hardcode_action_GCJ=
- if test -n "$hardcode_libdir_flag_spec_GCJ" || \
-    test -n "$runpath_var_GCJ" || \
-@@ -20360,8 +20156,8 @@ else
-   # directories.
-   hardcode_action_GCJ=unsupported
- fi
--{ $as_echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
--$as_echo "$hardcode_action_GCJ" >&6; }
-+{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-+echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
- 
- if test "$hardcode_action_GCJ" = relink; then
-   # Fast installation is not supported
-@@ -21284,8 +21080,8 @@ CC="$lt_save_CC"
- 	;;
- 
-       *)
--	{ { $as_echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
--$as_echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
-+	{ { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
-+echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-       esac
-@@ -21304,8 +21100,8 @@ $as_echo "$as_me: error: Unsupported tag
-     chmod +x "$ofile"
-   else
-     rm -f "${ofile}T"
--    { { $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;}
-+    { { 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;}
-    { (exit 1); exit 1; }; }
-   fi
- fi
-@@ -21347,10 +21143,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != 
- 	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
--{ $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_PKG_CONFIG+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   case $PKG_CONFIG in
-   [\\/]* | ?:[\\/]*)
-@@ -21365,7 +21161,7 @@ do
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$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
-@@ -21377,11 +21173,11 @@ esac
- fi
- PKG_CONFIG=$ac_cv_path_PKG_CONFIG
- if test -n "$PKG_CONFIG"; then
--  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
-+  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+echo "${ECHO_T}$PKG_CONFIG" >&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
- 
- 
-@@ -21390,10 +21186,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the
-   ac_pt_PKG_CONFIG=$PKG_CONFIG
-   # Extract the first word of "pkg-config", so it can be a program name with args.
- set dummy pkg-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: 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_ac_pt_PKG_CONFIG+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   case $ac_pt_PKG_CONFIG in
-   [\\/]* | ?:[\\/]*)
-@@ -21408,7 +21204,7 @@ do
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$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
-@@ -21420,11 +21216,11 @@ esac
- fi
- ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
- if test -n "$ac_pt_PKG_CONFIG"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
--$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-+  { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-   if test "x$ac_pt_PKG_CONFIG" = x; then
-@@ -21432,10 +21228,10 @@ fi
+@@ -21432,12 +21445,8 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
 -{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+{ 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
+-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
 -$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+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;}
+-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;}
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
-@@ -21449,14 +21245,14 @@ fi
- fi
- if test -n "$PKG_CONFIG"; then
- 	_pkg_min_version=0.9.0
--	{ $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; }
-+	{ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
- 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
--		{ $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+		{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&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; }
- 		PKG_CONFIG=""
- 	fi
- 
-@@ -21465,10 +21261,10 @@ fi
- gdu_cv_version_required=0.3.2
- 
- if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
-   ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   gdu_cv_have_gdu=yes
- else
-@@ -21478,8 +21274,8 @@ fi
- if test "$gdu_cv_have_gdu" = "yes"; then
- 	:
- else
--	{ { $as_echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5
--$as_echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}
-+	{ { echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5
-+echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
-@@ -21566,8 +21362,8 @@ fi
- 
- case "$am__api_version" in
-     1.01234)
--	{ { $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;}
-+	{ { 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;}
-    { (exit 1); exit 1; }; }
-     ;;
-     *)
-@@ -21575,27 +21371,27 @@ $as_echo "$as_me: error: Automake 1.5 or
  esac
- 
- if test -n "0.37.1"; then
--    { $as_echo "$as_me:$LINENO: checking for intltool >= 0.37.1" >&5
--$as_echo_n "checking for intltool >= 0.37.1... " >&6; }
-+    { echo "$as_me:$LINENO: checking for intltool >= 0.37.1" >&5
-+echo $ECHO_N "checking for intltool >= 0.37.1... $ECHO_C" >&6; }
- 
-     INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.37.1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-     INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-     INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- 
--    { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
--$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
-+    { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
-+echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }
-     test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
--	{ { $as_echo "$as_me:$LINENO: error: Your intltool is too old.  You need intltool 0.37.1 or later." >&5
--$as_echo "$as_me: error: Your intltool is too old.  You need intltool 0.37.1 or later." >&2;}
-+	{ { echo "$as_me:$LINENO: error: Your intltool is too old.  You need intltool 0.37.1 or later." >&5
-+echo "$as_me: error: Your intltool is too old.  You need intltool 0.37.1 or later." >&2;}
-    { (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
-   [\\/]* | ?:[\\/]*)
-@@ -21610,7 +21406,7 @@ do
-   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
-@@ -21622,20 +21418,20 @@ esac
- 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
-   [\\/]* | ?:[\\/]*)
-@@ -21650,7 +21446,7 @@ do
-   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
-@@ -21662,20 +21458,20 @@ esac
- 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
-   [\\/]* | ?:[\\/]*)
-@@ -21690,7 +21486,7 @@ do
-   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
-@@ -21702,17 +21498,17 @@ esac
- 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
- 
-@@ -21759,10 +21555,10 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
- # Check the gettext tools to make sure they are GNU
- # Extract the first word of "xgettext", so it can be a program name with args.
- set dummy xgettext; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_XGETTEXT+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   case $XGETTEXT in
-   [\\/]* | ?:[\\/]*)
-@@ -21777,7 +21573,7 @@ do
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -21789,20 +21585,20 @@ esac
- fi
- XGETTEXT=$ac_cv_path_XGETTEXT
- if test -n "$XGETTEXT"; then
--  { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
--$as_echo "$XGETTEXT" >&6; }
-+  { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-+echo "${ECHO_T}$XGETTEXT" >&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 "msgmerge", so it can be a program name with args.
- set dummy msgmerge; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_MSGMERGE+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   case $MSGMERGE in
-   [\\/]* | ?:[\\/]*)
-@@ -21817,7 +21613,7 @@ do
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -21829,20 +21625,20 @@ esac
- fi
- MSGMERGE=$ac_cv_path_MSGMERGE
- if test -n "$MSGMERGE"; then
--  { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
--$as_echo "$MSGMERGE" >&6; }
-+  { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
-+echo "${ECHO_T}$MSGMERGE" >&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 "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_MSGFMT+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   case $MSGFMT in
-   [\\/]* | ?:[\\/]*)
-@@ -21857,7 +21653,7 @@ do
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -21869,34 +21665,34 @@ esac
- fi
- MSGFMT=$ac_cv_path_MSGFMT
- if test -n "$MSGFMT"; then
--  { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
--$as_echo "$MSGFMT" >&6; }
-+  { echo "$as_me:$LINENO: result: $MSGFMT" >&5
-+echo "${ECHO_T}$MSGFMT" >&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 "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
--    { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
--$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
-+    { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
-+echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
- mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
- mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
- if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
--    { { $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;}
-+    { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
-+echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- # Extract the first word of "perl", so it can be a program name with args.
- set dummy perl; 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_PERL+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   case $INTLTOOL_PERL in
-   [\\/]* | ?:[\\/]*)
-@@ -21911,7 +21707,7 @@ do
-   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"
--    $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
-@@ -21923,33 +21719,33 @@ esac
- fi
- INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
- if test -n "$INTLTOOL_PERL"; then
--  { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
--$as_echo "$INTLTOOL_PERL" >&6; }
-+  { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
-+echo "${ECHO_T}$INTLTOOL_PERL" >&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_PERL"; then
--   { { $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;}
-+   { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
-+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
--   { { $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;}
-+   { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
-+echo "$as_me: error: perl 5.x required for intltool" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test "x" != "xno-xml"; then
--   { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
--$as_echo_n "checking for XML::Parser... " >&6; }
-+   { echo "$as_me:$LINENO: checking for XML::Parser" >&5
-+echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; }
-    if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
--       { $as_echo "$as_me:$LINENO: result: ok" >&5
--$as_echo "ok" >&6; }
-+       { echo "$as_me:$LINENO: result: ok" >&5
-+echo "${ECHO_T}ok" >&6; }
-    else
--       { { $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;}
-+       { { 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;}
-    { (exit 1); exit 1; }; }
-    fi
- fi
-@@ -21982,32 +21778,29 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
+     PKG_CONFIG=$ac_pt_PKG_CONFIG
+@@ -22089,7 +22098,7 @@ rm -f core conftest.err conftest.$ac_obj
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+ $as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
+-if test $ac_cv_func_bind_textdomain_codeset = yes; then
++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
    DATADIRNAME=share
  else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	case $host in
-     *-*-solaris*)
--                        { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
--$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
-+                        { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
-+echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
- if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -22060,35 +21853,31 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_func_bind_textdomain_codeset=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
--$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-+echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
- if test $ac_cv_func_bind_textdomain_codeset = yes; then
-   DATADIRNAME=share
- else
-@@ -22102,7 +21891,6 @@ fi
-     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
-@@ -22124,21 +21912,20 @@ _ACEOF
- 
- for ac_header in locale.h
- do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
-   # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
--$as_echo_n "checking $ac_header usability... " >&6; }
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -22154,33 +21941,32 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
-        } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
--$as_echo_n "checking $ac_header presence... " >&6; }
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -22194,52 +21980,51 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   ac_header_preproc=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { $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;}
-+    { 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;}
-     ( cat <<\_ASBOX
- ## ----------------------------------------------------------------------------------- ##
- ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center ##
-@@ -22248,23 +22033,21 @@ _ASBOX
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
--{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
+   DATADIRNAME=lib
+@@ -22261,8 +22270,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$ac_res" >&6; }
  
  fi
 -if test `eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'` = yes; then
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
++as_val=`eval 'as_val=${'$as_ac_Header'}
++		 $as_echo "$as_val"'`
++   if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
- 
- fi
-@@ -22272,10 +22055,10 @@ fi
- done
- 
-     if test $ac_cv_header_locale_h = yes; then
--    { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
--$as_echo_n "checking for LC_MESSAGES... " >&6; }
-+    { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
-+echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; }
- if test "${am_cv_val_LC_MESSAGES+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -22298,35 +22081,31 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   am_cv_val_LC_MESSAGES=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
--$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
-+{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
-+echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; }
-     if test $am_cv_val_LC_MESSAGES = yes; then
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -22345,17 +22124,17 @@ _ACEOF
-     INTLLIBS=
- 
-     if test "${ac_cv_header_libintl_h+set}" = set; then
--  { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
--$as_echo_n "checking for libintl.h... " >&6; }
-+  { echo "$as_me:$LINENO: checking for libintl.h" >&5
-+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_libintl_h+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
--$as_echo "$ac_cv_header_libintl_h" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
- else
-   # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5
--$as_echo_n "checking libintl.h usability... " >&6; }
-+{ echo "$as_me:$LINENO: checking libintl.h usability" >&5
-+echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -22371,33 +22150,32 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
-        } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5
--$as_echo_n "checking libintl.h presence... " >&6; }
-+{ echo "$as_me:$LINENO: checking libintl.h presence" >&5
-+echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -22411,52 +22189,51 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   ac_header_preproc=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
--    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { $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;}
-+    { 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;}
-     ( cat <<\_ASBOX
- ## ----------------------------------------------------------------------------------- ##
- ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center ##
-@@ -22465,15 +22242,15 @@ _ASBOX
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
--{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
--$as_echo_n "checking for libintl.h... " >&6; }
-+{ echo "$as_me:$LINENO: checking for libintl.h" >&5
-+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_libintl_h+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_cv_header_libintl_h=$ac_header_preproc
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
--$as_echo "$ac_cv_header_libintl_h" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
- 
- fi
- if test $ac_cv_header_libintl_h = yes; then
-@@ -22483,10 +22260,10 @@ if test $ac_cv_header_libintl_h = yes; t
-       #
-       # First check in libc
-       #
--      { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5
--$as_echo_n "checking for ngettext in libc... " >&6; }
-+      { echo "$as_me:$LINENO: checking for ngettext in libc" >&5
-+echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6; }
- if test "${gt_cv_func_ngettext_libc+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -22511,42 +22288,38 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   gt_cv_func_ngettext_libc=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
--$as_echo "$gt_cv_func_ngettext_libc" >&6; }
-+{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
-+echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6; }
- 
-       if test "$gt_cv_func_ngettext_libc" = "yes" ; then
--	      { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5
--$as_echo_n "checking for dgettext in libc... " >&6; }
-+	      { echo "$as_me:$LINENO: checking for dgettext in libc" >&5
-+echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; }
- if test "${gt_cv_func_dgettext_libc+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -22571,47 +22344,43 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   gt_cv_func_dgettext_libc=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
--$as_echo "$gt_cv_func_dgettext_libc" >&6; }
-+{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
-+echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6; }
-       fi
- 
-       if test "$gt_cv_func_ngettext_libc" = "yes" ; then
- 
- for ac_func in bind_textdomain_codeset
- do
--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; }
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -22664,41 +22433,35 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   eval "$as_ac_var=yes"
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
+@@ -22476,7 +22486,7 @@ fi
+ $as_echo "$ac_cv_header_libintl_h" >&6; }
+ 
+ fi
+-if test $ac_cv_header_libintl_h = yes; then
++if test "x$ac_cv_header_libintl_h" = x""yes; then
+   gt_cv_func_dgettext_libintl="no"
+       libintl_extra_libs=""
+ 
+@@ -22695,8 +22705,9 @@ 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
-+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
++as_val=`eval 'as_val=${'$as_ac_var'}
++		 $as_echo "$as_val"'`
++   if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
- 
- fi
-@@ -22713,10 +22476,10 @@ done
- 	 || test "$gt_cv_func_ngettext_libc" != "yes" \
-          || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
- 
--        { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
--$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
-+        { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
-+echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl  $LIBS"
-@@ -22748,41 +22511,37 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_intl_bindtextdomain=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
--$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
-+echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; }
- if test $ac_cv_lib_intl_bindtextdomain = yes; then
--  { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
--$as_echo_n "checking for ngettext in -lintl... " >&6; }
-+  { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-+echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }
+@@ -22778,7 +22789,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $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
++if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then
+   { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
+ $as_echo_n "checking for ngettext in -lintl... " >&6; }
  if test "${ac_cv_lib_intl_ngettext+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl  $LIBS"
-@@ -22814,41 +22573,37 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_intl_ngettext=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
--$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
-+echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }
- if test $ac_cv_lib_intl_ngettext = yes; then
--  { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
--$as_echo_n "checking for dgettext in -lintl... " >&6; }
-+  { echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
-+echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; }
+@@ -22844,7 +22855,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
+ $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
+-if test $ac_cv_lib_intl_ngettext = yes; then
++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
+   { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
+ $as_echo_n "checking for dgettext in -lintl... " >&6; }
  if test "${ac_cv_lib_intl_dgettext+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl  $LIBS"
-@@ -22880,36 +22635,32 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_intl_dgettext=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
--$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
-+echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; }
- if test $ac_cv_lib_intl_dgettext = yes; then
+@@ -22910,7 +22921,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
+ $as_echo "$ac_cv_lib_intl_dgettext" >&6; }
+-if test $ac_cv_lib_intl_dgettext = yes; then
++if test "x$ac_cv_lib_intl_dgettext" = x""yes; then
    gt_cv_func_dgettext_libintl=yes
  fi
-@@ -22920,14 +22671,14 @@ fi
- 
- 
- 	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
--	  { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
--$as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
--	  { $as_echo "$as_me:$LINENO: result: " >&5
--$as_echo "" >&6; }
--  	  { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
--$as_echo_n "checking for ngettext in -lintl... " >&6; }
-+	  { echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
-+echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6; }
-+	  { echo "$as_me:$LINENO: result: " >&5
-+echo "${ECHO_T}" >&6; }
-+  	  { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-+echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_intl_ngettext+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl -liconv $LIBS"
-@@ -22959,41 +22710,37 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_intl_ngettext=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
--$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
-+echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }
- if test $ac_cv_lib_intl_ngettext = yes; then
--  { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
--$as_echo_n "checking for dcgettext in -lintl... " >&6; }
-+  { echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
-+echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6; }
+ 
+@@ -22989,7 +23000,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
+ $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
+-if test $ac_cv_lib_intl_ngettext = yes; then
++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
+   { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
+ $as_echo_n "checking for dcgettext in -lintl... " >&6; }
  if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl -liconv $LIBS"
-@@ -23025,36 +22772,32 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_intl_dcgettext=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
--$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
-+echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6; }
- if test $ac_cv_lib_intl_dcgettext = yes; then
+@@ -23055,7 +23066,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
+ $as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
+-if test $ac_cv_lib_intl_dcgettext = yes; then
++if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then
    gt_cv_func_dgettext_libintl=yes
  			libintl_extra_libs=-liconv
-@@ -23080,11 +22823,11 @@ fi
- 
- for ac_func in bind_textdomain_codeset
- do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -23137,41 +22880,35 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   eval "$as_ac_var=yes"
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
+@@ -23168,8 +23179,9 @@ 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
-+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
++as_val=`eval 'as_val=${'$as_ac_var'}
++		 $as_echo "$as_val"'`
++   if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
- 
- fi
-@@ -23207,10 +22944,10 @@ _ACEOF
- 
- 	# Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_MSGFMT+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   case "$MSGFMT" in
-   /*)
-@@ -23234,11 +22971,11 @@ esac
- fi
- MSGFMT="$ac_cv_path_MSGFMT"
- if test "$MSGFMT" != "no"; then
--  { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
--$as_echo "$MSGFMT" >&6; }
-+  { echo "$as_me:$LINENO: result: $MSGFMT" >&5
-+echo "${ECHO_T}$MSGFMT" >&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 "$MSGFMT" != "no"; then
-           glib_save_LIBS="$LIBS"
-@@ -23246,11 +22983,11 @@ fi
- 
- for ac_func in dcgettext
- do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -23303,49 +23040,43 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   eval "$as_ac_var=yes"
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
+@@ -23334,8 +23346,9 @@ 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
-+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
++as_val=`eval 'as_val=${'$as_ac_var'}
++		 $as_echo "$as_val"'`
++   if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
- 
- fi
- done
- 
- 	  MSGFMT_OPTS=
--	  { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
--$as_echo_n "checking if msgfmt accepts -c... " >&6; }
-+	  { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
-+echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; }
- 	  cat >conftest.foo <<_ACEOF
- 
- msgid ""
-@@ -23359,25 +23090,25 @@ msgstr ""
- "Content-Transfer-Encoding: 8bit\n"
- 
- _ACEOF
--if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
-+if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
-   ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
--else { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+  MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+else { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- echo "$as_me: failed input was:" >&5
- sed 's/^/| /' conftest.foo >&5
- fi
- 
- 	  # Extract the first word of "gmsgfmt", so it can be a program name with args.
- set dummy gmsgfmt; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_GMSGFMT+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   case $GMSGFMT in
-   [\\/]* | ?:[\\/]*)
-@@ -23392,7 +23123,7 @@ do
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -23405,20 +23136,20 @@ esac
- fi
- GMSGFMT=$ac_cv_path_GMSGFMT
- if test -n "$GMSGFMT"; then
--  { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
--$as_echo "$GMSGFMT" >&6; }
-+  { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-+echo "${ECHO_T}$GMSGFMT" >&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 "xgettext", so it can be a program name with args.
- set dummy xgettext; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_XGETTEXT+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   case "$XGETTEXT" in
-   /*)
-@@ -23442,11 +23173,11 @@ esac
- fi
- XGETTEXT="$ac_cv_path_XGETTEXT"
- if test "$XGETTEXT" != ":"; then
--  { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
--$as_echo "$XGETTEXT" >&6; }
-+  { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-+echo "${ECHO_T}$XGETTEXT" >&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
- 
- 	  cat >conftest.$ac_ext <<_ACEOF
-@@ -23471,33 +23202,30 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   CATOBJEXT=.gmo
-              DATADIRNAME=share
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	case $host in
- 	    *-*-solaris*)
--	    	                	    	                { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
--$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
-+	    	                	    	                { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
-+echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
- if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -23550,35 +23278,31 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_func_bind_textdomain_codeset=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
--$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-+echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
- if test $ac_cv_func_bind_textdomain_codeset = yes; then
+@@ -23579,7 +23592,7 @@ rm -f core conftest.err conftest.$ac_obj
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+ $as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
+-if test $ac_cv_func_bind_textdomain_codeset = yes; then
++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
    CATOBJEXT=.gmo
                 DATADIRNAME=share
-@@ -23595,7 +23319,6 @@ fi
- 	    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"
-@@ -23621,8 +23344,8 @@ _ACEOF
-                   if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-         : ;
-       else
--        { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
--$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
-+        { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
-+echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }
-         XGETTEXT=":"
-       fi
-     fi
-@@ -23654,8 +23377,8 @@ $as_echo "found xgettext program is not 
-      if test "x$ALL_LINGUAS" = "x"; then
-        LINGUAS=
-      else
--       { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
--$as_echo_n "checking for catalogs to be installed... " >&6; }
-+       { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
-+echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; }
-        NEW_LINGUAS=
-        for presentlang in $ALL_LINGUAS; do
-          useit=no
-@@ -23679,8 +23402,8 @@ $as_echo_n "checking for catalogs to be 
-          fi
-        done
-        LINGUAS=$NEW_LINGUAS
--       { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5
--$as_echo "$LINGUAS" >&6; }
-+       { echo "$as_me:$LINENO: result: $LINGUAS" >&5
-+echo "${ECHO_T}$LINGUAS" >&6; }
-      fi
- 
-           if test -n "$LINGUAS"; then
-@@ -23773,8 +23496,8 @@ fi
- 	for option in -Wno-sign-compare; do
- 		SAVE_CFLAGS="$CFLAGS"
- 		CFLAGS="$CFLAGS $option"
--		{ $as_echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
--$as_echo_n "checking whether gcc understands $option... " >&6; }
-+		{ echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
-+echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; }
- 		cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -23796,21 +23519,20 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
-        } && test -s conftest.$ac_objext; then
-   has_option=yes
  else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	has_option=no
-@@ -23818,8 +23540,8 @@ fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 		CFLAGS="$SAVE_CFLAGS"
--		{ $as_echo "$as_me:$LINENO: result: $has_option" >&5
--$as_echo "$has_option" >&6; }
-+		{ echo "$as_me:$LINENO: result: $has_option" >&5
-+echo "${ECHO_T}$has_option" >&6; }
- 		if test $has_option = yes; then
- 		  warning_flags="$warning_flags $option"
- 		fi
-@@ -23832,16 +23554,16 @@ $as_echo "$has_option" >&6; }
- 	fi
- 	;;
-     *)
--	{ { $as_echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5
--$as_echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;}
-+	{ { echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5
-+echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-     esac
-     CFLAGS="$realsave_CFLAGS"
--    { $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; }
-+    { 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; }
- 
-     # Check whether --enable-iso-c was given.
- if test "${enable_iso_c+set}" = set; then
-@@ -23851,8 +23573,8 @@ else
- fi
- 
- 
--    { $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; }
-+    { echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
-+echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6; }
-     complCFLAGS=
-     if test "x$enable_iso_c" != "xno"; then
- 	if test "x$GCC" = "xyes"; then
-@@ -23866,8 +23588,8 @@ $as_echo_n "checking what language compl
- 	esac
- 	fi
-     fi
--    { $as_echo "$as_me:$LINENO: result: $complCFLAGS" >&5
--$as_echo "$complCFLAGS" >&6; }
-+    { echo "$as_me:$LINENO: result: $complCFLAGS" >&5
-+echo "${ECHO_T}$complCFLAGS" >&6; }
- 
-     WARN_CFLAGS="$warning_flags $complCFLAGS"
- 
-@@ -23883,8 +23605,8 @@ $as_echo "$complCFLAGS" >&6; }
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for X" >&5
--$as_echo_n "checking for X... " >&6; }
-+{ echo "$as_me:$LINENO: checking for X" >&5
-+echo $ECHO_N "checking for X... $ECHO_C" >&6; }
- 
- 
- # Check whether --with-x was given.
-@@ -23898,11 +23620,11 @@ if test "x$with_x" = xno; then
+@@ -23898,8 +23911,8 @@ if test "x$with_x" = xno; then
    have_x=disabled
  else
    case $x_includes,$x_libraries in #(
 -    *\'*) { { $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;}
-+    *\'*) { { 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
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
+@@ -23937,7 +23950,7 @@ _ACEOF
+ 	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
+     esac
+     case $ac_im_usrlibdir in
+-	/usr/lib | /lib) ;;
++	/usr/lib | /usr/lib64 | /lib | /lib64) ;;
+ 	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
+     esac
+   fi
+@@ -24377,7 +24390,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
+-if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
++if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+ 
+@@ -24447,7 +24460,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
+-if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
++if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+ fi
+ 
+@@ -24619,7 +24632,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
+-if test $ac_cv_lib_nsl_gethostbyname = yes; then
++if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+ 
+@@ -24689,7 +24702,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
+-if test $ac_cv_lib_bsd_gethostbyname = yes; then
++if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+ fi
+ 
+@@ -24855,7 +24868,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $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
++if test "x$ac_cv_lib_socket_connect" = x""yes; then
+   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+ fi
+ 
+@@ -25014,7 +25027,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $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
++if test "x$ac_cv_lib_posix_remove" = x""yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+ fi
+ 
+@@ -25173,7 +25186,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $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
++if test "x$ac_cv_lib_ipc_shmat" = x""yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+ fi
+ 
+@@ -25254,7 +25267,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $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
++if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then
+   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+ fi
+ 
+@@ -25349,7 +25362,7 @@ rm -f core conftest.err conftest.$ac_obj
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_func_XScreenSaverQueryInfo" >&5
+ $as_echo "$ac_cv_func_XScreenSaverQueryInfo" >&6; }
+-if test $ac_cv_func_XScreenSaverQueryInfo = yes; then
++if test "x$ac_cv_func_XScreenSaverQueryInfo" = x""yes; then
+ 
+   TYPING_BREAK="typing-break"
  else
-   # One or both of the vars are not set, and there is no cached value.
- ac_x_includes=no ac_x_libraries=no
-@@ -23923,7 +23645,7 @@ _ACEOF
-       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 dylib la dll; do
-+    for ac_extension in a so sl; do
-       if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
- 	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
- 	ac_im_usrlibdir=$ac_im_libdir; break
-@@ -23998,14 +23720,13 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -24013,7 +23734,7 @@ $as_echo "$ac_try_echo") >&5
-   # We can compile using X headers with no special include directory.
- ac_x_includes=
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   for ac_dir in $ac_x_header_dirs; do
-@@ -24054,33 +23775,30 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   LIBS=$ac_save_LIBS
- # We can link X programs with no special library path.
- ac_x_libraries=
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	LIBS=$ac_save_LIBS
--for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
-+for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
- do
-   # Don't even attempt the hair of trying to link an X program!
--  for ac_extension in a so sl dylib la dll; do
-+  for ac_extension in a so sl; do
-     if test -r "$ac_dir/libX11.$ac_extension"; then
-       ac_x_libraries=$ac_dir
-       break 2
-@@ -24089,7 +23807,6 @@ do
- 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
-@@ -24112,8 +23829,8 @@ fi
- fi # $with_x != no
- 
- if test "$have_x" != yes; then
--  { $as_echo "$as_me:$LINENO: result: $have_x" >&5
--$as_echo "$have_x" >&6; }
-+  { echo "$as_me:$LINENO: result: $have_x" >&5
-+echo "${ECHO_T}$have_x" >&6; }
-   no_x=yes
- else
-   # If each of the values was on the command line, it overrides each guess.
-@@ -24123,8 +23840,8 @@ else
-   ac_cv_have_x="have_x=yes\
- 	ac_x_includes='$x_includes'\
- 	ac_x_libraries='$x_libraries'"
--  { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
--$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
-+  { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
-+echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; }
- fi
- 
- if test "$no_x" = yes; then
-@@ -24145,8 +23862,8 @@ else
-     X_LIBS="$X_LIBS -L$x_libraries"
-     # For Solaris; some versions of Sun CC require a space after -R and
-     # others require no space.  Words are not sufficient . . . .
--    { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
--$as_echo_n "checking whether -R must be followed by a space... " >&6; }
-+    { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
-+echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; }
-     ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
-     ac_xsave_c_werror_flag=$ac_c_werror_flag
-     ac_c_werror_flag=yes
-@@ -24171,26 +23888,23 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && 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; }
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-        X_LIBS="$X_LIBS -R$x_libraries"
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	LIBS="$ac_xsave_LIBS -R $x_libraries"
-@@ -24215,38 +23929,33 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && 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; }
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- 	  X_LIBS="$X_LIBS -R $x_libraries"
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	{ $as_echo "$as_me:$LINENO: result: neither works" >&5
--$as_echo "neither works" >&6; }
-+	{ echo "$as_me:$LINENO: result: neither works" >&5
-+echo "${ECHO_T}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
-@@ -24292,30 +24001,27 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   :
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	{ $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
--$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
-+	{ echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
-+echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldnet  $LIBS"
-@@ -24347,45 +24053,41 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_dnet_dnet_ntoa=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
--$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-+echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; }
- if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
- fi
- 
-     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
--      { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
--$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
-+      { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
-+echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldnet_stub  $LIBS"
-@@ -24417,36 +24119,32 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_dnet_stub_dnet_ntoa=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
--$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-+echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
- if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
- fi
-@@ -24454,7 +24152,6 @@ fi
-     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"
-@@ -24467,10 +24164,10 @@ rm -f core conftest.err conftest.$ac_obj
-     # on Irix 5.2, according to T.E. Dickey.
-     # The functions gethostbyname, getservbyname, and inet_addr are
-     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
--    { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5
--$as_echo_n "checking for gethostbyname... " >&6; }
-+    { echo "$as_me:$LINENO: checking for gethostbyname" >&5
-+echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; }
- if test "${ac_cv_func_gethostbyname+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -24523,41 +24220,37 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_func_gethostbyname=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
--$as_echo "$ac_cv_func_gethostbyname" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; }
- 
-     if test $ac_cv_func_gethostbyname = no; then
--      { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
--$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
-+      { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
-+echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lnsl  $LIBS"
-@@ -24589,45 +24282,41 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_nsl_gethostbyname=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
--$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; }
- if test $ac_cv_lib_nsl_gethostbyname = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
- fi
- 
-       if test $ac_cv_lib_nsl_gethostbyname = no; then
--	{ $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
--$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
-+	{ echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
-+echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; }
- if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd  $LIBS"
-@@ -24659,36 +24348,32 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_bsd_gethostbyname=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
--$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; }
- if test $ac_cv_lib_bsd_gethostbyname = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
- fi
-@@ -24703,10 +24388,10 @@ fi
-     # variants that don't use the name server (or something).  -lsocket
-     # must be given before -lnsl if both are needed.  We assume that
-     # if connect needs -lnsl, so does gethostbyname.
--    { $as_echo "$as_me:$LINENO: checking for connect" >&5
--$as_echo_n "checking for connect... " >&6; }
-+    { echo "$as_me:$LINENO: checking for connect" >&5
-+echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
- if test "${ac_cv_func_connect+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -24759,41 +24444,37 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_func_connect=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
--$as_echo "$ac_cv_func_connect" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-+echo "${ECHO_T}$ac_cv_func_connect" >&6; }
- 
-     if test $ac_cv_func_connect = no; then
--      { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
--$as_echo_n "checking for connect in -lsocket... " >&6; }
-+      { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
- if test "${ac_cv_lib_socket_connect+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-@@ -24825,36 +24506,32 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_socket_connect=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
--$as_echo "$ac_cv_lib_socket_connect" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
- if test $ac_cv_lib_socket_connect = yes; then
-   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
- fi
-@@ -24862,10 +24539,10 @@ fi
-     fi
- 
-     # Guillermo Gomez says -lposix is necessary on A/UX.
--    { $as_echo "$as_me:$LINENO: checking for remove" >&5
--$as_echo_n "checking for remove... " >&6; }
-+    { echo "$as_me:$LINENO: checking for remove" >&5
-+echo $ECHO_N "checking for remove... $ECHO_C" >&6; }
- if test "${ac_cv_func_remove+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -24918,41 +24595,37 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_func_remove=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_func_remove=no
- fi
- 
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
--$as_echo "$ac_cv_func_remove" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-+echo "${ECHO_T}$ac_cv_func_remove" >&6; }
- 
-     if test $ac_cv_func_remove = no; then
--      { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
--$as_echo_n "checking for remove in -lposix... " >&6; }
-+      { echo "$as_me:$LINENO: checking for remove in -lposix" >&5
-+echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; }
- if test "${ac_cv_lib_posix_remove+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lposix  $LIBS"
-@@ -24984,36 +24657,32 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_posix_remove=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
--$as_echo "$ac_cv_lib_posix_remove" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
-+echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; }
- if test $ac_cv_lib_posix_remove = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
- fi
-@@ -25021,10 +24690,10 @@ fi
-     fi
- 
-     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
--    { $as_echo "$as_me:$LINENO: checking for shmat" >&5
--$as_echo_n "checking for shmat... " >&6; }
-+    { echo "$as_me:$LINENO: checking for shmat" >&5
-+echo $ECHO_N "checking for shmat... $ECHO_C" >&6; }
- if test "${ac_cv_func_shmat+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -25077,41 +24746,37 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_func_shmat=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
--$as_echo "$ac_cv_func_shmat" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-+echo "${ECHO_T}$ac_cv_func_shmat" >&6; }
- 
-     if test $ac_cv_func_shmat = no; then
--      { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
--$as_echo_n "checking for shmat in -lipc... " >&6; }
-+      { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
-+echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; }
- if test "${ac_cv_lib_ipc_shmat+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lipc  $LIBS"
-@@ -25143,36 +24808,32 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_ipc_shmat=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
--$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
-+echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; }
- if test $ac_cv_lib_ipc_shmat = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
- fi
-@@ -25189,10 +24850,10 @@ fi
-   # These have to be linked with before -lX11, unlike the other
-   # libraries we check for below, so use a different variable.
-   # John Interrante, Karl Berry
--  { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
--$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
-+  { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
-+echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; }
- if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-@@ -25224,36 +24885,32 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_ICE_IceConnectionNumber=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
--$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-+echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
- if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
-   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
- fi
-@@ -25264,10 +24921,10 @@ fi
- 
- x_libs="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
- 
--{ $as_echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo" >&5
--$as_echo_n "checking for XScreenSaverQueryInfo... " >&6; }
-+{ echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo" >&5
-+echo $ECHO_N "checking for XScreenSaverQueryInfo... $ECHO_C" >&6; }
- if test "${ac_cv_func_XScreenSaverQueryInfo+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -25320,35 +24977,31 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_func_XScreenSaverQueryInfo=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_func_XScreenSaverQueryInfo=no
- fi
- 
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XScreenSaverQueryInfo" >&5
--$as_echo "$ac_cv_func_XScreenSaverQueryInfo" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_XScreenSaverQueryInfo" >&5
-+echo "${ECHO_T}$ac_cv_func_XScreenSaverQueryInfo" >&6; }
- if test $ac_cv_func_XScreenSaverQueryInfo = yes; then
- 
-   TYPING_BREAK="typing-break"
-@@ -25356,10 +25009,10 @@ else
- 
-   save_LIBS=$LIBS
-   LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lXss -lXext -lX11"
--  { $as_echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXss" >&5
--$as_echo_n "checking for XScreenSaverQueryInfo in -lXss... " >&6; }
-+  { echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXss" >&5
-+echo $ECHO_N "checking for XScreenSaverQueryInfo in -lXss... $ECHO_C" >&6; }
- if test "${ac_cv_lib_Xss_XScreenSaverQueryInfo+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lXss  $LIBS"
-@@ -25391,36 +25044,32 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_Xss_XScreenSaverQueryInfo=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_Xss_XScreenSaverQueryInfo=no
- fi
- 
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xss_XScreenSaverQueryInfo" >&5
--$as_echo "$ac_cv_lib_Xss_XScreenSaverQueryInfo" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xss_XScreenSaverQueryInfo" >&5
-+echo "${ECHO_T}$ac_cv_lib_Xss_XScreenSaverQueryInfo" >&6; }
- if test $ac_cv_lib_Xss_XScreenSaverQueryInfo = yes; then
+@@ -25421,7 +25434,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xss_XScreenSaverQueryInfo" >&5
+ $as_echo "$ac_cv_lib_Xss_XScreenSaverQueryInfo" >&6; }
+-if test $ac_cv_lib_Xss_XScreenSaverQueryInfo = yes; then
++if test "x$ac_cv_lib_Xss_XScreenSaverQueryInfo" = x""yes; then
  
      TYPING_BREAK="typing-break"
-@@ -25429,10 +25078,10 @@ else
- 
-     LIBS=$save_LIBS
-     LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lXext -lX11"
--    { $as_echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXext" >&5
--$as_echo_n "checking for XScreenSaverQueryInfo in -lXext... " >&6; }
-+    { echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXext" >&5
-+echo $ECHO_N "checking for XScreenSaverQueryInfo in -lXext... $ECHO_C" >&6; }
- if test "${ac_cv_lib_Xext_XScreenSaverQueryInfo+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lXext  $LIBS"
-@@ -25464,36 +25113,32 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_Xext_XScreenSaverQueryInfo=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_Xext_XScreenSaverQueryInfo=no
- fi
- 
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XScreenSaverQueryInfo" >&5
--$as_echo "$ac_cv_lib_Xext_XScreenSaverQueryInfo" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XScreenSaverQueryInfo" >&5
-+echo "${ECHO_T}$ac_cv_lib_Xext_XScreenSaverQueryInfo" >&6; }
- if test $ac_cv_lib_Xext_XScreenSaverQueryInfo = yes; then
+     SCREENSAVER_LIBS="$X_PRE_LIBS $X_LIBS -lXss -lXext -lX11"
+@@ -25494,7 +25507,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XScreenSaverQueryInfo" >&5
+ $as_echo "$ac_cv_lib_Xext_XScreenSaverQueryInfo" >&6; }
+-if test $ac_cv_lib_Xext_XScreenSaverQueryInfo = yes; then
++if test "x$ac_cv_lib_Xext_XScreenSaverQueryInfo" = x""yes; then
  
        TYPING_BREAK="typing-break"
-@@ -25522,21 +25167,20 @@ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
- 
- for ac_header in X11/Xlib.h
- do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
-   # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
--$as_echo_n "checking $ac_header usability... " >&6; }
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -25552,33 +25196,32 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
-        } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
--$as_echo_n "checking $ac_header presence... " >&6; }
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -25592,52 +25235,51 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   ac_header_preproc=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { $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;}
-+    { 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;}
-     ( cat <<\_ASBOX
- ## ----------------------------------------------------------------------------------- ##
- ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center ##
-@@ -25646,33 +25288,31 @@ _ASBOX
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
--{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
+       SCREENSAVER_LIBS="$X_PRE_LIBS $X_LIBS -lXext -lX11"
+@@ -25659,8 +25672,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$ac_res" >&6; }
  
  fi
 -if test `eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'` = yes; then
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
++as_val=`eval 'as_val=${'$as_ac_Header'}
++		 $as_echo "$as_val"'`
++   if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
- 
- fi
- 
- done
- 
--{ $as_echo "$as_me:$LINENO: checking for XF86MiscQueryExtension in -lXxf86misc" >&5
--$as_echo_n "checking for XF86MiscQueryExtension in -lXxf86misc... " >&6; }
-+{ echo "$as_me:$LINENO: checking for XF86MiscQueryExtension in -lXxf86misc" >&5
-+echo $ECHO_N "checking for XF86MiscQueryExtension in -lXxf86misc... $ECHO_C" >&6; }
- if test "${ac_cv_lib_Xxf86misc_XF86MiscQueryExtension+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lXxf86misc  $LIBS"
-@@ -25704,46 +25344,42 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_Xxf86misc_XF86MiscQueryExtension=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_Xxf86misc_XF86MiscQueryExtension=no
- fi
- 
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86misc_XF86MiscQueryExtension" >&5
--$as_echo "$ac_cv_lib_Xxf86misc_XF86MiscQueryExtension" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86misc_XF86MiscQueryExtension" >&5
-+echo "${ECHO_T}$ac_cv_lib_Xxf86misc_XF86MiscQueryExtension" >&6; }
- if test $ac_cv_lib_Xxf86misc_XF86MiscQueryExtension = yes; then
+@@ -25734,7 +25748,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86misc_XF86MiscQueryExtension" >&5
+ $as_echo "$ac_cv_lib_Xxf86misc_XF86MiscQueryExtension" >&6; }
+-if test $ac_cv_lib_Xxf86misc_XF86MiscQueryExtension = yes; then
++if test "x$ac_cv_lib_Xxf86misc_XF86MiscQueryExtension" = x""yes; then
  
  
  for ac_header in X11/extensions/xf86misc.h
- do
--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; }
-+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; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -25764,21 +25400,20 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
-        } && test -s conftest.$ac_objext; then
-   eval "$as_ac_Header=yes"
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_Header=no"
-@@ -25786,14 +25421,12 @@ fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
+@@ -25790,8 +25804,9 @@ 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
-+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
++as_val=`eval 'as_val=${'$as_ac_Header'}
++		 $as_echo "$as_val"'`
++   if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-  XF86MISC_LIBS="-lXxf86misc"
- fi
-@@ -25806,21 +25439,20 @@ fi
- 
- for ac_header in X11/extensions/XKB.h
- do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
-   # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
--$as_echo_n "checking $ac_header usability... " >&6; }
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -25836,33 +25468,32 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
-        } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
--$as_echo_n "checking $ac_header presence... " >&6; }
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -25876,52 +25507,51 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   ac_header_preproc=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  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
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { $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;}
-+    { 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;}
-     ( cat <<\_ASBOX
- ## ----------------------------------------------------------------------------------- ##
- ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center ##
-@@ -25930,23 +25560,21 @@ _ASBOX
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
--{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
+@@ -25943,8 +25958,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$ac_res" >&6; }
  
  fi
 -if test `eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'` = yes; then
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
++as_val=`eval 'as_val=${'$as_ac_Header'}
++		 $as_echo "$as_val"'`
++   if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
- 
- fi
-@@ -25956,53 +25584,47 @@ done
+@@ -25956,133 +25972,17 @@ done
  CPPFLAGS=$savecppflags
  
  
@@ -23134,324 +13642,33 @@
  pkg_failed=no
 -{ $as_echo "$as_me:$LINENO: checking for LIBSLAB" >&5
 -$as_echo_n "checking for LIBSLAB... " >&6; }
-+{ echo "$as_me:$LINENO: checking for CAPPLET" >&5
-+echo $ECHO_N "checking for CAPPLET... $ECHO_C" >&6; }
- 
+-
 -if test -n "$LIBSLAB_CFLAGS"; then
 -    pkg_cv_LIBSLAB_CFLAGS="$LIBSLAB_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
 -    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0\"") >&5
 -  ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0") 2>&5
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$CAPPLET_CFLAGS"; then
-+        pkg_cv_CAPPLET_CFLAGS="$CAPPLET_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES") 2>&5
-   ac_status=$?
+-  ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+-  (exit $ac_status); }; then
 -  pkg_cv_LIBSLAB_CFLAGS=`$PKG_CONFIG --cflags "$COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0" 2>/dev/null`
-+  pkg_cv_CAPPLET_CFLAGS=`$PKG_CONFIG --cflags "$COMMON_MODULES" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
+-else
+-  pkg_failed=yes
+-fi
 - else
 -    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
+-fi
 -if test -n "$LIBSLAB_LIBS"; then
 -    pkg_cv_LIBSLAB_LIBS="$LIBSLAB_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
 -    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0\"") >&5
 -  ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0") 2>&5
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$CAPPLET_LIBS"; then
-+        pkg_cv_CAPPLET_LIBS="$CAPPLET_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES") 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_LIBSLAB_LIBS=`$PKG_CONFIG --libs "$COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0" 2>/dev/null`
-+  pkg_cv_CAPPLET_LIBS=`$PKG_CONFIG --libs "$COMMON_MODULES" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -26015,101 +25637,105 @@ else
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        LIBSLAB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0" 2>&1`
-+	        CAPPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$COMMON_MODULES"`
-         else
--	        LIBSLAB_PKG_ERRORS=`$PKG_CONFIG --print-errors "$COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0" 2>&1`
-+	        CAPPLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$COMMON_MODULES"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
--	echo "$LIBSLAB_PKG_ERRORS" >&5
-+	echo "$CAPPLET_PKG_ERRORS" >&5
- 
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0) were not met:
-+	{ { echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES) were not met:
- 
--$LIBSLAB_PKG_ERRORS
-+$CAPPLET_PKG_ERRORS
- 
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
- installed software in a non-standard prefix.
- 
--Alternatively, you may set the environment variables LIBSLAB_CFLAGS
--and LIBSLAB_LIBS to avoid the need to call pkg-config.
-+Alternatively, you may set the environment variables CAPPLET_CFLAGS
-+and CAPPLET_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements ($COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0) were not met:
-+echo "$as_me: error: Package requirements ($COMMON_MODULES) were not met:
- 
--$LIBSLAB_PKG_ERRORS
-+$CAPPLET_PKG_ERRORS
- 
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
- installed software in a non-standard prefix.
- 
--Alternatively, you may set the environment variables LIBSLAB_CFLAGS
--and LIBSLAB_LIBS to avoid the need to call pkg-config.
-+Alternatively, you may set the environment variables CAPPLET_CFLAGS
-+and CAPPLET_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&2;}
-    { (exit 1); exit 1; }; }
- elif test $pkg_failed = untried; then
--	{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-+	{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
- 
--Alternatively, you may set the environment variables LIBSLAB_CFLAGS
--and LIBSLAB_LIBS to avoid the need to call pkg-config.
-+Alternatively, you may set the environment variables CAPPLET_CFLAGS
-+and CAPPLET_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- 
- To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-+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.
- 
--Alternatively, you may set the environment variables LIBSLAB_CFLAGS
--and LIBSLAB_LIBS to avoid the need to call pkg-config.
-+Alternatively, you may set the environment variables CAPPLET_CFLAGS
-+and CAPPLET_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- 
- To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
- else
--	LIBSLAB_CFLAGS=$pkg_cv_LIBSLAB_CFLAGS
--	LIBSLAB_LIBS=$pkg_cv_LIBSLAB_LIBS
--        { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+	CAPPLET_CFLAGS=$pkg_cv_CAPPLET_CFLAGS
-+	CAPPLET_LIBS=$pkg_cv_CAPPLET_LIBS
-+        { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- 	:
- fi
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for CAPPLET" >&5
--$as_echo_n "checking for CAPPLET... " >&6; }
-+{ echo "$as_me:$LINENO: checking for GNOMECC" >&5
-+echo $ECHO_N "checking for GNOMECC... $ECHO_C" >&6; }
- 
--if test -n "$CAPPLET_CFLAGS"; then
--    pkg_cv_CAPPLET_CFLAGS="$CAPPLET_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
--  ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES") 2>&5
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$GNOMECC_CFLAGS"; then
-+        pkg_cv_GNOMECC_CFLAGS="$GNOMECC_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0") 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_CAPPLET_CFLAGS=`$PKG_CONFIG --cflags "$COMMON_MODULES" 2>/dev/null`
-+  pkg_cv_GNOMECC_CFLAGS=`$PKG_CONFIG --cflags "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$CAPPLET_LIBS"; then
--    pkg_cv_CAPPLET_LIBS="$CAPPLET_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
--  ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES") 2>&5
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$GNOMECC_LIBS"; then
-+        pkg_cv_GNOMECC_LIBS="$GNOMECC_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0") 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_CAPPLET_LIBS=`$PKG_CONFIG --libs "$COMMON_MODULES" 2>/dev/null`
-+  pkg_cv_GNOMECC_LIBS=`$PKG_CONFIG --libs "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -26122,155 +25748,48 @@ else
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        CAPPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$COMMON_MODULES" 2>&1`
-+	        GNOMECC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0"`
-         else
--	        CAPPLET_PKG_ERRORS=`$PKG_CONFIG --print-errors "$COMMON_MODULES" 2>&1`
-+	        GNOMECC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
--	echo "$CAPPLET_PKG_ERRORS" >&5
-+	echo "$GNOMECC_PKG_ERRORS" >&5
- 
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES) were not met:
-+	{ { echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0) were not met:
- 
--$CAPPLET_PKG_ERRORS
-+$GNOMECC_PKG_ERRORS
- 
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
- installed software in a non-standard prefix.
- 
--Alternatively, you may set the environment variables CAPPLET_CFLAGS
--and CAPPLET_LIBS to avoid the need to call pkg-config.
-+Alternatively, you may set the environment variables GNOMECC_CFLAGS
-+and GNOMECC_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements ($COMMON_MODULES) were not met:
-+echo "$as_me: error: Package requirements ($COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0) were not met:
- 
--$CAPPLET_PKG_ERRORS
-+$GNOMECC_PKG_ERRORS
- 
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
- installed software in a non-standard prefix.
- 
--Alternatively, you may set the environment variables CAPPLET_CFLAGS
--and CAPPLET_LIBS to avoid the need to call pkg-config.
-+Alternatively, you may set the environment variables GNOMECC_CFLAGS
-+and GNOMECC_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&2;}
-    { (exit 1); exit 1; }; }
- elif test $pkg_failed = untried; then
--	{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-+	{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
- 
--Alternatively, you may set the environment variables CAPPLET_CFLAGS
--and CAPPLET_LIBS to avoid the need to call pkg-config.
-+Alternatively, you may set the environment variables GNOMECC_CFLAGS
-+and GNOMECC_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- 
- To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
--
--Alternatively, you may set the environment variables CAPPLET_CFLAGS
--and CAPPLET_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--else
--	CAPPLET_CFLAGS=$pkg_cv_CAPPLET_CFLAGS
--	CAPPLET_LIBS=$pkg_cv_CAPPLET_LIBS
--        { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
--	:
--fi
--
--pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for GNOMECC" >&5
--$as_echo_n "checking for GNOMECC... " >&6; }
--
--if test -n "$GNOMECC_CFLAGS"; then
--    pkg_cv_GNOMECC_CFLAGS="$GNOMECC_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0\"") >&5
--  ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0") 2>&5
 -  ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; then
--  pkg_cv_GNOMECC_CFLAGS=`$PKG_CONFIG --cflags "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
-- else
--    pkg_failed=untried
--fi
--if test -n "$GNOMECC_LIBS"; then
--    pkg_cv_GNOMECC_LIBS="$GNOMECC_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0\"") >&5
--  ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
--  pkg_cv_GNOMECC_LIBS=`$PKG_CONFIG --libs "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0" 2>/dev/null`
+-  pkg_cv_LIBSLAB_LIBS=`$PKG_CONFIG --libs "$COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0" 2>/dev/null`
 -else
 -  pkg_failed=yes
 -fi
@@ -23469,33 +13686,33 @@
 -        _pkg_short_errors_supported=no
 -fi
 -        if test $_pkg_short_errors_supported = yes; then
--	        GNOMECC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0" 2>&1`
+-	        LIBSLAB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0" 2>&1`
 -        else
--	        GNOMECC_PKG_ERRORS=`$PKG_CONFIG --print-errors "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0" 2>&1`
+-	        LIBSLAB_PKG_ERRORS=`$PKG_CONFIG --print-errors "$COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0" 2>&1`
 -        fi
 -	# Put the nasty error message in config.log where it belongs
--	echo "$GNOMECC_PKG_ERRORS" >&5
+-	echo "$LIBSLAB_PKG_ERRORS" >&5
 -
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0) were not met:
+-	{ { $as_echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0) were not met:
 -
--$GNOMECC_PKG_ERRORS
+-$LIBSLAB_PKG_ERRORS
 -
 -Consider adjusting the PKG_CONFIG_PATH environment variable if you
 -installed software in a non-standard prefix.
 -
--Alternatively, you may set the environment variables GNOMECC_CFLAGS
--and GNOMECC_LIBS to avoid the need to call pkg-config.
+-Alternatively, you may set the environment variables LIBSLAB_CFLAGS
+-and LIBSLAB_LIBS to avoid the need to call pkg-config.
 -See the pkg-config man page for more details.
 -" >&5
--$as_echo "$as_me: error: Package requirements ($COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0) were not met:
+-$as_echo "$as_me: error: Package requirements ($COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0) were not met:
 -
--$GNOMECC_PKG_ERRORS
+-$LIBSLAB_PKG_ERRORS
 -
 -Consider adjusting the PKG_CONFIG_PATH environment variable if you
 -installed software in a non-standard prefix.
 -
--Alternatively, you may set the environment variables GNOMECC_CFLAGS
--and GNOMECC_LIBS to avoid the need to call pkg-config.
+-Alternatively, you may set the environment variables LIBSLAB_CFLAGS
+-and LIBSLAB_LIBS to avoid the need to call pkg-config.
 -See the pkg-config man page for more details.
 -" >&2;}
 -   { (exit 1); exit 1; }; }
@@ -23504,51 +13721,212 @@
 -is in your PATH or set the PKG_CONFIG environment variable to the full
 -path to pkg-config.
 -
--Alternatively, you may set the environment variables GNOMECC_CFLAGS
--and GNOMECC_LIBS to avoid the need to call pkg-config.
+-Alternatively, you may set the environment variables LIBSLAB_CFLAGS
+-and LIBSLAB_LIBS to avoid the need to call pkg-config.
 -See the pkg-config man page for more details.
 -
 -To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 -See \`config.log' for more details." >&5
 -$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-+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.
+-
+-Alternatively, you may set the environment variables LIBSLAB_CFLAGS
+-and LIBSLAB_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+-	LIBSLAB_CFLAGS=$pkg_cv_LIBSLAB_CFLAGS
+-	LIBSLAB_LIBS=$pkg_cv_LIBSLAB_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+-	:
+-fi
+-
+-pkg_failed=no
+ { $as_echo "$as_me:$LINENO: checking for CAPPLET" >&5
+ $as_echo_n "checking for CAPPLET... " >&6; }
+ 
+-if test -n "$CAPPLET_CFLAGS"; then
+-    pkg_cv_CAPPLET_CFLAGS="$CAPPLET_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++    if test -n "$CAPPLET_CFLAGS"; then
++        pkg_cv_CAPPLET_CFLAGS="$CAPPLET_CFLAGS"
++    else
++        if test -n "$PKG_CONFIG" && \
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
+   ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES") 2>&5
+   ac_status=$?
+@@ -26092,13 +25992,15 @@ if test -n "$CAPPLET_CFLAGS"; then
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+-if test -n "$CAPPLET_LIBS"; then
+-    pkg_cv_CAPPLET_LIBS="$CAPPLET_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++    if test -n "$CAPPLET_LIBS"; then
++        pkg_cv_CAPPLET_LIBS="$CAPPLET_LIBS"
++    else
++        if test -n "$PKG_CONFIG" && \
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
+   ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES") 2>&5
+   ac_status=$?
+@@ -26108,8 +26010,9 @@ if test -n "$CAPPLET_LIBS"; then
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -26122,9 +26025,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        CAPPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$COMMON_MODULES" 2>&1`
++	        CAPPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$COMMON_MODULES"`
+         else
+-	        CAPPLET_PKG_ERRORS=`$PKG_CONFIG --print-errors "$COMMON_MODULES" 2>&1`
++	        CAPPLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$COMMON_MODULES"`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$CAPPLET_PKG_ERRORS" >&5
+@@ -26153,7 +26056,9 @@ See the pkg-config man page for more det
+ " >&2;}
+    { (exit 1); exit 1; }; }
+ elif test $pkg_failed = untried; then
+-	{ { $as_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: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -26284,46 +25803,50 @@ See \`config.log' for more details." >&2
+@@ -26173,7 +26078,7 @@ See the pkg-config man page for more det
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
+ else
+ 	CAPPLET_CFLAGS=$pkg_cv_CAPPLET_CFLAGS
+ 	CAPPLET_LIBS=$pkg_cv_CAPPLET_LIBS
+@@ -26186,10 +26091,11 @@ pkg_failed=no
+ { $as_echo "$as_me:$LINENO: checking for GNOMECC" >&5
+ $as_echo_n "checking for GNOMECC... " >&6; }
+ 
+-if test -n "$GNOMECC_CFLAGS"; then
+-    pkg_cv_GNOMECC_CFLAGS="$GNOMECC_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++    if test -n "$GNOMECC_CFLAGS"; then
++        pkg_cv_GNOMECC_CFLAGS="$GNOMECC_CFLAGS"
++    else
++        if test -n "$PKG_CONFIG" && \
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0\"") >&5
+   ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0") 2>&5
+   ac_status=$?
+@@ -26199,13 +26105,15 @@ if test -n "$GNOMECC_CFLAGS"; then
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+-if test -n "$GNOMECC_LIBS"; then
+-    pkg_cv_GNOMECC_LIBS="$GNOMECC_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++    if test -n "$GNOMECC_LIBS"; then
++        pkg_cv_GNOMECC_LIBS="$GNOMECC_LIBS"
++    else
++        if test -n "$PKG_CONFIG" && \
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0\"") >&5
+   ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0") 2>&5
+   ac_status=$?
+@@ -26215,8 +26123,9 @@ if test -n "$GNOMECC_LIBS"; then
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -26229,9 +26138,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        GNOMECC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0" 2>&1`
++	        GNOMECC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0"`
+         else
+-	        GNOMECC_PKG_ERRORS=`$PKG_CONFIG --print-errors "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0" 2>&1`
++	        GNOMECC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0"`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$GNOMECC_PKG_ERRORS" >&5
+@@ -26260,7 +26169,9 @@ See the pkg-config man page for more det
+ " >&2;}
+    { (exit 1); exit 1; }; }
+ elif test $pkg_failed = untried; then
+-	{ { $as_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: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+@@ -26280,7 +26191,7 @@ See the pkg-config man page for more det
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
  else
  	GNOMECC_CFLAGS=$pkg_cv_GNOMECC_CFLAGS
  	GNOMECC_LIBS=$pkg_cv_GNOMECC_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; }
- 	:
- fi
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for GNOME" >&5
--$as_echo_n "checking for GNOME... " >&6; }
-+{ echo "$as_me:$LINENO: checking for GNOME" >&5
-+echo $ECHO_N "checking for GNOME... $ECHO_C" >&6; }
+@@ -26293,10 +26204,11 @@ pkg_failed=no
+ { $as_echo "$as_me:$LINENO: checking for GNOME" >&5
+ $as_echo_n "checking for GNOME... " >&6; }
  
 -if test -n "$GNOME_CFLAGS"; then
 -    pkg_cv_GNOME_CFLAGS="$GNOME_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$GNOME_CFLAGS"; then
 +        pkg_cv_GNOME_CFLAGS="$GNOME_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0\"") >&5
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0\"") >&5
    ($PKG_CONFIG --exists --print-errors "libgnomeui-2.0") 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_GNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0" 2>/dev/null`
+@@ -26306,13 +26218,15 @@ if test -n "$GNOME_CFLAGS"; then
  else
    pkg_failed=yes
  fi
@@ -23562,19 +13940,15 @@
 -    pkg_cv_GNOME_LIBS="$GNOME_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$GNOME_LIBS"; then
 +        pkg_cv_GNOME_LIBS="$GNOME_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0\"") >&5
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0\"") >&5
    ($PKG_CONFIG --exists --print-errors "libgnomeui-2.0") 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_GNOME_LIBS=`$PKG_CONFIG --libs "libgnomeui-2.0" 2>/dev/null`
+@@ -26322,8 +26236,9 @@ if test -n "$GNOME_LIBS"; then
  else
    pkg_failed=yes
  fi
@@ -23586,7 +13960,7 @@
  fi
  
  
-@@ -26336,14 +25859,14 @@ else
+@@ -26336,9 +26251,9 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -23598,73 +13972,43 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$GNOME_PKG_ERRORS" >&5
- 
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libgnomeui-2.0) were not met:
-+	{ { echo "$as_me:$LINENO: error: Package requirements (libgnomeui-2.0) were not met:
- 
- $GNOME_PKG_ERRORS
- 
-@@ -26354,7 +25877,7 @@ Alternatively, you may set the environme
- and GNOME_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements (libgnomeui-2.0) were not met:
-+echo "$as_me: error: Package requirements (libgnomeui-2.0) were not met:
- 
- $GNOME_PKG_ERRORS
- 
-@@ -26367,7 +25890,7 @@ See the pkg-config man page for more det
+@@ -26367,7 +26282,9 @@ See the pkg-config man page for more det
  " >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
 -	{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-+	{ { 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: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -26377,7 +25900,7 @@ See the pkg-config man page for more det
+@@ -26387,7 +26304,7 @@ See the pkg-config man page for more det
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-+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.
- 
-@@ -26391,46 +25914,50 @@ See \`config.log' for more details." >&2
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
  else
  	GNOME_CFLAGS=$pkg_cv_GNOME_CFLAGS
  	GNOME_LIBS=$pkg_cv_GNOME_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; }
- 	:
- fi
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for DBUS" >&5
--$as_echo_n "checking for DBUS... " >&6; }
-+{ echo "$as_me:$LINENO: checking for DBUS" >&5
-+echo $ECHO_N "checking for DBUS... $ECHO_C" >&6; }
+@@ -26400,10 +26317,11 @@ pkg_failed=no
+ { $as_echo "$as_me:$LINENO: checking for DBUS" >&5
+ $as_echo_n "checking for DBUS... " >&6; }
  
 -if test -n "$DBUS_CFLAGS"; then
 -    pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 dbus-glib-1\"") >&5
 +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-glib-1\"") >&5
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 dbus-glib-1\"") >&5
    ($PKG_CONFIG --exists --print-errors "dbus-1 dbus-glib-1") 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_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 dbus-glib-1" 2>/dev/null`
+@@ -26413,13 +26331,15 @@ if test -n "$DBUS_CFLAGS"; then
  else
    pkg_failed=yes
  fi
@@ -23678,19 +14022,15 @@
 -    pkg_cv_DBUS_LIBS="$DBUS_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 dbus-glib-1\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$DBUS_LIBS"; then
 +        pkg_cv_DBUS_LIBS="$DBUS_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 dbus-glib-1\"") >&5
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 dbus-glib-1\"") >&5
    ($PKG_CONFIG --exists --print-errors "dbus-1 dbus-glib-1") 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_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 dbus-glib-1" 2>/dev/null`
+@@ -26429,8 +26349,9 @@ if test -n "$DBUS_LIBS"; then
  else
    pkg_failed=yes
  fi
@@ -23702,7 +14042,7 @@
  fi
  
  
-@@ -26443,14 +25970,14 @@ else
+@@ -26443,9 +26364,9 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -23714,73 +14054,48 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$DBUS_PKG_ERRORS" >&5
- 
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements (dbus-1 dbus-glib-1) were not met:
-+	{ { echo "$as_me:$LINENO: error: Package requirements (dbus-1 dbus-glib-1) were not met:
- 
- $DBUS_PKG_ERRORS
- 
-@@ -26461,7 +25988,7 @@ Alternatively, you may set the environme
- and DBUS_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements (dbus-1 dbus-glib-1) were not met:
-+echo "$as_me: error: Package requirements (dbus-1 dbus-glib-1) were not met:
- 
- $DBUS_PKG_ERRORS
- 
-@@ -26474,7 +26001,7 @@ See the pkg-config man page for more det
+@@ -26474,7 +26395,9 @@ See the pkg-config man page for more det
  " >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
 -	{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-+	{ { 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: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -26484,7 +26011,7 @@ See the pkg-config man page for more det
+@@ -26494,7 +26417,7 @@ See the pkg-config man page for more det
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-+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.
- 
-@@ -26498,46 +26025,50 @@ See \`config.log' for more details." >&2
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
  else
  	DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
  	DBUS_LIBS=$pkg_cv_DBUS_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; }
- 	:
- fi
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for GNOME_DESKTOP" >&5
--$as_echo_n "checking for GNOME_DESKTOP... " >&6; }
-+{ echo "$as_me:$LINENO: checking for GNOME_DESKTOP" >&5
-+echo $ECHO_N "checking for GNOME_DESKTOP... $ECHO_C" >&6; }
+@@ -26507,37 +26430,41 @@ pkg_failed=no
+ { $as_echo "$as_me:$LINENO: checking for GNOME_DESKTOP" >&5
+ $as_echo_n "checking for GNOME_DESKTOP... " >&6; }
  
 -if test -n "$GNOME_DESKTOP_CFLAGS"; then
 -    pkg_cv_GNOME_DESKTOP_CFLAGS="$GNOME_DESKTOP_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
 -    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-desktop-2.0\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "gnome-desktop-2.0") 2>&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$GNOME_DESKTOP_CFLAGS"; then
 +        pkg_cv_GNOME_DESKTOP_CFLAGS="$GNOME_DESKTOP_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-desktop-2.0\"") >&5
-   ($PKG_CONFIG --exists --print-errors "gnome-desktop-2.0") 2>&5
++    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-desktop-2.0 libgnomeui-2.0\"") >&5
++  ($PKG_CONFIG --exists --print-errors "gnome-desktop-2.0 libgnomeui-2.0") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
-   pkg_cv_GNOME_DESKTOP_CFLAGS=`$PKG_CONFIG --cflags "gnome-desktop-2.0" 2>/dev/null`
+-  pkg_cv_GNOME_DESKTOP_CFLAGS=`$PKG_CONFIG --cflags "gnome-desktop-2.0" 2>/dev/null`
++  pkg_cv_GNOME_DESKTOP_CFLAGS=`$PKG_CONFIG --cflags "gnome-desktop-2.0 libgnomeui-2.0" 2>/dev/null`
  else
    pkg_failed=yes
  fi
@@ -23795,18 +14110,19 @@
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
 -    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-desktop-2.0\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "gnome-desktop-2.0") 2>&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$GNOME_DESKTOP_LIBS"; then
 +        pkg_cv_GNOME_DESKTOP_LIBS="$GNOME_DESKTOP_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-desktop-2.0\"") >&5
-   ($PKG_CONFIG --exists --print-errors "gnome-desktop-2.0") 2>&5
++    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-desktop-2.0 libgnomeui-2.0\"") >&5
++  ($PKG_CONFIG --exists --print-errors "gnome-desktop-2.0 libgnomeui-2.0") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
-   pkg_cv_GNOME_DESKTOP_LIBS=`$PKG_CONFIG --libs "gnome-desktop-2.0" 2>/dev/null`
+-  pkg_cv_GNOME_DESKTOP_LIBS=`$PKG_CONFIG --libs "gnome-desktop-2.0" 2>/dev/null`
++  pkg_cv_GNOME_DESKTOP_LIBS=`$PKG_CONFIG --libs "gnome-desktop-2.0 libgnomeui-2.0" 2>/dev/null`
  else
    pkg_failed=yes
  fi
@@ -23818,85 +14134,70 @@
  fi
  
  
-@@ -26550,14 +26081,14 @@ else
+@@ -26550,14 +26477,14 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
 -	        GNOME_DESKTOP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnome-desktop-2.0" 2>&1`
-+	        GNOME_DESKTOP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-desktop-2.0"`
++	        GNOME_DESKTOP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-desktop-2.0 libgnomeui-2.0"`
          else
 -	        GNOME_DESKTOP_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnome-desktop-2.0" 2>&1`
-+	        GNOME_DESKTOP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-desktop-2.0"`
++	        GNOME_DESKTOP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-desktop-2.0 libgnomeui-2.0"`
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$GNOME_DESKTOP_PKG_ERRORS" >&5
  
 -	{ { $as_echo "$as_me:$LINENO: error: Package requirements (gnome-desktop-2.0) were not met:
-+	{ { echo "$as_me:$LINENO: error: Package requirements (gnome-desktop-2.0) were not met:
++	{ { $as_echo "$as_me:$LINENO: error: Package requirements (gnome-desktop-2.0 libgnomeui-2.0) were not met:
  
  $GNOME_DESKTOP_PKG_ERRORS
  
-@@ -26568,7 +26099,7 @@ Alternatively, you may set the environme
+@@ -26568,7 +26495,7 @@ Alternatively, you may set the environme
  and GNOME_DESKTOP_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  " >&5
 -$as_echo "$as_me: error: Package requirements (gnome-desktop-2.0) were not met:
-+echo "$as_me: error: Package requirements (gnome-desktop-2.0) were not met:
++$as_echo "$as_me: error: Package requirements (gnome-desktop-2.0 libgnomeui-2.0) were not met:
  
  $GNOME_DESKTOP_PKG_ERRORS
  
-@@ -26581,7 +26112,7 @@ See the pkg-config man page for more det
+@@ -26581,7 +26508,9 @@ See the pkg-config man page for more det
  " >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
 -	{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-+	{ { 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: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -26591,7 +26122,7 @@ See the pkg-config man page for more det
+@@ -26601,7 +26530,7 @@ See the pkg-config man page for more det
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-+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.
- 
-@@ -26605,46 +26136,50 @@ See \`config.log' for more details." >&2
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
  else
  	GNOME_DESKTOP_CFLAGS=$pkg_cv_GNOME_DESKTOP_CFLAGS
  	GNOME_DESKTOP_LIBS=$pkg_cv_GNOME_DESKTOP_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; }
- 	:
- fi
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for DEFAULT_APPLICATIONS_CAPPLET" >&5
--$as_echo_n "checking for DEFAULT_APPLICATIONS_CAPPLET... " >&6; }
-+{ echo "$as_me:$LINENO: checking for DEFAULT_APPLICATIONS_CAPPLET" >&5
-+echo $ECHO_N "checking for DEFAULT_APPLICATIONS_CAPPLET... $ECHO_C" >&6; }
+@@ -26614,10 +26543,11 @@ pkg_failed=no
+ { $as_echo "$as_me:$LINENO: checking for DEFAULT_APPLICATIONS_CAPPLET" >&5
+ $as_echo_n "checking for DEFAULT_APPLICATIONS_CAPPLET... " >&6; }
  
 -if test -n "$DEFAULT_APPLICATIONS_CAPPLET_CFLAGS"; then
 -    pkg_cv_DEFAULT_APPLICATIONS_CAPPLET_CFLAGS="$DEFAULT_APPLICATIONS_CAPPLET_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$DEFAULT_APPLICATIONS_CAPPLET_CFLAGS"; then
 +        pkg_cv_DEFAULT_APPLICATIONS_CAPPLET_CFLAGS="$DEFAULT_APPLICATIONS_CAPPLET_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\"") >&5
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\"") >&5
    ($PKG_CONFIG --exists --print-errors "libxml-2.0") 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_DEFAULT_APPLICATIONS_CAPPLET_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0" 2>/dev/null`
+@@ -26627,13 +26557,15 @@ if test -n "$DEFAULT_APPLICATIONS_CAPPLE
  else
    pkg_failed=yes
  fi
@@ -23910,19 +14211,15 @@
 -    pkg_cv_DEFAULT_APPLICATIONS_CAPPLET_LIBS="$DEFAULT_APPLICATIONS_CAPPLET_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$DEFAULT_APPLICATIONS_CAPPLET_LIBS"; then
 +        pkg_cv_DEFAULT_APPLICATIONS_CAPPLET_LIBS="$DEFAULT_APPLICATIONS_CAPPLET_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\"") >&5
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\"") >&5
    ($PKG_CONFIG --exists --print-errors "libxml-2.0") 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_DEFAULT_APPLICATIONS_CAPPLET_LIBS=`$PKG_CONFIG --libs "libxml-2.0" 2>/dev/null`
+@@ -26643,8 +26575,9 @@ if test -n "$DEFAULT_APPLICATIONS_CAPPLE
  else
    pkg_failed=yes
  fi
@@ -23934,7 +14231,7 @@
  fi
  
  
-@@ -26657,14 +26192,14 @@ else
+@@ -26657,9 +26590,9 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -23946,73 +14243,43 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$DEFAULT_APPLICATIONS_CAPPLET_PKG_ERRORS" >&5
- 
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libxml-2.0) were not met:
-+	{ { echo "$as_me:$LINENO: error: Package requirements (libxml-2.0) were not met:
- 
- $DEFAULT_APPLICATIONS_CAPPLET_PKG_ERRORS
- 
-@@ -26675,7 +26210,7 @@ Alternatively, you may set the environme
- and DEFAULT_APPLICATIONS_CAPPLET_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements (libxml-2.0) were not met:
-+echo "$as_me: error: Package requirements (libxml-2.0) were not met:
- 
- $DEFAULT_APPLICATIONS_CAPPLET_PKG_ERRORS
- 
-@@ -26688,7 +26223,7 @@ See the pkg-config man page for more det
+@@ -26688,7 +26621,9 @@ See the pkg-config man page for more det
  " >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
 -	{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-+	{ { 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: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -26698,7 +26233,7 @@ See the pkg-config man page for more det
+@@ -26708,7 +26643,7 @@ See the pkg-config man page for more det
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-+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.
- 
-@@ -26712,46 +26247,50 @@ See \`config.log' for more details." >&2
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
  else
  	DEFAULT_APPLICATIONS_CAPPLET_CFLAGS=$pkg_cv_DEFAULT_APPLICATIONS_CAPPLET_CFLAGS
  	DEFAULT_APPLICATIONS_CAPPLET_LIBS=$pkg_cv_DEFAULT_APPLICATIONS_CAPPLET_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; }
- 	:
- fi
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for METACITY" >&5
--$as_echo_n "checking for METACITY... " >&6; }
-+{ echo "$as_me:$LINENO: checking for METACITY" >&5
-+echo $ECHO_N "checking for METACITY... $ECHO_C" >&6; }
+@@ -26721,10 +26656,11 @@ pkg_failed=no
+ { $as_echo "$as_me:$LINENO: checking for METACITY" >&5
+ $as_echo_n "checking for METACITY... " >&6; }
  
 -if test -n "$METACITY_CFLAGS"; then
 -    pkg_cv_METACITY_CFLAGS="$METACITY_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libmetacity-private >= 2.23.1\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$METACITY_CFLAGS"; then
 +        pkg_cv_METACITY_CFLAGS="$METACITY_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libmetacity-private >= 2.23.1\"") >&5
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libmetacity-private >= 2.23.1\"") >&5
    ($PKG_CONFIG --exists --print-errors "libmetacity-private >= 2.23.1") 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_METACITY_CFLAGS=`$PKG_CONFIG --cflags "libmetacity-private >= 2.23.1" 2>/dev/null`
+@@ -26734,13 +26670,15 @@ if test -n "$METACITY_CFLAGS"; then
  else
    pkg_failed=yes
  fi
@@ -24026,19 +14293,15 @@
 -    pkg_cv_METACITY_LIBS="$METACITY_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libmetacity-private >= 2.23.1\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$METACITY_LIBS"; then
 +        pkg_cv_METACITY_LIBS="$METACITY_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libmetacity-private >= 2.23.1\"") >&5
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libmetacity-private >= 2.23.1\"") >&5
    ($PKG_CONFIG --exists --print-errors "libmetacity-private >= 2.23.1") 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_METACITY_LIBS=`$PKG_CONFIG --libs "libmetacity-private >= 2.23.1" 2>/dev/null`
+@@ -26750,8 +26688,9 @@ if test -n "$METACITY_LIBS"; then
  else
    pkg_failed=yes
  fi
@@ -24050,7 +14313,7 @@
  fi
  
  
-@@ -26764,14 +26303,14 @@ else
+@@ -26764,9 +26703,9 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -24062,65 +14325,42 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$METACITY_PKG_ERRORS" >&5
- 
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libmetacity-private >= 2.23.1) were not met:
-+	{ { echo "$as_me:$LINENO: error: Package requirements (libmetacity-private >= 2.23.1) were not met:
- 
- $METACITY_PKG_ERRORS
- 
-@@ -26782,7 +26321,7 @@ Alternatively, you may set the environme
- and METACITY_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements (libmetacity-private >= 2.23.1) were not met:
-+echo "$as_me: error: Package requirements (libmetacity-private >= 2.23.1) were not met:
- 
- $METACITY_PKG_ERRORS
- 
-@@ -26795,7 +26334,7 @@ See the pkg-config man page for more det
+@@ -26795,7 +26734,9 @@ See the pkg-config man page for more det
  " >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
 -	{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-+	{ { 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: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -26805,7 +26344,7 @@ See the pkg-config man page for more det
+@@ -26815,7 +26756,7 @@ See the pkg-config man page for more det
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-+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.
- 
-@@ -26819,46 +26358,161 @@ See \`config.log' for more details." >&2
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
  else
  	METACITY_CFLAGS=$pkg_cv_METACITY_CFLAGS
  	METACITY_LIBS=$pkg_cv_METACITY_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; }
- 	:
+@@ -26825,13 +26766,127 @@ $as_echo "yes" >&6; }
  fi
  
  pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for TYPING" >&5
--$as_echo_n "checking for TYPING... " >&6; }
-+{ echo "$as_me:$LINENO: checking for SLAB" >&5
-+echo $ECHO_N "checking for SLAB... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for SLAB" >&5
++$as_echo_n "checking for SLAB... " >&6; }
 +
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$SLAB_CFLAGS"; then
 +        pkg_cv_SLAB_CFLAGS="$SLAB_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libslab\"") >&5
++    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libslab\"") >&5
 +  ($PKG_CONFIG --exists --print-errors "libslab") 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_SLAB_CFLAGS=`$PKG_CONFIG --cflags "libslab" 2>/dev/null`
 +else
@@ -24135,10 +14375,10 @@
 +        pkg_cv_SLAB_LIBS="$SLAB_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libslab\"") >&5
++    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libslab\"") >&5
 +  ($PKG_CONFIG --exists --print-errors "libslab") 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_SLAB_LIBS=`$PKG_CONFIG --libs "libslab" 2>/dev/null`
 +else
@@ -24166,15 +14406,10 @@
 +	# Put the nasty error message in config.log where it belongs
 +	echo "$SLAB_PKG_ERRORS" >&5
 +
-+	{ { echo "$as_me:$LINENO: error: Package requirements (libslab) were not met:
++	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libslab) were not met:
 +
 +$SLAB_PKG_ERRORS
- 
--if test -n "$TYPING_CFLAGS"; then
--    pkg_cv_TYPING_CFLAGS="$TYPING_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 > 2.11 gconf-2.0 gtk+-2.0\"") >&5
++
 +Consider adjusting the PKG_CONFIG_PATH environment variable if you
 +installed software in a non-standard prefix.
 +
@@ -24182,7 +14417,7 @@
 +and SLAB_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 (libslab) were not met:
++$as_echo "$as_me: error: Package requirements (libslab) were not met:
 +
 +$SLAB_PKG_ERRORS
 +
@@ -24195,7 +14430,9 @@
 +" >&2;}
 +   { (exit 1); exit 1; }; }
 +elif test $pkg_failed = untried; then
-+	{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
++	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
 +is in your PATH or set the PKG_CONFIG environment variable to the full
 +path to pkg-config.
 +
@@ -24205,7 +14442,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.
 +
@@ -24215,31 +14452,32 @@
 +
 +To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 +See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
 +else
 +	SLAB_CFLAGS=$pkg_cv_SLAB_CFLAGS
 +	SLAB_LIBS=$pkg_cv_SLAB_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 TYPING" >&5
-+echo $ECHO_N "checking for TYPING... $ECHO_C" >&6; }
-+
+ { $as_echo "$as_me:$LINENO: checking for TYPING" >&5
+ $as_echo_n "checking for TYPING... " >&6; }
+ 
+-if test -n "$TYPING_CFLAGS"; then
+-    pkg_cv_TYPING_CFLAGS="$TYPING_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$TYPING_CFLAGS"; then
 +        pkg_cv_TYPING_CFLAGS="$TYPING_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 > 2.11 gconf-2.0 gtk+-2.0\"") >&5
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 > 2.11 gconf-2.0 gtk+-2.0\"") >&5
    ($PKG_CONFIG --exists --print-errors "glib-2.0 > 2.11 gconf-2.0 gtk+-2.0") 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_TYPING_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 > 2.11 gconf-2.0 gtk+-2.0" 2>/dev/null`
+@@ -26841,13 +26896,15 @@ if test -n "$TYPING_CFLAGS"; then
  else
    pkg_failed=yes
  fi
@@ -24253,19 +14491,15 @@
 -    pkg_cv_TYPING_LIBS="$TYPING_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 > 2.11 gconf-2.0 gtk+-2.0\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$TYPING_LIBS"; then
 +        pkg_cv_TYPING_LIBS="$TYPING_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 > 2.11 gconf-2.0 gtk+-2.0\"") >&5
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 > 2.11 gconf-2.0 gtk+-2.0\"") >&5
    ($PKG_CONFIG --exists --print-errors "glib-2.0 > 2.11 gconf-2.0 gtk+-2.0") 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_TYPING_LIBS=`$PKG_CONFIG --libs "glib-2.0 > 2.11 gconf-2.0 gtk+-2.0" 2>/dev/null`
+@@ -26857,8 +26914,9 @@ if test -n "$TYPING_LIBS"; then
  else
    pkg_failed=yes
  fi
@@ -24277,7 +14511,7 @@
  fi
  
  
-@@ -26871,14 +26525,14 @@ else
+@@ -26871,9 +26929,9 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -24289,73 +14523,43 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$TYPING_PKG_ERRORS" >&5
- 
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 > 2.11 gconf-2.0 gtk+-2.0) were not met:
-+	{ { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 > 2.11 gconf-2.0 gtk+-2.0) were not met:
- 
- $TYPING_PKG_ERRORS
- 
-@@ -26889,7 +26543,7 @@ Alternatively, you may set the environme
- and TYPING_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements (glib-2.0 > 2.11 gconf-2.0 gtk+-2.0) were not met:
-+echo "$as_me: error: Package requirements (glib-2.0 > 2.11 gconf-2.0 gtk+-2.0) were not met:
- 
- $TYPING_PKG_ERRORS
- 
-@@ -26902,7 +26556,7 @@ See the pkg-config man page for more det
+@@ -26902,7 +26960,9 @@ See the pkg-config man page for more det
  " >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
 -	{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-+	{ { 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: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -26912,7 +26566,7 @@ See the pkg-config man page for more det
+@@ -26922,7 +26982,7 @@ See the pkg-config man page for more det
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-+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.
- 
-@@ -26926,46 +26580,50 @@ See \`config.log' for more details." >&2
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
  else
  	TYPING_CFLAGS=$pkg_cv_TYPING_CFLAGS
  	TYPING_LIBS=$pkg_cv_TYPING_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; }
- 	:
- fi
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for GSD_DBUS" >&5
--$as_echo_n "checking for GSD_DBUS... " >&6; }
-+{ echo "$as_me:$LINENO: checking for GSD_DBUS" >&5
-+echo $ECHO_N "checking for GSD_DBUS... $ECHO_C" >&6; }
+@@ -26935,10 +26995,11 @@ pkg_failed=no
+ { $as_echo "$as_me:$LINENO: checking for GSD_DBUS" >&5
+ $as_echo_n "checking for GSD_DBUS... " >&6; }
  
 -if test -n "$GSD_DBUS_CFLAGS"; then
 -    pkg_cv_GSD_DBUS_CFLAGS="$GSD_DBUS_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-settings-daemon\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$GSD_DBUS_CFLAGS"; then
 +        pkg_cv_GSD_DBUS_CFLAGS="$GSD_DBUS_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=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   pkg_cv_GSD_DBUS_CFLAGS=`$PKG_CONFIG --cflags "gnome-settings-daemon" 2>/dev/null`
+@@ -26948,13 +27009,15 @@ if test -n "$GSD_DBUS_CFLAGS"; then
  else
    pkg_failed=yes
  fi
@@ -24369,19 +14573,15 @@
 -    pkg_cv_GSD_DBUS_LIBS="$GSD_DBUS_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-settings-daemon\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$GSD_DBUS_LIBS"; then
 +        pkg_cv_GSD_DBUS_LIBS="$GSD_DBUS_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=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   pkg_cv_GSD_DBUS_LIBS=`$PKG_CONFIG --libs "gnome-settings-daemon" 2>/dev/null`
+@@ -26964,8 +27027,9 @@ if test -n "$GSD_DBUS_LIBS"; then
  else
    pkg_failed=yes
  fi
@@ -24393,7 +14593,7 @@
  fi
  
  
-@@ -26978,14 +26636,14 @@ else
+@@ -26978,9 +27042,9 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -24405,73 +14605,43 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$GSD_DBUS_PKG_ERRORS" >&5
- 
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements (gnome-settings-daemon) were not met:
-+	{ { echo "$as_me:$LINENO: error: Package requirements (gnome-settings-daemon) were not met:
- 
- $GSD_DBUS_PKG_ERRORS
- 
-@@ -26996,7 +26654,7 @@ Alternatively, you may set the environme
- and GSD_DBUS_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements (gnome-settings-daemon) were not met:
-+echo "$as_me: error: Package requirements (gnome-settings-daemon) were not met:
- 
- $GSD_DBUS_PKG_ERRORS
- 
-@@ -27009,7 +26667,7 @@ See the pkg-config man page for more det
+@@ -27009,7 +27073,9 @@ See the pkg-config man page for more det
  " >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
 -	{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-+	{ { 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: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -27019,7 +26677,7 @@ See the pkg-config man page for more det
+@@ -27029,7 +27095,7 @@ See the pkg-config man page for more det
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-+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.
- 
-@@ -27033,46 +26691,50 @@ See \`config.log' for more details." >&2
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
  else
  	GSD_DBUS_CFLAGS=$pkg_cv_GSD_DBUS_CFLAGS
  	GSD_DBUS_LIBS=$pkg_cv_GSD_DBUS_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; }
- 	:
- fi
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for GIO" >&5
--$as_echo_n "checking for GIO... " >&6; }
-+{ echo "$as_me:$LINENO: checking for GIO" >&5
-+echo $ECHO_N "checking for GIO... $ECHO_C" >&6; }
+@@ -27042,10 +27108,11 @@ pkg_failed=no
+ { $as_echo "$as_me:$LINENO: checking for GIO" >&5
+ $as_echo_n "checking for GIO... " >&6; }
  
 -if test -n "$GIO_CFLAGS"; then
 -    pkg_cv_GIO_CFLAGS="$GIO_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gio-2.0\"") >&5
 +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\"") >&5
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gio-2.0\"") >&5
    ($PKG_CONFIG --exists --print-errors "gio-2.0") 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_GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0" 2>/dev/null`
+@@ -27055,13 +27122,15 @@ if test -n "$GIO_CFLAGS"; then
  else
    pkg_failed=yes
  fi
@@ -24485,19 +14655,15 @@
 -    pkg_cv_GIO_LIBS="$GIO_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gio-2.0\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$GIO_LIBS"; then
 +        pkg_cv_GIO_LIBS="$GIO_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gio-2.0\"") >&5
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gio-2.0\"") >&5
    ($PKG_CONFIG --exists --print-errors "gio-2.0") 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_GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0" 2>/dev/null`
+@@ -27071,8 +27140,9 @@ if test -n "$GIO_LIBS"; then
  else
    pkg_failed=yes
  fi
@@ -24509,7 +14675,7 @@
  fi
  
  
-@@ -27085,14 +26747,14 @@ else
+@@ -27085,9 +27155,9 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -24521,84 +14687,43 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$GIO_PKG_ERRORS" >&5
- 
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements (gio-2.0) were not met:
-+	{ { echo "$as_me:$LINENO: error: Package requirements (gio-2.0) were not met:
- 
- $GIO_PKG_ERRORS
- 
-@@ -27103,7 +26765,7 @@ Alternatively, you may set the environme
- and GIO_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements (gio-2.0) were not met:
-+echo "$as_me: error: Package requirements (gio-2.0) were not met:
- 
- $GIO_PKG_ERRORS
- 
-@@ -27116,7 +26778,7 @@ See the pkg-config man page for more det
+@@ -27116,7 +27186,9 @@ See the pkg-config man page for more det
  " >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
 -	{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-+	{ { 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: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -27126,7 +26788,7 @@ See the pkg-config man page for more det
+@@ -27136,7 +27208,7 @@ See the pkg-config man page for more det
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-+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.
- 
-@@ -27140,8 +26802,8 @@ See \`config.log' for more details." >&2
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
  else
  	GIO_CFLAGS=$pkg_cv_GIO_CFLAGS
  	GIO_LIBS=$pkg_cv_GIO_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; }
- 	:
- fi
- 
-@@ -27155,47 +26817,51 @@ if $PKG_CONFIG --exists xft ; then
-   xft_modules="xft"
- 
- cat >>confdefs.h <<\_ACEOF
--#define HAVE_XFT2 /**/
-+#define HAVE_XFT2
- _ACEOF
- 
- fi
- 
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for FONT_CAPPLET" >&5
--$as_echo_n "checking for FONT_CAPPLET... " >&6; }
-+{ echo "$as_me:$LINENO: checking for FONT_CAPPLET" >&5
-+echo $ECHO_N "checking for FONT_CAPPLET... $ECHO_C" >&6; }
+@@ -27165,10 +27237,11 @@ pkg_failed=no
+ { $as_echo "$as_me:$LINENO: checking for FONT_CAPPLET" >&5
+ $as_echo_n "checking for FONT_CAPPLET... " >&6; }
  
 -if test -n "$FONT_CAPPLET_CFLAGS"; then
 -    pkg_cv_FONT_CAPPLET_CFLAGS="$FONT_CAPPLET_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES \$xft_modules\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$FONT_CAPPLET_CFLAGS"; then
 +        pkg_cv_FONT_CAPPLET_CFLAGS="$FONT_CAPPLET_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES \$xft_modules\"") >&5
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES \$xft_modules\"") >&5
    ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES $xft_modules") 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_FONT_CAPPLET_CFLAGS=`$PKG_CONFIG --cflags "$COMMON_MODULES $xft_modules" 2>/dev/null`
+@@ -27178,13 +27251,15 @@ if test -n "$FONT_CAPPLET_CFLAGS"; then
  else
    pkg_failed=yes
  fi
@@ -24612,19 +14737,15 @@
 -    pkg_cv_FONT_CAPPLET_LIBS="$FONT_CAPPLET_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES \$xft_modules\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$FONT_CAPPLET_LIBS"; then
 +        pkg_cv_FONT_CAPPLET_LIBS="$FONT_CAPPLET_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES \$xft_modules\"") >&5
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES \$xft_modules\"") >&5
    ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES $xft_modules") 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_FONT_CAPPLET_LIBS=`$PKG_CONFIG --libs "$COMMON_MODULES $xft_modules" 2>/dev/null`
+@@ -27194,8 +27269,9 @@ if test -n "$FONT_CAPPLET_LIBS"; then
  else
    pkg_failed=yes
  fi
@@ -24636,7 +14757,7 @@
  fi
  
  
-@@ -27208,14 +26874,14 @@ else
+@@ -27208,9 +27284,9 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -24648,74 +14769,43 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$FONT_CAPPLET_PKG_ERRORS" >&5
- 
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES $xft_modules) were not met:
-+	{ { echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES $xft_modules) were not met:
- 
- $FONT_CAPPLET_PKG_ERRORS
- 
-@@ -27226,7 +26892,7 @@ Alternatively, you may set the environme
- and FONT_CAPPLET_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements ($COMMON_MODULES $xft_modules) were not met:
-+echo "$as_me: error: Package requirements ($COMMON_MODULES $xft_modules) were not met:
- 
- $FONT_CAPPLET_PKG_ERRORS
- 
-@@ -27239,7 +26905,7 @@ See the pkg-config man page for more det
+@@ -27239,7 +27315,9 @@ See the pkg-config man page for more det
  " >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
 -	{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-+	{ { 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: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -27249,7 +26915,7 @@ See the pkg-config man page for more det
+@@ -27259,7 +27337,7 @@ See the pkg-config man page for more det
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-+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.
- 
-@@ -27263,47 +26929,51 @@ See \`config.log' for more details." >&2
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
  else
  	FONT_CAPPLET_CFLAGS=$pkg_cv_FONT_CAPPLET_CFLAGS
  	FONT_CAPPLET_LIBS=$pkg_cv_FONT_CAPPLET_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; }
- 	:
- fi
- 
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for AT_CAPPLET" >&5
--$as_echo_n "checking for AT_CAPPLET... " >&6; }
-+{ echo "$as_me:$LINENO: checking for AT_CAPPLET" >&5
-+echo $ECHO_N "checking for AT_CAPPLET... $ECHO_C" >&6; }
+@@ -27273,10 +27351,11 @@ pkg_failed=no
+ { $as_echo "$as_me:$LINENO: checking for AT_CAPPLET" >&5
+ $as_echo_n "checking for AT_CAPPLET... " >&6; }
  
 -if test -n "$AT_CAPPLET_CFLAGS"; then
 -    pkg_cv_AT_CAPPLET_CFLAGS="$AT_CAPPLET_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$AT_CAPPLET_CFLAGS"; then
 +        pkg_cv_AT_CAPPLET_CFLAGS="$AT_CAPPLET_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
    ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES") 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_AT_CAPPLET_CFLAGS=`$PKG_CONFIG --cflags "$COMMON_MODULES" 2>/dev/null`
+@@ -27286,13 +27365,15 @@ if test -n "$AT_CAPPLET_CFLAGS"; then
  else
    pkg_failed=yes
  fi
@@ -24729,19 +14819,15 @@
 -    pkg_cv_AT_CAPPLET_LIBS="$AT_CAPPLET_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$AT_CAPPLET_LIBS"; then
 +        pkg_cv_AT_CAPPLET_LIBS="$AT_CAPPLET_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
    ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES") 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_AT_CAPPLET_LIBS=`$PKG_CONFIG --libs "$COMMON_MODULES" 2>/dev/null`
+@@ -27302,8 +27383,9 @@ if test -n "$AT_CAPPLET_LIBS"; then
  else
    pkg_failed=yes
  fi
@@ -24753,7 +14839,7 @@
  fi
  
  
-@@ -27316,14 +26986,14 @@ else
+@@ -27316,9 +27398,9 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -24765,176 +14851,61 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$AT_CAPPLET_PKG_ERRORS" >&5
- 
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES) were not met:
-+	{ { echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES) were not met:
- 
- $AT_CAPPLET_PKG_ERRORS
- 
-@@ -27334,7 +27004,7 @@ Alternatively, you may set the environme
- and AT_CAPPLET_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements ($COMMON_MODULES) were not met:
-+echo "$as_me: error: Package requirements ($COMMON_MODULES) were not met:
- 
- $AT_CAPPLET_PKG_ERRORS
- 
-@@ -27347,7 +27017,7 @@ See the pkg-config man page for more det
+@@ -27347,7 +27429,9 @@ See the pkg-config man page for more det
  " >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
 -	{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-+	{ { 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: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -27357,7 +27027,7 @@ See the pkg-config man page for more det
+@@ -27367,7 +27451,7 @@ See the pkg-config man page for more det
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-+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.
- 
-@@ -27371,17 +27041,17 @@ See \`config.log' for more details." >&2
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
  else
  	AT_CAPPLET_CFLAGS=$pkg_cv_AT_CAPPLET_CFLAGS
  	AT_CAPPLET_LIBS=$pkg_cv_AT_CAPPLET_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; }
- 	:
- fi
- 
- 
- have_randr=no
--{ $as_echo "$as_me:$LINENO: checking for XRRUpdateConfiguration in -lXrandr" >&5
--$as_echo_n "checking for XRRUpdateConfiguration in -lXrandr... " >&6; }
-+{ echo "$as_me:$LINENO: checking for XRRUpdateConfiguration in -lXrandr" >&5
-+echo $ECHO_N "checking for XRRUpdateConfiguration in -lXrandr... $ECHO_C" >&6; }
- if test "${ac_cv_lib_Xrandr_XRRUpdateConfiguration+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lXrandr -lXrandr -lXrender $x_libs $LIBS"
-@@ -27413,41 +27083,37 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_Xrandr_XRRUpdateConfiguration=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_Xrandr_XRRUpdateConfiguration=no
- fi
- 
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRUpdateConfiguration" >&5
--$as_echo "$ac_cv_lib_Xrandr_XRRUpdateConfiguration" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRUpdateConfiguration" >&5
-+echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRUpdateConfiguration" >&6; }
- if test $ac_cv_lib_Xrandr_XRRUpdateConfiguration = yes; then
--  { $as_echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5
--$as_echo_n "checking for X11/extensions/Xrandr.h... " >&6; }
-+  { echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5
-+echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6; }
+@@ -27443,7 +27527,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRUpdateConfiguration" >&5
+ $as_echo "$ac_cv_lib_Xrandr_XRRUpdateConfiguration" >&6; }
+-if test $ac_cv_lib_Xrandr_XRRUpdateConfiguration = yes; then
++if test "x$ac_cv_lib_Xrandr_XRRUpdateConfiguration" = x""yes; then
+   { $as_echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5
+ $as_echo_n "checking for X11/extensions/Xrandr.h... " >&6; }
  if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -27465,21 +27131,20 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  $as_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
-        } && test -s conftest.$ac_objext; then
-   ac_cv_header_X11_extensions_Xrandr_h=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_header_X11_extensions_Xrandr_h=no
-@@ -27487,8 +27152,8 @@ fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5
--$as_echo "$ac_cv_header_X11_extensions_Xrandr_h" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5
-+echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6; }
- if test $ac_cv_header_X11_extensions_Xrandr_h = yes; then
+@@ -27489,7 +27573,7 @@ rm -f core conftest.err conftest.$ac_obj
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5
+ $as_echo "$ac_cv_header_X11_extensions_Xrandr_h" >&6; }
+-if test $ac_cv_header_X11_extensions_Xrandr_h = yes; then
++if test "x$ac_cv_header_X11_extensions_Xrandr_h" = x""yes; then
    have_randr=yes
       RANDR_LIBS="-lXrandr -lXrender"
-@@ -27517,40 +27182,44 @@ fi
- 
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for DISPLAY_CAPPLET" >&5
--$as_echo_n "checking for DISPLAY_CAPPLET... " >&6; }
-+{ echo "$as_me:$LINENO: checking for DISPLAY_CAPPLET" >&5
-+echo $ECHO_N "checking for DISPLAY_CAPPLET... $ECHO_C" >&6; }
+ 
+@@ -27520,10 +27604,11 @@ pkg_failed=no
+ { $as_echo "$as_me:$LINENO: checking for DISPLAY_CAPPLET" >&5
+ $as_echo_n "checking for DISPLAY_CAPPLET... " >&6; }
  
 -if test -n "$DISPLAY_CAPPLET_CFLAGS"; then
 -    pkg_cv_DISPLAY_CAPPLET_CFLAGS="$DISPLAY_CAPPLET_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$DISPLAY_CAPPLET_CFLAGS"; then
 +        pkg_cv_DISPLAY_CAPPLET_CFLAGS="$DISPLAY_CAPPLET_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
    ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES") 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_DISPLAY_CAPPLET_CFLAGS=`$PKG_CONFIG --cflags "$COMMON_MODULES" 2>/dev/null`
+@@ -27533,13 +27618,15 @@ if test -n "$DISPLAY_CAPPLET_CFLAGS"; th
  else
    pkg_failed=yes
  fi
@@ -24948,19 +14919,15 @@
 -    pkg_cv_DISPLAY_CAPPLET_LIBS="$DISPLAY_CAPPLET_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$DISPLAY_CAPPLET_LIBS"; then
 +        pkg_cv_DISPLAY_CAPPLET_LIBS="$DISPLAY_CAPPLET_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES\"") >&5
    ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES") 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_DISPLAY_CAPPLET_LIBS=`$PKG_CONFIG --libs "$COMMON_MODULES" 2>/dev/null`
+@@ -27549,8 +27636,9 @@ if test -n "$DISPLAY_CAPPLET_LIBS"; then
  else
    pkg_failed=yes
  fi
@@ -24972,7 +14939,7 @@
  fi
  
  
-@@ -27563,14 +27232,14 @@ else
+@@ -27563,9 +27651,9 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -24984,82 +14951,43 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$DISPLAY_CAPPLET_PKG_ERRORS" >&5
- 
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES) were not met:
-+	{ { echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES) were not met:
- 
- $DISPLAY_CAPPLET_PKG_ERRORS
- 
-@@ -27581,7 +27250,7 @@ Alternatively, you may set the environme
- and DISPLAY_CAPPLET_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements ($COMMON_MODULES) were not met:
-+echo "$as_me: error: Package requirements ($COMMON_MODULES) were not met:
- 
- $DISPLAY_CAPPLET_PKG_ERRORS
- 
-@@ -27594,7 +27263,7 @@ See the pkg-config man page for more det
+@@ -27594,7 +27682,9 @@ See the pkg-config man page for more det
  " >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
 -	{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-+	{ { 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: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -27604,7 +27273,7 @@ See the pkg-config man page for more det
+@@ -27614,7 +27704,7 @@ See the pkg-config man page for more det
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-+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.
- 
-@@ -27618,8 +27287,8 @@ See \`config.log' for more details." >&2
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
  else
  	DISPLAY_CAPPLET_CFLAGS=$pkg_cv_DISPLAY_CAPPLET_CFLAGS
  	DISPLAY_CAPPLET_LIBS=$pkg_cv_DISPLAY_CAPPLET_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; }
- 	:
- fi
- 
-@@ -27631,21 +27300,22 @@ GNOMECC_LIBS="$GNOMECC_LIBS $x_libs"
- have_xcursor=no
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for XCURSOR" >&5
--$as_echo_n "checking for XCURSOR... " >&6; }
-+{ echo "$as_me:$LINENO: checking for XCURSOR" >&5
-+echo $ECHO_N "checking for XCURSOR... $ECHO_C" >&6; }
+@@ -27634,10 +27724,11 @@ pkg_failed=no
+ { $as_echo "$as_me:$LINENO: checking for XCURSOR" >&5
+ $as_echo_n "checking for XCURSOR... " >&6; }
  
 -if test -n "$XCURSOR_CFLAGS"; then
 -    pkg_cv_XCURSOR_CFLAGS="$XCURSOR_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$XCURSOR_CFLAGS"; then
 +        pkg_cv_XCURSOR_CFLAGS="$XCURSOR_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
  	xcursor
  	\"") >&5
-   ($PKG_CONFIG --exists --print-errors "
- 	xcursor
- 	") 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_XCURSOR_CFLAGS=`$PKG_CONFIG --cflags "
- 	xcursor
-@@ -27653,21 +27323,23 @@ if test -n "$XCURSOR_CFLAGS"; then
+@@ -27653,13 +27744,15 @@ if test -n "$XCURSOR_CFLAGS"; then
  else
    pkg_failed=yes
  fi
@@ -25073,25 +15001,15 @@
 -    pkg_cv_XCURSOR_LIBS="$XCURSOR_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$XCURSOR_LIBS"; then
 +        pkg_cv_XCURSOR_LIBS="$XCURSOR_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
  	xcursor
  	\"") >&5
-   ($PKG_CONFIG --exists --print-errors "
- 	xcursor
- 	") 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_XCURSOR_LIBS=`$PKG_CONFIG --libs "
- 	xcursor
-@@ -27675,8 +27347,9 @@ if test -n "$XCURSOR_LIBS"; then
+@@ -27675,8 +27768,9 @@ if test -n "$XCURSOR_LIBS"; then
  else
    pkg_failed=yes
  fi
@@ -25103,7 +15021,7 @@
  fi
  
  
-@@ -27689,27 +27362,27 @@ else
+@@ -27689,13 +27783,13 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -25121,71 +15039,23 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$XCURSOR_PKG_ERRORS" >&5
- 
--	{ $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_xcursor=no
- elif test $pkg_failed = untried; then
- 	have_xcursor=no
- else
- 	XCURSOR_CFLAGS=$pkg_cv_XCURSOR_CFLAGS
- 	XCURSOR_LIBS=$pkg_cv_XCURSOR_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_xcursor=yes
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -27729,8 +27402,8 @@ fi
- 
- 
- if test x$have_xcursor = xyes; then
--  { $as_echo "$as_me:$LINENO: checking for XCURSOR cursor location" >&5
--$as_echo_n "checking for XCURSOR cursor location... " >&6; }
-+  { echo "$as_me:$LINENO: checking for XCURSOR cursor location" >&5
-+echo $ECHO_N "checking for XCURSOR cursor location... $ECHO_C" >&6; }
-   XCURSOR_ICONDIR=$($PKG_CONFIG --variable=icondir xcursor)
-   if test "x$XCURSOR_ICONDIR" != x; then
- 
-@@ -27741,48 +27414,52 @@ _ACEOF
-   else
-     XCURSOR_ICONDIR=none
-   fi
--  { $as_echo "$as_me:$LINENO: result: ${XCURSOR_ICONDIR}" >&5
--$as_echo "${XCURSOR_ICONDIR}" >&6; }
-+  { echo "$as_me:$LINENO: result: ${XCURSOR_ICONDIR}" >&5
-+echo "${ECHO_T}${XCURSOR_ICONDIR}" >&6; }
- fi
- 
- CAPPLET_LIBS="$CAPPLET_LIBS $XCURSOR_LIBS"
- 
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for LIBGNOMEKBD" >&5
--$as_echo_n "checking for LIBGNOMEKBD... " >&6; }
-+{ echo "$as_me:$LINENO: checking for LIBGNOMEKBD" >&5
-+echo $ECHO_N "checking for LIBGNOMEKBD... $ECHO_C" >&6; }
+@@ -27752,10 +27846,11 @@ pkg_failed=no
+ { $as_echo "$as_me:$LINENO: checking for LIBGNOMEKBD" >&5
+ $as_echo_n "checking for LIBGNOMEKBD... " >&6; }
  
 -if test -n "$LIBGNOMEKBD_CFLAGS"; then
 -    pkg_cv_LIBGNOMEKBD_CFLAGS="$LIBGNOMEKBD_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomekbd >= 2.21.4.1 libxklavier >= 3.6\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$LIBGNOMEKBD_CFLAGS"; then
 +        pkg_cv_LIBGNOMEKBD_CFLAGS="$LIBGNOMEKBD_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomekbd >= 2.21.4.1 libxklavier >= 3.6\"") >&5
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomekbd >= 2.21.4.1 libxklavier >= 3.6\"") >&5
    ($PKG_CONFIG --exists --print-errors "libgnomekbd >= 2.21.4.1 libxklavier >= 3.6") 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_LIBGNOMEKBD_CFLAGS=`$PKG_CONFIG --cflags "libgnomekbd >= 2.21.4.1 libxklavier >= 3.6" 2>/dev/null`
+@@ -27765,13 +27860,15 @@ if test -n "$LIBGNOMEKBD_CFLAGS"; then
  else
    pkg_failed=yes
  fi
@@ -25199,19 +15069,15 @@
 -    pkg_cv_LIBGNOMEKBD_LIBS="$LIBGNOMEKBD_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomekbd >= 2.21.4.1 libxklavier >= 3.6\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$LIBGNOMEKBD_LIBS"; then
 +        pkg_cv_LIBGNOMEKBD_LIBS="$LIBGNOMEKBD_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomekbd >= 2.21.4.1 libxklavier >= 3.6\"") >&5
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomekbd >= 2.21.4.1 libxklavier >= 3.6\"") >&5
    ($PKG_CONFIG --exists --print-errors "libgnomekbd >= 2.21.4.1 libxklavier >= 3.6") 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_LIBGNOMEKBD_LIBS=`$PKG_CONFIG --libs "libgnomekbd >= 2.21.4.1 libxklavier >= 3.6" 2>/dev/null`
+@@ -27781,8 +27878,9 @@ if test -n "$LIBGNOMEKBD_LIBS"; then
  else
    pkg_failed=yes
  fi
@@ -25223,7 +15089,7 @@
  fi
  
  
-@@ -27795,14 +27472,14 @@ else
+@@ -27795,9 +27893,9 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -25235,76 +15101,43 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$LIBGNOMEKBD_PKG_ERRORS" >&5
- 
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libgnomekbd >= 2.21.4.1 libxklavier >= 3.6) were not met:
-+	{ { echo "$as_me:$LINENO: error: Package requirements (libgnomekbd >= 2.21.4.1 libxklavier >= 3.6) were not met:
- 
- $LIBGNOMEKBD_PKG_ERRORS
- 
-@@ -27813,7 +27490,7 @@ Alternatively, you may set the environme
- and LIBGNOMEKBD_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements (libgnomekbd >= 2.21.4.1 libxklavier >= 3.6) were not met:
-+echo "$as_me: error: Package requirements (libgnomekbd >= 2.21.4.1 libxklavier >= 3.6) were not met:
- 
- $LIBGNOMEKBD_PKG_ERRORS
- 
-@@ -27826,7 +27503,7 @@ See the pkg-config man page for more det
+@@ -27826,7 +27924,9 @@ See the pkg-config man page for more det
  " >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
 -	{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-+	{ { 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: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -27836,7 +27513,7 @@ See the pkg-config man page for more det
+@@ -27846,7 +27946,7 @@ See the pkg-config man page for more det
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-+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.
- 
-@@ -27850,8 +27527,8 @@ See \`config.log' for more details." >&2
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
  else
  	LIBGNOMEKBD_CFLAGS=$pkg_cv_LIBGNOMEKBD_CFLAGS
  	LIBGNOMEKBD_LIBS=$pkg_cv_LIBGNOMEKBD_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; }
- 	:
- fi
- 
-@@ -27859,40 +27536,44 @@ fi
- 
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for LIBGNOMEKBDUI" >&5
--$as_echo_n "checking for LIBGNOMEKBDUI... " >&6; }
-+{ echo "$as_me:$LINENO: checking for LIBGNOMEKBDUI" >&5
-+echo $ECHO_N "checking for LIBGNOMEKBDUI... $ECHO_C" >&6; }
+@@ -27862,10 +27962,11 @@ pkg_failed=no
+ { $as_echo "$as_me:$LINENO: checking for LIBGNOMEKBDUI" >&5
+ $as_echo_n "checking for LIBGNOMEKBDUI... " >&6; }
  
 -if test -n "$LIBGNOMEKBDUI_CFLAGS"; then
 -    pkg_cv_LIBGNOMEKBDUI_CFLAGS="$LIBGNOMEKBDUI_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomekbdui >= 2.21\"") >&5
 +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\"") >&5
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomekbdui >= 2.21\"") >&5
    ($PKG_CONFIG --exists --print-errors "libgnomekbdui >= 2.21") 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_LIBGNOMEKBDUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomekbdui >= 2.21" 2>/dev/null`
+@@ -27875,13 +27976,15 @@ if test -n "$LIBGNOMEKBDUI_CFLAGS"; then
  else
    pkg_failed=yes
  fi
@@ -25318,19 +15151,15 @@
 -    pkg_cv_LIBGNOMEKBDUI_LIBS="$LIBGNOMEKBDUI_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomekbdui >= 2.21\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$LIBGNOMEKBDUI_LIBS"; then
 +        pkg_cv_LIBGNOMEKBDUI_LIBS="$LIBGNOMEKBDUI_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomekbdui >= 2.21\"") >&5
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomekbdui >= 2.21\"") >&5
    ($PKG_CONFIG --exists --print-errors "libgnomekbdui >= 2.21") 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_LIBGNOMEKBDUI_LIBS=`$PKG_CONFIG --libs "libgnomekbdui >= 2.21" 2>/dev/null`
+@@ -27891,8 +27994,9 @@ if test -n "$LIBGNOMEKBDUI_LIBS"; then
  else
    pkg_failed=yes
  fi
@@ -25342,7 +15171,7 @@
  fi
  
  
-@@ -27905,14 +27586,14 @@ else
+@@ -27905,9 +28009,9 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -25354,94 +15183,43 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$LIBGNOMEKBDUI_PKG_ERRORS" >&5
- 
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libgnomekbdui >= 2.21) were not met:
-+	{ { echo "$as_me:$LINENO: error: Package requirements (libgnomekbdui >= 2.21) were not met:
- 
- $LIBGNOMEKBDUI_PKG_ERRORS
- 
-@@ -27923,7 +27604,7 @@ Alternatively, you may set the environme
- and LIBGNOMEKBDUI_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements (libgnomekbdui >= 2.21) were not met:
-+echo "$as_me: error: Package requirements (libgnomekbdui >= 2.21) were not met:
- 
- $LIBGNOMEKBDUI_PKG_ERRORS
- 
-@@ -27936,7 +27617,7 @@ See the pkg-config man page for more det
+@@ -27936,7 +28040,9 @@ See the pkg-config man page for more det
  " >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
 -	{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-+	{ { 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: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -27946,7 +27627,7 @@ See the pkg-config man page for more det
+@@ -27956,7 +28062,7 @@ See the pkg-config man page for more det
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-+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.
- 
-@@ -27960,16 +27641,16 @@ See \`config.log' for more details." >&2
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
  else
  	LIBGNOMEKBDUI_CFLAGS=$pkg_cv_LIBGNOMEKBDUI_CFLAGS
  	LIBGNOMEKBDUI_LIBS=$pkg_cv_LIBGNOMEKBDUI_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; }
- 	:
- fi
- 
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking whether to enable About Me" >&5
--$as_echo_n "checking whether to enable About Me... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether to enable About Me" >&5
-+echo $ECHO_N "checking whether to enable About Me... $ECHO_C" >&6; }
- # Check whether --enable-aboutme was given.
- if test "${enable_aboutme+set}" = set; then
-   enableval=$enable_aboutme;
-@@ -27977,46 +27658,50 @@ else
-   enable_aboutme=no
- fi
- 
--{ $as_echo "$as_me:$LINENO: result: $enable_aboutme" >&5
--$as_echo "$enable_aboutme" >&6; }
-+{ echo "$as_me:$LINENO: result: $enable_aboutme" >&5
-+echo "${ECHO_T}$enable_aboutme" >&6; }
- 
- if test "x$enable_aboutme" = "xyes"; then
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for LIBEBOOK" >&5
--$as_echo_n "checking for LIBEBOOK... " >&6; }
-+{ echo "$as_me:$LINENO: checking for LIBEBOOK" >&5
-+echo $ECHO_N "checking for LIBEBOOK... $ECHO_C" >&6; }
+@@ -27986,10 +28092,11 @@ pkg_failed=no
+ { $as_echo "$as_me:$LINENO: checking for LIBEBOOK" >&5
+ $as_echo_n "checking for LIBEBOOK... " >&6; }
  
 -if test -n "$LIBEBOOK_CFLAGS"; then
 -    pkg_cv_LIBEBOOK_CFLAGS="$LIBEBOOK_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libebook-1.2 >= 1.7.90\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$LIBEBOOK_CFLAGS"; then
 +        pkg_cv_LIBEBOOK_CFLAGS="$LIBEBOOK_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libebook-1.2 >= 1.7.90\"") >&5
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libebook-1.2 >= 1.7.90\"") >&5
    ($PKG_CONFIG --exists --print-errors "libebook-1.2 >= 1.7.90") 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_LIBEBOOK_CFLAGS=`$PKG_CONFIG --cflags "libebook-1.2 >= 1.7.90" 2>/dev/null`
+@@ -27999,13 +28106,15 @@ if test -n "$LIBEBOOK_CFLAGS"; then
  else
    pkg_failed=yes
  fi
@@ -25455,19 +15233,15 @@
 -    pkg_cv_LIBEBOOK_LIBS="$LIBEBOOK_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libebook-1.2 >= 1.7.90\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$LIBEBOOK_LIBS"; then
 +        pkg_cv_LIBEBOOK_LIBS="$LIBEBOOK_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libebook-1.2 >= 1.7.90\"") >&5
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libebook-1.2 >= 1.7.90\"") >&5
    ($PKG_CONFIG --exists --print-errors "libebook-1.2 >= 1.7.90") 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_LIBEBOOK_LIBS=`$PKG_CONFIG --libs "libebook-1.2 >= 1.7.90" 2>/dev/null`
+@@ -28015,8 +28124,9 @@ if test -n "$LIBEBOOK_LIBS"; then
  else
    pkg_failed=yes
  fi
@@ -25479,7 +15253,7 @@
  fi
  
  
-@@ -28029,14 +27714,14 @@ else
+@@ -28029,9 +28139,9 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -25491,76 +15265,43 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$LIBEBOOK_PKG_ERRORS" >&5
- 
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libebook-1.2 >= 1.7.90) were not met:
-+	{ { echo "$as_me:$LINENO: error: Package requirements (libebook-1.2 >= 1.7.90) were not met:
- 
- $LIBEBOOK_PKG_ERRORS
- 
-@@ -28047,7 +27732,7 @@ Alternatively, you may set the environme
- and LIBEBOOK_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements (libebook-1.2 >= 1.7.90) were not met:
-+echo "$as_me: error: Package requirements (libebook-1.2 >= 1.7.90) were not met:
- 
- $LIBEBOOK_PKG_ERRORS
- 
-@@ -28060,7 +27745,7 @@ See the pkg-config man page for more det
+@@ -28060,7 +28170,9 @@ See the pkg-config man page for more det
  " >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
 -	{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-+	{ { 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: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -28070,7 +27755,7 @@ See the pkg-config man page for more det
+@@ -28080,7 +28192,7 @@ See the pkg-config man page for more det
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-+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.
- 
-@@ -28084,8 +27769,8 @@ See \`config.log' for more details." >&2
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
  else
  	LIBEBOOK_CFLAGS=$pkg_cv_LIBEBOOK_CFLAGS
  	LIBEBOOK_LIBS=$pkg_cv_LIBEBOOK_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; }
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_LIBEBOOK 1
-@@ -28111,40 +27796,44 @@ fi
- if test "x$enable_hal" != "xno"; then
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for HAL" >&5
--$as_echo_n "checking for HAL... " >&6; }
-+{ echo "$as_me:$LINENO: checking for HAL" >&5
-+echo $ECHO_N "checking for HAL... $ECHO_C" >&6; }
+@@ -28114,10 +28226,11 @@ pkg_failed=no
+ { $as_echo "$as_me:$LINENO: checking for HAL" >&5
+ $as_echo_n "checking for HAL... " >&6; }
  
 -if test -n "$HAL_CFLAGS"; then
 -    pkg_cv_HAL_CFLAGS="$HAL_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32\"") >&5
 +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 >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32\"") >&5
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32\"") >&5
    ($PKG_CONFIG --exists --print-errors "hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32") 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_HAL_CFLAGS=`$PKG_CONFIG --cflags "hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32" 2>/dev/null`
+@@ -28127,13 +28240,15 @@ if test -n "$HAL_CFLAGS"; then
  else
    pkg_failed=yes
  fi
@@ -25574,19 +15315,15 @@
 -    pkg_cv_HAL_LIBS="$HAL_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$HAL_LIBS"; then
 +        pkg_cv_HAL_LIBS="$HAL_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32\"") >&5
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32\"") >&5
    ($PKG_CONFIG --exists --print-errors "hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32") 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_HAL_LIBS=`$PKG_CONFIG --libs "hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32" 2>/dev/null`
+@@ -28143,8 +28258,9 @@ if test -n "$HAL_LIBS"; then
  else
    pkg_failed=yes
  fi
@@ -25598,7 +15335,7 @@
  fi
  
  
-@@ -28157,14 +27846,14 @@ else
+@@ -28157,9 +28273,9 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -25610,218 +15347,43 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$HAL_PKG_ERRORS" >&5
- 
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements (hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32) were not met:
-+	{ { echo "$as_me:$LINENO: error: Package requirements (hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32) were not met:
- 
- $HAL_PKG_ERRORS
- 
-@@ -28175,7 +27864,7 @@ Alternatively, you may set the environme
- and HAL_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements (hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32) were not met:
-+echo "$as_me: error: Package requirements (hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32) were not met:
- 
- $HAL_PKG_ERRORS
- 
-@@ -28188,7 +27877,7 @@ See the pkg-config man page for more det
+@@ -28188,7 +28304,9 @@ See the pkg-config man page for more det
  " >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
 -	{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-+	{ { 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: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -28198,7 +27887,7 @@ See the pkg-config man page for more det
+@@ -28208,7 +28326,7 @@ See the pkg-config man page for more det
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-+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.
- 
-@@ -28212,8 +27901,8 @@ See \`config.log' for more details." >&2
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
  else
  	HAL_CFLAGS=$pkg_cv_HAL_CFLAGS
  	HAL_LIBS=$pkg_cv_HAL_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; }
- 
- cat >>confdefs.h <<\_ACEOF
- #define USE_HAL 1
-@@ -28227,10 +27916,10 @@ fi
- 
- # Extract the first word of "glib-genmarshal", so it can be a program name with args.
- set dummy glib-genmarshal; 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_GLIB_GENMARSHAL+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   case $GLIB_GENMARSHAL in
-   [\\/]* | ?:[\\/]*)
-@@ -28245,7 +27934,7 @@ do
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$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
-@@ -28258,18 +27947,18 @@ esac
- fi
- GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
- if test -n "$GLIB_GENMARSHAL"; then
--  { $as_echo "$as_me:$LINENO: result: $GLIB_GENMARSHAL" >&5
--$as_echo "$GLIB_GENMARSHAL" >&6; }
-+  { echo "$as_me:$LINENO: result: $GLIB_GENMARSHAL" >&5
-+echo "${ECHO_T}$GLIB_GENMARSHAL" >&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 x"$GLIB_GENMARSHAL" = xno; then
--  { { $as_echo "$as_me:$LINENO: error: glib-genmarshal executable not found in your path - should be installed with glib" >&5
--$as_echo "$as_me: error: glib-genmarshal executable not found in your path - should be installed with glib" >&2;}
-+  { { echo "$as_me:$LINENO: error: glib-genmarshal executable not found in your path - should be installed with glib" >&5
-+echo "$as_me: error: glib-genmarshal executable not found in your path - should be installed with glib" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
-@@ -28278,10 +27967,10 @@ fi
- 
- # Extract the first word of "gconftool-2", so it can be a program name with args.
- set dummy gconftool-2; 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_GCONFTOOL+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   case $GCONFTOOL in
-   [\\/]* | ?:[\\/]*)
-@@ -28296,7 +27985,7 @@ do
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$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
-@@ -28309,18 +27998,18 @@ esac
- fi
- GCONFTOOL=$ac_cv_path_GCONFTOOL
- if test -n "$GCONFTOOL"; then
--  { $as_echo "$as_me:$LINENO: result: $GCONFTOOL" >&5
--$as_echo "$GCONFTOOL" >&6; }
-+  { echo "$as_me:$LINENO: result: $GCONFTOOL" >&5
-+echo "${ECHO_T}$GCONFTOOL" >&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 x"$GCONFTOOL" = xno; then
--  { { $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;}
-+  { { 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;}
-    { (exit 1); exit 1; }; }
- fi
- 
-@@ -28339,8 +28028,8 @@ fi
- 
- 
- 
--  { $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; }
-+  { 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; }
- 
-   if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-     GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-@@ -28354,15 +28043,15 @@ fi
- 
- 
- 
--  { $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; }
-+  { echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
-+echo "${ECHO_T}Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
- 
-   # Check whether --enable-schemas-install was given.
- if test "${enable_schemas_install+set}" = set; then
-   enableval=$enable_schemas_install; case ${enableval} in
-        yes|no) ;;
--       *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5
--$as_echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;}
-+       *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5
-+echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;}
-    { (exit 1); exit 1; }; } ;;
-       esac
- fi
-@@ -28385,12 +28074,12 @@ if test "${enable_gstreamer+set}" = set;
-  yes) ENABLE_GSTREAMER=yes ;;
-  0.10) ENABLE_GSTREAMER=yes && GST_MAJORMINOR=0.10 ;;
-  no)  ENABLE_GSTREAMER=no ;;
-- *) { { $as_echo "$as_me:$LINENO: error:
-+ *) { { echo "$as_me:$LINENO: error:
-                   *** Bad value ${enableval} for --enable-gstreamer
-                   *** Please use one of the following:
-                   ***    --enable-gstreamer=0.10
-                " >&5
--$as_echo "$as_me: error:
-+echo "$as_me: error:
-                   *** Bad value ${enableval} for --enable-gstreamer
-                   *** Please use one of the following:
-                   ***    --enable-gstreamer=0.10
-@@ -28408,40 +28097,44 @@ if test "x$ENABLE_GSTREAMER" = "xyes"; t
- 
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for GST" >&5
--$as_echo_n "checking for GST... " >&6; }
-+{ echo "$as_me:$LINENO: checking for GST" >&5
-+echo $ECHO_N "checking for GST... $ECHO_C" >&6; }
+@@ -28411,10 +28529,11 @@ pkg_failed=no
+ { $as_echo "$as_me:$LINENO: checking for GST" >&5
+ $as_echo_n "checking for GST... " >&6; }
  
 -if test -n "$GST_CFLAGS"; then
 -    pkg_cv_GST_CFLAGS="$GST_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$PKGS\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$GST_CFLAGS"; then
 +        pkg_cv_GST_CFLAGS="$GST_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$PKGS\"") >&5
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$PKGS\"") >&5
    ($PKG_CONFIG --exists --print-errors "$PKGS") 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_GST_CFLAGS=`$PKG_CONFIG --cflags "$PKGS" 2>/dev/null`
+@@ -28424,13 +28543,15 @@ if test -n "$GST_CFLAGS"; then
  else
    pkg_failed=yes
  fi
@@ -25835,19 +15397,15 @@
 -    pkg_cv_GST_LIBS="$GST_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$PKGS\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$GST_LIBS"; then
 +        pkg_cv_GST_LIBS="$GST_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$PKGS\"") >&5
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$PKGS\"") >&5
    ($PKG_CONFIG --exists --print-errors "$PKGS") 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_GST_LIBS=`$PKG_CONFIG --libs "$PKGS" 2>/dev/null`
+@@ -28440,8 +28561,9 @@ if test -n "$GST_LIBS"; then
  else
    pkg_failed=yes
  fi
@@ -25859,7 +15417,7 @@
  fi
  
  
-@@ -28454,32 +28147,32 @@ else
+@@ -28454,9 +28576,9 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -25871,65 +15429,23 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$GST_PKG_ERRORS" >&5
- 
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--                { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+                { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- elif test $pkg_failed = untried; then
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- else
- 	GST_CFLAGS=$pkg_cv_GST_CFLAGS
- 	GST_LIBS=$pkg_cv_GST_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_gstreamer=yes
- fi
- 
-    GST_LIBS="$GST_LIBS -lgstinterfaces-0.10 -lgstaudio-0.10"
- else
--   { $as_echo "$as_me:$LINENO: *** GStreamer support disabled ***" >&5
--$as_echo "$as_me: *** GStreamer support disabled ***" >&6;}
-+   { echo "$as_me:$LINENO: *** GStreamer support disabled ***" >&5
-+echo "$as_me: *** GStreamer support disabled ***" >&6;}
- fi
-  if test "x$have_gstreamer" = "xyes"; then
-   HAVE_GSTREAMER_TRUE=
-@@ -28505,40 +28198,44 @@ fi
- if test "x$with_libcanberra" != "xno"; then
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for CANBERRA" >&5
--$as_echo_n "checking for CANBERRA... " >&6; }
-+{ echo "$as_me:$LINENO: checking for CANBERRA" >&5
-+echo $ECHO_N "checking for CANBERRA... $ECHO_C" >&6; }
+@@ -28508,10 +28630,11 @@ pkg_failed=no
+ { $as_echo "$as_me:$LINENO: checking for CANBERRA" >&5
+ $as_echo_n "checking for CANBERRA... " >&6; }
  
 -if test -n "$CANBERRA_CFLAGS"; then
 -    pkg_cv_CANBERRA_CFLAGS="$CANBERRA_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk >= 0.4 gio-2.0\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$CANBERRA_CFLAGS"; then
 +        pkg_cv_CANBERRA_CFLAGS="$CANBERRA_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk >= 0.4 gio-2.0\"") >&5
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk >= 0.4 gio-2.0\"") >&5
    ($PKG_CONFIG --exists --print-errors "libcanberra-gtk >= 0.4 gio-2.0") 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_CANBERRA_CFLAGS=`$PKG_CONFIG --cflags "libcanberra-gtk >= 0.4 gio-2.0" 2>/dev/null`
+@@ -28521,13 +28644,15 @@ if test -n "$CANBERRA_CFLAGS"; then
  else
    pkg_failed=yes
  fi
@@ -25943,19 +15459,15 @@
 -    pkg_cv_CANBERRA_LIBS="$CANBERRA_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk >= 0.4 gio-2.0\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$CANBERRA_LIBS"; then
 +        pkg_cv_CANBERRA_LIBS="$CANBERRA_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk >= 0.4 gio-2.0\"") >&5
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk >= 0.4 gio-2.0\"") >&5
    ($PKG_CONFIG --exists --print-errors "libcanberra-gtk >= 0.4 gio-2.0") 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_CANBERRA_LIBS=`$PKG_CONFIG --libs "libcanberra-gtk >= 0.4 gio-2.0" 2>/dev/null`
+@@ -28537,8 +28662,9 @@ if test -n "$CANBERRA_LIBS"; then
  else
    pkg_failed=yes
  fi
@@ -25967,7 +15479,7 @@
  fi
  
  
-@@ -28551,23 +28248,23 @@ else
+@@ -28551,9 +28677,9 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -25979,87 +15491,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$CANBERRA_PKG_ERRORS" >&5
- 
--	{ $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_canberra=no
- elif test $pkg_failed = untried; then
- 	have_canberra=no
- else
- 	CANBERRA_CFLAGS=$pkg_cv_CANBERRA_CFLAGS
- 	CANBERRA_LIBS=$pkg_cv_CANBERRA_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_canberra=yes
- fi
-   if test "x$have_gstreamer" = "xyes" && test "x$have_canberra" = "xyes" ; then
-@@ -28577,16 +28274,16 @@ fi
- 
-   else
-     if test "x$with_libcanberra" = "xyes" -a "x$have_canberra" = "xno"; then
--      { { $as_echo "$as_me:$LINENO: error: Sound capplet requested but libcanberra not found" >&5
--$as_echo "$as_me: error: Sound capplet requested but libcanberra not found" >&2;}
-+      { { echo "$as_me:$LINENO: error: Sound capplet requested but libcanberra not found" >&5
-+echo "$as_me: error: Sound capplet requested but libcanberra not found" >&2;}
-    { (exit 1); exit 1; }; }
-     fi
--    { $as_echo "$as_me:$LINENO: *** Sound capplet will not be built" >&5
--$as_echo "$as_me: *** Sound capplet will not be built" >&6;};
-+    { echo "$as_me:$LINENO: *** Sound capplet will not be built" >&5
-+echo "$as_me: *** Sound capplet will not be built" >&6;};
-   fi
- else
--  { $as_echo "$as_me:$LINENO: *** Sound capplet will not be built" >&5
--$as_echo "$as_me: *** Sound capplet will not be built" >&6;};
-+  { echo "$as_me:$LINENO: *** Sound capplet will not be built" >&5
-+echo "$as_me: *** Sound capplet will not be built" >&6;};
- fi
-  if test "x$with_libcanberra" = "xyes"; then
-   BUILD_SOUND_TRUE=
-@@ -28616,10 +28313,10 @@ GNOMECC_CAPPLETS_EXTRA_DIST="ChangeLog \
- 
- # Extract the first word of "update-mime-database", so it can be a program name with args.
- set dummy update-mime-database; 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_UPDATE_MIME_DATABASE+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   case $UPDATE_MIME_DATABASE in
-   [\\/]* | ?:[\\/]*)
-@@ -28634,7 +28331,7 @@ do
-   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_UPDATE_MIME_DATABASE="$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
-@@ -28647,11 +28344,11 @@ esac
- fi
- UPDATE_MIME_DATABASE=$ac_cv_path_UPDATE_MIME_DATABASE
- if test -n "$UPDATE_MIME_DATABASE"; then
--  { $as_echo "$as_me:$LINENO: result: $UPDATE_MIME_DATABASE" >&5
--$as_echo "$UPDATE_MIME_DATABASE" >&6; }
-+  { echo "$as_me:$LINENO: result: $UPDATE_MIME_DATABASE" >&5
-+echo "${ECHO_T}$UPDATE_MIME_DATABASE" >&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
- 
- 
-@@ -28673,7 +28370,7 @@ fi
+@@ -28673,7 +28799,7 @@ fi
  
  
  
@@ -26068,558 +15500,88 @@
  
  
  cat >confcache <<\_ACEOF
-@@ -28703,12 +28400,11 @@ _ACEOF
+@@ -28703,8 +28829,8 @@ _ACEOF
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
 -      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
 -$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+      *_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
-@@ -28741,12 +28437,12 @@ $as_echo "$as_me: WARNING: Cache variabl
- if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-   if test -w "$cache_file"; then
-     test "x$cache_file" != "x/dev/null" &&
--      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
--$as_echo "$as_me: updating cache $cache_file" >&6;}
-+      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-+echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
-   else
--    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
--$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-+    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-   fi
- fi
- rm -f confcache
-@@ -28762,7 +28458,7 @@ ac_ltlibobjs=
- for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-   # 1. Remove the extension, and $U if already installed.
-   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
--  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-+  ac_i=`echo "$ac_i" | sed "$ac_script"`
-   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-   #    will be set to the directory where LIBOBJS objects are built.
-   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-@@ -28774,51 +28470,51 @@ LTLIBOBJS=$ac_ltlibobjs
- 
- 
- if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-+  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+@@ -28833,13 +28959,6 @@ $as_echo "$as_me: error: conditional \"H
  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
--  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-+  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
-+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
--  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-+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__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-+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
--  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-+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 "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined.
-+  { { echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"ENABLE_SK\" was never defined.
-+echo "$as_me: error: conditional \"ENABLE_SK\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
-+  { { echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
-+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
-@@ -28827,76 +28523,68 @@ fi
- 
- 
- if test -z "${HAVE_TYPING_BREAK_TRUE}" && test -z "${HAVE_TYPING_BREAK_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_TYPING_BREAK\" was never defined.
-+  { { echo "$as_me:$LINENO: error: conditional \"HAVE_TYPING_BREAK\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_TYPING_BREAK\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
--   { (exit 1); exit 1; }; }
--fi
 -if test -z "${ENABLE_DYNAMIC_LIBSLAB_TRUE}" && test -z "${ENABLE_DYNAMIC_LIBSLAB_FALSE}"; then
 -  { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_DYNAMIC_LIBSLAB\" was never defined.
 -Usually this means the macro was only invoked conditionally." >&5
 -$as_echo "$as_me: error: conditional \"ENABLE_DYNAMIC_LIBSLAB\" was never defined.
-+echo "$as_me: error: conditional \"HAVE_TYPING_BREAK\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
  if test -z "${HAVE_RANDR_TRUE}" && test -z "${HAVE_RANDR_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_RANDR\" was never defined.
-+  { { echo "$as_me:$LINENO: error: conditional \"HAVE_RANDR\" was never defined.
+   { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_RANDR\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_RANDR\" was never defined.
-+echo "$as_me: error: conditional \"HAVE_RANDR\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${HAVE_XCURSOR_TRUE}" && test -z "${HAVE_XCURSOR_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_XCURSOR\" was never defined.
-+  { { echo "$as_me:$LINENO: error: conditional \"HAVE_XCURSOR\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_XCURSOR\" was never defined.
-+echo "$as_me: error: conditional \"HAVE_XCURSOR\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${BUILD_ABOUTME_TRUE}" && test -z "${BUILD_ABOUTME_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_ABOUTME\" was never defined.
-+  { { echo "$as_me:$LINENO: error: conditional \"BUILD_ABOUTME\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"BUILD_ABOUTME\" was never defined.
-+echo "$as_me: error: conditional \"BUILD_ABOUTME\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
-+  { { echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
-+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 "${HAVE_GSTREAMER_TRUE}" && test -z "${HAVE_GSTREAMER_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GSTREAMER\" was never defined.
-+  { { echo "$as_me:$LINENO: error: conditional \"HAVE_GSTREAMER\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_GSTREAMER\" was never defined.
-+echo "$as_me: error: conditional \"HAVE_GSTREAMER\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${BUILD_SOUND_TRUE}" && test -z "${BUILD_SOUND_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_SOUND\" was never defined.
-+  { { echo "$as_me:$LINENO: error: conditional \"BUILD_SOUND\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"BUILD_SOUND\" was never defined.
-+echo "$as_me: error: conditional \"BUILD_SOUND\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${ENABLE_UPDATE_MIMEDB_TRUE}" && test -z "${ENABLE_UPDATE_MIMEDB_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_UPDATE_MIMEDB\" was never defined.
-+  { { echo "$as_me:$LINENO: error: conditional \"ENABLE_UPDATE_MIMEDB\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"ENABLE_UPDATE_MIMEDB\" was never defined.
-+echo "$as_me: error: conditional \"ENABLE_UPDATE_MIMEDB\" 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"
--{ $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
-+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-+echo "$as_me: creating $CONFIG_STATUS" >&6;}
-+cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
- # Generated by $as_me.
- # Run this file to recreate the current configuration.
-@@ -28909,7 +28597,7 @@ ac_cs_silent=false
- SHELL=\${CONFIG_SHELL-$SHELL}
- _ACEOF
- 
--cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<\_ACEOF
- ## --------------------- ##
- ## M4sh Initialization.  ##
- ## --------------------- ##
-@@ -28919,7 +28607,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
-   NULLCMD=:
--  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-   # is contrary to our usage.  Disable this feature.
-   alias -g '${1+"$@"}'='"$@"'
-   setopt NO_GLOB_SUBST
-@@ -28941,45 +28629,17 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
- 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
--  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=';'
--  }
-+  echo "#! /bin/sh" >conf$$.sh
-+  echo  "exit 0"   >>conf$$.sh
-+  chmod +x conf$$.sh
-+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+    PATH_SEPARATOR=';'
-+  else
-+    PATH_SEPARATOR=:
-+  fi
-+  rm -f conf$$.sh
- fi
- 
- # Support unset when possible.
-@@ -28995,6 +28655,8 @@ fi
- # 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.
-@@ -29017,7 +28679,7 @@ if test "x$as_myself" = x; then
-   as_myself=$0
- fi
- if test ! -f "$as_myself"; then
--  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-   { (exit 1); exit 1; }
- fi
- 
-@@ -29030,10 +28692,17 @@ PS2='> '
- PS4='+ '
- 
- # NLS nuisances.
--LC_ALL=C
--export LC_ALL
--LANGUAGE=C
--export LANGUAGE
-+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
- 
- # Required to use basename.
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-@@ -29055,7 +28724,7 @@ as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- 	 X"$0" : 'X\(//\)$' \| \
- 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
--$as_echo X/"$0" |
-+echo X/"$0" |
-     sed '/^.*\/\([^/][^/]*\)\/*$/{
- 	    s//\1/
- 	    q
-@@ -29106,7 +28775,7 @@ $as_unset CDPATH
-       s/-\n.*//
-     ' >$as_me.lineno &&
-   chmod +x "$as_me.lineno" ||
--    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-+    { 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
-@@ -29134,6 +28803,7 @@ case `echo -n x` in
- *)
-   ECHO_N='-n';;
- esac
-+
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-    test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
-@@ -29146,22 +28816,19 @@ if test -d conf$$.dir; then
-   rm -f conf$$.dir/conf$$.file
- else
-   rm -f conf$$.dir
--  mkdir conf$$.dir 2>/dev/null
-+  mkdir conf$$.dir
- fi
--if (echo >conf$$.file) 2>/dev/null; then
--  if ln -s conf$$.file conf$$ 2>/dev/null; then
--    as_ln_s='ln -s'
--    # ... but there are two gotchas:
--    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
--    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
--    # In both cases, we have to default to `cp -p'.
--    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
--      as_ln_s='cp -p'
--  elif ln conf$$.file conf$$ 2>/dev/null; then
--    as_ln_s=ln
--  else
-+echo >conf$$.file
-+if ln -s conf$$.file conf$$ 2>/dev/null; then
-+  as_ln_s='ln -s'
-+  # ... but there are two gotchas:
-+  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+  # In both cases, we have to default to `cp -p'.
-+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-     as_ln_s='cp -p'
--  fi
-+elif ln conf$$.file conf$$ 2>/dev/null; then
-+  as_ln_s=ln
- else
-   as_ln_s='cp -p'
- fi
-@@ -29186,10 +28853,10 @@ else
-   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
-@@ -29212,7 +28879,7 @@ exec 6>&1
+@@ -29212,7 +29331,7 @@ exec 6>&1
  # values after options handling.
  ac_log="
  This file was extended by gnome-control-center $as_me 2.24.0.1, which was
 -generated by GNU Autoconf 2.62.  Invocation command line was
-+generated by GNU Autoconf 2.61.  Invocation command line was
++generated by GNU Autoconf 2.63.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -29225,7 +28892,7 @@ on `(hostname || uname -n) 2>/dev/null |
+@@ -29225,6 +29344,15 @@ on `(hostname || uname -n) 2>/dev/null |
  
  _ACEOF
  
--cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<_ACEOF
++case $ac_config_files in *"
++"*) set x $ac_config_files; shift; ac_config_files=$*;;
++esac
++
++case $ac_config_headers in *"
++"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
++esac
++
++
+ 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"
-@@ -29233,7 +28900,7 @@ config_commands="$ac_config_commands"
- 
- _ACEOF
- 
--cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<\_ACEOF
- ac_cs_usage="\
+@@ -29238,16 +29366,17 @@ ac_cs_usage="\
  \`$as_me' instantiates files from templates according to the
  current configuration.
-@@ -29246,9 +28913,9 @@ Usage: $0 [OPTIONS] [FILE]...
+ 
+-Usage: $0 [OPTIONS] [FILE]...
++Usage: $0 [OPTION]... [FILE]...
+ 
+   -h, --help       print this help, then exit
+   -V, --version    print version number and configuration settings, then exit
+-  -q, --quiet      do not print progress messages
++  -q, --quiet, --silent
++                   do not print progress messages
    -d, --debug      don't remove temporary files
        --recheck    update $as_me by reconfiguring in the same conditions
-   --file=FILE[:TEMPLATE]
--                   instantiate the configuration file FILE
-+		   instantiate the configuration file FILE
-   --header=FILE[:TEMPLATE]
--                   instantiate the configuration header FILE
-+		   instantiate the configuration header FILE
+-  --file=FILE[:TEMPLATE]
++      --file=FILE[:TEMPLATE]
+                    instantiate the configuration file FILE
+-  --header=FILE[:TEMPLATE]
++      --header=FILE[:TEMPLATE]
+                    instantiate the configuration header FILE
  
  Configuration files:
- $config_files
-@@ -29262,13 +28929,13 @@ $config_commands
- Report bugs to <bug-autoconf at gnu.org>."
- 
- _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<_ACEOF
+@@ -29265,7 +29394,7 @@ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  ac_cs_version="\\
  gnome-control-center config.status 2.24.0.1
 -configured by $0, generated by GNU Autoconf 2.62,
--  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.61,
-+  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
- 
--Copyright (C) 2008 Free Software Foundation, Inc.
-+Copyright (C) 2006 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
- 
-@@ -29276,12 +28943,11 @@ ac_pwd='$ac_pwd'
- srcdir='$srcdir'
- INSTALL='$INSTALL'
- MKDIR_P='$MKDIR_P'
--AWK='$AWK'
--test -n "\$AWK" || AWK=awk
- _ACEOF
- 
--cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
--# The default lists apply if the user does not specify any file.
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+# If no file are specified by the user, then we need to provide default
-+# value.  By we need to know if files were specified by the user.
- ac_need_defaults=:
- while test $# != 0
- do
-@@ -29303,36 +28969,30 @@ do
-   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-     ac_cs_recheck=: ;;
-   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
--    $as_echo "$ac_cs_version"; exit ;;
-+    echo "$ac_cs_version"; exit ;;
-   --debug | --debu | --deb | --de | --d | -d )
-     debug=: ;;
-   --file | --fil | --fi | --f )
-     $ac_shift
--    case $ac_optarg in
--    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
--    esac
--    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
-+    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-     ac_need_defaults=false;;
-   --header | --heade | --head | --hea )
-     $ac_shift
--    case $ac_optarg in
--    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
--    esac
--    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
-+    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-     ac_need_defaults=false;;
-   --he | --h)
-     # Conflict between --help and --header
--    { $as_echo "$as_me: error: ambiguous option: $1
-+    { echo "$as_me: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&2
-    { (exit 1); exit 1; }; };;
-   --help | --hel | -h )
--    $as_echo "$ac_cs_usage"; exit ;;
-+    echo "$ac_cs_usage"; exit ;;
-   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-   | -silent | --silent | --silen | --sile | --sil | --si | --s)
-     ac_cs_silent=: ;;
- 
-   # This is an error.
--  -*) { $as_echo "$as_me: error: unrecognized option: $1
-+  -*) { echo "$as_me: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&2
-    { (exit 1); exit 1; }; } ;;
- 
-@@ -29351,29 +29011,27 @@ if $ac_cs_silent; then
- fi
- 
- _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<_ACEOF
- if \$ac_cs_recheck; then
--  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
--  shift
--  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
--  CONFIG_SHELL='$SHELL'
-+  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-+  CONFIG_SHELL=$SHELL
-   export CONFIG_SHELL
--  exec "\$@"
-+  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
- fi
- 
- _ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<\_ACEOF
- exec 5>>config.log
- {
-   echo
-   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
- ## Running $as_me. ##
- _ASBOX
--  $as_echo "$ac_log"
-+  echo "$ac_log"
- } >&5
- 
- _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<_ACEOF
- #
- # INIT-COMMANDS
- #
-@@ -29382,7 +29040,7 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac
- 
- _ACEOF
- 
--cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<\_ACEOF
- 
- # Handling of arguments.
- for ac_config_target in $ac_config_targets
-@@ -29424,8 +29082,6 @@ do
++configured by $0, generated by GNU Autoconf 2.63,
+   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+ 
+ Copyright (C) 2008 Free Software Foundation, Inc.
+@@ -29424,8 +29553,6 @@ do
      "capplets/windows/Makefile") CONFIG_FILES="$CONFIG_FILES capplets/windows/Makefile" ;;
      "capplets/windows/window-properties.desktop.in") CONFIG_FILES="$CONFIG_FILES capplets/windows/window-properties.desktop.in" ;;
      "help/Makefile") CONFIG_FILES="$CONFIG_FILES help/Makefile" ;;
@@ -26628,1064 +15590,61 @@
      "libwindow-settings/Makefile") CONFIG_FILES="$CONFIG_FILES libwindow-settings/Makefile" ;;
      "libwindow-settings/gnome-window-settings-2.0.pc") CONFIG_FILES="$CONFIG_FILES libwindow-settings/gnome-window-settings-2.0.pc" ;;
      "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
-@@ -29434,8 +29090,8 @@ do
-     "typing-break/Makefile") CONFIG_FILES="$CONFIG_FILES typing-break/Makefile" ;;
-     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
- 
--  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
--$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-+  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
- done
-@@ -29476,143 +29132,388 @@ $debug ||
-   (umask 077 && mkdir "$tmp")
- } ||
- {
--   $as_echo "$as_me: cannot create a temporary directory in ." >&2
-+   echo "$me: cannot create a temporary directory in ." >&2
-    { (exit 1); exit 1; }
- }
- 
--# 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'.
-+#
-+# 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
- if test -n "$CONFIG_FILES"; then
- 
-+_ACEOF
- 
--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
-+
-+
-+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
-+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
-+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
-+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
-+_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`
- fi
- 
--echo 'BEGIN {' >"$tmp/subs1.awk" &&
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+CEOF$ac_eof
- _ACEOF
- 
- 
--{
--  echo "cat >conf$$subs.awk <<_ACEOF" &&
--  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
--  echo "_ACEOF"
--} >conf$$subs.sh ||
--  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
--   { (exit 1); exit 1; }; }
--ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
--  . ./conf$$subs.sh ||
--    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
--   { (exit 1); exit 1; }; }
-+  cat >conf$$subs.sed <<_ACEOF
-+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
-+PKG_CONFIG!$PKG_CONFIG$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
-+INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
-+INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
-+INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
-+INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim
-+INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim
-+INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim
-+INTLTOOL_PROP_RULE!$INTLTOOL_PROP_RULE$ac_delim
-+INTLTOOL_OAF_RULE!$INTLTOOL_OAF_RULE$ac_delim
-+INTLTOOL_PONG_RULE!$INTLTOOL_PONG_RULE$ac_delim
-+INTLTOOL_SERVER_RULE!$INTLTOOL_SERVER_RULE$ac_delim
-+INTLTOOL_SHEET_RULE!$INTLTOOL_SHEET_RULE$ac_delim
-+INTLTOOL_SOUNDLIST_RULE!$INTLTOOL_SOUNDLIST_RULE$ac_delim
-+INTLTOOL_UI_RULE!$INTLTOOL_UI_RULE$ac_delim
-+INTLTOOL_XAM_RULE!$INTLTOOL_XAM_RULE$ac_delim
-+INTLTOOL_KBD_RULE!$INTLTOOL_KBD_RULE$ac_delim
-+INTLTOOL_XML_RULE!$INTLTOOL_XML_RULE$ac_delim
-+INTLTOOL_XML_NOMERGE_RULE!$INTLTOOL_XML_NOMERGE_RULE$ac_delim
-+INTLTOOL_CAVES_RULE!$INTLTOOL_CAVES_RULE$ac_delim
-+INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim
-+INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
-+INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
-+INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim
-+XGETTEXT!$XGETTEXT$ac_delim
-+MSGMERGE!$MSGMERGE$ac_delim
-+MSGFMT!$MSGFMT$ac_delim
-+INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
-+ALL_LINGUAS!$ALL_LINGUAS$ac_delim
-+DATADIRNAME!$DATADIRNAME$ac_delim
-+GETTEXT_PACKAGE!$GETTEXT_PACKAGE$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
-+ACLOCAL_AMFLAGS!$ACLOCAL_AMFLAGS$ac_delim
-+WARN_CFLAGS!$WARN_CFLAGS$ac_delim
-+DISABLE_DEPRECATED!$DISABLE_DEPRECATED$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
-+TYPING_BREAK!$TYPING_BREAK$ac_delim
-+SCREENSAVER_LIBS!$SCREENSAVER_LIBS$ac_delim
-+HAVE_TYPING_BREAK_TRUE!$HAVE_TYPING_BREAK_TRUE$ac_delim
-+HAVE_TYPING_BREAK_FALSE!$HAVE_TYPING_BREAK_FALSE$ac_delim
-+XF86MISC_LIBS!$XF86MISC_LIBS$ac_delim
-+CAPPLET_CFLAGS!$CAPPLET_CFLAGS$ac_delim
-+CAPPLET_LIBS!$CAPPLET_LIBS$ac_delim
-+GNOMECC_CFLAGS!$GNOMECC_CFLAGS$ac_delim
-+GNOMECC_LIBS!$GNOMECC_LIBS$ac_delim
-+GNOME_CFLAGS!$GNOME_CFLAGS$ac_delim
-+GNOME_LIBS!$GNOME_LIBS$ac_delim
-+DBUS_CFLAGS!$DBUS_CFLAGS$ac_delim
-+DBUS_LIBS!$DBUS_LIBS$ac_delim
-+GNOME_DESKTOP_CFLAGS!$GNOME_DESKTOP_CFLAGS$ac_delim
-+GNOME_DESKTOP_LIBS!$GNOME_DESKTOP_LIBS$ac_delim
-+DEFAULT_APPLICATIONS_CAPPLET_CFLAGS!$DEFAULT_APPLICATIONS_CAPPLET_CFLAGS$ac_delim
-+DEFAULT_APPLICATIONS_CAPPLET_LIBS!$DEFAULT_APPLICATIONS_CAPPLET_LIBS$ac_delim
-+METACITY_CFLAGS!$METACITY_CFLAGS$ac_delim
-+METACITY_LIBS!$METACITY_LIBS$ac_delim
-+SLAB_CFLAGS!$SLAB_CFLAGS$ac_delim
-+SLAB_LIBS!$SLAB_LIBS$ac_delim
-+TYPING_CFLAGS!$TYPING_CFLAGS$ac_delim
-+TYPING_LIBS!$TYPING_LIBS$ac_delim
-+GSD_DBUS_CFLAGS!$GSD_DBUS_CFLAGS$ac_delim
-+GSD_DBUS_LIBS!$GSD_DBUS_LIBS$ac_delim
-+GIO_CFLAGS!$GIO_CFLAGS$ac_delim
-+GIO_LIBS!$GIO_LIBS$ac_delim
-+GTK_ENGINE_DIR!$GTK_ENGINE_DIR$ac_delim
-+_ACEOF
+@@ -29514,7 +29641,8 @@ for ac_last_try in false false false fal
+ $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.awk | grep -c X` = $ac_delim_num; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
++  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
++  if test $ac_delim_n = $ac_delim_num; then
      break
    elif $ac_last_try; then
--    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+    { { 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
--rm -f conf$$subs.sh
- 
--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 = ""
-+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
- 
--}
--{
--  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
--  }
-+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
- 
--  print line
--}
- 
--_ACAWK
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+  cat >conf$$subs.sed <<_ACEOF
-+FONT_CAPPLET_CFLAGS!$FONT_CAPPLET_CFLAGS$ac_delim
-+FONT_CAPPLET_LIBS!$FONT_CAPPLET_LIBS$ac_delim
-+AT_CAPPLET_CFLAGS!$AT_CAPPLET_CFLAGS$ac_delim
-+AT_CAPPLET_LIBS!$AT_CAPPLET_LIBS$ac_delim
-+HAVE_RANDR_TRUE!$HAVE_RANDR_TRUE$ac_delim
-+HAVE_RANDR_FALSE!$HAVE_RANDR_FALSE$ac_delim
-+DISPLAY_CAPPLET_CFLAGS!$DISPLAY_CAPPLET_CFLAGS$ac_delim
-+DISPLAY_CAPPLET_LIBS!$DISPLAY_CAPPLET_LIBS$ac_delim
-+XCURSOR_CFLAGS!$XCURSOR_CFLAGS$ac_delim
-+XCURSOR_LIBS!$XCURSOR_LIBS$ac_delim
-+HAVE_XCURSOR_TRUE!$HAVE_XCURSOR_TRUE$ac_delim
-+HAVE_XCURSOR_FALSE!$HAVE_XCURSOR_FALSE$ac_delim
-+LIBGNOMEKBD_CFLAGS!$LIBGNOMEKBD_CFLAGS$ac_delim
-+LIBGNOMEKBD_LIBS!$LIBGNOMEKBD_LIBS$ac_delim
-+LIBGNOMEKBDUI_CFLAGS!$LIBGNOMEKBDUI_CFLAGS$ac_delim
-+LIBGNOMEKBDUI_LIBS!$LIBGNOMEKBDUI_LIBS$ac_delim
-+LIBEBOOK_CFLAGS!$LIBEBOOK_CFLAGS$ac_delim
-+LIBEBOOK_LIBS!$LIBEBOOK_LIBS$ac_delim
-+BUILD_ABOUTME_TRUE!$BUILD_ABOUTME_TRUE$ac_delim
-+BUILD_ABOUTME_FALSE!$BUILD_ABOUTME_FALSE$ac_delim
-+HAL_CFLAGS!$HAL_CFLAGS$ac_delim
-+HAL_LIBS!$HAL_LIBS$ac_delim
-+GLIB_GENMARSHAL!$GLIB_GENMARSHAL$ac_delim
-+GCONFTOOL!$GCONFTOOL$ac_delim
-+GCONF_SCHEMA_CONFIG_SOURCE!$GCONF_SCHEMA_CONFIG_SOURCE$ac_delim
-+GCONF_SCHEMA_FILE_DIR!$GCONF_SCHEMA_FILE_DIR$ac_delim
-+GCONF_SCHEMAS_INSTALL_TRUE!$GCONF_SCHEMAS_INSTALL_TRUE$ac_delim
-+GCONF_SCHEMAS_INSTALL_FALSE!$GCONF_SCHEMAS_INSTALL_FALSE$ac_delim
-+GST_CFLAGS!$GST_CFLAGS$ac_delim
-+GST_LIBS!$GST_LIBS$ac_delim
-+HAVE_GSTREAMER_TRUE!$HAVE_GSTREAMER_TRUE$ac_delim
-+HAVE_GSTREAMER_FALSE!$HAVE_GSTREAMER_FALSE$ac_delim
-+CANBERRA_CFLAGS!$CANBERRA_CFLAGS$ac_delim
-+CANBERRA_LIBS!$CANBERRA_LIBS$ac_delim
-+SOUND_CAPPLET_LIBS!$SOUND_CAPPLET_LIBS$ac_delim
-+SOUND_CAPPLET_CFLAGS!$SOUND_CAPPLET_CFLAGS$ac_delim
-+BUILD_SOUND_TRUE!$BUILD_SOUND_TRUE$ac_delim
-+BUILD_SOUND_FALSE!$BUILD_SOUND_FALSE$ac_delim
-+GNOMECC_CAPPLETS_EXTRA_DIST!$GNOMECC_CAPPLETS_EXTRA_DIST$ac_delim
-+GNOMECC_CAPPLETS_CLEANFILES!$GNOMECC_CAPPLETS_CLEANFILES$ac_delim
-+GNOMECC_CAPPLETS_CFLAGS!$GNOMECC_CAPPLETS_CFLAGS$ac_delim
-+GNOMECC_CAPPLETS_LIBS!$GNOMECC_CAPPLETS_LIBS$ac_delim
-+UPDATE_MIME_DATABASE!$UPDATE_MIME_DATABASE$ac_delim
-+ENABLE_UPDATE_MIMEDB_TRUE!$ENABLE_UPDATE_MIMEDB_TRUE$ac_delim
-+ENABLE_UPDATE_MIMEDB_FALSE!$ENABLE_UPDATE_MIMEDB_FALSE$ac_delim
-+LIBOBJS!$LIBOBJS$ac_delim
-+LTLIBOBJS!$LTLIBOBJS$ac_delim
- _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;}
-+
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 47; 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`
-+fi
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-3.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
-@@ -29628,133 +29529,19 @@ s/^[^=]*=[	 ]*$//
- }'
- fi
- 
--cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<\_ACEOF
- 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 "#".
+     { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+@@ -29719,9 +29847,9 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+   }
+   split(mac1, mac2, "(") #)
+   macro = mac2[1]
++  prefix = substr(line, 1, index(line, defundef) - 1)
+   if (D_is_set[macro]) {
+     # Preserve the white space surrounding the "#".
 -    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 prefix "define", macro P[macro] D[macro]
+     next
+   } else {
+@@ -29729,7 +29857,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+     # 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"
- 
--
--eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
--shift
--for ac_tag
-+for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
- do
-   case $ac_tag in
-   :[FHLC]) ac_mode=$ac_tag; continue;;
++      print "/*", prefix defundef, macro, "*/"
+       next
+     }
+   }
+@@ -29753,8 +29881,8 @@ do
    esac
    case $ac_mode$ac_tag in
    :[FHL]*:*);;
 -  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
 -$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-+  :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;;
-@@ -29783,38 +29570,26 @@ $as_echo "$as_me: error: Invalid tag $ac
- 	   [\\/$]*) false;;
- 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
- 	   esac ||
--	   { { $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;}
-+	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-    { (exit 1); exit 1; }; };;
-       esac
--      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
--      ac_file_inputs="$ac_file_inputs '$ac_f'"
-+      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 '`
--	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
--	`' by configure.'
-+    configure_input="Generated from "`IFS=:
-+	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-     if test x"$ac_file" != x-; then
-       configure_input="$ac_file.  $configure_input"
--      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
--$as_echo "$as_me: creating $ac_file" >&6;}
-+      { echo "$as_me:$LINENO: creating $ac_file" >&5
-+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" \
--      || { { $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; }; } ;;
-+    *:-:* | *:-) cat >"$tmp/stdin";;
-     esac
-     ;;
-   esac
-@@ -29824,7 +29599,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^
- 	 X"$ac_file" : 'X\(//\)[^/]' \| \
- 	 X"$ac_file" : 'X\(//\)$' \| \
- 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
--$as_echo X"$ac_file" |
-+echo X"$ac_file" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- 	    s//\1/
- 	    q
-@@ -29850,7 +29625,7 @@ $as_echo X"$ac_file" |
-     as_dirs=
-     while :; do
-       case $as_dir in #(
--      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-       *) as_qdir=$as_dir;;
-       esac
-       as_dirs="'$as_qdir' $as_dirs"
-@@ -29859,7 +29634,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/
- 	 X"$as_dir" : 'X\(//\)[^/]' \| \
- 	 X"$as_dir" : 'X\(//\)$' \| \
- 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
--$as_echo X"$as_dir" |
-+echo X"$as_dir" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- 	    s//\1/
- 	    q
-@@ -29880,17 +29655,17 @@ $as_echo X"$as_dir" |
-       test -d "$as_dir" && break
-     done
-     test -z "$as_dirs" || eval "mkdir $as_dirs"
--  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
--$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
-    { (exit 1); exit 1; }; }; }
-   ac_builddir=.
- 
- case "$ac_dir" in
- .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *)
--  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-   # A ".." for each directory in $ac_dir_suffix.
--  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-+  ac_top_builddir_sub=`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/ ;;
-@@ -29935,13 +29710,12 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
-   esac
- _ACEOF
- 
--cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<\_ACEOF
- # If the template does not know about datarootdir, expand it.
- # FIXME: This hack should be removed a few years after 2.60.
- ac_datarootdir_hack=; ac_datarootdir_seen=
- 
--ac_sed_dataroot='
--/datarootdir/ {
-+case `sed -n '/datarootdir/ {
-   p
-   q
- }
-@@ -29950,14 +29724,13 @@ ac_sed_dataroot='
- /@infodir@/p
- /@localedir@/p
- /@mandir@/p
--'
--case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-+' $ac_file_inputs` in
- *datarootdir*) ac_datarootdir_seen=yes;;
- *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
--  { $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;}
-+  { 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;}
- _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<_ACEOF
-   ac_datarootdir_hack='
-   s&@datadir@&$datadir&g
-   s&@docdir@&$docdir&g
-@@ -29971,16 +29744,15 @@ _ACEOF
- # 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 || ac_write_fail=1
--ac_sed_extra="$ac_vpsub
-+cat >>$CONFIG_STATUS <<_ACEOF
-+  sed "$ac_vpsub
- $extrasub
- _ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<\_ACEOF
- :t
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
--s|@configure_input@|$ac_sed_conf_input|;t t
-+s&@configure_input@&$configure_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
-@@ -29991,60 +29763,121 @@ s&@abs_top_builddir@&$ac_abs_top_builddi
- s&@INSTALL@&$ac_INSTALL&;t t
- s&@MKDIR_P@&$ac_MKDIR_P&;t t
- $ac_datarootdir_hack
--"
--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; }; }
-+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
- 
- 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"; } &&
--  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+  { 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
--$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+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 \
--  || { { $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; }; }
-+  -) cat "$tmp/out"; rm -f "$tmp/out";;
-+  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-+  esac
-  ;;
-   :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
--    {
--      $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;}
-+    echo "/* $configure_input  */" >"$tmp/config.h"
-+    cat "$ac_result" >>"$tmp/config.h"
-+    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-+      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-+echo "$as_me: $ac_file is unchanged" >&6;}
-     else
--      rm -f "$ac_file"
--      mv "$tmp/config.h" "$ac_file" \
--	|| { { $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; }; }
-+      rm -f $ac_file
-+      mv "$tmp/config.h" $ac_file
-     fi
-   else
--    $as_echo "/* $configure_input  */" \
--      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
--      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
--$as_echo "$as_me: error: could not create -" >&2;}
--   { (exit 1); exit 1; }; }
-+    echo "/* $configure_input  */"
-+    cat "$ac_result"
-   fi
--# Compute "$ac_file"'s index in $config_headers.
--_am_arg="$ac_file"
-+  rm -f "$tmp/out12"
-+# Compute $ac_file's index in $config_headers.
-+_am_arg=$ac_file
- _am_stamp_count=1
- for _am_header in $config_headers :; do
-   case $_am_header in
-@@ -30059,7 +29892,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^
- 	 X"$_am_arg" : 'X\(//\)[^/]' \| \
- 	 X"$_am_arg" : 'X\(//\)$' \| \
- 	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
--$as_echo X"$_am_arg" |
-+echo X"$_am_arg" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- 	    s//\1/
- 	    q
-@@ -30079,8 +29912,8 @@ $as_echo X"$_am_arg" |
- 	  s/.*/./; q'`/stamp-h$_am_stamp_count
-  ;;
- 
--  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
--$as_echo "$as_me: executing $ac_file commands" >&6;}
-+  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-+echo "$as_me: executing $ac_file commands" >&6;}
-  ;;
-   esac
- 
-@@ -30102,7 +29935,7 @@ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/
- 	 X"$mf" : 'X\(//\)[^/]' \| \
- 	 X"$mf" : 'X\(//\)$' \| \
- 	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
--$as_echo X"$mf" |
-+echo X"$mf" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- 	    s//\1/
- 	    q
-@@ -30146,7 +29979,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][
- 	 X"$file" : 'X\(//\)[^/]' \| \
- 	 X"$file" : 'X\(//\)$' \| \
- 	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
--$as_echo X"$file" |
-+echo X"$file" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- 	    s//\1/
- 	    q
-@@ -30172,7 +30005,7 @@ $as_echo X"$file" |
-     as_dirs=
-     while :; do
-       case $as_dir in #(
--      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-       *) as_qdir=$as_dir;;
-       esac
-       as_dirs="'$as_qdir' $as_dirs"
-@@ -30181,7 +30014,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/
- 	 X"$as_dir" : 'X\(//\)[^/]' \| \
- 	 X"$as_dir" : 'X\(//\)$' \| \
- 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
--$as_echo X"$as_dir" |
-+echo X"$as_dir" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- 	    s//\1/
- 	    q
-@@ -30202,8 +30035,8 @@ $as_echo X"$as_dir" |
-       test -d "$as_dir" && break
-     done
-     test -z "$as_dirs" || eval "mkdir $as_dirs"
--  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
--$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
-    { (exit 1); exit 1; }; }; }
-     # echo "creating $dirpart/$file"
-     echo '# dummy' > "$dirpart/$file"
-@@ -30223,8 +30056,8 @@ done
-       "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES"
- 
-     if test ! -f "po/Makefile"; then
--      { { $as_echo "$as_me:$LINENO: error: po/Makefile is not ready." >&5
--$as_echo "$as_me: error: po/Makefile is not ready." >&2;}
-+      { { echo "$as_me:$LINENO: error: po/Makefile is not ready." >&5
-+echo "$as_me: error: po/Makefile is not ready." >&2;}
-    { (exit 1); exit 1; }; }
-     fi
-     mv "po/Makefile" "po/Makefile.tmp"
-@@ -30246,11 +30079,6 @@ _ACEOF
- 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.
-@@ -30272,8 +30100,4 @@ if test "$no_create" != yes; then
-   # would make configure fail if this is the last instruction.
+@@ -30273,7 +30401,7 @@ if test "$no_create" != yes; then
    $ac_cs_success || { (exit 1); exit 1; }
  fi
--if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+ 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
++  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
++$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ fi
  
 Index: gnome-control-center-2.24.0.1/help/Makefile.in
 ===================================================================
---- gnome-control-center-2.24.0.1.orig/help/Makefile.in	2008-09-24 18:41:38.000000000 +0200
-+++ gnome-control-center-2.24.0.1/help/Makefile.in	2008-12-28 13:26:35.007855187 +0100
+--- gnome-control-center-2.24.0.1.orig/help/Makefile.in	2009-04-16 10:31:23.084851100 +0200
++++ gnome-control-center-2.24.0.1/help/Makefile.in	2009-04-16 10:32:37.745347835 +0200
 @@ -186,8 +186,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
  LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
  LIBOBJS = @LIBOBJS@
@@ -27714,8 +15673,8 @@
  _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
 Index: gnome-control-center-2.24.0.1/libwindow-settings/Makefile.in
 ===================================================================
---- gnome-control-center-2.24.0.1.orig/libwindow-settings/Makefile.in	2008-12-28 13:23:47.336356785 +0100
-+++ gnome-control-center-2.24.0.1/libwindow-settings/Makefile.in	2008-12-28 13:26:35.203855167 +0100
+--- gnome-control-center-2.24.0.1.orig/libwindow-settings/Makefile.in	2009-04-16 10:31:23.072850343 +0200
++++ gnome-control-center-2.24.0.1/libwindow-settings/Makefile.in	2009-04-16 10:32:37.745347835 +0200
 @@ -215,8 +215,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
  LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
  LIBOBJS = @LIBOBJS@
@@ -27748,8 +15707,8 @@
  	-DGNOME_ICONDIR=\""$(datadir)/pixmaps"\"			\
 Index: gnome-control-center-2.24.0.1/ltmain.sh
 ===================================================================
---- gnome-control-center-2.24.0.1.orig/ltmain.sh	2008-09-10 04:31:44.000000000 +0200
-+++ gnome-control-center-2.24.0.1/ltmain.sh	2008-04-29 22:21:21.000000000 +0200
+--- gnome-control-center-2.24.0.1.orig/ltmain.sh	2009-04-16 10:31:23.060850563 +0200
++++ gnome-control-center-2.24.0.1/ltmain.sh	2009-04-16 10:32:37.749349880 +0200
 @@ -43,8 +43,8 @@ EXIT_FAILURE=1
  
  PROGRAM=ltmain.sh
@@ -27787,8 +15746,8 @@
  	no)
 Index: gnome-control-center-2.24.0.1/Makefile.in
 ===================================================================
---- gnome-control-center-2.24.0.1.orig/Makefile.in	2008-09-24 18:41:38.000000000 +0200
-+++ gnome-control-center-2.24.0.1/Makefile.in	2008-12-28 13:26:35.775855241 +0100
+--- gnome-control-center-2.24.0.1.orig/Makefile.in	2009-04-16 10:31:23.048854694 +0200
++++ gnome-control-center-2.24.0.1/Makefile.in	2009-04-16 10:32:37.749349880 +0200
 @@ -61,8 +61,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re
    distclean-recursive maintainer-clean-recursive
  ETAGS = etags
@@ -27832,8 +15791,8 @@
  
 Index: gnome-control-center-2.24.0.1/shell/Makefile.in
 ===================================================================
---- gnome-control-center-2.24.0.1.orig/shell/Makefile.in	2008-09-24 18:41:38.000000000 +0200
-+++ gnome-control-center-2.24.0.1/shell/Makefile.in	2008-12-28 13:26:35.371855011 +0100
+--- gnome-control-center-2.24.0.1.orig/shell/Makefile.in	2009-04-16 10:31:23.040850115 +0200
++++ gnome-control-center-2.24.0.1/shell/Makefile.in	2009-04-16 10:32:37.749349880 +0200
 @@ -54,7 +54,7 @@ am_gnome_control_center_OBJECTS = contro
  gnome_control_center_OBJECTS = $(am_gnome_control_center_OBJECTS)
  am__DEPENDENCIES_1 =
@@ -27885,8 +15844,8 @@
  	-DGNOMELOCALEDIR="\"$(datadir)/locale\""
 Index: gnome-control-center-2.24.0.1/typing-break/Makefile.in
 ===================================================================
---- gnome-control-center-2.24.0.1.orig/typing-break/Makefile.in	2008-09-24 18:41:38.000000000 +0200
-+++ gnome-control-center-2.24.0.1/typing-break/Makefile.in	2008-12-28 13:26:35.580355393 +0100
+--- gnome-control-center-2.24.0.1.orig/typing-break/Makefile.in	2009-04-16 10:31:23.028850824 +0200
++++ gnome-control-center-2.24.0.1/typing-break/Makefile.in	2009-04-16 10:32:37.749349880 +0200
 @@ -206,8 +206,6 @@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS
  LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
  LIBOBJS = @LIBOBJS@

Modified: desktop/unstable/control-center/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/patches/series?rev=19601&op=diff
==============================================================================
--- desktop/unstable/control-center/debian/patches/series (original)
+++ desktop/unstable/control-center/debian/patches/series Thu Apr 16 08:35:11 2009
@@ -1,4 +1,5 @@
 01_fix_libslab_build.patch
+02_build_libgnome.patch
 03_a11y_logout.patch
 04_path_xtra.patch
 05_ta_po.patch




More information about the pkg-gnome-commits mailing list