r23293 - in /desktop/experimental/totem/debian: changelog control control.in patches/90_autotools.patch patches/99_gst-bus_flush.patch patches/series totem-mozilla.links

slomo at users.alioth.debian.org slomo at users.alioth.debian.org
Tue Mar 16 08:09:46 UTC 2010


Author: slomo
Date: Tue Mar 16 08:09:45 2010
New Revision: 23293

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23293
Log:
* New upstream development release:
  + debian/patches/90_autotools.patch:
    - Refreshed for the new version.
  + debian/patches/99_gst-bus_flush.patch:
    - Dropped, merged upstream.
* Merge changes from 2.28.5-2.
* totem-mozilla.links: removed. We don’t need iceweasel-specific 
  links, it is able to use the files in /usr/lib/mozilla/plugins.
  Closes: #569891.
* Require totem-common = ${source:Version}. Closes: #571164.
* debian/patches/02_python2.6.patch:
  - Backport change from GIT to fix FTBFS with Python 2.6 as the
    default interpreter. Closes: #571517.
* debian/patches/90_autotools.patch:
  - Updated.
* debian/control.in:
  - Standards-Version is 3.8.4, no changes needed.

Removed:
    desktop/experimental/totem/debian/patches/99_gst-bus_flush.patch
    desktop/experimental/totem/debian/totem-mozilla.links
Modified:
    desktop/experimental/totem/debian/changelog
    desktop/experimental/totem/debian/control
    desktop/experimental/totem/debian/control.in
    desktop/experimental/totem/debian/patches/90_autotools.patch
    desktop/experimental/totem/debian/patches/series

Modified: desktop/experimental/totem/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/changelog?rev=23293&op=diff
==============================================================================
--- desktop/experimental/totem/debian/changelog [utf-8] (original)
+++ desktop/experimental/totem/debian/changelog [utf-8] Tue Mar 16 08:09:45 2010
@@ -1,3 +1,14 @@
+totem (2.29.92-1) experimental; urgency=low
+
+  * New upstream development release:
+    + debian/patches/90_autotools.patch:
+      - Refreshed for the new version.
+    + debian/patches/99_gst-bus_flush.patch:
+      - Dropped, merged upstream.
+  * Merge changes from 2.28.5-2.
+
+ -- Sebastian Dröge <slomo at debian.org>  Tue, 16 Mar 2010 09:06:31 +0100
+
 totem (2.29.91-1) experimental; urgency=low
 
   * New upstream development release:
@@ -26,6 +37,25 @@
       - Drop the complex plugin, it doesn't exist anymore.
 
  -- Sebastian Dröge <slomo at debian.org>  Wed, 27 Jan 2010 09:40:18 +0100
+
+totem (2.28.5-2) unstable; urgency=low
+
+  [ Josselin Mouette ]
+  * totem-mozilla.links: removed. We don’t need iceweasel-specific 
+    links, it is able to use the files in /usr/lib/mozilla/plugins.
+    Closes: #569891.
+  * Require totem-common = ${source:Version}. Closes: #571164.
+
+  [ Emilio Pozuelo Monfort ]
+  * debian/patches/02_python2.6.patch:
+    - Backport change from GIT to fix FTBFS with Python 2.6 as the
+      default interpreter. Closes: #571517.
+  * debian/patches/90_autotools.patch:
+    - Updated.
+  * debian/control.in:
+    - Standards-Version is 3.8.4, no changes needed.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Thu, 04 Mar 2010 10:06:44 +0100
 
 totem (2.28.5-1) unstable; urgency=low
 

Modified: desktop/experimental/totem/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/control?rev=23293&op=diff
==============================================================================
--- desktop/experimental/totem/debian/control [utf-8] (original)
+++ desktop/experimental/totem/debian/control [utf-8] Tue Mar 16 08:09:45 2010
@@ -7,7 +7,7 @@
 Section: video
 Priority: optional
 Maintainer: Sebastien Bacher <seb128 at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Build-Depends: debhelper (>= 5.0.51~),
                cdbs,
                quilt,
@@ -57,7 +57,7 @@
                libbluetooth-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
                libgalago-dev (>= 0.5.2),
                libgdata-dev (>= 0.4.0)
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://www.gnome.org/projects/totem/
 
 Package: totem
@@ -71,8 +71,7 @@
          gstreamer0.10-x,
          gnome-icon-theme (>= 2.15.90),
          iso-codes,
-         totem-common (>= ${gnome:Version}),
-         totem-common (<< ${gnome:NextVersion})
+         totem-common (= ${source:Version})
 Conflicts: totem (<< 0.99.12-2),
            gnome-control-center (<< 2.15.90),
            totem-mozilla (<< 2.20.0-3),

Modified: desktop/experimental/totem/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/control.in?rev=23293&op=diff
==============================================================================
--- desktop/experimental/totem/debian/control.in [utf-8] (original)
+++ desktop/experimental/totem/debian/control.in [utf-8] Tue Mar 16 08:09:45 2010
@@ -52,7 +52,7 @@
                libbluetooth-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
                libgalago-dev (>= 0.5.2),
                libgdata-dev (>= 0.4.0)
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://www.gnome.org/projects/totem/
 
 Package: totem
@@ -66,8 +66,7 @@
          gstreamer0.10-x,
          gnome-icon-theme (>= 2.15.90),
          iso-codes,
-         totem-common (>= ${gnome:Version}),
-         totem-common (<< ${gnome:NextVersion})
+         totem-common (= ${source:Version})
 Conflicts: totem (<< 0.99.12-2),
            gnome-control-center (<< 2.15.90),
            totem-mozilla (<< 2.20.0-3),

Modified: desktop/experimental/totem/debian/patches/90_autotools.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/patches/90_autotools.patch?rev=23293&op=diff
==============================================================================
--- desktop/experimental/totem/debian/patches/90_autotools.patch [utf-8] (original)
+++ desktop/experimental/totem/debian/patches/90_autotools.patch [utf-8] Tue Mar 16 08:09:45 2010
@@ -1,17 +1,6 @@
-diff -Naur totem-2.29.91.old/aclocal.m4 totem-2.29.91/aclocal.m4
---- totem-2.29.91.old/aclocal.m4	2010-02-24 12:13:10.000000000 +0100
-+++ totem-2.29.91/aclocal.m4	2010-02-25 19:13:48.489954629 +0100
-@@ -13,8 +13,8 @@
- 
- m4_ifndef([AC_AUTOCONF_VERSION],
-   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
--m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
--[m4_warning([this file was generated for autoconf 2.63.
-+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-+[m4_warning([this file was generated for autoconf 2.65.
- You have another version of autoconf.  It may work, but is not guaranteed to.
- If you have problems, you may need to regenerate the build system entirely.
- To do so, use the procedure documented by the package, typically `autoreconf'.])])
+diff -Naur totem-2.29.92.old/aclocal.m4 totem-2.29.92/aclocal.m4
+--- totem-2.29.92.old/aclocal.m4	2010-03-15 18:51:25.000000000 +0100
++++ totem-2.29.92/aclocal.m4	2010-03-16 09:08:39.195699599 +0100
 @@ -757,6 +757,12 @@
  [
    AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
@@ -253,9 +242,9 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-diff -Naur totem-2.29.91.old/bindings/Makefile.in totem-2.29.91/bindings/Makefile.in
---- totem-2.29.91.old/bindings/Makefile.in	2010-02-24 13:15:28.000000000 +0100
-+++ totem-2.29.91/bindings/Makefile.in	2010-02-25 19:13:50.620951662 +0100
+diff -Naur totem-2.29.92.old/bindings/Makefile.in totem-2.29.92/bindings/Makefile.in
+--- totem-2.29.92.old/bindings/Makefile.in	2010-03-15 18:51:30.000000000 +0100
++++ totem-2.29.92/bindings/Makefile.in	2010-03-16 09:08:41.728669085 +0100
 @@ -109,6 +109,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -274,17 +263,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -224,6 +228,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/bindings/python/Makefile.in totem-2.29.91/bindings/python/Makefile.in
---- totem-2.29.91.old/bindings/python/Makefile.in	2010-02-24 13:15:28.000000000 +0100
-+++ totem-2.29.91/bindings/python/Makefile.in	2010-02-25 19:13:50.708952367 +0100
+diff -Naur totem-2.29.92.old/bindings/python/Makefile.in totem-2.29.92/bindings/python/Makefile.in
+--- totem-2.29.92.old/bindings/python/Makefile.in	2010-03-15 18:51:30.000000000 +0100
++++ totem-2.29.92/bindings/python/Makefile.in	2010-03-16 09:08:41.840668592 +0100
 @@ -106,6 +106,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -303,17 +284,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -221,6 +225,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/bindings/vala/Makefile.in totem-2.29.91/bindings/vala/Makefile.in
---- totem-2.29.91.old/bindings/vala/Makefile.in	2010-02-24 13:15:28.000000000 +0100
-+++ totem-2.29.91/bindings/vala/Makefile.in	2010-02-25 19:13:50.768952025 +0100
+diff -Naur totem-2.29.92.old/bindings/vala/Makefile.in totem-2.29.92/bindings/vala/Makefile.in
+--- totem-2.29.92.old/bindings/vala/Makefile.in	2010-03-15 18:51:30.000000000 +0100
++++ totem-2.29.92/bindings/vala/Makefile.in	2010-03-16 09:08:41.900669093 +0100
 @@ -70,6 +70,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -332,17 +305,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -185,6 +189,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/browser-plugin/Makefile.in totem-2.29.91/browser-plugin/Makefile.in
---- totem-2.29.91.old/browser-plugin/Makefile.in	2010-02-24 13:15:29.000000000 +0100
-+++ totem-2.29.91/browser-plugin/Makefile.in	2010-02-25 19:13:51.024951957 +0100
+diff -Naur totem-2.29.92.old/browser-plugin/Makefile.in totem-2.29.92/browser-plugin/Makefile.in
+--- totem-2.29.92.old/browser-plugin/Makefile.in	2010-03-15 18:51:31.000000000 +0100
++++ totem-2.29.92/browser-plugin/Makefile.in	2010-03-16 09:08:42.156668730 +0100
 @@ -304,6 +304,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -361,848 +326,10 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -419,6 +423,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/config.h.in totem-2.29.91/config.h.in
---- totem-2.29.91.old/config.h.in	2010-02-24 13:15:27.000000000 +0100
-+++ totem-2.29.91/config.h.in	2010-02-25 19:13:50.045952393 +0100
-@@ -100,6 +100,9 @@
- /* Define to the one symbol short name of this package. */
- #undef PACKAGE_TARNAME
- 
-+/* Define to the home page for this package. */
-+#undef PACKAGE_URL
-+
- /* Define to the version of this package. */
- #undef PACKAGE_VERSION
- 
-diff -Naur totem-2.29.91.old/configure totem-2.29.91/configure
---- totem-2.29.91.old/configure	2010-02-24 12:13:13.000000000 +0100
-+++ totem-2.29.91/configure	2010-02-25 19:13:49.788952820 +0100
-@@ -1,20 +1,24 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.63 for totem 2.29.91.
-+# Generated by GNU Autoconf 2.65 for totem 2.29.91.
- #
- # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=totem>.
- #
-+#
- # 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, 2007, 2008, 2009 Free Software Foundation,
-+# Inc.
-+#
-+#
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
--## --------------------- ##
--## M4sh Initialization.  ##
--## --------------------- ##
-+## -------------------- ##
-+## M4sh Initialization. ##
-+## -------------------- ##
- 
- # Be more Bourne compatible
- DUALCASE=1; export DUALCASE # for MKS sh
--if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+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
-@@ -22,23 +26,15 @@
-   alias -g '${1+"$@"}'='"$@"'
-   setopt NO_GLOB_SUBST
- else
--  case `(set -o) 2>/dev/null` in
--  *posix*) set -o posix ;;
-+  case `(set -o) 2>/dev/null` in #(
-+  *posix*) :
-+    set -o posix ;; #(
-+  *) :
-+     ;;
- esac
--
- fi
- 
- 
--
--
--# PATH needs CR
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
--
- as_nl='
- '
- export as_nl
-@@ -46,7 +42,13 @@
- 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
-+# Prefer a ksh shell builtin over an external printf program on Solaris,
-+# but without wasting forks for bash or zsh.
-+if test -z "$BASH_VERSION$ZSH_VERSION" \
-+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-+  as_echo='print -r --'
-+  as_echo_n='print -rn --'
-+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-   as_echo='printf %s\n'
-   as_echo_n='printf %s'
- else
-@@ -57,7 +59,7 @@
-     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-     as_echo_n_body='eval
-       arg=$1;
--      case $arg in
-+      case $arg in #(
-       *"$as_nl"*)
- 	expr "X$arg" : "X\\(.*\\)$as_nl";
- 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -80,13 +82,6 @@
-   }
- fi
- 
--# Support unset when possible.
--if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
--  as_unset=unset
--else
--  as_unset=false
--fi
--
- 
- # IFS
- # We need space, tab and new line, in precisely that order.  Quoting is
-@@ -96,15 +91,15 @@
- IFS=" ""	$as_nl"
- 
- # Find who we are.  Look in the path if we contain no directory separator.
--case $0 in
-+case $0 in #((
-   *[\\/]* ) as_myself=$0 ;;
-   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
--done
-+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+  done
- IFS=$as_save_IFS
- 
-      ;;
-@@ -116,12 +111,16 @@
- fi
- if test ! -f "$as_myself"; then
-   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
--  { (exit 1); exit 1; }
-+  exit 1
- fi
- 
--# Work around bugs in pre-3.0 UWIN ksh.
--for as_var in ENV MAIL MAILPATH
--do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+# Unset variables that we do not need and which cause bugs (e.g. in
-+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-+# suppresses any "Segmentation fault" message there.  '((' could
-+# trigger a bug in pdksh 5.2.14.
-+for as_var in BASH_ENV ENV MAIL MAILPATH
-+do eval test x\${$as_var+set} = xset \
-+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
- done
- PS1='$ '
- PS2='> '
-@@ -133,330 +132,301 @@
- LANGUAGE=C
- export LANGUAGE
- 
--# Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1 &&
--   test "X`expr 00001 : '.*\(...\)'`" = X001; then
--  as_expr=expr
--else
--  as_expr=false
--fi
--
--if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
--  as_basename=basename
--else
--  as_basename=false
--fi
--
--
--# Name of the executable.
--as_me=`$as_basename -- "$0" ||
--$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
--	 X"$0" : 'X\(//\)$' \| \
--	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
--$as_echo X/"$0" |
--    sed '/^.*\/\([^/][^/]*\)\/*$/{
--	    s//\1/
--	    q
--	  }
--	  /^X\/\(\/\/\)$/{
--	    s//\1/
--	    q
--	  }
--	  /^X\/\(\/\).*/{
--	    s//\1/
--	    q
--	  }
--	  s/.*/./; q'`
--
- # CDPATH.
--$as_unset CDPATH
--
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
- if test "x$CONFIG_SHELL" = x; then
--  if (eval ":") 2>/dev/null; then
--  as_have_required=yes
-+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-+  emulate sh
-+  NULLCMD=:
-+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-+  # is contrary to our usage.  Disable this feature.
-+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-+  setopt NO_GLOB_SUBST
- else
--  as_have_required=no
-+  case \`(set -o) 2>/dev/null\` in #(
-+  *posix*) :
-+    set -o posix ;; #(
-+  *) :
-+     ;;
-+esac
- fi
--
--  if test $as_have_required = yes &&	 (eval ":
--(as_func_return () {
--  (exit \$1)
--}
--as_func_success () {
--  as_func_return 0
--}
--as_func_failure () {
--  as_func_return 1
--}
--as_func_ret_success () {
--  return 0
--}
--as_func_ret_failure () {
--  return 1
--}
-+"
-+  as_required="as_fn_return () { (exit \$1); }
-+as_fn_success () { as_fn_return 0; }
-+as_fn_failure () { as_fn_return 1; }
-+as_fn_ret_success () { return 0; }
-+as_fn_ret_failure () { return 1; }
- 
- exitcode=0
--if as_func_success; then
--  :
--else
--  exitcode=1
--  echo as_func_success failed.
--fi
--
--if as_func_failure; then
--  exitcode=1
--  echo as_func_failure succeeded.
--fi
--
--if as_func_ret_success; then
--  :
--else
--  exitcode=1
--  echo as_func_ret_success failed.
--fi
--
--if as_func_ret_failure; then
--  exitcode=1
--  echo as_func_ret_failure succeeded.
--fi
--
--if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
--  :
-+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-+
-+else
-+  exitcode=1; echo positional parameters were not saved.
-+fi
-+test x\$exitcode = x0 || exit 1"
-+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-+test \$(( 1 + 1 )) = 2 || exit 1"
-+  if (eval "$as_required") 2>/dev/null; then :
-+  as_have_required=yes
- else
--  exitcode=1
--  echo positional parameters were not saved.
-+  as_have_required=no
- fi
-+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
- 
--test \$exitcode = 0) || { (exit 1); exit 1; }
--
--(
--  as_lineno_1=\$LINENO
--  as_lineno_2=\$LINENO
--  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
--  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
--") 2> /dev/null; then
--  :
- else
--  as_candidate_shells=
--    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+as_found=false
- for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  case $as_dir in
-+  as_found=:
-+  case $as_dir in #(
- 	 /*)
- 	   for as_base in sh bash ksh sh5; do
--	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-+	     # Try only shells that exist, to save several forks.
-+	     as_shell=$as_dir/$as_base
-+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-+  CONFIG_SHELL=$as_shell as_have_required=yes
-+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-+  break 2
-+fi
-+fi
- 	   done;;
-        esac
-+  as_found=false
- done
-+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-+  CONFIG_SHELL=$SHELL as_have_required=yes
-+fi; }
- IFS=$as_save_IFS
- 
- 
--      for as_shell in $as_candidate_shells $SHELL; do
--	 # Try only shells that exist, to save several forks.
--	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
--		{ ("$as_shell") 2> /dev/null <<\_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
--  # is contrary to our usage.  Disable this feature.
--  alias -g '${1+"$@"}'='"$@"'
--  setopt NO_GLOB_SUBST
--else
--  case `(set -o) 2>/dev/null` in
--  *posix*) set -o posix ;;
--esac
--
--fi
--
--
--:
--_ASEOF
--}; then
--  CONFIG_SHELL=$as_shell
--	       as_have_required=yes
--	       if { "$as_shell" 2> /dev/null <<\_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
--  # is contrary to our usage.  Disable this feature.
--  alias -g '${1+"$@"}'='"$@"'
--  setopt NO_GLOB_SUBST
--else
--  case `(set -o) 2>/dev/null` in
--  *posix*) set -o posix ;;
--esac
--
--fi
--
--
--:
--(as_func_return () {
--  (exit $1)
--}
--as_func_success () {
--  as_func_return 0
--}
--as_func_failure () {
--  as_func_return 1
--}
--as_func_ret_success () {
--  return 0
--}
--as_func_ret_failure () {
--  return 1
--}
--
--exitcode=0
--if as_func_success; then
--  :
--else
--  exitcode=1
--  echo as_func_success failed.
--fi
--
--if as_func_failure; then
--  exitcode=1
--  echo as_func_failure succeeded.
--fi
--
--if as_func_ret_success; then
--  :
--else
--  exitcode=1
--  echo as_func_ret_success failed.
--fi
--
--if as_func_ret_failure; then
--  exitcode=1
--  echo as_func_ret_failure succeeded.
--fi
--
--if ( set x; as_func_ret_success y && test x = "$1" ); then
--  :
--else
--  exitcode=1
--  echo positional parameters were not saved.
--fi
--
--test $exitcode = 0) || { (exit 1); exit 1; }
--
--(
--  as_lineno_1=$LINENO
--  as_lineno_2=$LINENO
--  test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
--
--_ASEOF
--}; then
--  break
--fi
--
--fi
--
--      done
--
--      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
-+      if test "x$CONFIG_SHELL" != x; then :
-+  # We cannot yet assume a decent shell, so we have to provide a
-+	# neutralization value for shells without unset; and this also
-+	# works around shells that cannot unset nonexistent variables.
-+	BASH_ENV=/dev/null
-+	ENV=/dev/null
-+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
- 	export CONFIG_SHELL
- 	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
- fi
- 
--
--    if test $as_have_required = no; then
--  echo This script requires a shell more modern than all the
--      echo shells that I found on your system.  Please install a
--      echo modern shell, or manually run the script under such a
--      echo shell if you do have one.
--      { (exit 1); exit 1; }
-+    if test x$as_have_required = xno; then :
-+  $as_echo "$0: This script requires a shell more modern than all"
-+  $as_echo "$0: the shells that I found on your system."
-+  if test x${ZSH_VERSION+set} = xset ; then
-+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-+  else
-+    $as_echo "$0: Please tell bug-autoconf at gnu.org and
-+$0: http://bugzilla.gnome.org/enter_bug.cgi?product=totem
-+$0: about your system, including any error possibly output
-+$0: before this message. Then install a modern shell, or
-+$0: manually run the script under such a shell if you do
-+$0: have one."
-+  fi
-+  exit 1
- fi
--
--
- fi
--
- fi
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+export SHELL
-+# Unset more variables known to interfere with behavior of common tools.
-+CLICOLOR_FORCE= GREP_OPTIONS=
-+unset CLICOLOR_FORCE GREP_OPTIONS
-+
-+## --------------------- ##
-+## M4sh Shell Functions. ##
-+## --------------------- ##
-+# as_fn_unset VAR
-+# ---------------
-+# Portably unset VAR.
-+as_fn_unset ()
-+{
-+  { eval $1=; unset $1;}
-+}
-+as_unset=as_fn_unset
-+
-+# as_fn_set_status STATUS
-+# -----------------------
-+# Set $? to STATUS, without forking.
-+as_fn_set_status ()
-+{
-+  return $1
-+} # as_fn_set_status
-+
-+# as_fn_exit STATUS
-+# -----------------
-+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-+as_fn_exit ()
-+{
-+  set +e
-+  as_fn_set_status $1
-+  exit $1
-+} # as_fn_exit
-+
-+# as_fn_mkdir_p
-+# -------------
-+# Create "$as_dir" as a directory, including parents if necessary.
-+as_fn_mkdir_p ()
-+{
- 
-+  case $as_dir in #(
-+  -*) as_dir=./$as_dir;;
-+  esac
-+  test -d "$as_dir" || eval $as_mkdir_p || {
-+    as_dirs=
-+    while :; do
-+      case $as_dir in #(
-+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-+      *) as_qdir=$as_dir;;
-+      esac
-+      as_dirs="'$as_qdir' $as_dirs"
-+      as_dir=`$as_dirname -- "$as_dir" ||
-+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$as_dir" : 'X\(//\)[^/]' \| \
-+	 X"$as_dir" : 'X\(//\)$' \| \
-+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$as_dir" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+      test -d "$as_dir" && break
-+    done
-+    test -z "$as_dirs" || eval "mkdir $as_dirs"
-+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
- 
- 
--(eval "as_func_return () {
--  (exit \$1)
--}
--as_func_success () {
--  as_func_return 0
--}
--as_func_failure () {
--  as_func_return 1
--}
--as_func_ret_success () {
--  return 0
--}
--as_func_ret_failure () {
--  return 1
--}
-+} # as_fn_mkdir_p
-+# as_fn_append VAR VALUE
-+# ----------------------
-+# Append the text in VALUE to the end of the definition contained in VAR. Take
-+# advantage of any shell optimizations that allow amortized linear growth over
-+# repeated appends, instead of the typical quadratic growth present in naive
-+# implementations.
-+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-+  eval 'as_fn_append ()
-+  {
-+    eval $1+=\$2
-+  }'
-+else
-+  as_fn_append ()
-+  {
-+    eval $1=\$$1\$2
-+  }
-+fi # as_fn_append
- 
--exitcode=0
--if as_func_success; then
--  :
-+# as_fn_arith ARG...
-+# ------------------
-+# Perform arithmetic evaluation on the ARGs, and store the result in the
-+# global $as_val. Take advantage of shells that can avoid forks. The arguments
-+# must be portable across $(()) and expr.
-+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-+  eval 'as_fn_arith ()
-+  {
-+    as_val=$(( $* ))
-+  }'
- else
--  exitcode=1
--  echo as_func_success failed.
--fi
-+  as_fn_arith ()
-+  {
-+    as_val=`expr "$@" || test $? -eq 1`
-+  }
-+fi # as_fn_arith
- 
--if as_func_failure; then
--  exitcode=1
--  echo as_func_failure succeeded.
--fi
- 
--if as_func_ret_success; then
--  :
-+# as_fn_error ERROR [LINENO LOG_FD]
-+# ---------------------------------
-+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-+# script with status $?, using 1 if that was 0.
-+as_fn_error ()
-+{
-+  as_status=$?; test $as_status -eq 0 && as_status=1
-+  if test "$3"; then
-+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-+  fi
-+  $as_echo "$as_me: error: $1" >&2
-+  as_fn_exit $as_status
-+} # as_fn_error
-+
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+  as_expr=expr
- else
--  exitcode=1
--  echo as_func_ret_success failed.
-+  as_expr=false
- fi
- 
--if as_func_ret_failure; then
--  exitcode=1
--  echo as_func_ret_failure succeeded.
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-+  as_basename=basename
-+else
-+  as_basename=false
- fi
- 
--if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
--  :
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+  as_dirname=dirname
- else
--  exitcode=1
--  echo positional parameters were not saved.
-+  as_dirname=false
- 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.
--}
-+as_me=`$as_basename -- "$0" ||
-+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-+	 X"$0" : 'X\(//\)$' \| \
-+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X/"$0" |
-+    sed '/^.*\/\([^/][^/]*\)\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
- 
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
- 
- 
--  as_lineno_1=$LINENO
--  as_lineno_2=$LINENO
--  test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
--
--  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
--  # uniformly replaced by the line number.  The first 'sed' inserts a
--  # line-number line after each line using $LINENO; the second 'sed'
--  # does the real work.  The second script uses 'N' to pair each
--  # line-number line with the line containing $LINENO, and appends
--  # trailing '-' during substitution so that $LINENO is not a special
--  # case at line end.
--  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
--  # scripts with optimization help from Paolo Bonzini.  Blame Lee
--  # E. McMahon (1931-1989) for sed's syntax.  :-)
-+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-   sed -n '
-     p
-     /[$]LINENO/=
-@@ -473,8 +443,7 @@
-       s/-\n.*//
-     ' >$as_me.lineno &&
-   chmod +x "$as_me.lineno" ||
--    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
--   { (exit 1); exit 1; }; }
-+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
- 
-   # Don't try to exec as it changes $[0], causing all sort of problems
-   # (the dirname of $[0] is not the place where we might find the
-@@ -484,29 +453,18 @@
-   exit
- }
- 
--
--if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
--  as_dirname=dirname
--else
--  as_dirname=false
--fi
--
- ECHO_C= ECHO_N= ECHO_T=
--case `echo -n x` in
-+case `echo -n x` in #(((((
- -n*)
--  case `echo 'x\c'` in
-+  case `echo 'xy\c'` in
-   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
--  *)   ECHO_C='\c';;
-+  xy)  ECHO_C='\c';;
-+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-+       ECHO_T='	';;
-   esac;;
- *)
-   ECHO_N='-n';;
- esac
--if expr a : '\(a\)' >/dev/null 2>&1 &&
--   test "X`expr 00001 : '.*\(...\)'`" = X001; then
--  as_expr=expr
--else
--  as_expr=false
--fi
- 
- rm -f conf$$ conf$$.exe conf$$.file
- if test -d conf$$.dir; then
-@@ -536,7 +494,7 @@
- rmdir conf$$.dir 2>/dev/null
- 
- if mkdir -p . 2>/dev/null; then
--  as_mkdir_p=:
-+  as_mkdir_p='mkdir -p "$as_dir"'
- else
-   test -d ./-p && rmdir ./-p
-   as_mkdir_p=false
-@@ -555,10 +513,10 @@
-       if test -d "$1"; then
- 	test -d "$1/.";
-       else
--	case $1 in
-+	case $1 in #(
- 	-*)set "./$1";;
- 	esac;
--	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- 	???[sx]*):;;*)false;;esac;fi
-     '\'' sh
-   '
-@@ -573,7 +531,6 @@
- 
- 
- 
--
- # Check that we are running under the correct shell.
- SHELL=${CONFIG_SHELL-/bin/sh}
- 
-@@ -722,7 +679,8 @@
- 
- 
- 
--exec 7<&0 </dev/null 6>&1
-+test -n "$DJDIR" || exec 7<&0 </dev/null
-+exec 6>&1
- 
- # Name of the host.
- # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-@@ -740,7 +698,6 @@
- subdirs=
- MFLAGS=
- MAKEFLAGS=
--SHELL=${CONFIG_SHELL-/bin/sh}
- 
- # Identity of this package.
- PACKAGE_NAME='totem'
-@@ -748,6 +705,7 @@
- PACKAGE_VERSION='2.29.91'
- PACKAGE_STRING='totem 2.29.91'
- PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=totem'
-+PACKAGE_URL=''
- 
- ac_unique_file="src/totem.c"
- # Factoring default headers for most tests.
-@@ -795,12 +753,20 @@
+diff -Naur totem-2.29.92.old/configure totem-2.29.92/configure
+--- totem-2.29.92.old/configure	2010-03-15 18:51:28.000000000 +0100
++++ totem-2.29.92/configure	2010-03-16 09:08:40.532668609 +0100
+@@ -753,12 +753,20 @@
  AM_CFLAGS
  AM_CPPFLAGS
  FULL_LIBEXECDIR
@@ -1224,7 +351,7 @@
  DISABLE_DEPRECATED
  WARN_CXXFLAGS
  WARN_CFLAGS
-@@ -847,6 +813,8 @@
+@@ -805,6 +813,8 @@
  LIBEPC_CFLAGS
  BEMUSED_LIBS
  BEMUSED_CFLAGS
@@ -1233,15 +360,7 @@
  GMYTH_LIBS
  GMYTH_CFLAGS
  LIRC_LIBS
-@@ -1078,6 +1046,7 @@
- program_transform_name
- prefix
- exec_prefix
-+PACKAGE_URL
- PACKAGE_BUGREPORT
- PACKAGE_STRING
- PACKAGE_VERSION
-@@ -1127,6 +1096,8 @@
+@@ -1086,6 +1096,8 @@
  enable_iso_cxx
  with_html_dir
  enable_gtk_doc
@@ -1250,7 +369,7 @@
  enable_run_in_source_tree
  '
        ac_precious_vars='build_alias
-@@ -1172,6 +1143,8 @@
+@@ -1131,6 +1143,8 @@
  MEDIA_PLAYER_KEYS_LIBS
  GMYTH_CFLAGS
  GMYTH_LIBS
@@ -1259,149 +378,16 @@
  BEMUSED_CFLAGS
  BEMUSED_LIBS
  LIBEPC_CFLAGS
-@@ -1299,8 +1272,7 @@
-     ac_useropt=`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
--   { (exit 1); exit 1; }; }
-+      as_fn_error "invalid feature name: $ac_useropt"
-     ac_useropt_orig=$ac_useropt
-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-     case $ac_user_opts in
-@@ -1326,8 +1298,7 @@
-     ac_useropt=`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
--   { (exit 1); exit 1; }; }
-+      as_fn_error "invalid feature name: $ac_useropt"
-     ac_useropt_orig=$ac_useropt
-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-     case $ac_user_opts in
-@@ -1531,8 +1502,7 @@
-     ac_useropt=`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
--   { (exit 1); exit 1; }; }
-+      as_fn_error "invalid package name: $ac_useropt"
-     ac_useropt_orig=$ac_useropt
-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-     case $ac_user_opts in
-@@ -1548,8 +1518,7 @@
-     ac_useropt=`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
--   { (exit 1); exit 1; }; }
-+      as_fn_error "invalid package name: $ac_useropt"
-     ac_useropt_orig=$ac_useropt
-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-     case $ac_user_opts in
-@@ -1579,17 +1548,17 @@
-   | --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
--Try \`$0 --help' for more information." >&2
--   { (exit 1); exit 1; }; }
-+  -*) as_fn_error "unrecognized option: \`$ac_option'
-+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
--   { (exit 1); exit 1; }; }
-+    case $ac_envvar in #(
-+      '' | [0-9]* | *[!_$as_cr_alnum]* )
-+      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
-+    esac
-     eval $ac_envvar=\$ac_optarg
-     export $ac_envvar ;;
- 
-@@ -1606,15 +1575,13 @@
- 
- 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
--   { (exit 1); exit 1; }; }
-+  as_fn_error "missing argument to $ac_option"
- 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_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
-     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-   esac
- fi
-@@ -1637,8 +1604,7 @@
-     [\\/$]* | ?:[\\/]* )  continue;;
-     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-   esac
--  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
--   { (exit 1); exit 1; }; }
-+  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
- done
- 
- # There might be people who depend on the old broken behavior: `$host'
-@@ -1668,11 +1634,9 @@
- 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
--   { (exit 1); exit 1; }; }
-+  as_fn_error "working directory cannot be determined"
- test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
--  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
--   { (exit 1); exit 1; }; }
-+  as_fn_error "pwd does not report name of working directory"
- 
- 
- # Find the source files, if location was not specified.
-@@ -1711,13 +1675,11 @@
- 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
--   { (exit 1); exit 1; }; }
-+  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
- 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
--   { (exit 1); exit 1; }; }
-+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
- 	pwd)`
- # When building in place, set srcdir=.
- if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1864,7 +1826,9 @@
-                                Turn on compiler warnings.
+@@ -1813,6 +1827,8 @@
  
    --enable-iso-cxx        Try to warn if code is not ISO C++
--  --enable-gtk-doc        use gtk-doc to build documentation [default=no]
-+  --enable-gtk-doc        use gtk-doc to build documentation [[default=no]]
+   --enable-gtk-doc        use gtk-doc to build documentation [[default=no]]
 +  --enable-gtk-doc-html   build documentation in html format [[default=yes]]
 +  --enable-gtk-doc-pdf    build documentation in pdf format [[default=no]]
    --disable-run-in-source-tree
                            disable search for UI files and plugins in local
                            directory
-@@ -1897,7 +1861,7 @@
-   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-               nonstandard directory <lib dir>
-   LIBS        libraries to pass to the linker, e.g. -l<library>
--  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-               you have headers in a nonstandard directory <include dir>
-   CPP         C preprocessor
-   PKG_CONFIG  path to pkg-config utility
-@@ -1950,6 +1914,8 @@
+@@ -1898,6 +1914,8 @@
    GMYTH_CFLAGS
                C compiler flags for GMYTH, overriding pkg-config
    GMYTH_LIBS  linker flags for GMYTH, overriding pkg-config
@@ -1410,6120 +396,24 @@
    BEMUSED_CFLAGS
                C compiler flags for BEMUSED, overriding pkg-config
    BEMUSED_LIBS
-@@ -2051,21 +2017,499 @@
- if $ac_init_version; then
-   cat <<\_ACEOF
- totem configure 2.29.91
--generated by GNU Autoconf 2.63
-+generated by GNU Autoconf 2.65
- 
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+Copyright (C) 2009 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
-   exit
- fi
-+
-+## ------------------------ ##
-+## Autoconf initialization. ##
-+## ------------------------ ##
-+
-+# ac_fn_c_try_compile LINENO
-+# --------------------------
-+# Try to compile conftest.$ac_ext, and return whether this succeeded.
-+ac_fn_c_try_compile ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  rm -f conftest.$ac_objext
-+  if { { ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_compile") 2>conftest.err
-+  ac_status=$?
-+  if test -s conftest.err; then
-+    grep -v '^ *+' conftest.err >conftest.er1
-+    cat conftest.er1 >&5
-+    mv -f conftest.er1 conftest.err
-+  fi
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then :
-+  ac_retval=0
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_retval=1
-+fi
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  as_fn_set_status $ac_retval
-+
-+} # ac_fn_c_try_compile
-+
-+# ac_fn_c_try_cpp LINENO
-+# ----------------------
-+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-+ac_fn_c_try_cpp ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  if { { ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-+  ac_status=$?
-+  if test -s conftest.err; then
-+    grep -v '^ *+' conftest.err >conftest.er1
-+    cat conftest.er1 >&5
-+    mv -f conftest.er1 conftest.err
-+  fi
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then :
-+  ac_retval=0
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+    ac_retval=1
-+fi
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  as_fn_set_status $ac_retval
-+
-+} # ac_fn_c_try_cpp
-+
-+# ac_fn_c_try_run LINENO
-+# ----------------------
-+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-+# that executables *can* be run.
-+ac_fn_c_try_run ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  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:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && { 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:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; }; then :
-+  ac_retval=0
-+else
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+       $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+       ac_retval=$ac_status
-+fi
-+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  as_fn_set_status $ac_retval
-+
-+} # ac_fn_c_try_run
-+
-+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-+# -------------------------------------------------------
-+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-+# the include files in INCLUDES and setting the cache variable VAR
-+# accordingly.
-+ac_fn_c_check_header_mongrel ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-+$as_echo_n "checking for $2... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+fi
-+eval ac_res=\$$3
-+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+else
-+  # Is the header compilable?
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-+$as_echo_n "checking $2 usability... " >&6; }
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$4
-+#include <$2>
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_header_compiler=yes
-+else
-+  ac_header_compiler=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
-+
-+# Is the header present?
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-+$as_echo_n "checking $2 presence... " >&6; }
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <$2>
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+  ac_header_preproc=yes
-+else
-+  ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-+$as_echo "$ac_header_preproc" >&6; }
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-+  yes:no: )
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-+    ;;
-+  no:yes:* )
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-+( cat <<\_ASBOX
-+## -------------------------------------------------------------------- ##
-+## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=totem ##
-+## -------------------------------------------------------------------- ##
-+_ASBOX
-+     ) | sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+esac
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-+$as_echo_n "checking for $2... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  eval "$3=\$ac_header_compiler"
-+fi
-+eval ac_res=\$$3
-+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+fi
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+
-+} # ac_fn_c_check_header_mongrel
-+
-+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-+# -------------------------------------------------------
-+# Tests whether HEADER exists and can be compiled using the include files in
-+# INCLUDES, setting the cache variable VAR accordingly.
-+ac_fn_c_check_header_compile ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-+$as_echo_n "checking for $2... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$4
-+#include <$2>
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  eval "$3=yes"
-+else
-+  eval "$3=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+eval ac_res=\$$3
-+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+
-+} # ac_fn_c_check_header_compile
-+
-+# ac_fn_c_try_link LINENO
-+# -----------------------
-+# Try to link conftest.$ac_ext, and return whether this succeeded.
-+ac_fn_c_try_link ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  rm -f conftest.$ac_objext conftest$ac_exeext
-+  if { { ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_link") 2>conftest.err
-+  ac_status=$?
-+  if test -s conftest.err; then
-+    grep -v '^ *+' conftest.err >conftest.er1
-+    cat conftest.er1 >&5
-+    mv -f conftest.er1 conftest.err
-+  fi
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then :
-+  ac_retval=0
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_retval=1
-+fi
-+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-+  # interfere with the next link command; also delete a directory that is
-+  # left behind by Apple's compiler.  We do this before executing the actions.
-+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  as_fn_set_status $ac_retval
-+
-+} # ac_fn_c_try_link
-+
-+# ac_fn_c_check_func LINENO FUNC VAR
-+# ----------------------------------
-+# Tests whether FUNC exists, setting the cache variable VAR accordingly
-+ac_fn_c_check_func ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-+$as_echo_n "checking for $2... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $2 innocuous_$2
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $2 (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $2
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char $2 ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined __stub_$2 || defined __stub___$2
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return $2 ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  eval "$3=yes"
-+else
-+  eval "$3=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+fi
-+eval ac_res=\$$3
-+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+
-+} # ac_fn_c_check_func
-+
-+# ac_fn_cxx_try_compile LINENO
-+# ----------------------------
-+# Try to compile conftest.$ac_ext, and return whether this succeeded.
-+ac_fn_cxx_try_compile ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  rm -f conftest.$ac_objext
-+  if { { ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_compile") 2>conftest.err
-+  ac_status=$?
-+  if test -s conftest.err; then
-+    grep -v '^ *+' conftest.err >conftest.er1
-+    cat conftest.er1 >&5
-+    mv -f conftest.er1 conftest.err
-+  fi
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && {
-+	 test -z "$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then :
-+  ac_retval=0
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_retval=1
-+fi
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  as_fn_set_status $ac_retval
-+
-+} # ac_fn_cxx_try_compile
-+
-+# ac_fn_cxx_try_cpp LINENO
-+# ------------------------
-+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-+ac_fn_cxx_try_cpp ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  if { { ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-+  ac_status=$?
-+  if test -s conftest.err; then
-+    grep -v '^ *+' conftest.err >conftest.er1
-+    cat conftest.er1 >&5
-+    mv -f conftest.er1 conftest.err
-+  fi
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } >/dev/null && {
-+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then :
-+  ac_retval=0
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+    ac_retval=1
-+fi
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  as_fn_set_status $ac_retval
-+
-+} # ac_fn_cxx_try_cpp
-+
-+# ac_fn_cxx_try_link LINENO
-+# -------------------------
-+# Try to link conftest.$ac_ext, and return whether this succeeded.
-+ac_fn_cxx_try_link ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  rm -f conftest.$ac_objext conftest$ac_exeext
-+  if { { ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_link") 2>conftest.err
-+  ac_status=$?
-+  if test -s conftest.err; then
-+    grep -v '^ *+' conftest.err >conftest.er1
-+    cat conftest.er1 >&5
-+    mv -f conftest.er1 conftest.err
-+  fi
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && {
-+	 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 :
-+  ac_retval=0
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_retval=1
-+fi
-+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-+  # interfere with the next link command; also delete a directory that is
-+  # left behind by Apple's compiler.  We do this before executing the actions.
-+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  as_fn_set_status $ac_retval
-+
-+} # ac_fn_cxx_try_link
- cat >config.log <<_ACEOF
- This file contains any messages produced by compilers while
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by totem $as_me 2.29.91, which was
--generated by GNU Autoconf 2.63.  Invocation command line was
-+generated by GNU Autoconf 2.65.  Invocation command line was
- 
-   $ $0 $@
- 
-@@ -2101,8 +2545,8 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  $as_echo "PATH: $as_dir"
--done
-+    $as_echo "PATH: $as_dir"
-+  done
- IFS=$as_save_IFS
- 
- } >&5
-@@ -2139,9 +2583,9 @@
-       ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-     esac
-     case $ac_pass in
--    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
-     2)
--      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-+      as_fn_append ac_configure_args1 " '$ac_arg'"
-       if test $ac_must_keep_next = true; then
- 	ac_must_keep_next=false # Got value, back to normal.
-       else
-@@ -2157,13 +2601,13 @@
- 	  -* ) ac_must_keep_next=true ;;
- 	esac
-       fi
--      ac_configure_args="$ac_configure_args '$ac_arg'"
-+      as_fn_append ac_configure_args " '$ac_arg'"
-       ;;
-     esac
-   done
- done
--$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
--$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-+{ ac_configure_args0=; unset ac_configure_args0;}
-+{ ac_configure_args1=; unset ac_configure_args1;}
- 
- # When interrupted or exit'd, cleanup temporary files, and complete
- # config.log.  We remove comments because anyway the quotes in there
-@@ -2188,13 +2632,13 @@
-     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
-+      *_cv_*) { $as_echo "$as_me:${as_lineno-$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 ;;
-+      *) { eval $ac_var=; unset $ac_var;} ;;
-       esac ;;
-     esac
-   done
-@@ -2266,39 +2710,41 @@
-     exit $exit_status
- ' 0
- for ac_signal in 1 2 13 15; do
--  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
- done
- ac_signal=0
- 
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
- rm -f -r conftest* confdefs.h
- 
-+$as_echo "/* confdefs.h */" > confdefs.h
-+
- # Predefined preprocessor variables.
- 
- cat >>confdefs.h <<_ACEOF
- #define PACKAGE_NAME "$PACKAGE_NAME"
- _ACEOF
- 
--
- cat >>confdefs.h <<_ACEOF
- #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
- _ACEOF
- 
--
- cat >>confdefs.h <<_ACEOF
- #define PACKAGE_VERSION "$PACKAGE_VERSION"
- _ACEOF
- 
--
- cat >>confdefs.h <<_ACEOF
- #define PACKAGE_STRING "$PACKAGE_STRING"
- _ACEOF
- 
--
- cat >>confdefs.h <<_ACEOF
- #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
- _ACEOF
- 
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_URL "$PACKAGE_URL"
-+_ACEOF
-+
- 
- # Let the site file select an alternate cache file if it wants to.
- # Prefer an explicitly selected file to automatically selected ones.
-@@ -2316,8 +2762,8 @@
- for ac_site_file in "$ac_site_file1" "$ac_site_file2"
- do
-   test "x$ac_site_file" = xNONE && continue
--  if test -r "$ac_site_file"; then
--    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
- $as_echo "$as_me: loading site script $ac_site_file" >&6;}
-     sed 's/^/| /' "$ac_site_file" >&5
-     . "$ac_site_file"
-@@ -2325,10 +2771,10 @@
- done
- 
- 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
-+  # Some versions of bash will fail to source /dev/null (special files
-+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
- $as_echo "$as_me: loading cache $cache_file" >&6;}
-     case $cache_file in
-       [\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2336,7 +2782,7 @@
-     esac
-   fi
- else
--  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
- $as_echo "$as_me: creating cache $cache_file" >&6;}
-   >$cache_file
- fi
-@@ -2351,11 +2797,11 @@
-   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:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
- $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-       ac_cache_corrupted=: ;;
-     ,set)
--      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
- $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-       ac_cache_corrupted=: ;;
-     ,);;
-@@ -2365,17 +2811,17 @@
- 	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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
- $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-       fi;;
-   esac
-@@ -2387,63 +2833,40 @@
-     esac
-     case " $ac_configure_args " in
-       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
--      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-     esac
-   fi
- done
- if $ac_cache_corrupted; then
--  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
- $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
--  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
--$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
- fi
-+## -------------------- ##
-+## Main body of script. ##
-+## -------------------- ##
- 
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
- 
- 
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-+    # Check whether --enable-maintainer-mode was given.
-+if test "${enable_maintainer_mode+set}" = set; then :
-+  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-+else
-+  USE_MAINTAINER_MODE=no
-+fi
- 
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
--
--
--
--{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
--$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
--    # Check whether --enable-maintainer-mode was given.
--if test "${enable_maintainer_mode+set}" = set; then
--  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
--else
--  USE_MAINTAINER_MODE=no
--fi
--
--  { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
- $as_echo "$USE_MAINTAINER_MODE" >&6; }
-    if test $USE_MAINTAINER_MODE = yes; then
-   MAINTAINER_MODE_TRUE=
-@@ -2464,24 +2887,16 @@
- 
- ac_aux_dir=
- for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
--  if test -f "$ac_dir/install-sh"; then
--    ac_aux_dir=$ac_dir
--    ac_install_sh="$ac_aux_dir/install-sh -c"
--    break
--  elif test -f "$ac_dir/install.sh"; then
--    ac_aux_dir=$ac_dir
--    ac_install_sh="$ac_aux_dir/install.sh -c"
--    break
--  elif test -f "$ac_dir/shtool"; then
--    ac_aux_dir=$ac_dir
--    ac_install_sh="$ac_aux_dir/shtool install -c"
--    break
--  fi
-+  for ac_t in install-sh install.sh shtool; do
-+    if test -f "$ac_dir/$ac_t"; then
-+      ac_aux_dir=$ac_dir
-+      ac_install_sh="$ac_aux_dir/$ac_t -c"
-+      break 2
-+    fi
-+  done
- 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;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
- fi
- 
- # These three variables are undocumented and unsupported,
-@@ -2507,10 +2922,10 @@
- # 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 "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
- $as_echo_n "checking for a BSD-compatible install... " >&6; }
- if test -z "$INSTALL"; then
--if test "${ac_cv_path_install+set}" = set; then
-+if test "${ac_cv_path_install+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2518,11 +2933,11 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  # Account for people who put trailing slashes in PATH elements.
--case $as_dir/ in
--  ./ | .// | /cC/* | \
-+    # Account for people who put trailing slashes in PATH elements.
-+case $as_dir/ in #((
-+  ./ | .// | /[cC]/* | \
-   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
--  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
-   /usr/ucb/* ) ;;
-   *)
-     # OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2559,7 +2974,7 @@
-     ;;
- esac
- 
--done
-+  done
- IFS=$as_save_IFS
- 
- rm -rf conftest.one conftest.two conftest.dir
-@@ -2575,7 +2990,7 @@
-     INSTALL=$ac_install_sh
-   fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
- $as_echo "$INSTALL" >&6; }
- 
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2586,7 +3001,7 @@
- 
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
--{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
- $as_echo_n "checking whether build environment is sane... " >&6; }
- # Just in case
- sleep 1
-@@ -2597,15 +3012,11 @@
- '
- case `pwd` in
-   *[\\\"\#\$\&\'\`$am_lf]*)
--    { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
--$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
--   { (exit 1); exit 1; }; };;
-+    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
- esac
- case $srcdir in
-   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
--    { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
--$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
--   { (exit 1); exit 1; }; };;
-+    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
- esac
- 
- # Do `set' in a subshell so we don't clobber the current shell's
-@@ -2627,11 +3038,8 @@
-       # 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
--alias in your environment" >&5
--$as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
--alias in your environment" >&2;}
--   { (exit 1); exit 1; }; }
-+      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
-+alias in your environment" "$LINENO" 5
-    fi
- 
-    test "$2" = conftest.file
-@@ -2640,13 +3048,10 @@
-    # Ok.
-    :
- else
--   { { $as_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!
--Check your system clock" >&2;}
--   { (exit 1); exit 1; }; }
-+   as_fn_error "newly created file is older than distributed files!
-+Check your system clock" "$LINENO" 5
- fi
--{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- test "$program_prefix" != NONE &&
-   program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2674,7 +3079,7 @@
-   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:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
- $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
- fi
- 
-@@ -2695,9 +3100,9 @@
-   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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_STRIP+set}" = set; then
-+if test "${ac_cv_prog_STRIP+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$STRIP"; then
-@@ -2708,24 +3113,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- STRIP=$ac_cv_prog_STRIP
- if test -n "$STRIP"; then
--  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
- $as_echo "$STRIP" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -2735,9 +3140,9 @@
-   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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_STRIP"; then
-@@ -2748,24 +3153,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- 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 "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
- $as_echo "$ac_ct_STRIP" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -2774,7 +3179,7 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -2787,10 +3192,10 @@
- fi
- INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
- 
--{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
- $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
- if test -z "$MKDIR_P"; then
--  if test "${ac_cv_path_mkdir+set}" = set; then
-+  if test "${ac_cv_path_mkdir+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2798,7 +3203,7 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_prog in mkdir gmkdir; do
-+    for ac_prog in mkdir gmkdir; do
- 	 for ac_exec_ext in '' $ac_executable_extensions; do
- 	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
- 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-@@ -2810,11 +3215,12 @@
- 	   esac
- 	 done
-        done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- 
-+  test -d ./--version && rmdir ./--version
-   if test "${ac_cv_path_mkdir+set}" = set; then
-     MKDIR_P="$ac_cv_path_mkdir -p"
-   else
-@@ -2822,11 +3228,10 @@
-     # value for MKDIR_P within a source directory, because that will
-     # break other packages using the cache if that directory is
-     # removed, or if the value is a relative name.
--    test -d ./--version && rmdir ./--version
-     MKDIR_P="$ac_install_sh -d"
-   fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
- $as_echo "$MKDIR_P" >&6; }
- 
- mkdir_p="$MKDIR_P"
-@@ -2839,9 +3244,9 @@
- 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_AWK+set}" = set; then
-+if test "${ac_cv_prog_AWK+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$AWK"; then
-@@ -2852,24 +3257,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- AWK=$ac_cv_prog_AWK
- if test -n "$AWK"; then
--  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
- $as_echo "$AWK" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -2877,11 +3282,11 @@
-   test -n "$AWK" && break
- done
- 
--{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
- $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
- set x ${MAKE-make}
- ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
--if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat >conftest.make <<\_ACEOF
-@@ -2899,11 +3304,11 @@
- 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 "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-   SET_MAKE=
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-   SET_MAKE="MAKE=${MAKE-make}"
- fi
-@@ -2923,9 +3328,7 @@
-   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;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-   fi
- fi
- 
-@@ -2984,7 +3387,7 @@
- 
- # Enable silent build when available (Automake 1.11)
- # Check whether --enable-silent-rules was given.
--if test "${enable_silent_rules+set}" = set; then
-+if test "${enable_silent_rules+set}" = set; then :
-   enableval=$enable_silent_rules;
- fi
- 
-@@ -3015,7 +3418,7 @@
- .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 "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
- $as_echo_n "checking for style of include used by $am_make... " >&6; }
- am__include="#"
- am__quote=
-@@ -3043,12 +3446,12 @@
- fi
- 
- 
--{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
- $as_echo "$_am_result" >&6; }
- rm -f confinc confmf
- 
- # Check whether --enable-dependency-tracking was given.
--if test "${enable_dependency_tracking+set}" = set; then
-+if test "${enable_dependency_tracking+set}" = set; then :
-   enableval=$enable_dependency_tracking;
- fi
- 
-@@ -3073,9 +3476,9 @@
- 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-@@ -3086,24 +3489,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
- $as_echo "$CC" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -3113,9 +3516,9 @@
-   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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_CC"; then
-@@ -3126,24 +3529,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- 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 "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
- $as_echo "$ac_ct_CC" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -3152,7 +3555,7 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -3166,9 +3569,9 @@
-           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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-@@ -3179,24 +3582,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
- $as_echo "$CC" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -3206,9 +3609,9 @@
- 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-@@ -3220,18 +3623,18 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-        continue
-      fi
-     ac_cv_prog_CC="cc"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- if test $ac_prog_rejected = yes; then
-@@ -3250,10 +3653,10 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
- $as_echo "$CC" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -3265,9 +3668,9 @@
-   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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-@@ -3278,24 +3681,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
- $as_echo "$CC" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -3309,9 +3712,9 @@
- 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_CC"; then
-@@ -3322,24 +3725,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- 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 "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
- $as_echo "$ac_ct_CC" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -3352,7 +3755,7 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -3363,57 +3766,37 @@
- fi
- 
- 
--test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$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
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
-+as_fn_error "no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." "$LINENO" 5; }
- 
- # Provide some information about the compiler.
--$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
-+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
- set X $ac_compile
- ac_compiler=$2
--{ (ac_try="$ac_compiler --version >&5"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compiler --version >&5") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--{ (ac_try="$ac_compiler -v >&5"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compiler -v >&5") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--{ (ac_try="$ac_compiler -V >&5"
-+for ac_option in --version -v -V -qversion; do
-+  { { ac_try="$ac_compiler $ac_option >&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 "$ac_compiler -V >&5") 2>&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
-+  if test -s conftest.err; then
-+    sed '10a\
-+... rest of stderr output deleted ...
-+         10q' conftest.err >conftest.er1
-+    cat conftest.er1 >&5
-+  fi
-+  rm -f conftest.er1 conftest.err
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+done
- 
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -3429,8 +3812,8 @@
- # 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; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-+$as_echo_n "checking whether the C compiler works... " >&6; }
- ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
- 
- # The possible output files:
-@@ -3446,17 +3829,17 @@
- done
- rm -f $ac_rmfiles
- 
--if { (ac_try="$ac_link_default"
-+if { { ac_try="$ac_link_default"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-   (eval "$ac_link_default") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; 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'
- # in a Makefile.  We should not override ac_cv_exeext if it was cached,
-@@ -3473,7 +3856,7 @@
- 	# certainly right.
- 	break;;
-     *.* )
--        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
- 	then :; else
- 	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- 	fi
-@@ -3492,84 +3875,42 @@
- else
-   ac_file=''
- fi
--
--{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
--$as_echo "$ac_file" >&6; }
--if test -z "$ac_file"; then
--  $as_echo "$as_me: failed program was:" >&5
-+if test -z "$ac_file"; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+{ { $as_echo "$as_me:${as_lineno-$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
--See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }; }
-+{ as_fn_set_status 77
-+as_fn_error "C compiler cannot create executables
-+See \`config.log' for more details." "$LINENO" 5; }; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
- fi
--
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-+$as_echo_n "checking for C compiler default output file name... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-+$as_echo "$ac_file" >&6; }
- 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; }
--# 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
--  if { ac_try='./$ac_file'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--    cross_compiling=no
--  else
--    if test "$cross_compiling" = maybe; then
--	cross_compiling=yes
--    else
--	{ { $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.
--If you meant to cross compile, use \`--host'.
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
--    fi
--  fi
--fi
--{ $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
--
- rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
--# Check that the compiler produces executables we can run.  If not, either
--# the compiler is broken, or we cross compile.
--{ $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; }
--
--{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
- $as_echo_n "checking for suffix of executables... " >&6; }
--if { (ac_try="$ac_link"
-+if { { ac_try="$ac_link"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then :
-   # If both `conftest.exe' and `conftest' are `present' (well, observable)
- # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
- # work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -3584,32 +3925,83 @@
-   esac
- done
- else
--  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+  { { $as_echo "$as_me:${as_lineno-$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
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
-+as_fn_error "cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." "$LINENO" 5; }
- fi
--
--rm -f conftest$ac_cv_exeext
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-+rm -f conftest conftest$ac_cv_exeext
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
- $as_echo "$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
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdio.h>
-+int
-+main ()
-+{
-+FILE *f = fopen ("conftest.out", "w");
-+ return ferror (f) || fclose (f) != 0;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+ac_clean_files="$ac_clean_files conftest.out"
-+# Check that the compiler produces executables we can run.  If not, either
-+# the compiler is broken, or we cross compile.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-+$as_echo_n "checking whether we are cross compiling... " >&6; }
-+if test "$cross_compiling" != yes; then
-+  { { 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:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+  if { ac_try='./conftest$ac_cv_exeext'
-+  { { case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; }; then
-+    cross_compiling=no
-+  else
-+    if test "$cross_compiling" = maybe; then
-+	cross_compiling=yes
-+    else
-+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run C compiled programs.
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." "$LINENO" 5; }
-+    fi
-+  fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-+$as_echo "$cross_compiling" >&6; }
-+
-+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-+ac_clean_files=$ac_clean_files_save
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
- $as_echo_n "checking for suffix of object files... " >&6; }
--if test "${ac_cv_objext+set}" = set; then
-+if test "${ac_cv_objext+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -3621,17 +4013,17 @@
- }
- _ACEOF
- rm -f conftest.o conftest.obj
--if { (ac_try="$ac_compile"
-+if { { ac_try="$ac_compile"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-   (eval "$ac_compile") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then :
-   for ac_file in conftest.o conftest.obj conftest.*; do
-   test -f "$ac_file" || continue;
-   case $ac_file in
-@@ -3644,31 +4036,23 @@
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+{ { $as_echo "$as_me:${as_lineno-$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
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
-+as_fn_error "cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details." "$LINENO" 5; }
- fi
--
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
- $as_echo "$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 "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
- $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
--if test "${ac_cv_c_compiler_gnu+set}" = set; then
-+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -3682,37 +4066,16 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   ac_compiler_gnu=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_compiler_gnu=no
-+  ac_compiler_gnu=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-+{ $as_echo "$as_me:${as_lineno-$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
-@@ -3721,20 +4084,16 @@
- fi
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
--{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
- $as_echo_n "checking whether $CC accepts -g... " >&6; }
--if test "${ac_cv_prog_cc_g+set}" = set; then
-+if test "${ac_cv_prog_cc_g+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_save_c_werror_flag=$ac_c_werror_flag
-    ac_c_werror_flag=yes
-    ac_cv_prog_cc_g=no
-    CFLAGS="-g"
--   cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -3745,35 +4104,11 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   ac_cv_prog_cc_g=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	CFLAGS=""
--      cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  CFLAGS=""
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -3784,36 +4119,12 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  :
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_c_try_compile "$LINENO"; then :
- 
--	ac_c_werror_flag=$ac_save_c_werror_flag
-+else
-+  ac_c_werror_flag=$ac_save_c_werror_flag
- 	 CFLAGS="-g"
--	 cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -3824,42 +4135,17 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   ac_cv_prog_cc_g=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
- 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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
- $as_echo "$ac_cv_prog_cc_g" >&6; }
- if test "$ac_test_CFLAGS" = set; then
-   CFLAGS=$ac_save_CFLAGS
-@@ -3876,18 +4162,14 @@
-     CFLAGS=
-   fi
- fi
--{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
- $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
--if test "${ac_cv_prog_cc_c89+set}" = set; then
-+if test "${ac_cv_prog_cc_c89+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_cv_prog_cc_c89=no
- ac_save_CC=$CC
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <stdarg.h>
- #include <stdio.h>
-@@ -3944,32 +4226,9 @@
- 	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
- do
-   CC="$ac_save_CC $ac_arg"
--  rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+  if ac_fn_c_try_compile "$LINENO"; then :
-   ac_cv_prog_cc_c89=$ac_arg
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
- rm -f core conftest.err conftest.$ac_objext
-   test "x$ac_cv_prog_cc_c89" != "xno" && break
- done
-@@ -3980,17 +4239,19 @@
- # AC_CACHE_VAL
- case "x$ac_cv_prog_cc_c89" in
-   x)
--    { $as_echo "$as_me:$LINENO: result: none needed" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
- $as_echo "none needed" >&6; } ;;
-   xno)
--    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
- $as_echo "unsupported" >&6; } ;;
-   *)
-     CC="$CC $ac_cv_prog_cc_c89"
--    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
- $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
- esac
-+if test "x$ac_cv_prog_cc_c89" != xno; then :
- 
-+fi
- 
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -4000,9 +4261,9 @@
- 
- depcc="$CC"   am_compiler_list=
- 
--{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
- $as_echo_n "checking dependency style of $depcc... " >&6; }
--if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -4110,7 +4371,7 @@
- fi
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
- $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
- CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
- 
-@@ -4131,14 +4392,14 @@
- 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 "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
- $as_echo_n "checking how to run the C preprocessor... " >&6; }
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
-   CPP=
- fi
- if test -z "$CPP"; then
--  if test "${ac_cv_prog_CPP+set}" = set; then
-+  if test "${ac_cv_prog_CPP+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-       # Double quotes because CPP needs to be expanded
-@@ -4153,11 +4414,7 @@
-   # <limits.h> exists even on freestanding compilers.
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #ifdef __STDC__
- # include <limits.h>
-@@ -4166,78 +4423,34 @@
- #endif
- 		     Syntax error
- _ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null && {
--	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       }; then
--  :
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_c_try_cpp "$LINENO"; then :
- 
-+else
-   # Broken: fails on valid input.
- continue
- fi
--
- rm -f conftest.err conftest.$ac_ext
- 
-   # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null && {
--	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       }; then
-+if ac_fn_c_try_cpp "$LINENO"; then :
-   # Broken: success on invalid input.
- continue
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-   # Passes both tests.
- ac_preproc_ok=:
- break
- fi
--
- rm -f conftest.err conftest.$ac_ext
- 
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
- rm -f conftest.err conftest.$ac_ext
--if $ac_preproc_ok; then
-+if $ac_preproc_ok; then :
-   break
- fi
- 
-@@ -4249,7 +4462,7 @@
- else
-   ac_cv_prog_CPP=$CPP
- fi
--{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
- $as_echo "$CPP" >&6; }
- ac_preproc_ok=false
- for ac_c_preproc_warn_flag in '' yes
-@@ -4260,11 +4473,7 @@
-   # <limits.h> exists even on freestanding compilers.
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #ifdef __STDC__
- # include <limits.h>
-@@ -4273,87 +4482,40 @@
- #endif
- 		     Syntax error
- _ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null && {
--	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       }; then
--  :
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_c_try_cpp "$LINENO"; then :
- 
-+else
-   # Broken: fails on valid input.
- continue
- fi
--
- rm -f conftest.err conftest.$ac_ext
- 
-   # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null && {
--	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       }; then
-+if ac_fn_c_try_cpp "$LINENO"; then :
-   # Broken: success on invalid input.
- continue
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-   # Passes both tests.
- ac_preproc_ok=:
- break
- fi
--
- rm -f conftest.err conftest.$ac_ext
- 
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
- rm -f conftest.err conftest.$ac_ext
--if $ac_preproc_ok; then
--  :
-+if $ac_preproc_ok; then :
-+
- else
--  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+  { { $as_echo "$as_me:${as_lineno-$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
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
-+as_fn_error "C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details." "$LINENO" 5; }
- fi
- 
- ac_ext=c
-@@ -4363,9 +4525,9 @@
- 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 "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
- $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
--if test "${ac_cv_path_GREP+set}" = set; then
-+if test "${ac_cv_path_GREP+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -z "$GREP"; then
-@@ -4376,7 +4538,7 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_prog in grep ggrep; do
-+    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
-@@ -4396,7 +4558,7 @@
-     $as_echo 'GREP' >> "conftest.nl"
-     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
--    ac_count=`expr $ac_count + 1`
-+    as_fn_arith $ac_count + 1 && ac_count=$as_val
-     if test $ac_count -gt ${ac_path_GREP_max-0}; then
-       # Best one so far, save it but keep looking for a better one
-       ac_cv_path_GREP="$ac_path_GREP"
-@@ -4411,26 +4573,24 @@
-       $ac_path_GREP_found && break 3
-     done
-   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;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-   fi
- else
-   ac_cv_path_GREP=$GREP
- fi
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
- $as_echo "$ac_cv_path_GREP" >&6; }
-  GREP="$ac_cv_path_GREP"
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
- $as_echo_n "checking for egrep... " >&6; }
--if test "${ac_cv_path_EGREP+set}" = set; then
-+if test "${ac_cv_path_EGREP+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4444,7 +4604,7 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_prog in egrep; do
-+    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
-@@ -4464,7 +4624,7 @@
-     $as_echo 'EGREP' >> "conftest.nl"
-     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
--    ac_count=`expr $ac_count + 1`
-+    as_fn_arith $ac_count + 1 && ac_count=$as_val
-     if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-       # Best one so far, save it but keep looking for a better one
-       ac_cv_path_EGREP="$ac_path_EGREP"
-@@ -4479,12 +4639,10 @@
-       $ac_path_EGREP_found && break 3
-     done
-   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;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-   fi
- else
-   ac_cv_path_EGREP=$EGREP
-@@ -4492,21 +4650,17 @@
- 
-    fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
- $as_echo "$ac_cv_path_EGREP" >&6; }
-  EGREP="$ac_cv_path_EGREP"
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
- $as_echo_n "checking for ANSI C header files... " >&6; }
--if test "${ac_cv_header_stdc+set}" = set; then
-+if test "${ac_cv_header_stdc+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -4521,48 +4675,23 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   ac_cv_header_stdc=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_header_stdc=no
-+  ac_cv_header_stdc=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <string.h>
- 
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "memchr" >/dev/null 2>&1; then
--  :
-+  $EGREP "memchr" >/dev/null 2>&1; then :
-+
- else
-   ac_cv_header_stdc=no
- fi
-@@ -4572,18 +4701,14 @@
- 
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <stdlib.h>
- 
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "free" >/dev/null 2>&1; then
--  :
-+  $EGREP "free" >/dev/null 2>&1; then :
-+
- else
-   ac_cv_header_stdc=no
- fi
-@@ -4593,14 +4718,10 @@
- 
- if test $ac_cv_header_stdc = yes; then
-   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
--  if test "$cross_compiling" = yes; then
-+  if test "$cross_compiling" = yes; then :
-   :
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <ctype.h>
- #include <stdlib.h>
-@@ -4627,118 +4748,34 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_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
--sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_c_try_run "$LINENO"; then :
- 
--( exit $ac_status )
--ac_cv_header_stdc=no
-+else
-+  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
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
- 
--
- fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
- $as_echo "$ac_cv_header_stdc" >&6; }
- if test $ac_cv_header_stdc = yes; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define STDC_HEADERS 1
--_ACEOF
-+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
- 
- fi
- 
- # On IRIX 5.3, sys/types and inttypes.h are conflicting.
--
--
--
--
--
--
--
--
--
- 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; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--
--#include <$ac_header>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  eval "$as_ac_Header=yes"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_Header=no"
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-+"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-@@ -4749,151 +4786,12 @@
- 
- 
- 
--
--for ac_header in locale.h
--do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--else
--  # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
--$as_echo_n "checking $ac_header usability... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--#include <$ac_header>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_header_compiler=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_header_compiler=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$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; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <$ac_header>
--_ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null && {
--	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       }; then
--  ac_header_preproc=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--  ac_header_preproc=no
--fi
--
--rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
--
--# So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--  yes:no: )
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
--    ac_header_preproc=yes
--    ;;
--  no:yes:* )
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--    ( cat <<\_ASBOX
--## -------------------------------------------------------------------- ##
--## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=totem ##
--## -------------------------------------------------------------------- ##
--_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; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
--  eval "$as_ac_Header=\$ac_header_preproc"
--fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--
--fi
--as_val=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
-+   for ac_header in locale.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
-+if test "x$ac_cv_header_locale_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_LOCALE_H 1
- _ACEOF
- 
- fi
-@@ -4901,16 +4799,12 @@
- done
- 
-     if test $ac_cv_header_locale_h = yes; then
--    { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
- $as_echo_n "checking for LC_MESSAGES... " >&6; }
--if test "${am_cv_val_LC_MESSAGES+set}" = set; then
-+if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <locale.h>
- int
-@@ -4921,46 +4815,19 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   am_cv_val_LC_MESSAGES=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	am_cv_val_LC_MESSAGES=no
-+  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
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
- $as_echo "$am_cv_val_LC_MESSAGES" >&6; }
-     if test $am_cv_val_LC_MESSAGES = yes; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_LC_MESSAGES 1
--_ACEOF
-+$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
- 
-     fi
-   fi
-@@ -4973,155 +4840,20 @@
-     XGETTEXT=:
-     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; }
--if test "${ac_cv_header_libintl_h+set}" = set; then
--  $as_echo_n "(cached) " >&6
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
--$as_echo "$ac_cv_header_libintl_h" >&6; }
--else
--  # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5
--$as_echo_n "checking libintl.h usability... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--#include <libintl.h>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_header_compiler=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_header_compiler=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$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; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <libintl.h>
--_ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null && {
--	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       }; then
--  ac_header_preproc=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--  ac_header_preproc=no
--fi
--
--rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
--
--# So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--  yes:no: )
--    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
--    ac_header_preproc=yes
--    ;;
--  no:yes:* )
--    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: libintl.h:     check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: libintl.h:     check for missing prerequisite headers?" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: libintl.h:     section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: libintl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
--$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
--$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
--    ( cat <<\_ASBOX
--## -------------------------------------------------------------------- ##
--## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=totem ##
--## -------------------------------------------------------------------- ##
--_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; }
--if test "${ac_cv_header_libintl_h+set}" = set; then
--  $as_echo_n "(cached) " >&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; }
--
--fi
--if test "x$ac_cv_header_libintl_h" = x""yes; then
-+    ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
-+if test "x$ac_cv_header_libintl_h" = x""yes; then :
-   gt_cv_func_dgettext_libintl="no"
-       libintl_extra_libs=""
- 
-       #
-       # First check in libc
-       #
--      { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5
- $as_echo_n "checking for ngettext in libc... " >&6; }
--if test "${gt_cv_func_ngettext_libc+set}" = set; then
-+if test "${gt_cv_func_ngettext_libc+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- #include <libintl.h>
-@@ -5133,202 +4865,58 @@
-   ;
-   return 0;
- }
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  gt_cv_func_ngettext_libc=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	gt_cv_func_ngettext_libc=no
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--
--fi
--{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
--$as_echo "$gt_cv_func_ngettext_libc" >&6; }
--
--      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
--	      { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5
--$as_echo_n "checking for dgettext in libc... " >&6; }
--if test "${gt_cv_func_dgettext_libc+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--#include <libintl.h>
--
--int
--main ()
--{
--return !dgettext ("","")
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  gt_cv_func_dgettext_libc=yes
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  gt_cv_func_ngettext_libc=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	gt_cv_func_dgettext_libc=no
-+  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
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
--$as_echo "$gt_cv_func_dgettext_libc" >&6; }
--      fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5
-+$as_echo "$gt_cv_func_ngettext_libc" >&6; }
- 
-       if test "$gt_cv_func_ngettext_libc" = "yes" ; then
--
--for ac_func in bind_textdomain_codeset
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+	      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
-+$as_echo_n "checking for dgettext in libc... " >&6; }
-+if test "${gt_cv_func_dgettext_libc+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
- 
--#undef $ac_func
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
-+#include <libintl.h>
- 
- int
- main ()
- {
--return $ac_func ();
-+return !dgettext ("","")
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  eval "$as_ac_var=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+  gt_cv_func_dgettext_libc=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
-+  gt_cv_func_dgettext_libc=no
- fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- 
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5
-+$as_echo "$gt_cv_func_dgettext_libc" >&6; }
-+      fi
-+
-+      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-+        for ac_func in bind_textdomain_codeset
-+do :
-+  ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
- _ACEOF
- 
- fi
-@@ -5343,18 +4931,14 @@
- 	 || 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 "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
- $as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
--if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
-+if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -5372,55 +4956,26 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_intl_bindtextdomain=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_intl_bindtextdomain=no
-+  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
-+rm -f core conftest.err conftest.$ac_objext \
-+    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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
- $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
--if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then
--  { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-+if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
-+  { $as_echo "$as_me:${as_lineno-$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
-+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -5438,55 +4993,26 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_intl_ngettext=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_intl_ngettext=no
-+  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
-+rm -f core conftest.err conftest.$ac_objext \
-+    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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
- $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
--if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
--  { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
-+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
-+  { $as_echo "$as_me:${as_lineno-$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
-+if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -5504,43 +5030,18 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_intl_dgettext=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_intl_dgettext=no
-+  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
-+rm -f core conftest.err conftest.$ac_objext \
-+    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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
- $as_echo "$ac_cv_lib_intl_dgettext" >&6; }
--if test "x$ac_cv_lib_intl_dgettext" = x""yes; then
-+if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
-   gt_cv_func_dgettext_libintl=yes
- fi
- 
-@@ -5550,22 +5051,18 @@
- 
- 
- 	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 "$as_me:${as_lineno-$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 "$as_me:${as_lineno-$LINENO}: result: " >&5
- $as_echo "" >&6; }
--  	  { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-+  	  { $as_echo "$as_me:${as_lineno-$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
-+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl -liconv $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -5583,55 +5080,26 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_intl_ngettext=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_intl_ngettext=no
-+  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
-+rm -f core conftest.err conftest.$ac_objext \
-+    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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
- $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
--if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
--  { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
-+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
-+  { $as_echo "$as_me:${as_lineno-$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
-+if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl -liconv $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -5649,43 +5117,18 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_intl_dcgettext=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_intl_dcgettext=no
-+  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
-+rm -f core conftest.err conftest.$ac_objext \
-+    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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
- $as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
--if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then
-+if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
-   gt_cv_func_dgettext_libintl=yes
- 			libintl_extra_libs=-liconv
- else
-@@ -5707,102 +5150,12 @@
-           glib_save_LIBS="$LIBS"
-           LIBS="$LIBS -lintl $libintl_extra_libs"
-           unset ac_cv_func_bind_textdomain_codeset
--
--for ac_func in bind_textdomain_codeset
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--
--int
--main ()
--{
--return $ac_func ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  eval "$as_ac_var=yes"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
-+          for ac_func in bind_textdomain_codeset
-+do :
-+  ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
- _ACEOF
- 
- fi
-@@ -5832,15 +5185,13 @@
- 
-       if test "$gt_cv_have_gettext" = "yes"; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETTEXT 1
--_ACEOF
-+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
- 
- 	# 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_MSGFMT+set}" = set; then
-+if test "${ac_cv_path_MSGFMT+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case "$MSGFMT" in
-@@ -5865,118 +5216,28 @@
- fi
- MSGFMT="$ac_cv_path_MSGFMT"
- if test "$MSGFMT" != "no"; then
--  { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
- $as_echo "$MSGFMT" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
--	if test "$MSGFMT" != "no"; then
--          glib_save_LIBS="$LIBS"
--          LIBS="$LIBS $INTLLIBS"
--
--for ac_func in dcgettext
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--
--int
--main ()
--{
--return $ac_func ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  eval "$as_ac_var=yes"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
-+	if test "$MSGFMT" != "no"; then
-+          glib_save_LIBS="$LIBS"
-+          LIBS="$LIBS $INTLLIBS"
-+	  for ac_func in dcgettext
-+do :
-+  ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
-+if test "x$ac_cv_func_dcgettext" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_DCGETTEXT 1
- _ACEOF
- 
- fi
- done
- 
- 	  MSGFMT_OPTS=
--	  { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
-+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5
- $as_echo_n "checking if msgfmt accepts -c... " >&6; }
- 	  cat >conftest.foo <<_ACEOF
- 
-@@ -5991,14 +5252,14 @@
- "Content-Transfer-Encoding: 8bit\n"
- 
- _ACEOF
--if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
-+if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5
-   ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
--  MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+  MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
--else { $as_echo "$as_me:$LINENO: result: no" >&5
-+else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- echo "$as_me: failed input was:" >&5
- sed 's/^/| /' conftest.foo >&5
-@@ -6006,9 +5267,9 @@
- 
- 	  # 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_GMSGFMT+set}" = set; then
-+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $GMSGFMT in
-@@ -6021,14 +5282,14 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
-   test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -6037,19 +5298,19 @@
- fi
- GMSGFMT=$ac_cv_path_GMSGFMT
- if test -n "$GMSGFMT"; then
--  { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
- $as_echo "$GMSGFMT" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
- 
- 	  # Extract the first word of "xgettext", so it can be a program name with args.
- set dummy xgettext; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_XGETTEXT+set}" = set; then
-+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case "$XGETTEXT" in
-@@ -6074,18 +5335,14 @@
- fi
- XGETTEXT="$ac_cv_path_XGETTEXT"
- if test "$XGETTEXT" != ":"; then
--  { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
- $as_echo "$XGETTEXT" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
--	  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+	  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -6097,121 +5354,14 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   CATOBJEXT=.gmo
-              DATADIRNAME=share
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	case $host in
-+  case $host in
- 	    *-*-solaris*)
--	    	                	    	                { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
--$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
--if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char bind_textdomain_codeset (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef bind_textdomain_codeset
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char bind_textdomain_codeset ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
--choke me
--#endif
--
--int
--main ()
--{
--return bind_textdomain_codeset ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  ac_cv_func_bind_textdomain_codeset=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_func_bind_textdomain_codeset=no
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
--$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
--if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
-+	    	                	    	                ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
-   CATOBJEXT=.gmo
-                DATADIRNAME=share
- else
-@@ -6226,10 +5376,8 @@
- 	    ;;
- 	    esac
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-           LIBS="$glib_save_LIBS"
- 	  INSTOBJEXT=.mo
- 	else
-@@ -6243,9 +5391,7 @@
- 
-     if test "$gt_cv_have_gettext" = "yes" ; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define ENABLE_NLS 1
--_ACEOF
-+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
- 
-     fi
- 
-@@ -6253,7 +5399,7 @@
-                   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 "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
- $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
-         XGETTEXT=":"
-       fi
-@@ -6286,7 +5432,7 @@
-      if test "x$ALL_LINGUAS" = "x"; then
-        LINGUAS=
-      else
--       { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
-+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
- $as_echo_n "checking for catalogs to be installed... " >&6; }
-        NEW_LINGUAS=
-        for presentlang in $ALL_LINGUAS; do
-@@ -6311,7 +5457,7 @@
-          fi
-        done
-        LINGUAS=$NEW_LINGUAS
--       { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5
-+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
- $as_echo "$LINGUAS" >&6; }
-      fi
- 
-@@ -6344,16 +5490,16 @@
- 	< $srcdir/po/POTFILES.in > po/POTFILES
- 
- 
--  { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
- $as_echo_n "checking whether NLS is requested... " >&6; }
-     # Check whether --enable-nls was given.
--if test "${enable_nls+set}" = set; then
-+if test "${enable_nls+set}" = set; then :
-   enableval=$enable_nls; USE_NLS=$enableval
- else
-   USE_NLS=yes
- fi
- 
--  { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
- $as_echo "$USE_NLS" >&6; }
- 
- 
-@@ -6361,35 +5507,31 @@
- 
- 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;}
--   { (exit 1); exit 1; }; }
-+	as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
-     ;;
-     *)
-     ;;
- esac
- 
- if test -n "0.40.0"; then
--    { $as_echo "$as_me:$LINENO: checking for intltool >= 0.40.0" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.40.0" >&5
- $as_echo_n "checking for intltool >= 0.40.0... " >&6; }
- 
-     INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.40.0 | 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 "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
- $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
-     test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
--	{ { $as_echo "$as_me:$LINENO: error: Your intltool is too old.  You need intltool 0.40.0 or later." >&5
--$as_echo "$as_me: error: Your intltool is too old.  You need intltool 0.40.0 or later." >&2;}
--   { (exit 1); exit 1; }; }
-+	as_fn_error "Your intltool is too old.  You need intltool 0.40.0 or later." "$LINENO" 5
- 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
-+if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $INTLTOOL_UPDATE in
-@@ -6402,14 +5544,14 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
-   ;;
-@@ -6417,19 +5559,19 @@
- 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 "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5
- $as_echo "$INTLTOOL_UPDATE" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
-+if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $INTLTOOL_MERGE in
-@@ -6442,14 +5584,14 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
-   ;;
-@@ -6457,19 +5599,19 @@
- 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 "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5
- $as_echo "$INTLTOOL_MERGE" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
-+if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $INTLTOOL_EXTRACT in
-@@ -6482,14 +5624,14 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
-   ;;
-@@ -6497,18 +5639,16 @@
- 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 "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5
- $as_echo "$INTLTOOL_EXTRACT" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "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;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
- fi
- 
-   INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-@@ -6630,9 +5770,9 @@
- # 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_XGETTEXT+set}" = set; then
-+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $XGETTEXT in
-@@ -6645,14 +5785,14 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
-   ;;
-@@ -6660,19 +5800,19 @@
- fi
- XGETTEXT=$ac_cv_path_XGETTEXT
- if test -n "$XGETTEXT"; then
--  { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
- $as_echo "$XGETTEXT" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
- 
- # Extract the first word of "msgmerge", so it can be a program name with args.
- set dummy msgmerge; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_MSGMERGE+set}" = set; then
-+if test "${ac_cv_path_MSGMERGE+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $MSGMERGE in
-@@ -6685,14 +5825,14 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
-   ;;
-@@ -6700,19 +5840,19 @@
- fi
- MSGMERGE=$ac_cv_path_MSGMERGE
- if test -n "$MSGMERGE"; then
--  { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
- $as_echo "$MSGMERGE" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
- 
- # Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_MSGFMT+set}" = set; then
-+if test "${ac_cv_path_MSGFMT+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $MSGFMT in
-@@ -6725,14 +5865,14 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
-   ;;
-@@ -6740,19 +5880,19 @@
- fi
- MSGFMT=$ac_cv_path_MSGFMT
- if test -n "$MSGFMT"; then
--  { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
- $as_echo "$MSGFMT" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
- 
- # Extract the first word of "gmsgfmt", so it can be a program name with args.
- set dummy gmsgfmt; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_GMSGFMT+set}" = set; then
-+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $GMSGFMT in
-@@ -6765,14 +5905,14 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
-   test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -6781,33 +5921,29 @@
- fi
- GMSGFMT=$ac_cv_path_GMSGFMT
- if test -n "$GMSGFMT"; then
--  { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
- $as_echo "$GMSGFMT" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "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;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
- fi
- xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
- mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
- mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
- if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
--    { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
--$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
- 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
-+if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $INTLTOOL_PERL in
-@@ -6820,14 +5956,14 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
-   ;;
-@@ -6835,41 +5971,35 @@
- 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 "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
- $as_echo "$INTLTOOL_PERL" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
- 
- if test -z "$INTLTOOL_PERL"; then
--   { { $as_echo "$as_me:$LINENO: error: perl not found" >&5
--$as_echo "$as_me: error: perl not found" >&2;}
--   { (exit 1); exit 1; }; }
-+   as_fn_error "perl not found" "$LINENO" 5
- fi
--{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
- $as_echo_n "checking for perl >= 5.8.1... " >&6; }
- $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
- if test $? -ne 0; then
--   { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
--$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
--   { (exit 1); exit 1; }; }
-+   as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
- else
-    IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
--   { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
-+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
- $as_echo "$IT_PERL_VERSION" >&6; }
- fi
- if test "x" != "xno-xml"; then
--   { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
-+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
- $as_echo_n "checking for XML::Parser... " >&6; }
-    if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
--       { $as_echo "$as_me:$LINENO: result: ok" >&5
-+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
- $as_echo "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;}
--   { (exit 1); exit 1; }; }
-+       as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
-    fi
- fi
- 
-@@ -6879,11 +6009,7 @@
- # Set DATADIRNAME correctly if it is not set yet
- # (copied from glib-gettext.m4)
- if test -z "$DATADIRNAME"; then
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -6895,120 +6021,13 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   DATADIRNAME=share
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	case $host in
-+  case $host in
-     *-*-solaris*)
--                        { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
--$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
--if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char bind_textdomain_codeset (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef bind_textdomain_codeset
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char bind_textdomain_codeset ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
--choke me
--#endif
--
--int
--main ()
--{
--return bind_textdomain_codeset ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  ac_cv_func_bind_textdomain_codeset=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_func_bind_textdomain_codeset=no
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
--$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
--if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
-+                        ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
-   DATADIRNAME=share
- else
-   DATADIRNAME=lib
-@@ -7020,10 +6039,8 @@
-     ;;
-     esac
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- fi
- 
- 
-@@ -7031,14 +6048,14 @@
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
- $as_echo_n "checking whether ln -s works... " >&6; }
- LN_S=$as_ln_s
- if test "$LN_S" = "ln -s"; then
--  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
- $as_echo "no, using $LN_S" >&6; }
- fi
- 
-@@ -7048,9 +6065,9 @@
- 	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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $PKG_CONFIG in
-@@ -7063,14 +6080,14 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
-   ;;
-@@ -7078,10 +6095,10 @@
- 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 "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
- $as_echo "$PKG_CONFIG" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -7091,9 +6108,9 @@
-   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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
-+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $ac_pt_PKG_CONFIG in
-@@ -7106,14 +6123,14 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
-   ;;
-@@ -7121,10 +6138,10 @@
- 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 "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
- $as_echo "$ac_pt_PKG_CONFIG" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -7133,7 +6150,7 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -7146,13 +6163,13 @@
- 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 "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
- $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
- 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
--		{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	else
--		{ $as_echo "$as_me:$LINENO: result: no" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 		PKG_CONFIG=""
- 	fi
-@@ -7161,35 +6178,33 @@
- 
- gdu_cv_version_required=0.3.2
- 
--{ $as_echo "$as_me:$LINENO: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
- $as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; }
- if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   gdu_cv_have_gdu=yes
- else
-   gdu_cv_have_gdu=no
- fi
- 
- if test "$gdu_cv_have_gdu" = "yes"; then
--	{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	:
- else
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
--	{ { $as_echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5
--$as_echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}
--   { (exit 1); exit 1; }; }
-+	as_fn_error "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5
- fi
- 
- 
- 
- # Check whether --with-help-dir was given.
--if test "${with_help_dir+set}" = set; then
-+if test "${with_help_dir+set}" = set; then :
-   withval=$with_help_dir;
- else
-   with_help_dir='${datadir}/gnome/help'
-@@ -7200,7 +6215,7 @@
- 
- 
- # Check whether --with-omf-dir was given.
--if test "${with_omf_dir+set}" = set; then
-+if test "${with_omf_dir+set}" = set; then :
-   withval=$with_omf_dir;
- else
-   with_omf_dir='${datadir}/omf'
-@@ -7211,7 +6226,7 @@
- 
- 
- # Check whether --with-help-formats was given.
--if test "${with_help_formats+set}" = set; then
-+if test "${with_help_formats+set}" = set; then :
-   withval=$with_help_formats;
- else
-   with_help_formats=''
-@@ -7221,7 +6236,7 @@
- 
- 
- # Check whether --enable-scrollkeeper was given.
--if test "${enable_scrollkeeper+set}" = set; then
-+if test "${enable_scrollkeeper+set}" = set; then :
-   enableval=$enable_scrollkeeper;
- else
-   enable_scrollkeeper=yes
-@@ -7264,9 +6279,9 @@
-   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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CXX+set}" = set; then
-+if test "${ac_cv_prog_CXX+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$CXX"; then
-@@ -7277,24 +6292,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- CXX=$ac_cv_prog_CXX
- if test -n "$CXX"; then
--  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
- $as_echo "$CXX" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -7308,9 +6323,9 @@
- 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_CXX"; then
-@@ -7321,24 +6336,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- 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 "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
- $as_echo "$ac_ct_CXX" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -7351,7 +6366,7 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -7362,53 +6377,36 @@
-   fi
- fi
- # Provide some information about the compiler.
--$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
- set X $ac_compile
- ac_compiler=$2
--{ (ac_try="$ac_compiler --version >&5"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compiler --version >&5") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--{ (ac_try="$ac_compiler -v >&5"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compiler -v >&5") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--{ (ac_try="$ac_compiler -V >&5"
-+for ac_option in --version -v -V -qversion; do
-+  { { ac_try="$ac_compiler $ac_option >&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 "$ac_compiler -V >&5") 2>&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
-+  if test -s conftest.err; then
-+    sed '10a\
-+... rest of stderr output deleted ...
-+         10q' conftest.err >conftest.er1
-+    cat conftest.er1 >&5
-+  fi
-+  rm -f conftest.er1 conftest.err
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+done
- 
--{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
- $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
--if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -7422,37 +6420,16 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_cxx_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-   ac_compiler_gnu=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_compiler_gnu=no
-+  ac_compiler_gnu=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-+{ $as_echo "$as_me:${as_lineno-$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
-@@ -7461,20 +6438,16 @@
- fi
- ac_test_CXXFLAGS=${CXXFLAGS+set}
- ac_save_CXXFLAGS=$CXXFLAGS
--{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
- $as_echo_n "checking whether $CXX accepts -g... " >&6; }
--if test "${ac_cv_prog_cxx_g+set}" = set; then
-+if test "${ac_cv_prog_cxx_g+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-    ac_cxx_werror_flag=yes
-    ac_cv_prog_cxx_g=no
-    CXXFLAGS="-g"
--   cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -7485,35 +6458,11 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_cxx_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-   ac_cv_prog_cxx_g=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	CXXFLAGS=""
--      cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  CXXFLAGS=""
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -7524,82 +6473,33 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_cxx_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  :
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_cxx_try_compile "$LINENO"; then :
- 
--	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-+else
-+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
- 	 CXXFLAGS="-g"
--	 cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
- main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_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
--sed 's/^/| /' conftest.$ac_ext >&5
--
-+{
- 
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  ac_cv_prog_cxx_g=yes
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
- 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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
- $as_echo "$ac_cv_prog_cxx_g" >&6; }
- if test "$ac_test_CXXFLAGS" = set; then
-   CXXFLAGS=$ac_save_CXXFLAGS
-@@ -7624,9 +6524,9 @@
- 
- depcc="$CXX"  am_compiler_list=
- 
--{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
- $as_echo_n "checking dependency style of $depcc... " >&6; }
--if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
-+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -7734,7 +6634,7 @@
- fi
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
- $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
- CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
- 
-@@ -7750,22 +6650,18 @@
- 
- 
- if test "x$CC" != xcc; then
--  { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
-+  { $as_echo "$as_me:${as_lineno-$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; }
- else
--  { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
- $as_echo_n "checking whether cc understands -c and -o together... " >&6; }
- fi
- set dummy $CC; ac_cc=`$as_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
-+if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
-   $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -7781,63 +6677,63 @@
- # existing .o file with -o, though they will create one.
- ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
- rm -f conftest2.*
--if { (case "(($ac_try" in
-+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 ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--   test -f conftest2.$ac_objext && { (case "(($ac_try" in
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } &&
-+   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 ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); };
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; };
- then
-   eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-   if test "x$CC" != xcc; then
-     # Test first that cc exists at all.
-     if { ac_try='cc -c conftest.$ac_ext >&5'
--  { (case "(($ac_try" in
-+  { { case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; }; then
-       ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-       rm -f conftest2.*
--      if { (case "(($ac_try" in
-+      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 ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 test -f conftest2.$ac_objext && { (case "(($ac_try" in
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } &&
-+	 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 ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); };
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; };
-       then
- 	# cc works too.
- 	:
-@@ -7854,15 +6750,13 @@
- 
- fi
- if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
--  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 
--cat >>confdefs.h <<\_ACEOF
--#define NO_MINUS_C_MINUS_O 1
--_ACEOF
-+$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
- 
- fi
- 
-@@ -7883,7 +6777,7 @@
- 
- case `pwd` in
-   *\ * | *\	*)
--    { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
- $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
- esac
- 
-@@ -7908,35 +6802,27 @@
- 
- # 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;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
- 
--{ $as_echo "$as_me:$LINENO: checking build system type" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
- $as_echo_n "checking build system type... " >&6; }
--if test "${ac_cv_build+set}" = set; then
-+if test "${ac_cv_build+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_build_alias=$build_alias
- test "x$ac_build_alias" = x &&
-   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
- test "x$ac_build_alias" = x &&
--  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
--$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
- 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;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
- $as_echo "$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;}
--   { (exit 1); exit 1; }; };;
-+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
- esac
- build=$ac_cv_build
- ac_save_IFS=$IFS; IFS='-'
-@@ -7952,28 +6838,24 @@
- 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 "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
- $as_echo_n "checking host system type... " >&6; }
--if test "${ac_cv_host+set}" = set; then
-+if test "${ac_cv_host+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test "x$host_alias" = x; then
-   ac_cv_host=$ac_cv_build
- else
-   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
--    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
--$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
- fi
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
- $as_echo "$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;}
--   { (exit 1); exit 1; }; };;
-+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
- esac
- host=$ac_cv_host
- ac_save_IFS=$IFS; IFS='-'
-@@ -7989,9 +6871,9 @@
- 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 "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
- $as_echo_n "checking for a sed that does not truncate output... " >&6; }
--if test "${ac_cv_path_SED+set}" = set; then
-+if test "${ac_cv_path_SED+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -7999,7 +6881,7 @@
-        ac_script="$ac_script$as_nl$ac_script"
-      done
-      echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
--     $as_unset ac_script || ac_script=
-+     { ac_script=; unset ac_script;}
-      if test -z "$SED"; then
-   ac_path_SED_found=false
-   # Loop through the user's path and test for each of PROGNAME-LIST
-@@ -8008,7 +6890,7 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_prog in sed gsed; do
-+    for ac_prog in sed gsed; do
-     for ac_exec_ext in '' $ac_executable_extensions; do
-       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-       { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-@@ -8028,7 +6910,7 @@
-     $as_echo '' >> "conftest.nl"
-     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
-     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
--    ac_count=`expr $ac_count + 1`
-+    as_fn_arith $ac_count + 1 && ac_count=$as_val
-     if test $ac_count -gt ${ac_path_SED_max-0}; then
-       # Best one so far, save it but keep looking for a better one
-       ac_cv_path_SED="$ac_path_SED"
-@@ -8043,19 +6925,17 @@
-       $ac_path_SED_found && break 3
-     done
-   done
--done
-+  done
- IFS=$as_save_IFS
-   if test -z "$ac_cv_path_SED"; then
--    { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
--$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
-   fi
- else
-   ac_cv_path_SED=$SED
- fi
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
- $as_echo "$ac_cv_path_SED" >&6; }
-  SED="$ac_cv_path_SED"
-   rm -f conftest.sed
-@@ -8073,9 +6953,9 @@
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
- $as_echo_n "checking for fgrep... " >&6; }
--if test "${ac_cv_path_FGREP+set}" = set; then
-+if test "${ac_cv_path_FGREP+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -8089,7 +6969,7 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_prog in fgrep; do
-+    for ac_prog in fgrep; do
-     for ac_exec_ext in '' $ac_executable_extensions; do
-       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-       { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-@@ -8109,7 +6989,7 @@
-     $as_echo 'FGREP' >> "conftest.nl"
-     "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
-     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
--    ac_count=`expr $ac_count + 1`
-+    as_fn_arith $ac_count + 1 && ac_count=$as_val
-     if test $ac_count -gt ${ac_path_FGREP_max-0}; then
-       # Best one so far, save it but keep looking for a better one
-       ac_cv_path_FGREP="$ac_path_FGREP"
-@@ -8124,12 +7004,10 @@
-       $ac_path_FGREP_found && break 3
-     done
-   done
--done
-+  done
- IFS=$as_save_IFS
-   if test -z "$ac_cv_path_FGREP"; then
--    { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
--$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-   fi
- else
-   ac_cv_path_FGREP=$FGREP
-@@ -8137,7 +7015,7 @@
- 
-    fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
- $as_echo "$ac_cv_path_FGREP" >&6; }
-  FGREP="$ac_cv_path_FGREP"
- 
-@@ -8163,7 +7041,7 @@
- 
- 
- # Check whether --with-gnu-ld was given.
--if test "${with_gnu_ld+set}" = set; then
-+if test "${with_gnu_ld+set}" = set; then :
-   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
- else
-   with_gnu_ld=no
-@@ -8172,7 +7050,7 @@
- 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 "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
- $as_echo_n "checking for ld used by $CC... " >&6; }
-   case $host in
-   *-*-mingw*)
-@@ -8202,13 +7080,13 @@
-     ;;
-   esac
- elif test "$with_gnu_ld" = yes; then
--  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
- $as_echo_n "checking for GNU ld... " >&6; }
- else
--  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
- $as_echo_n "checking for non-GNU ld... " >&6; }
- fi
--if test "${lt_cv_path_LD+set}" = set; then
-+if test "${lt_cv_path_LD+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -z "$LD"; then
-@@ -8239,18 +7117,16 @@
- 
- LD="$lt_cv_path_LD"
- if test -n "$LD"; then
--  { $as_echo "$as_me:$LINENO: result: $LD" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
- $as_echo "$LD" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "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;}
--   { (exit 1); exit 1; }; }
--{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
- $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
--if test "${lt_cv_prog_gnu_ld+set}" = set; then
-+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   # I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -8263,7 +7139,7 @@
-   ;;
- esac
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
- $as_echo "$lt_cv_prog_gnu_ld" >&6; }
- with_gnu_ld=$lt_cv_prog_gnu_ld
- 
-@@ -8275,9 +7151,9 @@
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
- $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
--if test "${lt_cv_path_NM+set}" = set; then
-+if test "${lt_cv_path_NM+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$NM"; then
-@@ -8324,7 +7200,7 @@
-   : ${lt_cv_path_NM=no}
- fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
- $as_echo "$lt_cv_path_NM" >&6; }
- if test "$lt_cv_path_NM" != "no"; then
-   NM="$lt_cv_path_NM"
-@@ -8335,9 +7211,9 @@
-   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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_DUMPBIN+set}" = set; then
-+if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$DUMPBIN"; then
-@@ -8348,24 +7224,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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_DUMPBIN="$ac_tool_prefix$ac_prog"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- DUMPBIN=$ac_cv_prog_DUMPBIN
- if test -n "$DUMPBIN"; then
--  { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
- $as_echo "$DUMPBIN" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -8379,9 +7255,9 @@
- 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_DUMPBIN"; then
-@@ -8392,24 +7268,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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_DUMPBIN="$ac_prog"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
- if test -n "$ac_ct_DUMPBIN"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
- $as_echo "$ac_ct_DUMPBIN" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -8422,7 +7298,7 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -8442,33 +7318,33 @@
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
- $as_echo_n "checking the name lister ($NM) interface... " >&6; }
--if test "${lt_cv_nm_interface+set}" = set; then
-+if test "${lt_cv_nm_interface+set}" = set; then :
-   $as_echo_n "(cached) " >&6
+@@ -7307,13 +7325,13 @@
  else
    lt_cv_nm_interface="BSD nm"
    echo "int some_variable = 0;" > conftest.$ac_ext
--  (eval echo "\"\$as_me:8452: $ac_compile\"" >&5)
+-  (eval echo "\"\$as_me:7310: $ac_compile\"" >&5)
 +  (eval echo "\"\$as_me:7328: $ac_compile\"" >&5)
    (eval "$ac_compile" 2>conftest.err)
    cat conftest.err >&5
--  (eval echo "\"\$as_me:8455: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+-  (eval echo "\"\$as_me:7313: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
 +  (eval echo "\"\$as_me:7331: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
    (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
    cat conftest.err >&5
--  (eval echo "\"\$as_me:8458: output\"" >&5)
+-  (eval echo "\"\$as_me:7316: output\"" >&5)
 +  (eval echo "\"\$as_me:7334: output\"" >&5)
    cat conftest.out >&5
    if $GREP 'External.*some_variable' conftest.out > /dev/null; then
      lt_cv_nm_interface="MS dumpbin"
-   fi
-   rm -f conftest*
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
- $as_echo "$lt_cv_nm_interface" >&6; }
- 
- # find the maximum length of command line arguments
--{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
- $as_echo_n "checking the maximum length of command line arguments... " >&6; }
--if test "${lt_cv_sys_max_cmd_len+set}" = set; then
-+if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-     i=0
-@@ -8586,10 +7462,10 @@
- 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 "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
- $as_echo "$lt_cv_sys_max_cmd_len" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: none" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
- $as_echo "none" >&6; }
- fi
- max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -8603,7 +7479,7 @@
- : ${MV="mv -f"}
- : ${RM="rm -f"}
- 
--{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
- $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
- # Try some XSI features
- xsi_shell=no
-@@ -8613,17 +7489,17 @@
-     && eval 'test $(( 1 + 1 )) -eq 2 \
-     && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-   && xsi_shell=yes
--{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
- $as_echo "$xsi_shell" >&6; }
- 
- 
--{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
- $as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
- lt_shell_append=no
- ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
-     >/dev/null 2>&1 \
-   && lt_shell_append=yes
--{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
- $as_echo "$lt_shell_append" >&6; }
- 
- 
-@@ -8658,14 +7534,14 @@
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
- $as_echo_n "checking for $LD option to reload object files... " >&6; }
--if test "${lt_cv_ld_reload_flag+set}" = set; then
-+if test "${lt_cv_ld_reload_flag+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_ld_reload_flag='-r'
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
- $as_echo "$lt_cv_ld_reload_flag" >&6; }
- reload_flag=$lt_cv_ld_reload_flag
- case $reload_flag in
-@@ -8694,9 +7570,9 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
- set dummy ${ac_tool_prefix}objdump; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_OBJDUMP+set}" = set; then
-+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$OBJDUMP"; then
-@@ -8707,24 +7583,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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_OBJDUMP="${ac_tool_prefix}objdump"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- OBJDUMP=$ac_cv_prog_OBJDUMP
- if test -n "$OBJDUMP"; then
--  { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
- $as_echo "$OBJDUMP" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -8734,9 +7610,9 @@
-   ac_ct_OBJDUMP=$OBJDUMP
-   # Extract the first word of "objdump", so it can be a program name with args.
- set dummy objdump; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_OBJDUMP"; then
-@@ -8747,24 +7623,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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_OBJDUMP="objdump"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
- if test -n "$ac_ct_OBJDUMP"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
- $as_echo "$ac_ct_OBJDUMP" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -8773,7 +7649,7 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -8793,9 +7669,9 @@
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
- $as_echo_n "checking how to recognize dependent libraries... " >&6; }
--if test "${lt_cv_deplibs_check_method+set}" = set; then
-+if test "${lt_cv_deplibs_check_method+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -8910,11 +7786,11 @@
+@@ -7768,11 +7786,11 @@
    ;;
  
  # This must be Linux ELF.
@@ -7537,1885 +427,30 @@
    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
-@@ -8989,7 +7865,7 @@
- esac
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
- $as_echo "$lt_cv_deplibs_check_method" >&6; }
- file_magic_cmd=$lt_cv_file_magic_cmd
- deplibs_check_method=$lt_cv_deplibs_check_method
-@@ -9009,9 +7885,9 @@
- 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_AR+set}" = set; then
-+if test "${ac_cv_prog_AR+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$AR"; then
-@@ -9022,24 +7898,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
--  { $as_echo "$as_me:$LINENO: result: $AR" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
- $as_echo "$AR" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -9049,9 +7925,9 @@
-   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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_AR"; then
-@@ -9062,24 +7938,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- 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 "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
- $as_echo "$ac_ct_AR" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -9088,7 +7964,7 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -9114,9 +7990,9 @@
- 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_STRIP+set}" = set; then
-+if test "${ac_cv_prog_STRIP+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$STRIP"; then
-@@ -9127,24 +8003,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- STRIP=$ac_cv_prog_STRIP
- if test -n "$STRIP"; then
--  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
- $as_echo "$STRIP" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -9154,9 +8030,9 @@
-   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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_STRIP"; then
-@@ -9167,24 +8043,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- 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 "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
- $as_echo "$ac_ct_STRIP" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -9193,7 +8069,7 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -9213,9 +8089,9 @@
- 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_RANLIB+set}" = set; then
-+if test "${ac_cv_prog_RANLIB+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$RANLIB"; then
-@@ -9226,24 +8102,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- RANLIB=$ac_cv_prog_RANLIB
- if test -n "$RANLIB"; then
--  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
- $as_echo "$RANLIB" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -9253,9 +8129,9 @@
-   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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_RANLIB"; then
-@@ -9266,24 +8142,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- 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 "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
- $as_echo "$ac_ct_RANLIB" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -9292,7 +8168,7 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -9370,9 +8246,9 @@
- 
- 
- # 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 "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
- $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
--if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
-+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-@@ -9488,18 +8364,18 @@
- int main(){nm_test_var='a';nm_test_func();return(0);}
- _LT_EOF
- 
--  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; 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
-+    if { { eval echo "\"\$as_me\":${as_lineno-$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
--  (exit $ac_status); } && test -s "$nlist"; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && test -s "$nlist"; then
-       # Try sorting and uniquifying the output.
-       if sort "$nlist" | uniq > "$nlist"T; then
- 	mv -f "$nlist"T "$nlist"
-@@ -9552,11 +8428,11 @@
- 	  lt_save_CFLAGS="$CFLAGS"
- 	  LIBS="conftstm.$ac_objext"
- 	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
--	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && test -s conftest${ac_exeext}; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
- 	    pipe_works=yes
- 	  fi
- 	  LIBS="$lt_save_LIBS"
-@@ -9590,10 +8466,10 @@
-   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 "$as_me:${as_lineno-$LINENO}: result: failed" >&5
- $as_echo "failed" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: ok" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
- $as_echo "ok" >&6; }
- fi
- 
-@@ -9619,7 +8495,7 @@
- 
- 
- # Check whether --enable-libtool-lock was given.
--if test "${enable_libtool_lock+set}" = set; then
-+if test "${enable_libtool_lock+set}" = set; then :
-   enableval=$enable_libtool_lock;
- fi
- 
-@@ -9631,11 +8507,11 @@
- ia64-*-hpux*)
-   # Find out which ABI we are using.
-   echo 'int i;' > conftest.$ac_ext
--  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-     case `/usr/bin/file conftest.$ac_objext` in
-       *ELF-32*)
- 	HPUX_IA64_MODE="32"
-@@ -9649,12 +8525,12 @@
+@@ -8507,7 +8525,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 9652 "configure"' > conftest.$ac_ext
--  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  echo '#line 8510 "configure"' > conftest.$ac_ext
 +  echo '#line 8528 "configure"' > conftest.$ac_ext
-+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-     if test "$lt_cv_prog_gnu_ld" = yes; then
-       case `/usr/bin/file conftest.$ac_objext` in
- 	*32-bit*)
-@@ -9688,11 +8564,11 @@
- s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-   # Find out which ABI we are using.
-   echo 'int i;' > conftest.$ac_ext
--  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-     case `/usr/bin/file conftest.o` in
-       *32-bit*)
- 	case $host in
-@@ -9741,9 +8617,9 @@
-   # 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 "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
- $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
--if test "${lt_cv_cc_needs_belf+set}" = set; then
-+if test "${lt_cv_cc_needs_belf+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_ext=c
-@@ -9752,11 +8628,7 @@
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--     cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -9767,38 +8639,13 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   lt_cv_cc_needs_belf=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	lt_cv_cc_needs_belf=no
-+  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
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-      ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -9806,7 +8653,7 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
- $as_echo "$lt_cv_cc_needs_belf" >&6; }
-   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-@@ -9816,11 +8663,11 @@
- sparc*-*solaris*)
-   # Find out which ABI we are using.
-   echo 'int i;' > conftest.$ac_ext
--  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-     case `/usr/bin/file conftest.o` in
-     *64-bit*)
-       case $lt_cv_prog_gnu_ld in
-@@ -9846,9 +8693,9 @@
-     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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
-+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$DSYMUTIL"; then
-@@ -9859,24 +8706,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- DSYMUTIL=$ac_cv_prog_DSYMUTIL
- if test -n "$DSYMUTIL"; then
--  { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
- $as_echo "$DSYMUTIL" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -9886,9 +8733,9 @@
-   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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_DSYMUTIL"; then
-@@ -9899,24 +8746,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- 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 "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
- $as_echo "$ac_ct_DSYMUTIL" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -9925,7 +8772,7 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -9938,9 +8785,9 @@
-     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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_NMEDIT+set}" = set; then
-+if test "${ac_cv_prog_NMEDIT+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$NMEDIT"; then
-@@ -9951,24 +8798,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- NMEDIT=$ac_cv_prog_NMEDIT
- if test -n "$NMEDIT"; then
--  { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
- $as_echo "$NMEDIT" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -9978,9 +8825,9 @@
-   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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_NMEDIT"; then
-@@ -9991,24 +8838,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- 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 "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
- $as_echo "$ac_ct_NMEDIT" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -10017,7 +8864,7 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -10030,9 +8877,9 @@
-     if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
- set dummy ${ac_tool_prefix}lipo; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_LIPO+set}" = set; then
-+if test "${ac_cv_prog_LIPO+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$LIPO"; then
-@@ -10043,24 +8890,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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_LIPO="${ac_tool_prefix}lipo"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- LIPO=$ac_cv_prog_LIPO
- if test -n "$LIPO"; then
--  { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
- $as_echo "$LIPO" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -10070,9 +8917,9 @@
-   ac_ct_LIPO=$LIPO
-   # Extract the first word of "lipo", so it can be a program name with args.
- set dummy lipo; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_LIPO"; then
-@@ -10083,24 +8930,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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_LIPO="lipo"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
- if test -n "$ac_ct_LIPO"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
- $as_echo "$ac_ct_LIPO" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -10109,7 +8956,7 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -10122,9 +8969,9 @@
-     if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
- set dummy ${ac_tool_prefix}otool; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_OTOOL+set}" = set; then
-+if test "${ac_cv_prog_OTOOL+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$OTOOL"; then
-@@ -10135,24 +8982,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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_OTOOL="${ac_tool_prefix}otool"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- OTOOL=$ac_cv_prog_OTOOL
- if test -n "$OTOOL"; then
--  { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
- $as_echo "$OTOOL" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -10162,9 +9009,9 @@
-   ac_ct_OTOOL=$OTOOL
-   # Extract the first word of "otool", so it can be a program name with args.
- set dummy otool; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_OTOOL"; then
-@@ -10175,24 +9022,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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_OTOOL="otool"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
- if test -n "$ac_ct_OTOOL"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
- $as_echo "$ac_ct_OTOOL" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -10201,7 +9048,7 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -10214,9 +9061,9 @@
-     if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
- set dummy ${ac_tool_prefix}otool64; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_OTOOL64+set}" = set; then
-+if test "${ac_cv_prog_OTOOL64+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$OTOOL64"; then
-@@ -10227,24 +9074,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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_OTOOL64="${ac_tool_prefix}otool64"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- OTOOL64=$ac_cv_prog_OTOOL64
- if test -n "$OTOOL64"; then
--  { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
- $as_echo "$OTOOL64" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -10254,9 +9101,9 @@
-   ac_ct_OTOOL64=$OTOOL64
-   # Extract the first word of "otool64", so it can be a program name with args.
- set dummy otool64; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_OTOOL64"; then
-@@ -10267,24 +9114,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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_OTOOL64="otool64"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
- if test -n "$ac_ct_OTOOL64"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
- $as_echo "$ac_ct_OTOOL64" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -10293,7 +9140,7 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -10329,9 +9176,9 @@
- 
- 
- 
--    { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
- $as_echo_n "checking for -single_module linker flag... " >&6; }
--if test "${lt_cv_apple_cc_single_mod+set}" = set; then
-+if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_apple_cc_single_mod=no
-@@ -10356,22 +9203,18 @@
- 	rm -f conftest.*
-       fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
-+{ $as_echo "$as_me:${as_lineno-$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 "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
- $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
--if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
-+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_ld_exported_symbols_list=no
-       save_LDFLAGS=$LDFLAGS
-       echo "_main" > conftest.sym
-       LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
--      cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -10382,42 +9225,17 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   lt_cv_ld_exported_symbols_list=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	lt_cv_ld_exported_symbols_list=no
-+  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
-+rm -f core conftest.err conftest.$ac_objext \
-+    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 "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
- $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-     case $host_os in
-     rhapsody* | darwin1.[012])
-@@ -10454,62 +9272,13 @@
-     ;;
-   esac
- 
--
- for ac_header in dlfcn.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; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--
--#include <$ac_header>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  eval "$as_ac_Header=yes"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_Header=no"
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
-+do :
-+  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-+"
-+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_DLFCN_H 1
- _ACEOF
- 
- fi
-@@ -10532,9 +9301,9 @@
-   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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CXX+set}" = set; then
-+if test "${ac_cv_prog_CXX+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$CXX"; then
-@@ -10545,24 +9314,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- CXX=$ac_cv_prog_CXX
- if test -n "$CXX"; then
--  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
- $as_echo "$CXX" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -10576,9 +9345,9 @@
- 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_CXX"; then
-@@ -10589,24 +9358,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- 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 "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
- $as_echo "$ac_ct_CXX" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -10619,7 +9388,7 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -10630,53 +9399,36 @@
-   fi
- fi
- # Provide some information about the compiler.
--$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
- set X $ac_compile
- ac_compiler=$2
--{ (ac_try="$ac_compiler --version >&5"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compiler --version >&5") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--{ (ac_try="$ac_compiler -v >&5"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compiler -v >&5") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--{ (ac_try="$ac_compiler -V >&5"
-+for ac_option in --version -v -V -qversion; do
-+  { { ac_try="$ac_compiler $ac_option >&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 "$ac_compiler -V >&5") 2>&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
-+  if test -s conftest.err; then
-+    sed '10a\
-+... rest of stderr output deleted ...
-+         10q' conftest.err >conftest.er1
-+    cat conftest.er1 >&5
-+  fi
-+  rm -f conftest.er1 conftest.err
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+done
- 
--{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
- $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
--if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -10690,37 +9442,16 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_cxx_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-   ac_compiler_gnu=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_compiler_gnu=no
-+  ac_compiler_gnu=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-+{ $as_echo "$as_me:${as_lineno-$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
-@@ -10729,20 +9460,16 @@
- fi
- ac_test_CXXFLAGS=${CXXFLAGS+set}
- ac_save_CXXFLAGS=$CXXFLAGS
--{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
- $as_echo_n "checking whether $CXX accepts -g... " >&6; }
--if test "${ac_cv_prog_cxx_g+set}" = set; then
-+if test "${ac_cv_prog_cxx_g+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-    ac_cxx_werror_flag=yes
-    ac_cv_prog_cxx_g=no
-    CXXFLAGS="-g"
--   cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -10753,35 +9480,11 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_cxx_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-   ac_cv_prog_cxx_g=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	CXXFLAGS=""
--      cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  CXXFLAGS=""
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -10792,36 +9495,12 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_cxx_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  :
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_cxx_try_compile "$LINENO"; then :
- 
--	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-+else
-+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
- 	 CXXFLAGS="-g"
--	 cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -10832,42 +9511,17 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_cxx_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-   ac_cv_prog_cxx_g=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
- 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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
- $as_echo "$ac_cv_prog_cxx_g" >&6; }
- if test "$ac_test_CXXFLAGS" = set; then
-   CXXFLAGS=$ac_save_CXXFLAGS
-@@ -10892,9 +9546,9 @@
- 
- depcc="$CXX"  am_compiler_list=
- 
--{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
- $as_echo_n "checking dependency style of $depcc... " >&6; }
--if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
-+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -11002,7 +9656,7 @@
- fi
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
- $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
- CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
- 
-@@ -11025,10 +9679,10 @@
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
- $as_echo_n "checking how to run the C++ preprocessor... " >&6; }
- if test -z "$CXXCPP"; then
--  if test "${ac_cv_prog_CXXCPP+set}" = set; then
-+  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-       # Double quotes because CXXCPP needs to be expanded
-@@ -11043,11 +9697,7 @@
-   # <limits.h> exists even on freestanding compilers.
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #ifdef __STDC__
- # include <limits.h>
-@@ -11056,78 +9706,34 @@
- #endif
- 		     Syntax error
- _ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null && {
--	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
--	 test ! -s conftest.err
--       }; then
--  :
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_cxx_try_cpp "$LINENO"; then :
- 
-+else
-   # Broken: fails on valid input.
- continue
- fi
--
- rm -f conftest.err conftest.$ac_ext
- 
-   # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null && {
--	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
--	 test ! -s conftest.err
--       }; then
-+if ac_fn_cxx_try_cpp "$LINENO"; then :
-   # Broken: success on invalid input.
- continue
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-   # Passes both tests.
- ac_preproc_ok=:
- break
- fi
--
- rm -f conftest.err conftest.$ac_ext
- 
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
- rm -f conftest.err conftest.$ac_ext
--if $ac_preproc_ok; then
-+if $ac_preproc_ok; then :
-   break
- fi
- 
-@@ -11139,7 +9745,7 @@
- else
-   ac_cv_prog_CXXCPP=$CXXCPP
- fi
--{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
- $as_echo "$CXXCPP" >&6; }
- ac_preproc_ok=false
- for ac_cxx_preproc_warn_flag in '' yes
-@@ -11150,94 +9756,46 @@
-   # <limits.h> exists even on freestanding compilers.
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--		     Syntax error
--_ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null && {
--	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
--	 test ! -s conftest.err
--       }; then
--  :
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+		     Syntax error
-+_ACEOF
-+if ac_fn_cxx_try_cpp "$LINENO"; then :
- 
-+else
-   # Broken: fails on valid input.
- continue
- fi
--
- rm -f conftest.err conftest.$ac_ext
- 
-   # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null && {
--	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
--	 test ! -s conftest.err
--       }; then
-+if ac_fn_cxx_try_cpp "$LINENO"; then :
-   # Broken: success on invalid input.
- continue
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-   # Passes both tests.
- ac_preproc_ok=:
- break
- fi
--
- rm -f conftest.err conftest.$ac_ext
- 
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
- rm -f conftest.err conftest.$ac_ext
--if $ac_preproc_ok; then
--  :
-+if $ac_preproc_ok; then :
-+
- else
--  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- _lt_caught_CXX_error=yes; }
- fi
-@@ -11267,7 +9825,7 @@
- 
- 
-             # Check whether --enable-shared was given.
--if test "${enable_shared+set}" = set; then
-+if test "${enable_shared+set}" = set; then :
-   enableval=$enable_shared; p=${PACKAGE-default}
-     case $enableval in
-     yes) enable_shared=yes ;;
-@@ -11298,7 +9856,7 @@
- 
- 
-   # Check whether --enable-static was given.
--if test "${enable_static+set}" = set; then
-+if test "${enable_static+set}" = set; then :
-   enableval=$enable_static; p=${PACKAGE-default}
-     case $enableval in
-     yes) enable_static=yes ;;
-@@ -11330,7 +9888,7 @@
- 
- 
- # Check whether --with-pic was given.
--if test "${with_pic+set}" = set; then
-+if test "${with_pic+set}" = set; then :
-   withval=$with_pic; pic_mode="$withval"
- else
-   pic_mode=default
-@@ -11346,7 +9904,7 @@
- 
- 
-   # Check whether --enable-fast-install was given.
--if test "${enable_fast_install+set}" = set; then
-+if test "${enable_fast_install+set}" = set; then :
-   enableval=$enable_fast_install; p=${PACKAGE-default}
-     case $enableval in
-     yes) enable_fast_install=yes ;;
-@@ -11427,9 +9985,9 @@
-    setopt NO_GLOB_SUBST
- fi
- 
--{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
- $as_echo_n "checking for objdir... " >&6; }
--if test "${lt_cv_objdir+set}" = set; then
-+if test "${lt_cv_objdir+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   rm -f .libs 2>/dev/null
-@@ -11442,7 +10000,7 @@
- fi
- rmdir .libs 2>/dev/null
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
- $as_echo "$lt_cv_objdir" >&6; }
- objdir=$lt_cv_objdir
- 
-@@ -11535,9 +10093,9 @@
- 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 "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
- $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
--if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $MAGIC_CMD in
-@@ -11588,10 +10146,10 @@
- 
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- if test -n "$MAGIC_CMD"; then
--  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
- $as_echo "$MAGIC_CMD" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -11601,9 +10159,9 @@
- 
- 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 "$as_me:${as_lineno-$LINENO}: checking for file" >&5
- $as_echo_n "checking for file... " >&6; }
--if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $MAGIC_CMD in
-@@ -11654,10 +10212,10 @@
- 
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- if test -n "$MAGIC_CMD"; then
--  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
- $as_echo "$MAGIC_CMD" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -11734,9 +10292,9 @@
- 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 "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
- $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
--if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_rtti_exceptions=no
-@@ -11752,11 +10310,11 @@
+@@ -10292,11 +10310,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:11755: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:10295: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:10313: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:11759: \$? = $ac_status" >&5
+-   echo "$as_me:10299: \$? = $ac_status" >&5
 +   echo "$as_me:10317: \$? = $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.
-@@ -11769,7 +10327,7 @@
-    $RM conftest*
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
- $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
- 
- if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -11789,7 +10347,7 @@
- lt_prog_compiler_pic=
- lt_prog_compiler_static=
- 
--{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
- $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- 
-   if test "$GCC" = yes; then
-@@ -11921,7 +10479,7 @@
+@@ -10461,7 +10479,7 @@
        lt_prog_compiler_static='-non_shared'
        ;;
  
@@ -9424,173 +459,49 @@
        case $cc_basename in
        # old Intel for x86_64 which still supported -KPIC.
        ecc*)
-@@ -12061,7 +10619,7 @@
-     lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-     ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
- $as_echo "$lt_prog_compiler_pic" >&6; }
- 
- 
-@@ -12073,9 +10631,9 @@
- # 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 "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
- $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
--if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
-+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_pic_works=no
-@@ -12091,11 +10649,11 @@
+@@ -10631,11 +10649,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:12094: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:10634: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:10652: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:12098: \$? = $ac_status" >&5
+-   echo "$as_me:10638: \$? = $ac_status" >&5
 +   echo "$as_me:10656: \$? = $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.
-@@ -12108,7 +10666,7 @@
-    $RM conftest*
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
- $as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
- 
- if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -12132,9 +10690,9 @@
- # 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 "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
- $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
--if test "${lt_cv_prog_compiler_static_works+set}" = set; then
-+if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_static_works=no
-@@ -12160,7 +10718,7 @@
-    LDFLAGS="$save_LDFLAGS"
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
- $as_echo "$lt_cv_prog_compiler_static_works" >&6; }
- 
- if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -12175,9 +10733,9 @@
- 
- 
- 
--  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
- $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
--if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_c_o=no
-@@ -12196,11 +10754,11 @@
+@@ -10736,11 +10754,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:12199: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:10739: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:10757: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:12203: \$? = $ac_status" >&5
+-   echo "$as_me:10743: \$? = $ac_status" >&5
 +   echo "$as_me:10761: \$? = $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
-@@ -12222,7 +10780,7 @@
-    $RM conftest*
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
- $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
- 
- 
-@@ -12230,9 +10788,9 @@
- 
- 
- 
--  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
- $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
--if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_c_o=no
-@@ -12251,11 +10809,11 @@
+@@ -10791,11 +10809,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:12254: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:10794: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:10812: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:12258: \$? = $ac_status" >&5
+-   echo "$as_me:10798: \$? = $ac_status" >&5
 +   echo "$as_me:10816: \$? = $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
-@@ -12277,7 +10835,7 @@
-    $RM conftest*
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
- $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
- 
- 
-@@ -12286,7 +10844,7 @@
- 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 "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
- $as_echo_n "checking if we can lock with hard links... " >&6; }
-   hard_links=yes
-   $RM conftest*
-@@ -12294,10 +10852,10 @@
-   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 "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
- $as_echo "$hard_links" >&6; }
-   if test "$hard_links" = no; then
--    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
- $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-     need_locks=warn
-   fi
-@@ -12310,7 +10868,7 @@
- 
- 
- 
--  { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
- $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
- 
-   runpath_var=
-@@ -12370,6 +10928,9 @@
+@@ -10910,6 +10928,9 @@
    openbsd*)
      with_gnu_ld=no
      ;;
@@ -9600,7 +511,7 @@
    esac
  
    ld_shlibs=yes
-@@ -12391,6 +10952,7 @@
+@@ -10931,6 +10952,7 @@
      fi
      supports_anon_versioning=no
      case `$LD -v 2>&1` in
@@ -9608,7 +519,7 @@
        *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -12482,7 +11044,7 @@
+@@ -11022,7 +11044,7 @@
        archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
        ;;
  
@@ -9617,7 +528,7 @@
        tmp_diet=no
        if test "$host_os" = linux-dietlibc; then
  	case $cc_basename in
-@@ -12552,7 +11114,7 @@
+@@ -11092,7 +11114,7 @@
        fi
        ;;
  
@@ -9626,7 +537,7 @@
        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -12727,6 +11289,7 @@
+@@ -11267,6 +11289,7 @@
  	if test "$aix_use_runtimelinking" = yes; then
  	  shared_flag="$shared_flag "'${wl}-G'
  	fi
@@ -9634,177 +545,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -12752,11 +11315,7 @@
- 	allow_undefined_flag='-berok'
-         # Determine the default libpath from the value encoded in an
-         # empty executable.
--        cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -12767,27 +11326,7 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- 
- lt_aix_libpath_sed='
-     /Import File Strings/,/^$/ {
-@@ -12801,16 +11340,9 @@
- if test -z "$aix_libpath"; then
-   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
-         hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -12823,11 +11355,7 @@
- 	else
- 	 # Determine the default libpath from the value encoded in an
- 	 # empty executable.
--	 cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -12838,27 +11366,7 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- 
- lt_aix_libpath_sed='
-     /Import File Strings/,/^$/ {
-@@ -12872,16 +11380,9 @@
- if test -z "$aix_libpath"; then
-   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
- 	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -13093,42 +11594,16 @@
- 	# implicitly export all symbols.
-         save_LDFLAGS="$LDFLAGS"
-         LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
--        cat >conftest.$ac_ext <<_ACEOF
-+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- int foo(void) {}
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
- 
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-         LDFLAGS="$save_LDFLAGS"
-       else
- 	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -13141,7 +11616,7 @@
+@@ -11593,7 +11616,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -9813,70 +554,7 @@
        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -13384,7 +11859,7 @@
-     fi
-   fi
- 
--{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
- $as_echo "$ld_shlibs" >&6; }
- test "$ld_shlibs" = no && can_build_shared=no
- 
-@@ -13421,16 +11896,16 @@
-       # 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 "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
- $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-       $RM conftest*
-       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
--      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } 2>conftest.err; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } 2>conftest.err; then
-         soname=conftest
-         lib=conftest
-         libobjs=conftest.$ac_objext
-@@ -13444,11 +11919,11 @@
-         libname=conftest
-         lt_save_allow_undefined_flag=$allow_undefined_flag
-         allow_undefined_flag=
--        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
-+        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-         then
- 	  archive_cmds_need_lc=no
-         else
-@@ -13459,7 +11934,7 @@
-         cat conftest.err 1>&5
-       fi
-       $RM conftest*
--      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
- $as_echo "$archive_cmds_need_lc" >&6; }
-       ;;
-     esac
-@@ -13623,7 +12098,7 @@
- 
- 
- 
--  { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
- $as_echo_n "checking dynamic linker characteristics... " >&6; }
- 
- if test "$GCC" = yes; then
-@@ -14031,7 +12506,7 @@
+@@ -12483,7 +12506,7 @@
    ;;
  
  # This must be Linux ELF.
@@ -9885,66 +563,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -14045,11 +12520,7 @@
-   save_libdir=$libdir
-   eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-        LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -14060,41 +12531,13 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
-+if ac_fn_c_try_link "$LINENO"; then :
-+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-   shlibpath_overrides_runpath=yes
- fi
--
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-   LDFLAGS=$save_LDFLAGS
-   libdir=$save_libdir
- 
-@@ -14103,13 +12546,10 @@
+@@ -12523,13 +12546,10 @@
    # before this can be enabled.
    hardcode_into_libs=yes
  
@@ -9959,7 +578,7 @@
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -14121,6 +12561,18 @@
+@@ -12541,6 +12561,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -9978,916 +597,25 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -14309,7 +12761,7 @@
-   dynamic_linker=no
-   ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
- $as_echo "$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
- 
-@@ -14411,7 +12863,7 @@
- 
- 
- 
--  { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
- $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
- hardcode_action=
- if test -n "$hardcode_libdir_flag_spec" ||
-@@ -14436,7 +12888,7 @@
-   # directories.
-   hardcode_action=unsupported
- fi
--{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
- $as_echo "$hardcode_action" >&6; }
- 
- if test "$hardcode_action" = relink ||
-@@ -14481,18 +12933,14 @@
- 
-   darwin*)
-   # if libdl is installed we need to link against it
--    { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
- $as_echo_n "checking for dlopen in -ldl... " >&6; }
--if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -14510,43 +12958,18 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_dl_dlopen=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_dl_dlopen=no
-+  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
-+rm -f core conftest.err conftest.$ac_objext \
-+    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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
- $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
--if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
-+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
- else
- 
-@@ -14559,106 +12982,18 @@
-     ;;
- 
-   *)
--    { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
--$as_echo_n "checking for shl_load... " >&6; }
--if test "${ac_cv_func_shl_load+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define shl_load innocuous_shl_load
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char shl_load (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef shl_load
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char shl_load ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_shl_load || defined __stub___shl_load
--choke me
--#endif
--
--int
--main ()
--{
--return shl_load ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  ac_cv_func_shl_load=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_func_shl_load=no
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
--$as_echo "$ac_cv_func_shl_load" >&6; }
--if test "x$ac_cv_func_shl_load" = x""yes; then
-+    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-+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 "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
- $as_echo_n "checking for shl_load in -ldld... " >&6; }
--if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -14676,145 +13011,32 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_dld_shl_load=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_dld_shl_load=no
-+  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
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
--$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
--if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
--  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
--else
--  { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
--$as_echo_n "checking for dlopen... " >&6; }
--if test "${ac_cv_func_dlopen+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define dlopen innocuous_dlopen
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char dlopen (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef dlopen
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char dlopen ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_dlopen || defined __stub___dlopen
--choke me
--#endif
--
--int
--main ()
--{
--return dlopen ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  ac_cv_func_dlopen=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_func_dlopen=no
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
--$as_echo "$ac_cv_func_dlopen" >&6; }
--if test "x$ac_cv_func_dlopen" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
-+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-+else
-+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-+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 "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
- $as_echo_n "checking for dlopen in -ldl... " >&6; }
--if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -14832,57 +13054,28 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_dl_dlopen=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_dl_dlopen=no
-+  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
-+rm -f core conftest.err conftest.$ac_objext \
-+    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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
- $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
--if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
-+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 "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
- $as_echo_n "checking for dlopen in -lsvld... " >&6; }
--if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-+if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsvld  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -14900,57 +13093,28 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_svld_dlopen=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_svld_dlopen=no
-+  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
-+rm -f core conftest.err conftest.$ac_objext \
-+    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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
- $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
--if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
-+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 "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
- $as_echo_n "checking for dld_link in -ldld... " >&6; }
--if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-+if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -14968,43 +13132,18 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_dld_dld_link=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_dld_dld_link=no
-+  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
-+rm -f core conftest.err conftest.$ac_objext \
-+    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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
- $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
--if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
-+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
-   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
- fi
- 
-@@ -15043,9 +13182,9 @@
-     save_LIBS="$LIBS"
-     LIBS="$lt_cv_dlopen_libs $LIBS"
- 
--    { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
- $as_echo_n "checking whether a program can dlopen itself... " >&6; }
--if test "${lt_cv_dlopen_self+set}" = set; then
-+if test "${lt_cv_dlopen_self+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   	  if test "$cross_compiling" = yes; then :
-@@ -15054,7 +13193,7 @@
+@@ -13161,7 +13193,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
--#line 15057 "configure"
+-#line 13164 "configure"
 +#line 13196 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -15113,11 +13252,11 @@
-   return status;
- }
- _LT_EOF
--  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-     (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-@@ -15134,14 +13273,14 @@
- 
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
- $as_echo "$lt_cv_dlopen_self" >&6; }
- 
-     if test "x$lt_cv_dlopen_self" = xyes; then
-       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
--      { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
- $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
--if test "${lt_cv_dlopen_self_static+set}" = set; then
-+if test "${lt_cv_dlopen_self_static+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   	  if test "$cross_compiling" = yes; then :
-@@ -15150,7 +13289,7 @@
+@@ -13257,7 +13289,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
--#line 15153 "configure"
+-#line 13260 "configure"
 +#line 13292 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -15209,11 +13348,11 @@
-   return status;
- }
- _LT_EOF
--  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-     (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-@@ -15230,7 +13369,7 @@
- 
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
- $as_echo "$lt_cv_dlopen_self_static" >&6; }
-     fi
- 
-@@ -15269,12 +13408,12 @@
- 
- striplib=
- old_striplib=
--{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
- $as_echo_n "checking whether stripping libraries is possible... " >&6; }
- if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
--  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- else
- # FIXME - insert some real tests, host_os isn't really good enough
-@@ -15283,15 +13422,15 @@
-     if test -n "$STRIP" ; then
-       striplib="$STRIP -x"
-       old_striplib="$STRIP -S"
--      { $as_echo "$as_me:$LINENO: result: yes" >&5
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-     else
--      { $as_echo "$as_me:$LINENO: result: no" >&5
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-     fi
-     ;;
-   *)
--    { $as_echo "$as_me:$LINENO: result: no" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-     ;;
-   esac
-@@ -15309,12 +13448,12 @@
- 
- 
-   # Report which library types will actually be built
--  { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-+  { $as_echo "$as_me:${as_lineno-$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 "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
- $as_echo "$can_build_shared" >&6; }
- 
--  { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
- $as_echo_n "checking whether to build shared libraries... " >&6; }
-   test "$can_build_shared" = "no" && enable_shared=no
- 
-@@ -15335,14 +13474,14 @@
-     fi
-     ;;
-   esac
--  { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
- $as_echo "$enable_shared" >&6; }
- 
--  { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
- $as_echo_n "checking whether to build static libraries... " >&6; }
-   # Make sure either enable_shared or enable_static is yes.
-   test "$enable_shared" = yes || enable_static=yes
--  { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
- $as_echo "$enable_static" >&6; }
- 
- 
-@@ -15483,7 +13622,7 @@
- 
- 
- # Check whether --with-gnu-ld was given.
--if test "${with_gnu_ld+set}" = set; then
-+if test "${with_gnu_ld+set}" = set; then :
-   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
- else
-   with_gnu_ld=no
-@@ -15492,7 +13631,7 @@
- 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 "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
- $as_echo_n "checking for ld used by $CC... " >&6; }
-   case $host in
-   *-*-mingw*)
-@@ -15522,13 +13661,13 @@
-     ;;
-   esac
- elif test "$with_gnu_ld" = yes; then
--  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
- $as_echo_n "checking for GNU ld... " >&6; }
- else
--  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
- $as_echo_n "checking for non-GNU ld... " >&6; }
- fi
--if test "${lt_cv_path_LD+set}" = set; then
-+if test "${lt_cv_path_LD+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -z "$LD"; then
-@@ -15559,18 +13698,16 @@
- 
- LD="$lt_cv_path_LD"
- if test -n "$LD"; then
--  { $as_echo "$as_me:$LINENO: result: $LD" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
- $as_echo "$LD" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "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;}
--   { (exit 1); exit 1; }; }
--{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
- $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
--if test "${lt_cv_prog_gnu_ld+set}" = set; then
-+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   # I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -15583,7 +13720,7 @@
-   ;;
- esac
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
- $as_echo "$lt_cv_prog_gnu_ld" >&6; }
- with_gnu_ld=$lt_cv_prog_gnu_ld
- 
-@@ -15638,7 +13775,7 @@
-     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 "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
- $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-     ld_shlibs_CXX=yes
-     case $host_os in
-@@ -15739,11 +13876,7 @@
-           allow_undefined_flag_CXX='-berok'
-           # Determine the default libpath from the value encoded in an empty
-           # executable.
--          cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -15754,27 +13887,7 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_cxx_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_cxx_try_link "$LINENO"; then :
- 
- lt_aix_libpath_sed='
-     /Import File Strings/,/^$/ {
-@@ -15788,16 +13901,9 @@
- if test -z "$aix_libpath"; then
-   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
-           hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -15811,11 +13917,7 @@
-           else
- 	    # Determine the default libpath from the value encoded in an
- 	    # empty executable.
--	    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -15826,27 +13928,7 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_cxx_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_cxx_try_link "$LINENO"; then :
- 
- lt_aix_libpath_sed='
-     /Import File Strings/,/^$/ {
-@@ -15860,16 +13942,9 @@
- if test -z "$aix_libpath"; then
-   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
- 	    hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -16154,7 +14229,7 @@
+@@ -14197,7 +14229,7 @@
          inherit_rpath_CXX=yes
          ;;
  
@@ -10896,40 +624,7 @@
          case $cc_basename in
            KCC*)
  	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -16613,7 +14688,7 @@
-         ;;
-     esac
- 
--    { $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
- $as_echo "$ld_shlibs_CXX" >&6; }
-     test "$ld_shlibs_CXX" = no && can_build_shared=no
- 
-@@ -16641,11 +14716,11 @@
- };
- _LT_EOF
- 
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   # Parse the compiler output and extract the necessary
-   # objects, libraries and library flags.
- 
-@@ -16826,7 +14901,7 @@
- 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 "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
- $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- 
-   # C++ specific cases for pic, static, wl, etc.
-@@ -16982,7 +15057,7 @@
+@@ -15025,7 +15057,7 @@
  	    ;;
  	esac
  	;;
@@ -10938,7 +633,7 @@
  	case $cc_basename in
  	  KCC*)
  	    # KAI C++ Compiler
-@@ -17046,7 +15121,7 @@
+@@ -15089,7 +15121,7 @@
  	    ;;
  	esac
  	;;
@@ -10947,170 +642,49 @@
  	;;
        *qnx* | *nto*)
          # QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -17143,7 +15218,7 @@
-     lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
-     ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
- $as_echo "$lt_prog_compiler_pic_CXX" >&6; }
- 
- 
-@@ -17152,9 +15227,9 @@
- # 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 "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
- $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
--if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
-+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_pic_works_CXX=no
-@@ -17170,11 +15245,11 @@
+@@ -15213,11 +15245,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:17173: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:15216: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:15248: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:17177: \$? = $ac_status" >&5
+-   echo "$as_me:15220: \$? = $ac_status" >&5
 +   echo "$as_me:15252: \$? = $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.
-@@ -17187,7 +15262,7 @@
-    $RM conftest*
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
- $as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
- 
- if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
-@@ -17208,9 +15283,9 @@
- # 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 "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
- $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
--if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
-+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_static_works_CXX=no
-@@ -17236,7 +15311,7 @@
-    LDFLAGS="$save_LDFLAGS"
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
- $as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
- 
- if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
-@@ -17248,9 +15323,9 @@
- 
- 
- 
--    { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
- $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
--if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_c_o_CXX=no
-@@ -17269,11 +15344,11 @@
+@@ -15312,11 +15344,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:17272: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:15315: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:15347: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:17276: \$? = $ac_status" >&5
+-   echo "$as_me:15319: \$? = $ac_status" >&5
 +   echo "$as_me:15351: \$? = $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
-@@ -17295,14 +15370,14 @@
-    $RM conftest*
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
- $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
- 
- 
- 
--    { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
- $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
--if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_c_o_CXX=no
-@@ -17321,11 +15396,11 @@
+@@ -15364,11 +15396,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:17324: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:15367: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:15399: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:17328: \$? = $ac_status" >&5
+-   echo "$as_me:15371: \$? = $ac_status" >&5
 +   echo "$as_me:15403: \$? = $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
-@@ -17347,7 +15422,7 @@
-    $RM conftest*
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
- $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
- 
- 
-@@ -17356,7 +15431,7 @@
- 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 "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
- $as_echo_n "checking if we can lock with hard links... " >&6; }
-   hard_links=yes
-   $RM conftest*
-@@ -17364,10 +15439,10 @@
-   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 "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
- $as_echo "$hard_links" >&6; }
-   if test "$hard_links" = no; then
--    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
- $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-     need_locks=warn
-   fi
-@@ -17377,7 +15452,7 @@
- 
- 
- 
--    { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
- $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
- 
-   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -17397,13 +15472,16 @@
+@@ -15440,6 +15472,9 @@
    cygwin* | mingw* | cegcc*)
      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'
    ;;
@@ -11120,69 +694,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 "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
- $as_echo "$ld_shlibs_CXX" >&6; }
- test "$ld_shlibs_CXX" = no && can_build_shared=no
- 
-@@ -17431,16 +15509,16 @@
-       # 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 "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
- $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-       $RM conftest*
-       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
--      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } 2>conftest.err; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } 2>conftest.err; then
-         soname=conftest
-         lib=conftest
-         libobjs=conftest.$ac_objext
-@@ -17454,11 +15532,11 @@
-         libname=conftest
-         lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
-         allow_undefined_flag_CXX=
--        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
-+        if { { eval echo "\"\$as_me\":${as_lineno-$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
--  (exit $ac_status); }
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-         then
- 	  archive_cmds_need_lc_CXX=no
-         else
-@@ -17469,7 +15547,7 @@
-         cat conftest.err 1>&5
-       fi
-       $RM conftest*
--      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5
- $as_echo "$archive_cmds_need_lc_CXX" >&6; }
-       ;;
-     esac
-@@ -17540,7 +15618,7 @@
- 
- 
- 
--    { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
- $as_echo_n "checking dynamic linker characteristics... " >&6; }
- 
- library_names_spec=
-@@ -17896,7 +15974,7 @@
+@@ -15939,7 +15974,7 @@
    ;;
  
  # This must be Linux ELF.
@@ -11191,66 +703,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -17910,11 +15988,7 @@
-   save_libdir=$libdir
-   eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
-        LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -17925,41 +15999,13 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_cxx_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
-+if ac_fn_cxx_try_link "$LINENO"; then :
-+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-   shlibpath_overrides_runpath=yes
- fi
--
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-   LDFLAGS=$save_LDFLAGS
-   libdir=$save_libdir
- 
-@@ -17968,13 +16014,10 @@
+@@ -15979,13 +16014,10 @@
    # before this can be enabled.
    hardcode_into_libs=yes
  
@@ -11265,7 +718,7 @@
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -17986,6 +16029,18 @@
+@@ -15997,6 +16029,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -11284,690 +737,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -18174,7 +16229,7 @@
-   dynamic_linker=no
-   ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
- $as_echo "$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
- 
-@@ -18225,7 +16280,7 @@
- 
- 
- 
--    { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
- $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
- hardcode_action_CXX=
- if test -n "$hardcode_libdir_flag_spec_CXX" ||
-@@ -18250,7 +16305,7 @@
-   # directories.
-   hardcode_action_CXX=unsupported
- fi
--{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
- $as_echo "$hardcode_action_CXX" >&6; }
- 
- if test "$hardcode_action_CXX" = relink ||
-@@ -18309,7 +16364,7 @@
- 
- 
- : ${CONFIG_LT=./config.lt}
--{ $as_echo "$as_me:$LINENO: creating $CONFIG_LT" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
- $as_echo "$as_me: creating $CONFIG_LT" >&6;}
- cat >"$CONFIG_LT" <<_LTEOF
- #! $SHELL
-@@ -18321,13 +16376,13 @@
- _LTEOF
- 
- cat >>"$CONFIG_LT" <<\_LTEOF
--## --------------------- ##
--## M4sh Initialization.  ##
--## --------------------- ##
-+## -------------------- ##
-+## M4sh Initialization. ##
-+## -------------------- ##
- 
- # Be more Bourne compatible
- DUALCASE=1; export DUALCASE # for MKS sh
--if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+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
-@@ -18335,23 +16390,15 @@
-   alias -g '${1+"$@"}'='"$@"'
-   setopt NO_GLOB_SUBST
- else
--  case `(set -o) 2>/dev/null` in
--  *posix*) set -o posix ;;
-+  case `(set -o) 2>/dev/null` in #(
-+  *posix*) :
-+    set -o posix ;; #(
-+  *) :
-+     ;;
- esac
--
- fi
- 
- 
--
--
--# PATH needs CR
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
--
- as_nl='
- '
- export as_nl
-@@ -18359,7 +16406,13 @@
- 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
-+# Prefer a ksh shell builtin over an external printf program on Solaris,
-+# but without wasting forks for bash or zsh.
-+if test -z "$BASH_VERSION$ZSH_VERSION" \
-+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-+  as_echo='print -r --'
-+  as_echo_n='print -rn --'
-+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-   as_echo='printf %s\n'
-   as_echo_n='printf %s'
- else
-@@ -18370,7 +16423,7 @@
-     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-     as_echo_n_body='eval
-       arg=$1;
--      case $arg in
-+      case $arg in #(
-       *"$as_nl"*)
- 	expr "X$arg" : "X\\(.*\\)$as_nl";
- 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -18393,13 +16446,6 @@
-   }
- fi
- 
--# Support unset when possible.
--if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
--  as_unset=unset
--else
--  as_unset=false
--fi
--
- 
- # IFS
- # We need space, tab and new line, in precisely that order.  Quoting is
-@@ -18409,15 +16455,15 @@
- IFS=" ""	$as_nl"
- 
- # Find who we are.  Look in the path if we contain no directory separator.
--case $0 in
-+case $0 in #((
-   *[\\/]* ) as_myself=$0 ;;
-   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
--done
-+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+  done
- IFS=$as_save_IFS
- 
-      ;;
-@@ -18429,12 +16475,16 @@
- fi
- if test ! -f "$as_myself"; then
-   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
--  { (exit 1); exit 1; }
-+  exit 1
- fi
- 
--# Work around bugs in pre-3.0 UWIN ksh.
--for as_var in ENV MAIL MAILPATH
--do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+# Unset variables that we do not need and which cause bugs (e.g. in
-+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-+# suppresses any "Segmentation fault" message there.  '((' could
-+# trigger a bug in pdksh 5.2.14.
-+for as_var in BASH_ENV ENV MAIL MAILPATH
-+do eval test x\${$as_var+set} = xset \
-+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
- done
- PS1='$ '
- PS2='> '
-@@ -18446,7 +16496,90 @@
- LANGUAGE=C
- export LANGUAGE
- 
--# Required to use basename.
-+# CDPATH.
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-+
-+
-+
-+# as_fn_error ERROR [LINENO LOG_FD]
-+# ---------------------------------
-+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-+# script with status $?, using 1 if that was 0.
-+as_fn_error ()
-+{
-+  as_status=$?; test $as_status -eq 0 && as_status=1
-+  if test "$3"; then
-+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-+  fi
-+  $as_echo "$as_me: error: $1" >&2
-+  as_fn_exit $as_status
-+} # as_fn_error
-+
-+
-+# as_fn_set_status STATUS
-+# -----------------------
-+# Set $? to STATUS, without forking.
-+as_fn_set_status ()
-+{
-+  return $1
-+} # as_fn_set_status
-+
-+# as_fn_exit STATUS
-+# -----------------
-+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-+as_fn_exit ()
-+{
-+  set +e
-+  as_fn_set_status $1
-+  exit $1
-+} # as_fn_exit
-+
-+# as_fn_unset VAR
-+# ---------------
-+# Portably unset VAR.
-+as_fn_unset ()
-+{
-+  { eval $1=; unset $1;}
-+}
-+as_unset=as_fn_unset
-+# as_fn_append VAR VALUE
-+# ----------------------
-+# Append the text in VALUE to the end of the definition contained in VAR. Take
-+# advantage of any shell optimizations that allow amortized linear growth over
-+# repeated appends, instead of the typical quadratic growth present in naive
-+# implementations.
-+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-+  eval 'as_fn_append ()
-+  {
-+    eval $1+=\$2
-+  }'
-+else
-+  as_fn_append ()
-+  {
-+    eval $1=\$$1\$2
-+  }
-+fi # as_fn_append
-+
-+# as_fn_arith ARG...
-+# ------------------
-+# Perform arithmetic evaluation on the ARGs, and store the result in the
-+# global $as_val. Take advantage of shells that can avoid forks. The arguments
-+# must be portable across $(()) and expr.
-+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-+  eval 'as_fn_arith ()
-+  {
-+    as_val=$(( $* ))
-+  }'
-+else
-+  as_fn_arith ()
-+  {
-+    as_val=`expr "$@" || test $? -eq 1`
-+  }
-+fi # as_fn_arith
-+
-+
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-    test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
-@@ -18460,8 +16593,12 @@
-   as_basename=false
- fi
- 
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+  as_dirname=dirname
-+else
-+  as_dirname=false
-+fi
- 
--# Name of the executable.
- as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- 	 X"$0" : 'X\(//\)$' \| \
-@@ -18481,77 +16618,25 @@
- 	  }
- 	  s/.*/./; q'`
- 
--# CDPATH.
--$as_unset CDPATH
--
--
--
--  as_lineno_1=$LINENO
--  as_lineno_2=$LINENO
--  test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
--
--  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
--  # uniformly replaced by the line number.  The first 'sed' inserts a
--  # line-number line after each line using $LINENO; the second 'sed'
--  # does the real work.  The second script uses 'N' to pair each
--  # line-number line with the line containing $LINENO, and appends
--  # trailing '-' during substitution so that $LINENO is not a special
--  # case at line end.
--  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
--  # scripts with optimization help from Paolo Bonzini.  Blame Lee
--  # E. McMahon (1931-1989) for sed's syntax.  :-)
--  sed -n '
--    p
--    /[$]LINENO/=
--  ' <$as_myself |
--    sed '
--      s/[$]LINENO.*/&-/
--      t lineno
--      b
--      :lineno
--      N
--      :loop
--      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
--      t loop
--      s/-\n.*//
--    ' >$as_me.lineno &&
--  chmod +x "$as_me.lineno" ||
--    { { $as_echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
--$as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
--   { (exit 1); exit 1; }; }
--
--  # Don't try to exec as it changes $[0], causing all sort of problems
--  # (the dirname of $[0] is not the place where we might find the
--  # original and so on.  Autoconf is especially sensitive to this).
--  . "./$as_me.lineno"
--  # Exit status is that of the last command.
--  exit
--}
--
--
--if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
--  as_dirname=dirname
--else
--  as_dirname=false
--fi
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
- 
- ECHO_C= ECHO_N= ECHO_T=
--case `echo -n x` in
-+case `echo -n x` in #(((((
- -n*)
--  case `echo 'x\c'` in
-+  case `echo 'xy\c'` in
-   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
--  *)   ECHO_C='\c';;
-+  xy)  ECHO_C='\c';;
-+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-+       ECHO_T='	';;
-   esac;;
- *)
-   ECHO_N='-n';;
- esac
--if expr a : '\(a\)' >/dev/null 2>&1 &&
--   test "X`expr 00001 : '.*\(...\)'`" = X001; then
--  as_expr=expr
--else
--  as_expr=false
--fi
- 
- rm -f conf$$ conf$$.exe conf$$.file
- if test -d conf$$.dir; then
-@@ -18580,8 +16665,56 @@
- rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
- rmdir conf$$.dir 2>/dev/null
- 
-+
-+# as_fn_mkdir_p
-+# -------------
-+# Create "$as_dir" as a directory, including parents if necessary.
-+as_fn_mkdir_p ()
-+{
-+
-+  case $as_dir in #(
-+  -*) as_dir=./$as_dir;;
-+  esac
-+  test -d "$as_dir" || eval $as_mkdir_p || {
-+    as_dirs=
-+    while :; do
-+      case $as_dir in #(
-+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-+      *) as_qdir=$as_dir;;
-+      esac
-+      as_dirs="'$as_qdir' $as_dirs"
-+      as_dir=`$as_dirname -- "$as_dir" ||
-+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$as_dir" : 'X\(//\)[^/]' \| \
-+	 X"$as_dir" : 'X\(//\)$' \| \
-+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$as_dir" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+      test -d "$as_dir" && break
-+    done
-+    test -z "$as_dirs" || eval "mkdir $as_dirs"
-+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" "$LINENO" 5
-+
-+
-+} # as_fn_mkdir_p
- if mkdir -p . 2>/dev/null; then
--  as_mkdir_p=:
-+  as_mkdir_p='mkdir -p "$as_dir"'
- else
-   test -d ./-p && rmdir ./-p
-   as_mkdir_p=false
-@@ -18600,10 +16733,10 @@
-       if test -d "$1"; then
- 	test -d "$1/.";
-       else
--	case $1 in
-+	case $1 in #(
- 	-*)set "./$1";;
- 	esac;
--	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- 	???[sx]*):;;*)false;;esac;fi
-     '\'' sh
-   '
-@@ -18643,7 +16776,7 @@
- 
- lt_cl_version="\
- totem config.lt 2.29.91
--configured by $0, generated by GNU Autoconf 2.63.
-+configured by $0, generated by GNU Autoconf 2.65.
- 
- Copyright (C) 2008 Free Software Foundation, Inc.
- This config.lt script is free software; the Free Software Foundation
-@@ -18661,17 +16794,11 @@
-     --quiet | --q* | --silent | --s* | -q )
-       lt_cl_silent=: ;;
- 
--    -*) { { $as_echo "$as_me:$LINENO: error: unrecognized option: $1
--Try \`$0 --help' for more information." >&5
--$as_echo "$as_me: error: unrecognized option: $1
--Try \`$0 --help' for more information." >&2;}
--   { (exit 1); exit 1; }; } ;;
--
--    *) { { $as_echo "$as_me:$LINENO: error: unrecognized argument: $1
--Try \`$0 --help' for more information." >&5
--$as_echo "$as_me: error: unrecognized argument: $1
--Try \`$0 --help' for more information." >&2;}
--   { (exit 1); exit 1; }; } ;;
-+    -*) as_fn_error "unrecognized option: $1
-+Try \`$0 --help' for more information." "$LINENO" 5 ;;
-+
-+    *) as_fn_error "unrecognized argument: $1
-+Try \`$0 --help' for more information." "$LINENO" 5 ;;
-   esac
-   shift
- done
-@@ -19036,7 +17163,7 @@
- _LTEOF
- 
- cat >>"$CONFIG_LT" <<\_LTEOF
--{ $as_echo "$as_me:$LINENO: creating $ofile" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $ofile" >&5
- $as_echo "$as_me: creating $ofile" >&6;}
- 
- 
-@@ -19840,7 +17967,7 @@
- _LT_EOF
- 
- 
--{ (exit 0); exit 0; }
-+as_fn_exit 0
- _LTEOF
- chmod +x "$CONFIG_LT"
- 
-@@ -19855,7 +17982,7 @@
-   exec 5>/dev/null
-   $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-   exec 5>>config.log
--  $lt_cl_success || { (exit 1); exit 1; }
-+  $lt_cl_success || as_fn_exit 1
- fi
- 
- 
-@@ -19865,9 +17992,9 @@
- 	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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $PKG_CONFIG in
-@@ -19880,14 +18007,14 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
-   ;;
-@@ -19895,10 +18022,10 @@
- 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 "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
- $as_echo "$PKG_CONFIG" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -19908,9 +18035,9 @@
-   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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
-+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $ac_pt_PKG_CONFIG in
-@@ -19923,14 +18050,14 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
-   ;;
-@@ -19938,10 +18065,10 @@
- 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 "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
- $as_echo "$ac_pt_PKG_CONFIG" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -19950,7 +18077,7 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -19963,13 +18090,13 @@
- 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 "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
- $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
- 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
--		{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	else
--		{ $as_echo "$as_me:$LINENO: result: no" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 		PKG_CONFIG=""
- 	fi
-@@ -19978,9 +18105,9 @@
- 
- # 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_GLIB_GENMARSHAL+set}" = set; then
-+if test "${ac_cv_path_GLIB_GENMARSHAL+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $GLIB_GENMARSHAL in
-@@ -19993,14 +18120,14 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
-   ;;
-@@ -20008,19 +18135,19 @@
- 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 "$as_me:${as_lineno-$LINENO}: result: $GLIB_GENMARSHAL" >&5
- $as_echo "$GLIB_GENMARSHAL" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
- 
- # Extract the first word of "glib-mkenums", so it can be a program name with args.
- set dummy glib-mkenums; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_GLIB_MKENUMS+set}" = set; then
-+if test "${ac_cv_path_GLIB_MKENUMS+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $GLIB_MKENUMS in
-@@ -20033,14 +18160,14 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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_MKENUMS="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
-   ;;
-@@ -20048,10 +18175,10 @@
- fi
- GLIB_MKENUMS=$ac_cv_path_GLIB_MKENUMS
- if test -n "$GLIB_MKENUMS"; then
--  { $as_echo "$as_me:$LINENO: result: $GLIB_MKENUMS" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_MKENUMS" >&5
- $as_echo "$GLIB_MKENUMS" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -20073,7 +18200,7 @@
+@@ -18156,7 +18200,7 @@
  
  
  # The full list of plugins
@@ -11976,52 +746,23 @@
  
  PLUGINDIR='${libdir}/totem/plugins'
  
-@@ -20084,10 +18211,10 @@
- 
- HAVE_GSTREAMER=no
- 
--{ $as_echo "$as_me:$LINENO: checking whether to enable easy codec installation support" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable easy codec installation support" >&5
- $as_echo_n "checking whether to enable easy codec installation support... " >&6; }
- # Check whether --enable-easy-codec-installation was given.
--if test "${enable_easy_codec_installation+set}" = set; then
-+if test "${enable_easy_codec_installation+set}" = set; then :
-   enableval=$enable_easy_codec_installation;
- 		case "${enableval}" in
- 			yes) enable_easy_codec_installation=yes ;;
-@@ -20102,46 +18229,50 @@
- 
- fi
- 
--{ $as_echo "$as_me:$LINENO: result: $enable_easy_codec_installation" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_easy_codec_installation" >&5
- $as_echo "$enable_easy_codec_installation" >&6; }
- 
- if test "x$enable_easy_codec_installation" != "xno"; then
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for MISSING_PLUGINS" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MISSING_PLUGINS" >&5
+@@ -18194,10 +18238,11 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MISSING_PLUGINS" >&5
  $as_echo_n "checking for MISSING_PLUGINS... " >&6; }
  
 -if test -n "$MISSING_PLUGINS_CFLAGS"; then
 -    pkg_cv_MISSING_PLUGINS_CFLAGS="$MISSING_PLUGINS_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$MISSING_PLUGINS_CFLAGS"; then
 +        pkg_cv_MISSING_PLUGINS_CFLAGS="$MISSING_PLUGINS_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10\""; } >&5
    ($PKG_CONFIG --exists --print-errors "gstreamer-plugins-base-0.10") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_MISSING_PLUGINS_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-plugins-base-0.10" 2>/dev/null`
+@@ -18207,13 +18252,15 @@
  else
    pkg_failed=yes
  fi
@@ -12035,32 +776,27 @@
 -    pkg_cv_MISSING_PLUGINS_LIBS="$MISSING_PLUGINS_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$MISSING_PLUGINS_LIBS"; then
 +        pkg_cv_MISSING_PLUGINS_LIBS="$MISSING_PLUGINS_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10\""; } >&5
    ($PKG_CONFIG --exists --print-errors "gstreamer-plugins-base-0.10") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_MISSING_PLUGINS_LIBS=`$PKG_CONFIG --libs "gstreamer-plugins-base-0.10" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -20154,25 +18285,14 @@
+@@ -18223,8 +18270,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -18237,9 +18285,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -12072,98 +808,23 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$MISSING_PLUGINS_PKG_ERRORS" >&5
- 
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements (gstreamer-plugins-base-0.10) were not met:
--
--$MISSING_PLUGINS_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 MISSING_PLUGINS_CFLAGS
--and MISSING_PLUGINS_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 (gstreamer-plugins-base-0.10) were not met:
-+	as_fn_error "Package requirements (gstreamer-plugins-base-0.10) were not met:
- 
- $MISSING_PLUGINS_PKG_ERRORS
- 
-@@ -20182,22 +18302,11 @@
- Alternatively, you may set the environment variables MISSING_PLUGINS_CFLAGS
- and MISSING_PLUGINS_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
--" >&2;}
--   { (exit 1); exit 1; }; }
-+" "$LINENO" 5
- elif test $pkg_failed = untried; then
--	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+	{ { $as_echo "$as_me:${as_lineno-$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.
--
--Alternatively, you may set the environment variables MISSING_PLUGINS_CFLAGS
--and MISSING_PLUGINS_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
-+as_fn_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.
- 
-@@ -20206,19 +18315,16 @@
- 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; }; }; }
-+See \`config.log' for more details." "$LINENO" 5; }
- else
- 	MISSING_PLUGINS_CFLAGS=$pkg_cv_MISSING_PLUGINS_CFLAGS
- 	MISSING_PLUGINS_LIBS=$pkg_cv_MISSING_PLUGINS_LIBS
--        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 
- 		MISSING_PLUGINS_LIBS="$MISSING_PLUGINS_LIBS -lgstpbutils-0.10"
- 
--cat >>confdefs.h <<\_ACEOF
--#define ENABLE_MISSING_PLUGIN_INSTALLATION 1
--_ACEOF
-+$as_echo "#define ENABLE_MISSING_PLUGIN_INSTALLATION 1" >>confdefs.h
- 
- 
- fi
-@@ -20227,40 +18333,44 @@
- MM="gstreamer-0.10 >= $GST_REQS gstreamer-base-0.10 >= $GST_REQS gstreamer-plugins-base-0.10 >= $GSTPLUG_REQS gstreamer-tag-0.10 >= $GSTPLUG_REQS gconf-2.0"
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for GST" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GST" >&5
+@@ -18288,10 +18336,11 @@
+ { $as_echo "$as_me:${as_lineno-$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 \"\$MM\"") >&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" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MM\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MM\""; } >&5
    ($PKG_CONFIG --exists --print-errors "$MM") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_GST_CFLAGS=`$PKG_CONFIG --cflags "$MM" 2>/dev/null`
+@@ -18301,13 +18350,15 @@
  else
    pkg_failed=yes
  fi
@@ -12177,32 +838,27 @@
 -    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 \"\$MM\"") >&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" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MM\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MM\""; } >&5
    ($PKG_CONFIG --exists --print-errors "$MM") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_GST_LIBS=`$PKG_CONFIG --libs "$MM" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -20273,25 +18383,14 @@
+@@ -18317,8 +18368,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -18331,9 +18383,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -12214,228 +870,23 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$GST_PKG_ERRORS" >&5
- 
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements ($MM) were not met:
--
--$GST_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 GST_CFLAGS
--and GST_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 ($MM) were not met:
-+	as_fn_error "Package requirements ($MM) were not met:
- 
- $GST_PKG_ERRORS
- 
-@@ -20301,22 +18400,11 @@
- Alternatively, you may set the environment variables GST_CFLAGS
- and GST_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
--" >&2;}
--   { (exit 1); exit 1; }; }
-+" "$LINENO" 5
- elif test $pkg_failed = untried; then
--	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+	{ { $as_echo "$as_me:${as_lineno-$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.
--
--Alternatively, you may set the environment variables GST_CFLAGS
--and GST_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
-+as_fn_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.
- 
-@@ -20325,12 +18413,11 @@
- 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; }; }; }
-+See \`config.log' for more details." "$LINENO" 5; }
- else
- 	GST_CFLAGS=$pkg_cv_GST_CFLAGS
- 	GST_LIBS=$pkg_cv_GST_LIBS
--        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	:
- fi
-@@ -20341,94 +18428,79 @@
- gst010_toolsdir=`$PKG_CONFIG --variable=toolsdir gstreamer-0.10`
- gst010_inspect="$gst010_toolsdir/gst-inspect-0.10"
- 
--{ $as_echo "$as_me:$LINENO: checking GStreamer 0.10 inspection tool" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking GStreamer 0.10 inspection tool" >&5
- $as_echo_n "checking GStreamer 0.10 inspection tool... " >&6; }
- if test -r "$gst010_inspect"; then
--	{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- else
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
--	{ { $as_echo "$as_me:$LINENO: error:
--		Cannot find required GStreamer-0.10 tool 'gst-inspect-0.10'.
--		It should be part of gstreamer-0_10-utils. Please install it.
--	" >&5
--$as_echo "$as_me: error:
-+	as_fn_error "
- 		Cannot find required GStreamer-0.10 tool 'gst-inspect-0.10'.
- 		It should be part of gstreamer-0_10-utils. Please install it.
--	" >&2;}
--   { (exit 1); exit 1; }; }
-+	" "$LINENO" 5
- fi
- 
- for base_element in playbin2 ffmpegcolorspace videoscale
- do
--	{ $as_echo "$as_me:$LINENO: checking GStreamer 0.10 $base_element plugin" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking GStreamer 0.10 $base_element plugin" >&5
- $as_echo_n "checking GStreamer 0.10 $base_element plugin... " >&6; }
- 	if $gst010_inspect $base_element >/dev/null 2>/dev/null; then
--		{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	else
--		{ $as_echo "$as_me:$LINENO: result: no" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
--		{ { $as_echo "$as_me:$LINENO: error:
--			Cannot find required GStreamer-0.10 plugin '$base_element'.
--			It should be part of gst-plugins-base. Please install it.
--		" >&5
--$as_echo "$as_me: error:
-+		as_fn_error "
- 			Cannot find required GStreamer-0.10 plugin '$base_element'.
- 			It should be part of gst-plugins-base. Please install it.
--		" >&2;}
--   { (exit 1); exit 1; }; }
-+		" "$LINENO" 5
- 	fi
- done
- 
- for good_element in gconfaudiosink gconfvideosink goom
- do
--	{ $as_echo "$as_me:$LINENO: checking GStreamer 0.10 $good_element plugin" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking GStreamer 0.10 $good_element plugin" >&5
- $as_echo_n "checking GStreamer 0.10 $good_element plugin... " >&6; }
- 	if $gst010_inspect $good_element >/dev/null 2>/dev/null; then
--		{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	else
--		{ $as_echo "$as_me:$LINENO: result: no" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
--		{ { $as_echo "$as_me:$LINENO: error:
--			Cannot find required GStreamer-0.10 plugin '$good_element'.
--			It should be part of gst-plugins-good. Please install it.
--		" >&5
--$as_echo "$as_me: error:
-+		as_fn_error "
- 			Cannot find required GStreamer-0.10 plugin '$good_element'.
- 			It should be part of gst-plugins-good. Please install it.
--		" >&2;}
--   { (exit 1); exit 1; }; }
-+		" "$LINENO" 5
- 	fi
- done
- 
--{ $as_echo "$as_me:$LINENO: checking Whether not to check for iso-codes" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether not to check for iso-codes" >&5
- $as_echo_n "checking Whether not to check for iso-codes... " >&6; }
- # Check whether --enable-iso-codes was given.
--if test "${enable_iso_codes+set}" = set; then
-+if test "${enable_iso_codes+set}" = set; then :
-   enableval=$enable_iso_codes;
- else
-   disable_iso_codes_check=no
- fi
- 
- if test x$disable_iso_codes_check = xno ; then
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- else
--	{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- fi
- 
- if test x$disable_iso_codes_check = "xno" ; then
--	{ $as_echo "$as_me:$LINENO: checking whether iso-codes has iso-639 domain" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iso-codes has iso-639 domain" >&5
- $as_echo_n "checking whether iso-codes has iso-639 domain... " >&6; }
- 	if $PKG_CONFIG --variable=domains iso-codes | grep 639 >/dev/null ; then
--		{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	else
--		{ $as_echo "$as_me:$LINENO: result: no" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 	fi
- 
-@@ -20449,11 +18521,11 @@
- GDK_TARGET="$($PKG_CONFIG --variable target gdk-2.0)"
- 
- SMCLIENT_PKGS=
--{ $as_echo "$as_me:$LINENO: checking which smclient backend to use" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which smclient backend to use" >&5
- $as_echo_n "checking which smclient backend to use... " >&6; }
- 
- # Check whether --with-smclient was given.
--if test "${with_smclient+set}" = set; then
-+if test "${with_smclient+set}" = set; then :
-   withval=$with_smclient;
- else
-   case "$GDK_TARGET" in
-@@ -20463,46 +18535,50 @@
-    esac
- fi
- 
--{ $as_echo "$as_me:$LINENO: result: $with_smclient" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_smclient" >&5
- $as_echo "$with_smclient" >&6; }
- 
- if test "$with_smclient" != "no"; then
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for SMCLIENT" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SMCLIENT" >&5
+@@ -18492,10 +18544,11 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SMCLIENT" >&5
  $as_echo_n "checking for SMCLIENT... " >&6; }
  
 -if test -n "$SMCLIENT_CFLAGS"; then
 -    pkg_cv_SMCLIENT_CFLAGS="$SMCLIENT_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$SMCLIENT_PKGS\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$SMCLIENT_CFLAGS"; then
 +        pkg_cv_SMCLIENT_CFLAGS="$SMCLIENT_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SMCLIENT_PKGS\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SMCLIENT_PKGS\""; } >&5
    ($PKG_CONFIG --exists --print-errors "$SMCLIENT_PKGS") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_SMCLIENT_CFLAGS=`$PKG_CONFIG --cflags "$SMCLIENT_PKGS" 2>/dev/null`
+@@ -18505,13 +18558,15 @@
  else
    pkg_failed=yes
  fi
@@ -12449,32 +900,27 @@
 -    pkg_cv_SMCLIENT_LIBS="$SMCLIENT_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$SMCLIENT_PKGS\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$SMCLIENT_LIBS"; then
 +        pkg_cv_SMCLIENT_LIBS="$SMCLIENT_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SMCLIENT_PKGS\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SMCLIENT_PKGS\""; } >&5
    ($PKG_CONFIG --exists --print-errors "$SMCLIENT_PKGS") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_SMCLIENT_LIBS=`$PKG_CONFIG --libs "$SMCLIENT_PKGS" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -20515,25 +18591,14 @@
+@@ -18521,8 +18576,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -18535,9 +18591,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -12486,114 +932,23 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$SMCLIENT_PKG_ERRORS" >&5
- 
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements ($SMCLIENT_PKGS) were not met:
--
--$SMCLIENT_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 SMCLIENT_CFLAGS
--and SMCLIENT_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 ($SMCLIENT_PKGS) were not met:
-+	as_fn_error "Package requirements ($SMCLIENT_PKGS) were not met:
- 
- $SMCLIENT_PKG_ERRORS
- 
-@@ -20543,22 +18608,11 @@
- Alternatively, you may set the environment variables SMCLIENT_CFLAGS
- and SMCLIENT_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
--" >&2;}
--   { (exit 1); exit 1; }; }
-+" "$LINENO" 5
- elif test $pkg_failed = untried; then
--	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+	{ { $as_echo "$as_me:${as_lineno-$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.
--
--Alternatively, you may set the environment variables SMCLIENT_CFLAGS
--and SMCLIENT_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
-+as_fn_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.
- 
-@@ -20567,19 +18621,16 @@
- 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; }; }; }
-+See \`config.log' for more details." "$LINENO" 5; }
- else
- 	SMCLIENT_CFLAGS=$pkg_cv_SMCLIENT_CFLAGS
- 	SMCLIENT_LIBS=$pkg_cv_SMCLIENT_LIBS
--        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	:
- fi
- 
--cat >>confdefs.h <<\_ACEOF
--#define WITH_SMCLIENT 1
--_ACEOF
-+$as_echo "#define WITH_SMCLIENT 1" >>confdefs.h
- 
- fi
- 
-@@ -20619,21 +18670,22 @@
- 
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for DEPENDENCY" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEPENDENCY" >&5
+@@ -18617,10 +18673,11 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEPENDENCY" >&5
  $as_echo_n "checking for DEPENDENCY... " >&6; }
  
 -if test -n "$DEPENDENCY_CFLAGS"; then
 -    pkg_cv_DEPENDENCY_CFLAGS="$DEPENDENCY_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 "$DEPENDENCY_CFLAGS"; then
 +        pkg_cv_DEPENDENCY_CFLAGS="$DEPENDENCY_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
    glib-2.0 >= \$GLIB_REQS
    gio-2.0
-   gtk+-2.0 >= \$GTK_REQS
-   gmodule-2.0
-   gconf-2.0
-   totem-plparser >= \$TOTEM_PLPARSER_REQS
--  cairo\"") >&5
-+  cairo\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "
-   glib-2.0 >= $GLIB_REQS
-   gio-2.0
-@@ -20643,8 +18695,8 @@
-   totem-plparser >= $TOTEM_PLPARSER_REQS
-   cairo") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_DEPENDENCY_CFLAGS=`$PKG_CONFIG --cflags "
-   glib-2.0 >= $GLIB_REQS
-   gio-2.0
-@@ -20656,21 +18708,23 @@
+@@ -18651,13 +18708,15 @@
  else
    pkg_failed=yes
  fi
@@ -12607,48 +962,27 @@
 -    pkg_cv_DEPENDENCY_LIBS="$DEPENDENCY_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 "$DEPENDENCY_LIBS"; then
 +        pkg_cv_DEPENDENCY_LIBS="$DEPENDENCY_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
    glib-2.0 >= \$GLIB_REQS
    gio-2.0
-   gtk+-2.0 >= \$GTK_REQS
-   gmodule-2.0
-   gconf-2.0
-   totem-plparser >= \$TOTEM_PLPARSER_REQS
--  cairo\"") >&5
-+  cairo\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "
-   glib-2.0 >= $GLIB_REQS
-   gio-2.0
-@@ -20680,8 +18734,8 @@
-   totem-plparser >= $TOTEM_PLPARSER_REQS
-   cairo") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_DEPENDENCY_LIBS=`$PKG_CONFIG --libs "
-   glib-2.0 >= $GLIB_REQS
-   gio-2.0
-@@ -20693,8 +18747,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -20707,46 +18762,28 @@
+@@ -18688,8 +18747,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -18702,23 +18762,23 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -12676,96 +1010,23 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$DEPENDENCY_PKG_ERRORS" >&5
- 
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements (
--  glib-2.0 >= $GLIB_REQS
--  gio-2.0
--  gtk+-2.0 >= $GTK_REQS
--  gmodule-2.0
--  gconf-2.0
--  totem-plparser >= $TOTEM_PLPARSER_REQS
--  cairo) were not met:
--
--$DEPENDENCY_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 DEPENDENCY_CFLAGS
--and DEPENDENCY_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 (
-+	as_fn_error "Package requirements (
-   glib-2.0 >= $GLIB_REQS
-   gio-2.0
-   gtk+-2.0 >= $GTK_REQS
-@@ -20763,22 +18800,11 @@
- Alternatively, you may set the environment variables DEPENDENCY_CFLAGS
- and DEPENDENCY_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
--" >&2;}
--   { (exit 1); exit 1; }; }
-+" "$LINENO" 5
- elif test $pkg_failed = untried; then
--	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+	{ { $as_echo "$as_me:${as_lineno-$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.
--
--Alternatively, you may set the environment variables DEPENDENCY_CFLAGS
--and DEPENDENCY_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
-+as_fn_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.
- 
-@@ -20787,52 +18813,55 @@
- 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; }; }; }
-+See \`config.log' for more details." "$LINENO" 5; }
- else
- 	DEPENDENCY_CFLAGS=$pkg_cv_DEPENDENCY_CFLAGS
- 	DEPENDENCY_LIBS=$pkg_cv_DEPENDENCY_LIBS
--        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	:
- fi
- 
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for MM" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MM" >&5
+@@ -18767,10 +18827,11 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MM" >&5
  $as_echo_n "checking for MM... " >&6; }
  
 -if test -n "$MM_CFLAGS"; then
 -    pkg_cv_MM_CFLAGS="$MM_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MM\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$MM_CFLAGS"; then
 +        pkg_cv_MM_CFLAGS="$MM_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MM\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MM\""; } >&5
    ($PKG_CONFIG --exists --print-errors "$MM") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_MM_CFLAGS=`$PKG_CONFIG --cflags "$MM" 2>/dev/null`
+@@ -18780,13 +18841,15 @@
  else
    pkg_failed=yes
  fi
@@ -12779,32 +1040,27 @@
 -    pkg_cv_MM_LIBS="$MM_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MM\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$MM_LIBS"; then
 +        pkg_cv_MM_LIBS="$MM_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MM\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MM\""; } >&5
    ($PKG_CONFIG --exists --print-errors "$MM") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_MM_LIBS=`$PKG_CONFIG --libs "$MM" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -20845,25 +18874,14 @@
+@@ -18796,8 +18859,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -18810,9 +18874,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -12816,89 +1072,23 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$MM_PKG_ERRORS" >&5
- 
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements ($MM) were not met:
--
--$MM_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 MM_CFLAGS
--and MM_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 ($MM) were not met:
-+	as_fn_error "Package requirements ($MM) were not met:
- 
- $MM_PKG_ERRORS
- 
-@@ -20873,22 +18891,11 @@
- Alternatively, you may set the environment variables MM_CFLAGS
- and MM_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
--" >&2;}
--   { (exit 1); exit 1; }; }
-+" "$LINENO" 5
- elif test $pkg_failed = untried; then
--	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+	{ { $as_echo "$as_me:${as_lineno-$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.
--
--Alternatively, you may set the environment variables MM_CFLAGS
--and MM_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
-+as_fn_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.
- 
-@@ -20897,52 +18904,55 @@
- 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; }; }; }
-+See \`config.log' for more details." "$LINENO" 5; }
- else
- 	MM_CFLAGS=$pkg_cv_MM_CFLAGS
- 	MM_LIBS=$pkg_cv_MM_LIBS
--        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	:
- fi
- 
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for GTK" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
+@@ -18854,10 +18918,11 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
  $as_echo_n "checking for GTK... " >&6; }
  
 -if test -n "$GTK_CFLAGS"; then
 -    pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$GTK_CFLAGS"; then
 +        pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0\""; } >&5
    ($PKG_CONFIG --exists --print-errors "gtk+-2.0 gthread-2.0") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 gthread-2.0" 2>/dev/null`
+@@ -18867,13 +18932,15 @@
  else
    pkg_failed=yes
  fi
@@ -12912,32 +1102,27 @@
 -    pkg_cv_GTK_LIBS="$GTK_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$GTK_LIBS"; then
 +        pkg_cv_GTK_LIBS="$GTK_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0\""; } >&5
    ($PKG_CONFIG --exists --print-errors "gtk+-2.0 gthread-2.0") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 gthread-2.0" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -20955,25 +18965,14 @@
+@@ -18883,8 +18950,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -18897,9 +18965,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -12949,108 +1134,23 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$GTK_PKG_ERRORS" >&5
- 
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 gthread-2.0) were not met:
--
--$GTK_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 GTK_CFLAGS
--and GTK_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 (gtk+-2.0 gthread-2.0) were not met:
-+	as_fn_error "Package requirements (gtk+-2.0 gthread-2.0) were not met:
- 
- $GTK_PKG_ERRORS
- 
-@@ -20983,22 +18982,11 @@
- Alternatively, you may set the environment variables GTK_CFLAGS
- and GTK_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
--" >&2;}
--   { (exit 1); exit 1; }; }
-+" "$LINENO" 5
- elif test $pkg_failed = untried; then
--	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+	{ { $as_echo "$as_me:${as_lineno-$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.
--
--Alternatively, you may set the environment variables GTK_CFLAGS
--and GTK_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
-+as_fn_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.
- 
-@@ -21007,12 +18995,11 @@
- 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; }; }; }
-+See \`config.log' for more details." "$LINENO" 5; }
- else
- 	GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
- 	GTK_LIBS=$pkg_cv_GTK_LIBS
--        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	:
- fi
-@@ -21022,54 +19009,58 @@
- 
- 
- if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
-   \$ISO_CODES
--  gnome-icon-theme >= \$GNOMEICON_REQS\"") >&5
-+  gnome-icon-theme >= \$GNOMEICON_REQS\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "
-   $ISO_CODES
-   gnome-icon-theme >= $GNOMEICON_REQS") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   :
- fi
- 
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for UNIQUE" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UNIQUE" >&5
+@@ -18958,10 +19026,11 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UNIQUE" >&5
  $as_echo_n "checking for UNIQUE... " >&6; }
  
 -if test -n "$UNIQUE_CFLAGS"; then
 -    pkg_cv_UNIQUE_CFLAGS="$UNIQUE_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"unique-1.0\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$UNIQUE_CFLAGS"; then
 +        pkg_cv_UNIQUE_CFLAGS="$UNIQUE_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"unique-1.0\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"unique-1.0\""; } >&5
    ($PKG_CONFIG --exists --print-errors "unique-1.0") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_UNIQUE_CFLAGS=`$PKG_CONFIG --cflags "unique-1.0" 2>/dev/null`
+@@ -18971,13 +19040,15 @@
  else
    pkg_failed=yes
  fi
@@ -13064,32 +1164,27 @@
 -    pkg_cv_UNIQUE_LIBS="$UNIQUE_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"unique-1.0\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$UNIQUE_LIBS"; then
 +        pkg_cv_UNIQUE_LIBS="$UNIQUE_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"unique-1.0\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"unique-1.0\""; } >&5
    ($PKG_CONFIG --exists --print-errors "unique-1.0") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_UNIQUE_LIBS=`$PKG_CONFIG --libs "unique-1.0" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -21082,25 +19073,14 @@
+@@ -18987,8 +19058,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -19001,9 +19073,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -13101,364 +1196,23 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$UNIQUE_PKG_ERRORS" >&5
- 
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements (unique-1.0) were not met:
--
--$UNIQUE_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 UNIQUE_CFLAGS
--and UNIQUE_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 (unique-1.0) were not met:
-+	as_fn_error "Package requirements (unique-1.0) were not met:
- 
- $UNIQUE_PKG_ERRORS
- 
-@@ -21110,22 +19090,11 @@
- Alternatively, you may set the environment variables UNIQUE_CFLAGS
- and UNIQUE_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
--" >&2;}
--   { (exit 1); exit 1; }; }
-+" "$LINENO" 5
- elif test $pkg_failed = untried; then
--	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+	{ { $as_echo "$as_me:${as_lineno-$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.
--
--Alternatively, you may set the environment variables UNIQUE_CFLAGS
--and UNIQUE_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
-+as_fn_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.
- 
-@@ -21134,24 +19103,23 @@
- 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; }; }; }
-+See \`config.log' for more details." "$LINENO" 5; }
- else
- 	UNIQUE_CFLAGS=$pkg_cv_UNIQUE_CFLAGS
- 	UNIQUE_LIBS=$pkg_cv_UNIQUE_LIBS
--        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	:
- fi
- 
- have_x11=no
- if test x$(pkg-config --variable=target gtk+-2.0) = xx11; then
--	{ $as_echo "$as_me:$LINENO: checking for X" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
- $as_echo_n "checking for X... " >&6; }
- 
- 
- # Check whether --with-x was given.
--if test "${with_x+set}" = set; then
-+if test "${with_x+set}" = set; then :
-   withval=$with_x;
- fi
- 
-@@ -21161,10 +19129,8 @@
-   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;}
--   { (exit 1); exit 1; }; };; #(
--    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
-+    *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #(
-+    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   # One or both of the vars are not set, and there is no cached value.
-@@ -21212,21 +19178,25 @@
- # Check X11 before X11Rn because it is often a symlink to the current release.
- ac_x_header_dirs='
- /usr/X11/include
-+/usr/X11R7/include
- /usr/X11R6/include
- /usr/X11R5/include
- /usr/X11R4/include
- 
- /usr/include/X11
-+/usr/include/X11R7
- /usr/include/X11R6
- /usr/include/X11R5
- /usr/include/X11R4
- 
- /usr/local/X11/include
-+/usr/local/X11R7/include
- /usr/local/X11R6/include
- /usr/local/X11R5/include
- /usr/local/X11R4/include
- 
- /usr/local/include/X11
-+/usr/local/include/X11R7
- /usr/local/include/X11R6
- /usr/local/include/X11R5
- /usr/local/include/X11R4
-@@ -21248,37 +19218,14 @@
- if test "$ac_x_includes" = no; then
-   # Guess where to find include files, by looking for Xlib.h.
-   # First, try using that file with no special directory specified.
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <X11/Xlib.h>
- _ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null && {
--	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       }; then
-+if ac_fn_c_try_cpp "$LINENO"; then :
-   # We can compile using X headers with no special include directory.
- ac_x_includes=
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-   for ac_dir in $ac_x_header_dirs; do
-   if test -r "$ac_dir/X11/Xlib.h"; then
-     ac_x_includes=$ac_dir
-@@ -21286,7 +19233,6 @@
-   fi
- done
- fi
--
- rm -f conftest.err conftest.$ac_ext
- fi # $ac_x_includes = no
- 
-@@ -21296,11 +19242,7 @@
-   # Don't add to $LIBS permanently.
-   ac_save_LIBS=$LIBS
-   LIBS="-lX11 $LIBS"
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <X11/Xlib.h>
- int
-@@ -21311,35 +19253,12 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   LIBS=$ac_save_LIBS
- # We can link X programs with no special library path.
- ac_x_libraries=
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	LIBS=$ac_save_LIBS
-+  LIBS=$ac_save_LIBS
- for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
- do
-   # Don't even attempt the hair of trying to link an X program!
-@@ -21351,10 +19270,8 @@
-   done
- done
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- fi # $ac_x_libraries = no
- 
- case $ac_x_includes,$ac_x_libraries in #(
-@@ -21375,7 +19292,7 @@
- fi # $with_x != no
- 
- if test "$have_x" != yes; then
--  { $as_echo "$as_me:$LINENO: result: $have_x" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5
- $as_echo "$have_x" >&6; }
-   no_x=yes
- else
-@@ -21386,7 +19303,7 @@
-   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 "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5
- $as_echo "libraries $x_libraries, headers $x_includes" >&6; }
- fi
- 
-@@ -21404,18 +19321,14 @@
- 
- 	XTEST_LIBS=""
- 	enable_xtest=no
--	{ $as_echo "$as_me:$LINENO: checking for XTestFakeKeyEvent in -lXtst" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XTestFakeKeyEvent in -lXtst" >&5
- $as_echo_n "checking for XTestFakeKeyEvent in -lXtst... " >&6; }
--if test "${ac_cv_lib_Xtst_XTestFakeKeyEvent+set}" = set; then
-+if test "${ac_cv_lib_Xtst_XTestFakeKeyEvent+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lXtst $X_LIBRARIES $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -21427,55 +19340,28 @@
- char XTestFakeKeyEvent ();
- int
- main ()
--{
--return XTestFakeKeyEvent ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+{
-+return XTestFakeKeyEvent ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_Xtst_XTestFakeKeyEvent=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_Xtst_XTestFakeKeyEvent=no
-+  ac_cv_lib_Xtst_XTestFakeKeyEvent=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xtst_XTestFakeKeyEvent" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xtst_XTestFakeKeyEvent" >&5
- $as_echo "$ac_cv_lib_Xtst_XTestFakeKeyEvent" >&6; }
--if test "x$ac_cv_lib_Xtst_XTestFakeKeyEvent" = x""yes; then
-+if test "x$ac_cv_lib_Xtst_XTestFakeKeyEvent" = x""yes; then :
-   XTEST_LIBS="-lX11 -lXtst $X_LIBRARIES"
- 		enable_xtest=yes
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_XTEST 1
--_ACEOF
-+$as_echo "#define HAVE_XTEST 1" >>confdefs.h
- 
- fi
- 
-@@ -21483,40 +19369,44 @@
- 
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for XVIDMODE" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XVIDMODE" >&5
+@@ -19300,10 +19372,11 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XVIDMODE" >&5
  $as_echo_n "checking for XVIDMODE... " >&6; }
  
 -if test -n "$XVIDMODE_CFLAGS"; then
 -    pkg_cv_XVIDMODE_CFLAGS="$XVIDMODE_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xrandr >= 1.1.1 xxf86vm >= 1.0.1\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$XVIDMODE_CFLAGS"; then
 +        pkg_cv_XVIDMODE_CFLAGS="$XVIDMODE_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrandr >= 1.1.1 xxf86vm >= 1.0.1\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrandr >= 1.1.1 xxf86vm >= 1.0.1\""; } >&5
    ($PKG_CONFIG --exists --print-errors "xrandr >= 1.1.1 xxf86vm >= 1.0.1") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_XVIDMODE_CFLAGS=`$PKG_CONFIG --cflags "xrandr >= 1.1.1 xxf86vm >= 1.0.1" 2>/dev/null`
+@@ -19313,13 +19386,15 @@
  else
    pkg_failed=yes
  fi
@@ -13472,32 +1226,27 @@
 -    pkg_cv_XVIDMODE_LIBS="$XVIDMODE_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xrandr >= 1.1.1 xxf86vm >= 1.0.1\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$XVIDMODE_LIBS"; then
 +        pkg_cv_XVIDMODE_LIBS="$XVIDMODE_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrandr >= 1.1.1 xxf86vm >= 1.0.1\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrandr >= 1.1.1 xxf86vm >= 1.0.1\""; } >&5
    ($PKG_CONFIG --exists --print-errors "xrandr >= 1.1.1 xxf86vm >= 1.0.1") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_XVIDMODE_LIBS=`$PKG_CONFIG --libs "xrandr >= 1.1.1 xxf86vm >= 1.0.1" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -21529,14 +19419,14 @@
+@@ -19329,8 +19404,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -19343,9 +19419,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -13509,327 +1258,23 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$XVIDMODE_PKG_ERRORS" >&5
- 
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-                 have_xvidmode=no
- elif test $pkg_failed = untried; then
-@@ -21544,16 +19434,14 @@
- else
- 	XVIDMODE_CFLAGS=$pkg_cv_XVIDMODE_CFLAGS
- 	XVIDMODE_LIBS=$pkg_cv_XVIDMODE_LIBS
--        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	have_xvidmode=yes
- fi
- 
- 	if test x$have_xvidmode = xyes; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_XVIDMODE /**/
--_ACEOF
-+$as_echo "#define HAVE_XVIDMODE /**/" >>confdefs.h
- 
- 	fi
- 
-@@ -21563,7 +19451,8 @@
- 
- 
- 		have_xfree=no
--	cat >conftest.$ac_ext <<_ACEOF
-+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
- 		#include <X11/XF86keysym.h>
- 		int main(int argc,char **argv) {
-@@ -21571,43 +19460,18 @@
- 		}
- 
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   have_xfree=yes
- 
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--	{ $as_echo "$as_me:$LINENO: checking for X11 XFree86 headers" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11 XFree86 headers" >&5
- $as_echo_n "checking for X11 XFree86 headers... " >&6; }
--	{ $as_echo "$as_me:$LINENO: result: $have_xfree" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_xfree" >&5
- $as_echo "$have_xfree" >&6; }
- 	if test x"$have_xfree" = "xyes" ; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_XFREE 1
--_ACEOF
-+$as_echo "#define HAVE_XFREE 1" >>confdefs.h
- 
- 	fi
- fi
-@@ -21621,26 +19485,24 @@
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking whether Python plugin support is requested" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Python plugin support is requested" >&5
- $as_echo_n "checking whether Python plugin support is requested... " >&6; }
- # Check whether --enable-python was given.
--if test "${enable_python+set}" = set; then
-+if test "${enable_python+set}" = set; then :
-   enableval=$enable_python; enable_python=$enableval have_python=$enableval
- else
-   enable_python=autodetect have_python=yes
- fi
- 
--{ $as_echo "$as_me:$LINENO: result: $enable_python" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_python" >&5
- $as_echo "$enable_python" >&6; }
- 
- if test "x$have_python" != "xyes"; then
- 	if test "x$enable_python" = "xyes"; then
--		{ { $as_echo "$as_me:$LINENO: error: Python not found" >&5
--$as_echo "$as_me: error: Python not found" >&2;}
--   { (exit 1); exit 1; }; }
-+		as_fn_error "Python not found" "$LINENO" 5
- 	elif test "x$enable_python" = "xautodetect"; then
- 		enable_python=no
--		{ $as_echo "$as_me:$LINENO: WARNING: Python not found, disabling python support" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Python not found, disabling python support" >&5
- $as_echo "$as_me: WARNING: Python not found, disabling python support" >&2;}
- 	fi
- fi
-@@ -21652,7 +19514,7 @@
- 
-         if test -n "$PYTHON"; then
-       # If the user set $PYTHON, use it and don't search something else.
--      { $as_echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.3" >&5
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.3" >&5
- $as_echo_n "checking whether $PYTHON version >= 2.3... " >&6; }
-       prog="import sys
- # split strings by '.' and convert to numeric.  Append some zeros
-@@ -21667,22 +19529,19 @@
-    ($PYTHON -c "$prog") >&5 2>&5
-    ac_status=$?
-    echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); }; then
--  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+   (exit $ac_status); }; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- else
--  { { $as_echo "$as_me:$LINENO: error: too old" >&5
--$as_echo "$as_me: error: too old" >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "too old" "$LINENO" 5
- fi
--
-       am_display_PYTHON=$PYTHON
-     else
-       # Otherwise, try each interpreter until we find one that satisfies
-       # VERSION.
--      { $as_echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.3" >&5
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.3" >&5
- $as_echo_n "checking for a Python interpreter with version >= 2.3... " >&6; }
--if test "${am_cv_pathless_PYTHON+set}" = set; then
-+if test "${am_cv_pathless_PYTHON+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-@@ -21701,13 +19560,12 @@
-    ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5
-    ac_status=$?
-    echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); }; then
-+   (exit $ac_status); }; then :
-   break
- fi
--
- 	done
- fi
--{ $as_echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5
- $as_echo "$am_cv_pathless_PYTHON" >&6; }
-       # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
-       if test "$am_cv_pathless_PYTHON" = none; then
-@@ -21715,9 +19573,9 @@
-       else
-         # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args.
- set dummy $am_cv_pathless_PYTHON; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PYTHON+set}" = set; then
-+if test "${ac_cv_path_PYTHON+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $PYTHON in
-@@ -21730,14 +19588,14 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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_PYTHON="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
-   ;;
-@@ -21745,10 +19603,10 @@
- fi
- PYTHON=$ac_cv_path_PYTHON
- if test -n "$PYTHON"; then
--  { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
- $as_echo "$PYTHON" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -21763,14 +19621,14 @@
-   else
- 
- 
--  { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5
- $as_echo_n "checking for $am_display_PYTHON version... " >&6; }
--if test "${am_cv_python_version+set}" = set; then
-+if test "${am_cv_python_version+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
- fi
--{ $as_echo "$as_me:$LINENO: result: $am_cv_python_version" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
- $as_echo "$am_cv_python_version" >&6; }
-   PYTHON_VERSION=$am_cv_python_version
- 
-@@ -21782,23 +19640,23 @@
- 
- 
- 
--  { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
- $as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
--if test "${am_cv_python_platform+set}" = set; then
-+if test "${am_cv_python_platform+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
- fi
--{ $as_echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
- $as_echo "$am_cv_python_platform" >&6; }
-   PYTHON_PLATFORM=$am_cv_python_platform
- 
- 
- 
- 
--                { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5
-+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
- $as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
--if test "${am_cv_python_pythondir+set}" = set; then
-+if test "${am_cv_python_pythondir+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test "x$prefix" = xNONE
-@@ -21825,7 +19683,7 @@
-      esac
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
- $as_echo "$am_cv_python_pythondir" >&6; }
-   pythondir=$am_cv_python_pythondir
- 
-@@ -21834,9 +19692,9 @@
-   pkgpythondir=\${pythondir}/$PACKAGE
- 
- 
--            { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5
-+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
- $as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
--if test "${am_cv_python_pyexecdir+set}" = set; then
-+if test "${am_cv_python_pyexecdir+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test "x$exec_prefix" = xNONE
-@@ -21863,7 +19721,7 @@
-      esac
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
- $as_echo "$am_cv_python_pyexecdir" >&6; }
-   pyexecdir=$am_cv_python_pyexecdir
- 
-@@ -21905,52 +19763,56 @@
- 
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for PYGTK" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYGTK" >&5
+@@ -19690,10 +19766,11 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYGTK" >&5
  $as_echo_n "checking for PYGTK... " >&6; }
  
 -if test -n "$PYGTK_CFLAGS"; then
 -    pkg_cv_PYGTK_CFLAGS="$PYGTK_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 "$PYGTK_CFLAGS"; then
 +        pkg_cv_PYGTK_CFLAGS="$PYGTK_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
  		pygtk-2.0 >= \$PYGTK_REQUIRED
--		totem-plparser >= \$TOTEM_PLPARSER_REQS\"") >&5
-+		totem-plparser >= \$TOTEM_PLPARSER_REQS\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "
- 		pygtk-2.0 >= $PYGTK_REQUIRED
- 		totem-plparser >= $TOTEM_PLPARSER_REQS") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_PYGTK_CFLAGS=`$PKG_CONFIG --cflags "
- 		pygtk-2.0 >= $PYGTK_REQUIRED
- 		totem-plparser >= $TOTEM_PLPARSER_REQS" 2>/dev/null`
+ 		totem-plparser >= \$TOTEM_PLPARSER_REQS\""; } >&5
+@@ -19709,13 +19786,15 @@
  else
    pkg_failed=yes
  fi
@@ -13843,39 +1288,27 @@
 -    pkg_cv_PYGTK_LIBS="$PYGTK_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 "$PYGTK_LIBS"; then
 +        pkg_cv_PYGTK_LIBS="$PYGTK_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
  		pygtk-2.0 >= \$PYGTK_REQUIRED
--		totem-plparser >= \$TOTEM_PLPARSER_REQS\"") >&5
-+		totem-plparser >= \$TOTEM_PLPARSER_REQS\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "
- 		pygtk-2.0 >= $PYGTK_REQUIRED
- 		totem-plparser >= $TOTEM_PLPARSER_REQS") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_PYGTK_LIBS=`$PKG_CONFIG --libs "
- 		pygtk-2.0 >= $PYGTK_REQUIRED
- 		totem-plparser >= $TOTEM_PLPARSER_REQS" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -21963,30 +19825,28 @@
+ 		totem-plparser >= \$TOTEM_PLPARSER_REQS\""; } >&5
+@@ -19731,8 +19810,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -19745,13 +19825,13 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -13893,191 +1326,23 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$PYGTK_PKG_ERRORS" >&5
- 
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 
- 		have_python=no
- 		if test "x$enable_python" = "xyes"; then
--			{ { $as_echo "$as_me:$LINENO: error: $PYGTK_PKG_ERRORS" >&5
--$as_echo "$as_me: error: $PYGTK_PKG_ERRORS" >&2;}
--   { (exit 1); exit 1; }; }
-+			as_fn_error "$PYGTK_PKG_ERRORS" "$LINENO" 5
- 		elif test "x$enable_python" = "xautodetect"; then
- 			enable_python=no
--			{ $as_echo "$as_me:$LINENO: WARNING: $PYGTK_PKG_ERRORS" >&5
-+			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $PYGTK_PKG_ERRORS" >&5
- $as_echo "$as_me: WARNING: $PYGTK_PKG_ERRORS" >&2;}
--			{ $as_echo "$as_me:$LINENO: WARNING: Disabling python support" >&5
-+			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling python support" >&5
- $as_echo "$as_me: WARNING: Disabling python support" >&2;}
- 		fi
- 
-@@ -21994,21 +19854,19 @@
- 
- 		have_python=no
- 		if test "x$enable_python" = "xyes"; then
--			{ { $as_echo "$as_me:$LINENO: error: $PYGTK_PKG_ERRORS" >&5
--$as_echo "$as_me: error: $PYGTK_PKG_ERRORS" >&2;}
--   { (exit 1); exit 1; }; }
-+			as_fn_error "$PYGTK_PKG_ERRORS" "$LINENO" 5
- 		elif test "x$enable_python" = "xautodetect"; then
- 			enable_python=no
--			{ $as_echo "$as_me:$LINENO: WARNING: $PYGTK_PKG_ERRORS" >&5
-+			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $PYGTK_PKG_ERRORS" >&5
- $as_echo "$as_me: WARNING: $PYGTK_PKG_ERRORS" >&2;}
--			{ $as_echo "$as_me:$LINENO: WARNING: Disabling python support" >&5
-+			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling python support" >&5
- $as_echo "$as_me: WARNING: Disabling python support" >&2;}
- 		fi
- 
- else
- 	PYGTK_CFLAGS=$pkg_cv_PYGTK_CFLAGS
- 	PYGTK_LIBS=$pkg_cv_PYGTK_LIBS
--        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	:
- fi
-@@ -22018,22 +19876,22 @@
- fi
- 
- if test "x$have_python" != "xno"; then
--	{ $as_echo "$as_me:$LINENO: checking for pygtk defs" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pygtk defs" >&5
- $as_echo_n "checking for pygtk defs... " >&6; }
- 	PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
--	{ $as_echo "$as_me:$LINENO: result: $PYGTK_DEFSDIR" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYGTK_DEFSDIR" >&5
- $as_echo "$PYGTK_DEFSDIR" >&6; }
- 
--	{ $as_echo "$as_me:$LINENO: checking for pygtk codegen" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pygtk codegen" >&5
- $as_echo_n "checking for pygtk codegen... " >&6; }
- 	PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py"
--	{ $as_echo "$as_me:$LINENO: result: $PYGTK_CODEGEN" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYGTK_CODEGEN" >&5
- $as_echo "$PYGTK_CODEGEN" >&6; }
- 
--	{ $as_echo "$as_me:$LINENO: checking for pygtk h2def" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pygtk h2def" >&5
- $as_echo_n "checking for pygtk h2def... " >&6; }
- 	PYGTK_H2DEF="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/h2def.py"
--	{ $as_echo "$as_me:$LINENO: result: $PYGTK_H2DEF" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYGTK_H2DEF" >&5
- $as_echo "$PYGTK_H2DEF" >&6; }
- 
- 
-@@ -22044,13 +19902,9 @@
- 		FLAGS="-fno-strict-aliasing"
- 	save_CFLAGS="$CFLAGS"
- 	CFLAGS="$CFLAGS $FLAGS"
--	{ $as_echo "$as_me:$LINENO: checking whether $CC understands $FLAGS" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands $FLAGS" >&5
- $as_echo_n "checking whether $CC understands $FLAGS... " >&6; }
--	cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -22061,35 +19915,14 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   compiler_has_option=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	compiler_has_option=no
-+  compiler_has_option=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 	CFLAGS="$save_CFLAGS"
--	{ $as_echo "$as_me:$LINENO: result: $compiler_has_option" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $compiler_has_option" >&5
- $as_echo "$compiler_has_option" >&6; }
- 	if test $compiler_has_option = yes; then
- 		NO_STRICT_ALIASING_CFLAGS="$FLAGS"
-@@ -22100,9 +19933,7 @@
- if test "x$have_python" != "xno" -a "x$enable_python" != "xno"; then
- 	enable_python=yes
- 
--cat >>confdefs.h <<\_ACEOF
--#define ENABLE_PYTHON 1
--_ACEOF
-+$as_echo "#define ENABLE_PYTHON 1" >>confdefs.h
- 
- fi
- 
-@@ -22115,54 +19946,58 @@
- fi
- 
- 
--{ $as_echo "$as_me:$LINENO: checking whether Vala plugin support is requested" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Vala plugin support is requested" >&5
- $as_echo_n "checking whether Vala plugin support is requested... " >&6; }
- # Check whether --enable-vala was given.
--if test "${enable_vala+set}" = set; then
-+if test "${enable_vala+set}" = set; then :
-   enableval=$enable_vala; enable_vala=$enableval have_vala=$enableval
- else
-   enable_vala=autodetect have_vala=yes
- fi
- 
--{ $as_echo "$as_me:$LINENO: result: $enable_vala" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_vala" >&5
- $as_echo "$enable_vala" >&6; }
- if test "x$enable_vala" != "xno"; then
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for VALA" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VALA" >&5
+@@ -19883,10 +19963,11 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for VALA" >&5
  $as_echo_n "checking for VALA... " >&6; }
  
 -if test -n "$VALA_CFLAGS"; then
 -    pkg_cv_VALA_CFLAGS="$VALA_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vala-1.0 >= \$VALA_REQS\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$VALA_CFLAGS"; then
 +        pkg_cv_VALA_CFLAGS="$VALA_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vala-1.0 >= \$VALA_REQS\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vala-1.0 >= \$VALA_REQS\""; } >&5
    ($PKG_CONFIG --exists --print-errors "vala-1.0 >= $VALA_REQS") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_VALA_CFLAGS=`$PKG_CONFIG --cflags "vala-1.0 >= $VALA_REQS" 2>/dev/null`
+@@ -19896,13 +19977,15 @@
  else
    pkg_failed=yes
  fi
@@ -14091,32 +1356,27 @@
 -    pkg_cv_VALA_LIBS="$VALA_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vala-1.0 >= \$VALA_REQS\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$VALA_LIBS"; then
 +        pkg_cv_VALA_LIBS="$VALA_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vala-1.0 >= \$VALA_REQS\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vala-1.0 >= \$VALA_REQS\""; } >&5
    ($PKG_CONFIG --exists --print-errors "vala-1.0 >= $VALA_REQS") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_VALA_LIBS=`$PKG_CONFIG --libs "vala-1.0 >= $VALA_REQS" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -22175,14 +20010,14 @@
+@@ -19912,8 +19995,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -19926,9 +20010,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -14128,80 +1388,23 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$VALA_PKG_ERRORS" >&5
- 
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-                 with_vala=no
- elif test $pkg_failed = untried; then
-@@ -22190,7 +20025,7 @@
- else
- 	VALA_CFLAGS=$pkg_cv_VALA_CFLAGS
- 	VALA_LIBS=$pkg_cv_VALA_LIBS
--        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	with_vala=yes
- fi
-@@ -22198,9 +20033,7 @@
- 		VALAC="`pkg-config --variable=prefix vala-1.0`/bin/valac"
- 
- 	elif test "x$enable_vala" = "xyes"; then
--		{ { $as_echo "$as_me:$LINENO: error: Vala plugin support explicitly requested, but not found" >&5
--$as_echo "$as_me: error: Vala plugin support explicitly requested, but not found" >&2;}
--   { (exit 1); exit 1; }; }
-+		as_fn_error "Vala plugin support explicitly requested, but not found" "$LINENO" 5
- 	fi
- fi
-  if test "x$with_vala" = "xyes"; then
-@@ -22219,18 +20052,16 @@
- plugin_error_or_ignore()
- {
- 	if test "${error_on_bad_plugin}" = "1" ; then
--		{ { $as_echo "$as_me:$LINENO: error: $1" >&5
--$as_echo "$as_me: error: $1" >&2;}
--   { (exit 1); exit 1; }; }
-+		as_fn_error "$1" "$LINENO" 5
- 	else
--		{ $as_echo "$as_me:$LINENO: WARNING: $1 (disabling plugin)" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $1 (disabling plugin)" >&5
- $as_echo "$as_me: WARNING: $1 (disabling plugin)" >&2;}
- 	fi
- }
- 
- 
- # Check whether --with-plugins was given.
--if test "${with_plugins+set}" = set; then
-+if test "${with_plugins+set}" = set; then :
-   withval=$with_plugins;
- else
-   with_plugins=autodetect
-@@ -22277,40 +20108,44 @@
- 		screensaver)
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for SCREENSAVER" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SCREENSAVER" >&5
+@@ -20027,10 +20111,11 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SCREENSAVER" >&5
  $as_echo_n "checking for SCREENSAVER... " >&6; }
  
 -if test -n "$SCREENSAVER_CFLAGS"; then
 -    pkg_cv_SCREENSAVER_CFLAGS="$SCREENSAVER_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$SCREENSAVER_CFLAGS"; then
 +        pkg_cv_SCREENSAVER_CFLAGS="$SCREENSAVER_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\""; } >&5
    ($PKG_CONFIG --exists --print-errors "gconf-2.0") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_SCREENSAVER_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0" 2>/dev/null`
+@@ -20040,13 +20125,15 @@
  else
    pkg_failed=yes
  fi
@@ -14215,32 +1418,27 @@
 -    pkg_cv_SCREENSAVER_LIBS="$SCREENSAVER_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$SCREENSAVER_LIBS"; then
 +        pkg_cv_SCREENSAVER_LIBS="$SCREENSAVER_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\""; } >&5
    ($PKG_CONFIG --exists --print-errors "gconf-2.0") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_SCREENSAVER_LIBS=`$PKG_CONFIG --libs "gconf-2.0" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -22323,25 +20158,14 @@
+@@ -20056,8 +20143,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -20070,9 +20158,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -14252,90 +1450,23 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$SCREENSAVER_PKG_ERRORS" >&5
- 
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements (gconf-2.0) were not met:
--
--$SCREENSAVER_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 SCREENSAVER_CFLAGS
--and SCREENSAVER_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 (gconf-2.0) were not met:
-+	as_fn_error "Package requirements (gconf-2.0) were not met:
- 
- $SCREENSAVER_PKG_ERRORS
- 
-@@ -22351,12 +20175,11 @@
- Alternatively, you may set the environment variables SCREENSAVER_CFLAGS
- and SCREENSAVER_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
--" >&2;}
--   { (exit 1); exit 1; }; }
-+" "$LINENO" 5
- elif test $pkg_failed = untried; then
--	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+	{ { $as_echo "$as_me:${as_lineno-$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
-+as_fn_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.
- 
-@@ -22365,22 +20188,11 @@
- 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 SCREENSAVER_CFLAGS
--and SCREENSAVER_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; }; }; }
-+See \`config.log' for more details." "$LINENO" 5; }
- else
- 	SCREENSAVER_CFLAGS=$pkg_cv_SCREENSAVER_CFLAGS
- 	SCREENSAVER_LIBS=$pkg_cv_SCREENSAVER_LIBS
--        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	:
- fi
-@@ -22388,40 +20200,44 @@
- 		galago)
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for LIBGALAGO" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGALAGO" >&5
+@@ -20115,10 +20203,11 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGALAGO" >&5
  $as_echo_n "checking for LIBGALAGO... " >&6; }
  
 -if test -n "$LIBGALAGO_CFLAGS"; then
 -    pkg_cv_LIBGALAGO_CFLAGS="$LIBGALAGO_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgalago >= 0.5.2\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$LIBGALAGO_CFLAGS"; then
 +        pkg_cv_LIBGALAGO_CFLAGS="$LIBGALAGO_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgalago >= 0.5.2\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgalago >= 0.5.2\""; } >&5
    ($PKG_CONFIG --exists --print-errors "libgalago >= 0.5.2") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_LIBGALAGO_CFLAGS=`$PKG_CONFIG --cflags "libgalago >= 0.5.2" 2>/dev/null`
+@@ -20128,13 +20217,15 @@
  else
    pkg_failed=yes
  fi
@@ -14349,32 +1480,27 @@
 -    pkg_cv_LIBGALAGO_LIBS="$LIBGALAGO_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgalago >= 0.5.2\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$LIBGALAGO_LIBS"; then
 +        pkg_cv_LIBGALAGO_LIBS="$LIBGALAGO_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgalago >= 0.5.2\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgalago >= 0.5.2\""; } >&5
    ($PKG_CONFIG --exists --print-errors "libgalago >= 0.5.2") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_LIBGALAGO_LIBS=`$PKG_CONFIG --libs "libgalago >= 0.5.2" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -22434,14 +20250,14 @@
+@@ -20144,8 +20235,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -20158,9 +20250,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -14386,47 +1512,23 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$LIBGALAGO_PKG_ERRORS" >&5
- 
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-                 HAVE_LIBGALAGO=no
- elif test $pkg_failed = untried; then
-@@ -22449,7 +20265,7 @@
- else
- 	LIBGALAGO_CFLAGS=$pkg_cv_LIBGALAGO_CFLAGS
- 	LIBGALAGO_LIBS=$pkg_cv_LIBGALAGO_LIBS
--        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	HAVE_LIBGALAGO=yes
- fi
-@@ -22467,40 +20283,44 @@
- 		media-player-keys)
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for MEDIA_PLAYER_KEYS" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MEDIA_PLAYER_KEYS" >&5
+@@ -20194,10 +20286,11 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MEDIA_PLAYER_KEYS" >&5
  $as_echo_n "checking for MEDIA_PLAYER_KEYS... " >&6; }
  
 -if test -n "$MEDIA_PLAYER_KEYS_CFLAGS"; then
 -    pkg_cv_MEDIA_PLAYER_KEYS_CFLAGS="$MEDIA_PLAYER_KEYS_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$MEDIA_PLAYER_KEYS_CFLAGS"; then
 +        pkg_cv_MEDIA_PLAYER_KEYS_CFLAGS="$MEDIA_PLAYER_KEYS_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1\""; } >&5
    ($PKG_CONFIG --exists --print-errors "dbus-glib-1") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_MEDIA_PLAYER_KEYS_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1" 2>/dev/null`
+@@ -20207,13 +20300,15 @@
  else
    pkg_failed=yes
  fi
@@ -14440,32 +1542,27 @@
 -    pkg_cv_MEDIA_PLAYER_KEYS_LIBS="$MEDIA_PLAYER_KEYS_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$MEDIA_PLAYER_KEYS_LIBS"; then
 +        pkg_cv_MEDIA_PLAYER_KEYS_LIBS="$MEDIA_PLAYER_KEYS_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1\""; } >&5
    ($PKG_CONFIG --exists --print-errors "dbus-glib-1") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_MEDIA_PLAYER_KEYS_LIBS=`$PKG_CONFIG --libs "dbus-glib-1" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -22513,14 +20333,14 @@
+@@ -20223,8 +20318,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -20237,9 +20333,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -14477,316 +1574,72 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$MEDIA_PLAYER_KEYS_PKG_ERRORS" >&5
- 
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-                 HAVE_MEDIA_PLAYER_KEYS=no
- elif test $pkg_failed = untried; then
-@@ -22528,7 +20348,7 @@
- else
- 	MEDIA_PLAYER_KEYS_CFLAGS=$pkg_cv_MEDIA_PLAYER_KEYS_CFLAGS
- 	MEDIA_PLAYER_KEYS_LIBS=$pkg_cv_MEDIA_PLAYER_KEYS_LIBS
--        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	HAVE_MEDIA_PLAYER_KEYS=yes
- fi
-@@ -22538,18 +20358,14 @@
+@@ -20324,10 +20420,11 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMYTH" >&5
+ $as_echo_n "checking for GMYTH... " >&6; }
+ 
+-if test -n "$GMYTH_CFLAGS"; then
+-    pkg_cv_GMYTH_CFLAGS="$GMYTH_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++    if test -n "$GMYTH_CFLAGS"; then
++        pkg_cv_GMYTH_CFLAGS="$GMYTH_CFLAGS"
++    else
++        if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0") 2>&5
+   ac_status=$?
+@@ -20337,13 +20434,15 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+-if test -n "$GMYTH_LIBS"; then
+-    pkg_cv_GMYTH_LIBS="$GMYTH_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++    if test -n "$GMYTH_LIBS"; then
++        pkg_cv_GMYTH_LIBS="$GMYTH_LIBS"
++    else
++        if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0") 2>&5
+   ac_status=$?
+@@ -20353,8 +20452,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -20367,9 +20467,9 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        GMYTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0" 2>&1`
++	        GMYTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0"`
+         else
+-	        GMYTH_PKG_ERRORS=`$PKG_CONFIG --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0" 2>&1`
++	        GMYTH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0"`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$GMYTH_PKG_ERRORS" >&5
+@@ -20391,16 +20491,111 @@
+ 				add_plugin="0"
  			fi
  		;;
- 		lirc)
--			{ $as_echo "$as_me:$LINENO: checking for lirc_init in -llirc_client" >&5
-+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lirc_init in -llirc_client" >&5
- $as_echo_n "checking for lirc_init in -llirc_client... " >&6; }
--if test "${ac_cv_lib_lirc_client_lirc_init+set}" = set; then
-+if test "${ac_cv_lib_lirc_client_lirc_init+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-llirc_client  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -22567,176 +20383,20 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_lirc_client_lirc_init=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_lirc_client_lirc_init=no
-+  ac_cv_lib_lirc_client_lirc_init=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lirc_client_lirc_init" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lirc_client_lirc_init" >&5
- $as_echo "$ac_cv_lib_lirc_client_lirc_init" >&6; }
--if test "x$ac_cv_lib_lirc_client_lirc_init" = x""yes; then
--  if test "${ac_cv_header_lirc_lirc_client_h+set}" = set; then
--  { $as_echo "$as_me:$LINENO: checking for lirc/lirc_client.h" >&5
--$as_echo_n "checking for lirc/lirc_client.h... " >&6; }
--if test "${ac_cv_header_lirc_lirc_client_h+set}" = set; then
--  $as_echo_n "(cached) " >&6
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_lirc_lirc_client_h" >&5
--$as_echo "$ac_cv_header_lirc_lirc_client_h" >&6; }
--else
--  # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking lirc/lirc_client.h usability" >&5
--$as_echo_n "checking lirc/lirc_client.h usability... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--#include <lirc/lirc_client.h>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_header_compiler=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_header_compiler=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
--
--# Is the header present?
--{ $as_echo "$as_me:$LINENO: checking lirc/lirc_client.h presence" >&5
--$as_echo_n "checking lirc/lirc_client.h presence... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <lirc/lirc_client.h>
--_ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null && {
--	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       }; then
--  ac_header_preproc=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--  ac_header_preproc=no
--fi
--
--rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
--
--# So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--  yes:no: )
--    { $as_echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: lirc/lirc_client.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: lirc/lirc_client.h: proceeding with the compiler's result" >&2;}
--    ac_header_preproc=yes
--    ;;
--  no:yes:* )
--    { $as_echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: lirc/lirc_client.h: present but cannot be compiled" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h:     check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: lirc/lirc_client.h:     check for missing prerequisite headers?" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: lirc/lirc_client.h: see the Autoconf documentation" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h:     section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: lirc/lirc_client.h:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: proceeding with the preprocessor's result" >&5
--$as_echo "$as_me: WARNING: lirc/lirc_client.h: proceeding with the preprocessor's result" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: in the future, the compiler will take precedence" >&5
--$as_echo "$as_me: WARNING: lirc/lirc_client.h: in the future, the compiler will take precedence" >&2;}
--    ( cat <<\_ASBOX
--## -------------------------------------------------------------------- ##
--## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=totem ##
--## -------------------------------------------------------------------- ##
--_ASBOX
--     ) | sed "s/^/$as_me: WARNING:     /" >&2
--    ;;
--esac
--{ $as_echo "$as_me:$LINENO: checking for lirc/lirc_client.h" >&5
--$as_echo_n "checking for lirc/lirc_client.h... " >&6; }
--if test "${ac_cv_header_lirc_lirc_client_h+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  ac_cv_header_lirc_lirc_client_h=$ac_header_preproc
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_lirc_lirc_client_h" >&5
--$as_echo "$ac_cv_header_lirc_lirc_client_h" >&6; }
--
--fi
--if test "x$ac_cv_header_lirc_lirc_client_h" = x""yes; then
-+if test "x$ac_cv_lib_lirc_client_lirc_init" = x""yes; then :
-+  ac_fn_c_check_header_mongrel "$LINENO" "lirc/lirc_client.h" "ac_cv_header_lirc_lirc_client_h" "$ac_includes_default"
-+if test "x$ac_cv_header_lirc_lirc_client_h" = x""yes; then :
-   LIRC_LIBS="-llirc_client"
- 					 HAVE_LIRC=yes
- else
-@@ -22757,40 +20417,123 @@
- 		mythtv)
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for GMYTH" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMYTH" >&5
- $as_echo_n "checking for GMYTH... " >&6; }
- 
--if test -n "$GMYTH_CFLAGS"; then
--    pkg_cv_GMYTH_CFLAGS="$GMYTH_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$GMYTH_CFLAGS"; then
-+        pkg_cv_GMYTH_CFLAGS="$GMYTH_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_GMYTH_CFLAGS=`$PKG_CONFIG --cflags "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
-+fi
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$GMYTH_LIBS"; then
-+        pkg_cv_GMYTH_LIBS="$GMYTH_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+  pkg_cv_GMYTH_LIBS=`$PKG_CONFIG --libs "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0" 2>/dev/null`
-+else
-+  pkg_failed=yes
-+fi
-+    fi
-+else
-+	pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+        _pkg_short_errors_supported=yes
-+else
-+        _pkg_short_errors_supported=no
-+fi
-+        if test $_pkg_short_errors_supported = yes; then
-+	        GMYTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0"`
-+        else
-+	        GMYTH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0"`
-+        fi
-+	# Put the nasty error message in config.log where it belongs
-+	echo "$GMYTH_PKG_ERRORS" >&5
-+
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+                HAVE_GMYTH=no
-+elif test $pkg_failed = untried; then
-+	HAVE_GMYTH=no
-+else
-+	GMYTH_CFLAGS=$pkg_cv_GMYTH_CFLAGS
-+	GMYTH_LIBS=$pkg_cv_GMYTH_LIBS
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+	HAVE_GMYTH=yes
-+fi
-+			if test "${HAVE_GMYTH}" != "yes"; then
-+				plugin_error_or_ignore "you need GMyth >= 0.7 installed for the MythTV plugin"
-+				add_plugin="0"
-+			fi
-+		;;
 +		bbc)
 +			# pygobject >= 2.15.3 for gio support
 +			# pygtk >= 2.13.0 for gtk_tree_view_get_tooltip_context support
@@ -14812,17 +1665,7 @@
 +    fi
 +else
 +	pkg_failed=untried
- fi
--if test -n "$GMYTH_LIBS"; then
--    pkg_cv_GMYTH_LIBS="$GMYTH_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0\"") >&5
--  ($PKG_CONFIG --exists --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
--  pkg_cv_GMYTH_LIBS=`$PKG_CONFIG --libs "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0" 2>/dev/null`
++fi
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$BBC_LIBS"; then
 +        pkg_cv_BBC_LIBS="$BBC_LIBS"
@@ -14834,56 +1677,47 @@
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }; then
 +  pkg_cv_BBC_LIBS=`$PKG_CONFIG --libs " pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 " 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -22803,67 +20546,86 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        GMYTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0" 2>&1`
++else
++  pkg_failed=yes
++fi
++    fi
++else
++	pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++        _pkg_short_errors_supported=yes
++else
++        _pkg_short_errors_supported=no
++fi
++        if test $_pkg_short_errors_supported = yes; then
 +	        BBC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 "`
-         else
--	        GMYTH_PKG_ERRORS=`$PKG_CONFIG --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0" 2>&1`
++        else
 +	        BBC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 "`
-         fi
- 	# Put the nasty error message in config.log where it belongs
--	echo "$GMYTH_PKG_ERRORS" >&5
++        fi
++	# Put the nasty error message in config.log where it belongs
 +	echo "$BBC_PKG_ERRORS" >&5
- 
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
++
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
--                HAVE_GMYTH=no
++$as_echo "no" >&6; }
 +                 HAVE_BBCSTUFF=no
- elif test $pkg_failed = untried; then
--	HAVE_GMYTH=no
++elif test $pkg_failed = untried; then
 +	 HAVE_BBCSTUFF=no
- else
--	GMYTH_CFLAGS=$pkg_cv_GMYTH_CFLAGS
--	GMYTH_LIBS=$pkg_cv_GMYTH_LIBS
--        { $as_echo "$as_me:$LINENO: result: yes" >&5
++else
 +	BBC_CFLAGS=$pkg_cv_BBC_CFLAGS
 +	BBC_LIBS=$pkg_cv_BBC_LIBS
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
--	HAVE_GMYTH=yes
++$as_echo "yes" >&6; }
 +	 HAVE_BBCSTUFF=yes
- fi
--			if test "${HAVE_GMYTH}" != "yes"; then
--				plugin_error_or_ignore "you need GMyth >= 0.7 installed for the MythTV plugin"
++fi
 +			if test "x$HAVE_BBCSTUFF" != "xyes"; then
 +				plugin_error_or_ignore "you need pygobject-2.0 >= 2.15.3 and gst-python-0.10 >= 0.10.11 and pygtk-2.0 >= 2.13.0 installed for the BBC plugin"
- 				add_plugin="0"
- 			fi
++				add_plugin="0"
++			fi
 +			# only require python apt and gdbm where we would actually be using it, ie. on ubuntu
 +			bbc_py_pkg_reqs=''
 +			if test -f /etc/debian_version ; then
@@ -14899,32 +1733,26 @@
 +					add_plugin="0"
 +				fi
 +			done
- 		;;
++		;;
  		bemused)
  
  pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for BEMUSED" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BEMUSED" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BEMUSED" >&5
  $as_echo_n "checking for BEMUSED... " >&6; }
  
 -if test -n "$BEMUSED_CFLAGS"; then
 -    pkg_cv_BEMUSED_CFLAGS="$BEMUSED_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"bluez\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$BEMUSED_CFLAGS"; then
 +        pkg_cv_BEMUSED_CFLAGS="$BEMUSED_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bluez\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bluez\""; } >&5
    ($PKG_CONFIG --exists --print-errors "bluez") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_BEMUSED_CFLAGS=`$PKG_CONFIG --cflags "bluez" 2>/dev/null`
+@@ -20410,13 +20605,15 @@
  else
    pkg_failed=yes
  fi
@@ -14938,32 +1766,27 @@
 -    pkg_cv_BEMUSED_LIBS="$BEMUSED_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"bluez\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$BEMUSED_LIBS"; then
 +        pkg_cv_BEMUSED_LIBS="$BEMUSED_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bluez\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bluez\""; } >&5
    ($PKG_CONFIG --exists --print-errors "bluez") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_BEMUSED_LIBS=`$PKG_CONFIG --libs "bluez" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -22876,14 +20638,14 @@
+@@ -20426,8 +20623,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -20440,9 +20638,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -14975,47 +1798,23 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$BEMUSED_PKG_ERRORS" >&5
- 
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-                 HAVE_BLUEZ=no
- elif test $pkg_failed = untried; then
-@@ -22891,7 +20653,7 @@
- else
- 	BEMUSED_CFLAGS=$pkg_cv_BEMUSED_CFLAGS
- 	BEMUSED_LIBS=$pkg_cv_BEMUSED_LIBS
--        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	HAVE_BLUEZ=yes
- fi
-@@ -22903,40 +20665,44 @@
- 		publish)
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for LIBEPC" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBEPC" >&5
+@@ -20470,10 +20668,11 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBEPC" >&5
  $as_echo_n "checking for LIBEPC... " >&6; }
  
 -if test -n "$LIBEPC_CFLAGS"; then
 -    pkg_cv_LIBEPC_CFLAGS="$LIBEPC_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libepc-ui-1.0 >= 0.3.0\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$LIBEPC_CFLAGS"; then
 +        pkg_cv_LIBEPC_CFLAGS="$LIBEPC_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libepc-ui-1.0 >= 0.3.0\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libepc-ui-1.0 >= 0.3.0\""; } >&5
    ($PKG_CONFIG --exists --print-errors "libepc-ui-1.0 >= 0.3.0") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_LIBEPC_CFLAGS=`$PKG_CONFIG --cflags "libepc-ui-1.0 >= 0.3.0" 2>/dev/null`
+@@ -20483,13 +20682,15 @@
  else
    pkg_failed=yes
  fi
@@ -15029,32 +1828,27 @@
 -    pkg_cv_LIBEPC_LIBS="$LIBEPC_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libepc-ui-1.0 >= 0.3.0\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$LIBEPC_LIBS"; then
 +        pkg_cv_LIBEPC_LIBS="$LIBEPC_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libepc-ui-1.0 >= 0.3.0\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libepc-ui-1.0 >= 0.3.0\""; } >&5
    ($PKG_CONFIG --exists --print-errors "libepc-ui-1.0 >= 0.3.0") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_LIBEPC_LIBS=`$PKG_CONFIG --libs "libepc-ui-1.0 >= 0.3.0" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -22949,14 +20715,14 @@
+@@ -20499,8 +20700,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -20513,9 +20715,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -15066,47 +1860,23 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$LIBEPC_PKG_ERRORS" >&5
- 
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-                 HAVE_LIBEPC=no
- elif test $pkg_failed = untried; then
-@@ -22964,7 +20730,7 @@
- else
- 	LIBEPC_CFLAGS=$pkg_cv_LIBEPC_CFLAGS
- 	LIBEPC_LIBS=$pkg_cv_LIBEPC_LIBS
--        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	HAVE_LIBEPC=yes
- fi
-@@ -22976,40 +20742,44 @@
- 		tracker)
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for TRACKER" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TRACKER" >&5
+@@ -20543,10 +20745,11 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TRACKER" >&5
  $as_echo_n "checking for TRACKER... " >&6; }
  
 -if test -n "$TRACKER_CFLAGS"; then
 -    pkg_cv_TRACKER_CFLAGS="$TRACKER_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.7 >= 0.7.1\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$TRACKER_CFLAGS"; then
 +        pkg_cv_TRACKER_CFLAGS="$TRACKER_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.7 >= 0.7.1\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.7 >= 0.7.1\""; } >&5
    ($PKG_CONFIG --exists --print-errors "tracker-client-0.7 >= 0.7.1") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_TRACKER_CFLAGS=`$PKG_CONFIG --cflags "tracker-client-0.7 >= 0.7.1" 2>/dev/null`
+@@ -20556,13 +20759,15 @@
  else
    pkg_failed=yes
  fi
@@ -15120,32 +1890,27 @@
 -    pkg_cv_TRACKER_LIBS="$TRACKER_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.7 >= 0.7.1\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$TRACKER_LIBS"; then
 +        pkg_cv_TRACKER_LIBS="$TRACKER_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.7 >= 0.7.1\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.7 >= 0.7.1\""; } >&5
    ($PKG_CONFIG --exists --print-errors "tracker-client-0.7 >= 0.7.1") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_TRACKER_LIBS=`$PKG_CONFIG --libs "tracker-client-0.7 >= 0.7.1" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -23022,14 +20792,14 @@
+@@ -20572,8 +20777,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -20586,9 +20792,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -15157,47 +1922,23 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$TRACKER_PKG_ERRORS" >&5
- 
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-                 HAVE_TRACKER=no
- elif test $pkg_failed = untried; then
-@@ -23037,7 +20807,7 @@
- else
- 	TRACKER_CFLAGS=$pkg_cv_TRACKER_CFLAGS
- 	TRACKER_LIBS=$pkg_cv_TRACKER_LIBS
--        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	HAVE_TRACKER=yes
- fi
-@@ -23055,40 +20825,44 @@
- 		thumbnail)
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for GLIB" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
+@@ -20622,10 +20828,11 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
  $as_echo_n "checking for GLIB... " >&6; }
  
 -if test -n "$GLIB_CFLAGS"; then
 -    pkg_cv_GLIB_CFLAGS="$GLIB_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.15.0\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$GLIB_CFLAGS"; then
 +        pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.0\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.0\""; } >&5
    ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.0") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.15.0" 2>/dev/null`
+@@ -20635,13 +20842,15 @@
  else
    pkg_failed=yes
  fi
@@ -15211,32 +1952,27 @@
 -    pkg_cv_GLIB_LIBS="$GLIB_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.15.0\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$GLIB_LIBS"; then
 +        pkg_cv_GLIB_LIBS="$GLIB_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.0\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.0\""; } >&5
    ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.0") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.15.0" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -23101,14 +20875,14 @@
+@@ -20651,8 +20860,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -20665,9 +20875,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -15248,47 +1984,23 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$GLIB_PKG_ERRORS" >&5
- 
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-                 HAVE_GLIB_2_15=no
- elif test $pkg_failed = untried; then
-@@ -23116,7 +20890,7 @@
- else
- 	GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
- 	GLIB_LIBS=$pkg_cv_GLIB_LIBS
--        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	HAVE_GLIB_2_15=yes
- fi
-@@ -23128,40 +20902,44 @@
- 		brasero-disc-recorder)
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for DISC_RECORDER" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DISC_RECORDER" >&5
+@@ -20695,10 +20905,11 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DISC_RECORDER" >&5
  $as_echo_n "checking for DISC_RECORDER... " >&6; }
  
 -if test -n "$DISC_RECORDER_CFLAGS"; then
 -    pkg_cv_DISC_RECORDER_CFLAGS="$DISC_RECORDER_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 >= 2.6.0 gtk+-x11-2.0\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$DISC_RECORDER_CFLAGS"; then
 +        pkg_cv_DISC_RECORDER_CFLAGS="$DISC_RECORDER_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.6.0 gtk+-x11-2.0\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.6.0 gtk+-x11-2.0\""; } >&5
    ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.6.0 gtk+-x11-2.0") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_DISC_RECORDER_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.6.0 gtk+-x11-2.0" 2>/dev/null`
+@@ -20708,13 +20919,15 @@
  else
    pkg_failed=yes
  fi
@@ -15302,32 +2014,27 @@
 -    pkg_cv_DISC_RECORDER_LIBS="$DISC_RECORDER_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 >= 2.6.0 gtk+-x11-2.0\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$DISC_RECORDER_LIBS"; then
 +        pkg_cv_DISC_RECORDER_LIBS="$DISC_RECORDER_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.6.0 gtk+-x11-2.0\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.6.0 gtk+-x11-2.0\""; } >&5
    ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.6.0 gtk+-x11-2.0") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_DISC_RECORDER_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.6.0 gtk+-x11-2.0" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -23174,14 +20952,14 @@
+@@ -20724,8 +20937,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -20738,9 +20952,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -15339,47 +2046,23 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$DISC_RECORDER_PKG_ERRORS" >&5
- 
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-                 BUILD_RECORDER=no
- elif test $pkg_failed = untried; then
-@@ -23189,7 +20967,7 @@
- else
- 	DISC_RECORDER_CFLAGS=$pkg_cv_DISC_RECORDER_CFLAGS
- 	DISC_RECORDER_LIBS=$pkg_cv_DISC_RECORDER_LIBS
--        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	BUILD_RECORDER=yes
- fi
-@@ -23201,40 +20979,44 @@
- 		youtube)
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for LIBGDATA" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGDATA" >&5
+@@ -20768,10 +20982,11 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGDATA" >&5
  $as_echo_n "checking for LIBGDATA... " >&6; }
  
 -if test -n "$LIBGDATA_CFLAGS"; then
 -    pkg_cv_LIBGDATA_CFLAGS="$LIBGDATA_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgdata >= 0.4.0\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$LIBGDATA_CFLAGS"; then
 +        pkg_cv_LIBGDATA_CFLAGS="$LIBGDATA_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgdata >= 0.4.0\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgdata >= 0.4.0\""; } >&5
    ($PKG_CONFIG --exists --print-errors "libgdata >= 0.4.0") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_LIBGDATA_CFLAGS=`$PKG_CONFIG --cflags "libgdata >= 0.4.0" 2>/dev/null`
+@@ -20781,13 +20996,15 @@
  else
    pkg_failed=yes
  fi
@@ -15393,32 +2076,27 @@
 -    pkg_cv_LIBGDATA_LIBS="$LIBGDATA_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgdata >= 0.4.0\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$LIBGDATA_LIBS"; then
 +        pkg_cv_LIBGDATA_LIBS="$LIBGDATA_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgdata >= 0.4.0\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgdata >= 0.4.0\""; } >&5
    ($PKG_CONFIG --exists --print-errors "libgdata >= 0.4.0") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_LIBGDATA_LIBS=`$PKG_CONFIG --libs "libgdata >= 0.4.0" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -23247,14 +21029,14 @@
+@@ -20797,8 +21014,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -20811,9 +21029,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -15430,176 +2108,57 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$LIBGDATA_PKG_ERRORS" >&5
- 
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-                 HAVE_LIBGDATA=no
- elif test $pkg_failed = untried; then
-@@ -23262,7 +21044,7 @@
- else
- 	LIBGDATA_CFLAGS=$pkg_cv_LIBGDATA_CFLAGS
- 	LIBGDATA_LIBS=$pkg_cv_LIBGDATA_LIBS
--        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	HAVE_LIBGDATA=yes
- fi
-@@ -23271,23 +21053,18 @@
- 				add_plugin="0"
- 			fi
- 
--						{ $as_echo "$as_me:$LINENO: checking GStreamer 0.10 souphttpsrc plugin" >&5
-+						{ $as_echo "$as_me:${as_lineno-$LINENO}: checking GStreamer 0.10 souphttpsrc plugin" >&5
- $as_echo_n "checking GStreamer 0.10 souphttpsrc plugin... " >&6; }
- 			if $gst010_inspect souphttpsrc >/dev/null 2>/dev/null; then
--				{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 			else
--				{ $as_echo "$as_me:$LINENO: result: no" >&5
-+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
--				{ { $as_echo "$as_me:$LINENO: error:
--					Cannot find required GStreamer-0.10 plugin 'souphttpsrc'.
--					It should be part of gst-plugins-good. Please install it.
--				" >&5
--$as_echo "$as_me: error:
-+				as_fn_error "
- 					Cannot find required GStreamer-0.10 plugin 'souphttpsrc'.
- 					It should be part of gst-plugins-good. Please install it.
--				" >&2;}
--   { (exit 1); exit 1; }; }
-+				" "$LINENO" 5
- 			fi
- 		;;
- 	esac
-@@ -23301,9 +21078,9 @@
- ALL_PLUGINS=$allowed_plugins
- PLUGINS=$used_plugins2
- 
--{ $as_echo "$as_me:$LINENO: checking which plugins to compile" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which plugins to compile" >&5
- $as_echo_n "checking which plugins to compile... " >&6; }
--{ $as_echo "$as_me:$LINENO: result: $PLUGINS" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PLUGINS" >&5
- $as_echo "$PLUGINS" >&6; }
- 
- 
-@@ -23313,24 +21090,22 @@
- # Browser plugins
- # ***************
- 
--{ $as_echo "$as_me:$LINENO: checking whether to compile the browser plugins" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to compile the browser plugins" >&5
- $as_echo_n "checking whether to compile the browser plugins... " >&6; }
- 
- # Check whether --enable-browser-plugins was given.
--if test "${enable_browser_plugins+set}" = set; then
-+if test "${enable_browser_plugins+set}" = set; then :
-   enableval=$enable_browser_plugins;
- else
-   enable_browser_plugins=yes
- fi
- 
--{ $as_echo "$as_me:$LINENO: result: $enable_browser_plugins" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_browser_plugins" >&5
- $as_echo "$enable_browser_plugins" >&6; }
- 
- if test "$enable_browser_plugins" = "yes" ; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define ENABLE_BROWSER_PLUGINS 1
--_ACEOF
-+$as_echo "#define ENABLE_BROWSER_PLUGINS 1" >>confdefs.h
- 
- 
- 	BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}"
-@@ -23338,24 +21113,25 @@
- 
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for BROWSER_PLUGIN" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BROWSER_PLUGIN" >&5
+@@ -20898,10 +21116,11 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BROWSER_PLUGIN" >&5
  $as_echo_n "checking for BROWSER_PLUGIN... " >&6; }
  
 -if test -n "$BROWSER_PLUGIN_CFLAGS"; then
 -    pkg_cv_BROWSER_PLUGIN_CFLAGS="$BROWSER_PLUGIN_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
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$BROWSER_PLUGIN_CFLAGS"; then
 +        pkg_cv_BROWSER_PLUGIN_CFLAGS="$BROWSER_PLUGIN_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0
  		 gio-2.0
  		 x11
--		 totem-plparser-mini >= \$TOTEM_PLPARSER_REQS\"") >&5
-+		 totem-plparser-mini >= \$TOTEM_PLPARSER_REQS\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "glib-2.0
+@@ -20920,13 +21139,15 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+-if test -n "$BROWSER_PLUGIN_LIBS"; then
+-    pkg_cv_BROWSER_PLUGIN_LIBS="$BROWSER_PLUGIN_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++    if test -n "$BROWSER_PLUGIN_LIBS"; then
++        pkg_cv_BROWSER_PLUGIN_LIBS="$BROWSER_PLUGIN_LIBS"
++    else
++        if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0
  		 gio-2.0
  		 x11
- 		 totem-plparser-mini >= $TOTEM_PLPARSER_REQS") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_BROWSER_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0
- 		 gio-2.0
- 		 x11
-@@ -23363,24 +21139,26 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$BROWSER_PLUGIN_LIBS"; then
--    pkg_cv_BROWSER_PLUGIN_LIBS="$BROWSER_PLUGIN_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
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$BROWSER_PLUGIN_LIBS"; then
-+        pkg_cv_BROWSER_PLUGIN_LIBS="$BROWSER_PLUGIN_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0
- 		 gio-2.0
- 		 x11
--		 totem-plparser-mini >= \$TOTEM_PLPARSER_REQS\"") >&5
-+		 totem-plparser-mini >= \$TOTEM_PLPARSER_REQS\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "glib-2.0
- 		 gio-2.0
- 		 x11
- 		 totem-plparser-mini >= $TOTEM_PLPARSER_REQS") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_BROWSER_PLUGIN_LIBS=`$PKG_CONFIG --libs "glib-2.0
- 		 gio-2.0
- 		 x11
-@@ -23388,8 +21166,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -23402,20 +21181,20 @@
+@@ -20945,8 +21166,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -20959,15 +21181,15 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -15619,70 +2178,23 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$BROWSER_PLUGIN_PKG_ERRORS" >&5
- 
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-                 enable_browser_plugins=no
- elif test $pkg_failed = untried; then
-@@ -23423,7 +21202,7 @@
- else
- 	BROWSER_PLUGIN_CFLAGS=$pkg_cv_BROWSER_PLUGIN_CFLAGS
- 	BROWSER_PLUGIN_LIBS=$pkg_cv_BROWSER_PLUGIN_LIBS
--        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	:
- fi
-@@ -23433,58 +21212,58 @@
- 
- 	# Earlier versions misdetect playlists
- 	if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"shared-mime-info >= 0.22\"") >&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"shared-mime-info >= 0.22\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "shared-mime-info >= 0.22") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   :
- else
--  { { $as_echo "$as_me:$LINENO: error:
-+  as_fn_error "
- 				The Browser plugin requires shared-mime-info
--				>= 0.22 to function." >&5
--$as_echo "$as_me: error:
--				The Browser plugin requires shared-mime-info
--				>= 0.22 to function." >&2;}
--   { (exit 1); exit 1; }; }
-+				>= 0.22 to function." "$LINENO" 5
- fi
- 
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for DBUS" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
+@@ -21007,10 +21229,11 @@
+ { $as_echo "$as_me:${as_lineno-$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-glib-1 >= \$DBUS_REQS\"") >&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" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\""; } >&5
    ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_REQS") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_REQS" 2>/dev/null`
+@@ -21020,13 +21243,15 @@
  else
    pkg_failed=yes
  fi
@@ -15696,32 +2208,27 @@
 -    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-glib-1 >= \$DBUS_REQS\"") >&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" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\""; } >&5
    ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_REQS") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_REQS" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -23497,14 +21276,14 @@
+@@ -21036,8 +21261,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -21050,9 +21276,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -15733,232 +2240,23 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$DBUS_PKG_ERRORS" >&5
- 
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-                 enable_browser_plugins=no
- elif test $pkg_failed = untried; then
-@@ -23512,7 +21291,7 @@
- else
- 	DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
- 	DBUS_LIBS=$pkg_cv_DBUS_LIBS
--        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	:
- fi
-@@ -23520,9 +21299,9 @@
- 	DBUSBINDIR="`echo $DBUSLIBDIR | sed -e s/lib/bin/`"
- 	# Extract the first word of "dbus-binding-tool", so it can be a program name with args.
- set dummy dbus-binding-tool; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_DBUS_BIND+set}" = set; then
-+if test "${ac_cv_path_DBUS_BIND+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $DBUS_BIND in
-@@ -23536,14 +21315,14 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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_DBUS_BIND="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
-   test -z "$ac_cv_path_DBUS_BIND" && ac_cv_path_DBUS_BIND="no"
-@@ -23552,16 +21331,16 @@
- fi
- DBUS_BIND=$ac_cv_path_DBUS_BIND
- if test -n "$DBUS_BIND"; then
--  { $as_echo "$as_me:$LINENO: result: $DBUS_BIND" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_BIND" >&5
- $as_echo "$DBUS_BIND" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
- 
- 	if test "x$DBUS_BIND" = "xno"; then
--		{ $as_echo "$as_me:$LINENO: WARNING: dbus-binding-tool not found" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dbus-binding-tool not found" >&5
- $as_echo "$as_me: WARNING: dbus-binding-tool not found" >&2;}
- 		enable_browser_plugins=no
- 	fi
-@@ -23577,13 +21356,9 @@
- 	__SAVE_CXXFLAGS=$CXXFLAGS
- 	CXXFLAGS="-fno-rtti $CXXFLAGS"
- 
--	{ $as_echo "$as_me:$LINENO: checking for -fno-rtti compiler flag" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fno-rtti compiler flag" >&5
- $as_echo_n "checking for -fno-rtti compiler flag... " >&6; }
--	cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -23594,34 +21369,13 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_cxx_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-   have_no_rtti_flag=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	have_no_rtti_flag=no
-+  have_no_rtti_flag=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--	{ $as_echo "$as_me:$LINENO: result: $have_no_rtti_flag" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_no_rtti_flag" >&5
- $as_echo "$have_no_rtti_flag" >&6; }
- 
- 	CXXFLAGS=$__SAVE_CXXFLAGS
-@@ -23650,52 +21404,52 @@
- 
- if test "$enable_browser_plugins" = "yes"; then
- 
--{ $as_echo "$as_me:$LINENO: checking whether to enable the GMP browser plugin" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the GMP browser plugin" >&5
- $as_echo_n "checking whether to enable the GMP browser plugin... " >&6; }
- # Check whether --enable-gmp-plugin was given.
--if test "${enable_gmp_plugin+set}" = set; then
-+if test "${enable_gmp_plugin+set}" = set; then :
-   enableval=$enable_gmp_plugin;
- else
-   enable_gmp_plugin=yes
- fi
- 
--{ $as_echo "$as_me:$LINENO: result: $enable_gmp_plugin" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gmp_plugin" >&5
- $as_echo "$enable_gmp_plugin" >&6; }
- 
--{ $as_echo "$as_me:$LINENO: checking whether to enable the NarrowSpace browser plugin" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the NarrowSpace browser plugin" >&5
- $as_echo_n "checking whether to enable the NarrowSpace browser plugin... " >&6; }
- # Check whether --enable-narrowspace-plugin was given.
--if test "${enable_narrowspace_plugin+set}" = set; then
-+if test "${enable_narrowspace_plugin+set}" = set; then :
-   enableval=$enable_narrowspace_plugin;
- else
-   enable_narrowspace_plugin=yes
- fi
- 
--{ $as_echo "$as_me:$LINENO: result: $enable_narrowspace_plugin" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_narrowspace_plugin" >&5
- $as_echo "$enable_narrowspace_plugin" >&6; }
- 
--{ $as_echo "$as_me:$LINENO: checking whether to enable the MullY browser plugin" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the MullY browser plugin" >&5
- $as_echo_n "checking whether to enable the MullY browser plugin... " >&6; }
- # Check whether --enable-mully-plugin was given.
--if test "${enable_mully_plugin+set}" = set; then
-+if test "${enable_mully_plugin+set}" = set; then :
-   enableval=$enable_mully_plugin;
- else
-   enable_mully_plugin=yes
- fi
- 
--{ $as_echo "$as_me:$LINENO: result: $enable_mully_plugin" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_mully_plugin" >&5
- $as_echo "$enable_mully_plugin" >&6; }
- 
--{ $as_echo "$as_me:$LINENO: checking whether to enable the Cone browser plugin" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the Cone browser plugin" >&5
- $as_echo_n "checking whether to enable the Cone browser plugin... " >&6; }
- # Check whether --enable-cone-plugin was given.
--if test "${enable_cone_plugin+set}" = set; then
-+if test "${enable_cone_plugin+set}" = set; then :
-   enableval=$enable_cone_plugin;
- else
-   enable_cone_plugin=yes
- fi
- 
--{ $as_echo "$as_me:$LINENO: result: $enable_cone_plugin" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_cone_plugin" >&5
- $as_echo "$enable_cone_plugin" >&6; }
- 
- fi
-@@ -23735,13 +21489,11 @@
- 
- 
- # Check whether --enable-nautilus was given.
--if test "${enable_nautilus+set}" = set; then
-+if test "${enable_nautilus+set}" = set; then :
-   enableval=$enable_nautilus; case "${enableval}" in
- 	yes) ENABLE_NAUTILUS=yes ;;
- 	no) ENABLE_NAUTILUS=no ;;
--	*) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-nautilus" >&5
--$as_echo "$as_me: error: bad value ${enableval} for --enable-nautilus" >&2;}
--   { (exit 1); exit 1; }; } ;;
-+	*) as_fn_error "bad value ${enableval} for --enable-nautilus" "$LINENO" 5 ;;
- 	esac
- else
-   ENABLE_NAUTILUS=yes
-@@ -23750,40 +21502,44 @@
- if test x$ENABLE_NAUTILUS = "xyes" ; then
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for NAUTILUS" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NAUTILUS" >&5
+@@ -21279,10 +21505,11 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NAUTILUS" >&5
  $as_echo_n "checking for NAUTILUS... " >&6; }
  
 -if test -n "$NAUTILUS_CFLAGS"; then
 -    pkg_cv_NAUTILUS_CFLAGS="$NAUTILUS_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0 libnautilus-extension\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$NAUTILUS_CFLAGS"; then
 +        pkg_cv_NAUTILUS_CFLAGS="$NAUTILUS_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0 libnautilus-extension\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0 libnautilus-extension\""; } >&5
    ($PKG_CONFIG --exists --print-errors "gtk+-2.0 gthread-2.0 libnautilus-extension") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_NAUTILUS_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 gthread-2.0 libnautilus-extension" 2>/dev/null`
+@@ -21292,13 +21519,15 @@
  else
    pkg_failed=yes
  fi
@@ -15972,32 +2270,27 @@
 -    pkg_cv_NAUTILUS_LIBS="$NAUTILUS_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0 libnautilus-extension\"") >&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$NAUTILUS_LIBS"; then
 +        pkg_cv_NAUTILUS_LIBS="$NAUTILUS_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0 libnautilus-extension\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0 libnautilus-extension\""; } >&5
    ($PKG_CONFIG --exists --print-errors "gtk+-2.0 gthread-2.0 libnautilus-extension") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_NAUTILUS_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 gthread-2.0 libnautilus-extension" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -23796,14 +21552,14 @@
+@@ -21308,8 +21537,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -21322,9 +21552,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -16009,83 +2302,23 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$NAUTILUS_PKG_ERRORS" >&5
- 
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-                 HAVE_NAUTILUS=no
- elif test $pkg_failed = untried; then
-@@ -23811,7 +21567,7 @@
- else
- 	NAUTILUS_CFLAGS=$pkg_cv_NAUTILUS_CFLAGS
- 	NAUTILUS_LIBS=$pkg_cv_NAUTILUS_LIBS
--        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	HAVE_NAUTILUS=yes
- fi
-@@ -23819,7 +21575,7 @@
- 
- 
- # Check whether --with-nautilusdir was given.
--if test "${with_nautilusdir+set}" = set; then
-+if test "${with_nautilusdir+set}" = set; then :
-   withval=$with_nautilusdir; ac_with_nautilusdir=$withval
- else
-   ac_with_nautilusdir=""
-@@ -23831,15 +21587,13 @@
- 
- if test x$HAVE_NAUTILUS = "xyes"; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_NAUTILUS 1
--_ACEOF
-+$as_echo "#define HAVE_NAUTILUS 1" >>confdefs.h
- 
- 	if test "${ac_with_nautilusdir}" = ""; then
- 		ac_with_nautilusdir=`pkg-config --variable=extensiondir libnautilus-extension`
- 	fi
- 
--	{ $as_echo "$as_me:$LINENO: installing nautilus plugin in ${ac_with_nautilusdir}" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: installing nautilus plugin in ${ac_with_nautilusdir}" >&5
- $as_echo "$as_me: installing nautilus plugin in ${ac_with_nautilusdir}" >&6;}
- 	NAUTILUSDIR=${ac_with_nautilusdir}
- 
-@@ -23856,7 +21610,7 @@
- 
- 
- # Check whether --with-dbus was given.
--if test "${with_dbus+set}" = set; then
-+if test "${with_dbus+set}" = set; then :
-   withval=$with_dbus;
- else
-   with_dbus=auto
-@@ -23865,40 +21619,44 @@
- if test "x$with_dbus" != "xno"; then
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for DBUS" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
+@@ -21392,10 +21622,11 @@
+ { $as_echo "$as_me:${as_lineno-$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-glib-1 >= \$DBUS_REQS\"") >&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" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\""; } >&5
    ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_REQS") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_REQS" 2>/dev/null`
+@@ -21405,13 +21636,15 @@
  else
    pkg_failed=yes
  fi
@@ -16099,32 +2332,27 @@
 -    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-glib-1 >= \$DBUS_REQS\"") >&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" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\""; } >&5
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\""; } >&5
    ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_REQS") 2>&5
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_REQS" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -23911,14 +21669,14 @@
+@@ -21421,8 +21654,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -21435,9 +21669,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -16136,305 +2364,25 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$DBUS_PKG_ERRORS" >&5
- 
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-                 enable_dbus=no
- elif test $pkg_failed = untried; then
-@@ -23926,20 +21684,16 @@
- else
- 	DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
- 	DBUS_LIBS=$pkg_cv_DBUS_LIBS
--        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	enable_dbus=yes
- fi
-         if test "x$with_dbus" = xyes && test "x$enable_dbus" = xno; then
--	   { { $as_echo "$as_me:$LINENO: error: D-BUS explicitly requested but no support found" >&5
--$as_echo "$as_me: error: D-BUS explicitly requested but no support found" >&2;}
--   { (exit 1); exit 1; }; }
-+	   as_fn_error "D-BUS explicitly requested but no support found" "$LINENO" 5
- 	fi
-         if test "x$enable_dbus" = xyes; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define WITH_DBUS 1
--_ACEOF
-+$as_echo "#define WITH_DBUS 1" >>confdefs.h
- 
- 	fi
- fi
-@@ -23954,9 +21708,9 @@
- 
- # 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_GCONFTOOL+set}" = set; then
-+if test "${ac_cv_path_GCONFTOOL+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $GCONFTOOL in
-@@ -23969,14 +21723,14 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; 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
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
-   ;;
-@@ -23984,10 +21738,10 @@
- fi
- GCONFTOOL=$ac_cv_path_GCONFTOOL
- if test -n "$GCONFTOOL"; then
--  { $as_echo "$as_me:$LINENO: result: $GCONFTOOL" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONFTOOL" >&5
- $as_echo "$GCONFTOOL" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -24001,13 +21755,13 @@
- 
- 
- # Check whether --with-gconf-source was given.
--if test "${with_gconf_source+set}" = set; then
-+if test "${with_gconf_source+set}" = set; then :
-   withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"
- fi
- 
- 
- 
--  { $as_echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
- $as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
- 
-   if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-@@ -24016,22 +21770,20 @@
- 
- 
- # Check whether --with-gconf-schema-file-dir was given.
--if test "${with_gconf_schema_file_dir+set}" = set; then
-+if test "${with_gconf_schema_file_dir+set}" = set; then :
-   withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval"
- fi
- 
- 
- 
--  { $as_echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
- $as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
- 
-   # Check whether --enable-schemas-install was given.
--if test "${enable_schemas_install+set}" = set; then
-+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;}
--   { (exit 1); exit 1; }; } ;;
-+       *) as_fn_error "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
-       esac
- fi
- 
-@@ -24057,7 +21809,7 @@
- 
- 
- 	# Check whether --enable-debug was given.
--if test "${enable_debug+set}" = set; then
-+if test "${enable_debug+set}" = set; then :
-   enableval=$enable_debug;
- else
-   enable_debug=no
-@@ -24066,16 +21818,14 @@
- 
- 	if test x$enable_debug = xyes ; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define GNOME_ENABLE_DEBUG 1
--_ACEOF
-+$as_echo "#define GNOME_ENABLE_DEBUG 1" >>confdefs.h
- 
- 	fi
- 
- 
- 
-     # Check whether --enable-compile-warnings was given.
--if test "${enable_compile_warnings+set}" = set; then
-+if test "${enable_compile_warnings+set}" = set; then :
-   enableval=$enable_compile_warnings;
- else
-   enable_compile_warnings="maximum"
-@@ -24106,13 +21856,9 @@
- 	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 "$as_me:${as_lineno-$LINENO}: checking whether gcc understands $option" >&5
- $as_echo_n "checking whether gcc understands $option... " >&6; }
--		cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -24123,35 +21869,14 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   has_option=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	has_option=no
-+  has_option=no
- 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 "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5
- $as_echo "$has_option" >&6; }
- 		if test $has_option = yes; then
- 		  warning_flags="$warning_flags $option"
-@@ -24165,26 +21890,24 @@
- 	fi
- 	;;
-     *)
--	{ { $as_echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5
--$as_echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;}
--   { (exit 1); exit 1; }; }
-+	as_fn_error "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5
- 	;;
-     esac
-     CFLAGS="$realsave_CFLAGS"
--    { $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
-+    { $as_echo "$as_me:${as_lineno-$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 "$as_me:${as_lineno-$LINENO}: result: $warning_flags" >&5
- $as_echo "$warning_flags" >&6; }
- 
-     # Check whether --enable-iso-c was given.
--if test "${enable_iso_c+set}" = set; then
-+if test "${enable_iso_c+set}" = set; then :
-   enableval=$enable_iso_c;
- else
-   enable_iso_c=no
- fi
- 
- 
--    { $as_echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking what language compliance flags to pass to the C compiler" >&5
- $as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; }
-     complCFLAGS=
-     if test "x$enable_iso_c" != "xno"; then
-@@ -24199,7 +21922,7 @@
- 	esac
- 	fi
-     fi
--    { $as_echo "$as_me:$LINENO: result: $complCFLAGS" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $complCFLAGS" >&5
- $as_echo "$complCFLAGS" >&6; }
- 
-     WARN_CFLAGS="$warning_flags $complCFLAGS"
-@@ -24207,14 +21930,14 @@
- 
- 
-   # Check whether --enable-cxx-warnings was given.
--if test "${enable_cxx_warnings+set}" = set; then
-+if test "${enable_cxx_warnings+set}" = set; then :
-   enableval=$enable_cxx_warnings;
- else
-   enable_cxx_warnings="minimum"
- fi
- 
- 
--  { $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C++ compiler" >&5
-+  { $as_echo "$as_me:${as_lineno-$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; }
-   warnCXXFLAGS=
-   if test "x$GXX" != xyes; then
-@@ -24234,18 +21957,18 @@
-       fi
-     fi
-   fi
--  { $as_echo "$as_me:$LINENO: result: $warnCXXFLAGS" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $warnCXXFLAGS" >&5
- $as_echo "$warnCXXFLAGS" >&6; }
- 
-    # Check whether --enable-iso-cxx was given.
--if test "${enable_iso_cxx+set}" = set; then
-+if test "${enable_iso_cxx+set}" = set; then :
-   enableval=$enable_iso_cxx;
- else
-   enable_iso_cxx=no
- fi
- 
- 
--   { $as_echo "$as_me:$LINENO: checking what language compliance flags to pass to the C++ compiler" >&5
-+   { $as_echo "$as_me:${as_lineno-$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; }
-    complCXXFLAGS=
-    if test "x$enable_iso_cxx" != "xno"; then
-@@ -24261,7 +21984,7 @@
-       esac
-      fi
-    fi
--  { $as_echo "$as_me:$LINENO: result: $complCXXFLAGS" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $complCXXFLAGS" >&5
- $as_echo "$complCXXFLAGS" >&6; }
- 
-   WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
-@@ -24282,8 +22005,136 @@
- 
- 
- 
+@@ -21771,54 +22005,58 @@
+ 
+ 
+ 
+-# Check whether --with-html-dir was given.
+-if test "${with_html_dir+set}" = set; then :
+-  withval=$with_html_dir;
 +    # Extract the first word of "gtkdoc-check", so it can be a program name with args.
 +set dummy gtkdoc-check; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
-+else
+ else
+-  with_html_dir='${datadir}/gtk-doc/html'
+-fi
+-
+-  HTML_DIR="$with_html_dir"
+-
 +  case $GTKDOC_CHECK in
 +  [\\/]* | ?:[\\/]*)
 +  ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.
@@ -16454,62 +2402,88 @@
 +done
 +  done
 +IFS=$as_save_IFS
-+
+ 
+-    # Check whether --enable-gtk-doc was given.
+-if test "${enable_gtk_doc+set}" = set; then :
+-  enableval=$enable_gtk_doc;
+-else
+-  enable_gtk_doc=no
 +  ;;
 +esac
-+fi
+ fi
+-
+-
+-  if test x$enable_gtk_doc = xyes; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.11\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.11") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  :
 +GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
 +if test -n "$GTKDOC_CHECK"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
 +$as_echo "$GTKDOC_CHECK" >&6; }
-+else
+ else
+-  as_fn_error "You need to have gtk-doc >= 1.11 installed to build gtk-doc" "$LINENO" 5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
-+fi
-+
-+
+ fi
+-  fi
+ 
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
+-$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
+-$as_echo "$enable_gtk_doc" >&6; }
+ 
+-  for ac_prog in gtkdoc-check
 +  for ac_prog in gtkdoc-rebase
-+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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then :
 +if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $as_echo_n "(cached) " >&6
+ else
+-  case $GTKDOC_CHECK in
 +  case $GTKDOC_REBASE in
-+  [\\/]* | ?:[\\/]*)
+   [\\/]* | ?:[\\/]*)
+-  ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.
 +  ac_cv_path_GTKDOC_REBASE="$GTKDOC_REBASE" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+   ;;
+   *)
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -21828,7 +22066,7 @@
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
 +    ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+  ;;
-+esac
-+fi
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+@@ -21839,18 +22077,116 @@
+   ;;
+ esac
+ fi
+-GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
+-if test -n "$GTKDOC_CHECK"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
+-$as_echo "$GTKDOC_CHECK" >&6; }
 +GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
 +if test -n "$GTKDOC_REBASE"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_REBASE" >&5
 +$as_echo "$GTKDOC_REBASE" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+ 
+-  test -n "$GTKDOC_CHECK" && break
 +  test -n "$GTKDOC_REBASE" && break
 +done
 +test -n "$GTKDOC_REBASE" || GTKDOC_REBASE="true"
@@ -16537,7 +2511,7 @@
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
-+done
+ done
 +  done
 +IFS=$as_save_IFS
 +
@@ -16556,109 +2530,64 @@
 +
 +
 +
- # Check whether --with-html-dir was given.
--if test "${with_html_dir+set}" = set; then
++# Check whether --with-html-dir was given.
 +if test "${with_html_dir+set}" = set; then :
-   withval=$with_html_dir;
- else
-   with_html_dir='${datadir}/gtk-doc/html'
-@@ -24293,7 +22144,7 @@
- 
- 
-     # Check whether --enable-gtk-doc was given.
--if test "${enable_gtk_doc+set}" = set; then
++  withval=$with_html_dir;
++else
++  with_html_dir='${datadir}/gtk-doc/html'
++fi
++
++  HTML_DIR="$with_html_dir"
++
++
++    # Check whether --enable-gtk-doc was given.
 +if test "${enable_gtk_doc+set}" = set; then :
-   enableval=$enable_gtk_doc;
- else
-   enable_gtk_doc=no
-@@ -24302,68 +22153,40 @@
- 
-   if test x$enable_gtk_doc = xyes; then
-     if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.11\"") >&5
++  enableval=$enable_gtk_doc;
++else
++  enable_gtk_doc=no
++fi
++
++
++  if test x$enable_gtk_doc = xyes; then
++    if test -n "$PKG_CONFIG" && \
 +    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.11") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
++  ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.11") 2>&5
++  ac_status=$?
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }; then
-   :
- else
--  { { $as_echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.11 installed to build gtk-doc" >&5
--$as_echo "$as_me: error: You need to have gtk-doc >= 1.11 installed to build gtk-doc" >&2;}
--   { (exit 1); exit 1; }; }
++  :
++else
 +  as_fn_error "You need to have gtk-doc >= 1.11 installed to build $PACKAGE_NAME" "$LINENO" 5
- fi
-   fi
- 
--  { $as_echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5
++fi
++  fi
++
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
- $as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
--  { $as_echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5
++$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
- $as_echo "$enable_gtk_doc" >&6; }
- 
--  for ac_prog in gtkdoc-check
--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; }
--if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then
--  $as_echo_n "(cached) " >&6
++$as_echo "$enable_gtk_doc" >&6; }
++
 +    # Check whether --enable-gtk-doc-html was given.
 +if test "${enable_gtk_doc_html+set}" = set; then :
 +  enableval=$enable_gtk_doc_html;
- else
--  case $GTKDOC_CHECK in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--IFS=$as_save_IFS
--
--  ;;
--esac
++else
 +  enable_gtk_doc_html=yes
- fi
--GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
--if test -n "$GTKDOC_CHECK"; then
--  { $as_echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5
--$as_echo "$GTKDOC_CHECK" >&6; }
++fi
 +
 +    # Check whether --enable-gtk-doc-pdf was given.
 +if test "${enable_gtk_doc_pdf+set}" = set; then :
 +  enableval=$enable_gtk_doc_pdf;
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
++else
 +  enable_gtk_doc_pdf=no
- fi
- 
- 
--  test -n "$GTKDOC_CHECK" && break
--done
++fi
++
++
 +  if test -z "$GTKDOC_MKPDF"; then
 +    enable_gtk_doc_pdf=no
 +  fi
  
  
     if test x$enable_gtk_doc = xyes; then
-@@ -24374,6 +22197,22 @@
+@@ -21861,6 +22197,22 @@
    ENABLE_GTK_DOC_FALSE=
  fi
  
@@ -16681,7 +2610,7 @@
     if test -n "$LIBTOOL"; then
    GTK_DOC_USE_LIBTOOL_TRUE=
    GTK_DOC_USE_LIBTOOL_FALSE='#'
-@@ -24382,6 +22221,14 @@
+@@ -21869,6 +22221,14 @@
    GTK_DOC_USE_LIBTOOL_FALSE=
  fi
  
@@ -16696,33 +2625,7 @@
  
  
  # This macro expands DIR and assigns it to RET.
-@@ -24400,22 +22247,18 @@
- 
- 
- # Check whether --enable-run-in-source-tree was given.
--if test "${enable_run_in_source_tree+set}" = set; then
-+if test "${enable_run_in_source_tree+set}" = set; then :
-   enableval=$enable_run_in_source_tree; case "${enableval}" in
- 	yes) ENABLE_RUN_IN_SOURCE_TREE=yes ;;
- 	no)  ENABLE_RUN_IN_SOURCE_TREE=no ;;
--	*) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-run-in-source-tree" >&5
--$as_echo "$as_me: error: bad value ${enableval} for --disable-run-in-source-tree" >&2;}
--   { (exit 1); exit 1; }; } ;;
-+	*) as_fn_error "bad value ${enableval} for --disable-run-in-source-tree" "$LINENO" 5 ;;
- 	esac
- else
-   ENABLE_RUN_IN_SOURCE_TREE=yes
- fi
-  if test x$ENABLE_RUN_IN_SOURCE_TREE = xyes; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define TOTEM_RUN_IN_SOURCE_TREE 1
--_ACEOF
-+$as_echo "#define TOTEM_RUN_IN_SOURCE_TREE 1" >>confdefs.h
- 
- fi
- 
-@@ -24434,7 +22277,7 @@
+@@ -21917,7 +22277,7 @@
  
  
  
@@ -16731,277 +2634,10 @@
  
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
-@@ -24463,13 +22306,13 @@
-     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
-+      *_cv_*) { $as_echo "$as_me:${as_lineno-$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 ;;
-+      *) { eval $ac_var=; unset $ac_var;} ;;
-       esac ;;
-     esac
-   done
-@@ -24477,8 +22320,8 @@
-   (set) 2>&1 |
-     case $as_nl`(ac_space=' '; set) 2>&1` in #(
-     *${as_nl}ac_space=\ *)
--      # `set' does not quote correctly, so add quotes (double-quote
--      # substitution turns \\\\ into \\, and sed turns \\ into \).
-+      # `set' does not quote correctly, so add quotes: double-quote
-+      # substitution turns \\\\ into \\, and sed turns \\ into \.
-       sed -n \
- 	"s/'/'\\\\''/g;
- 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -24501,11 +22344,11 @@
- 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:${as_lineno-$LINENO}: updating cache $cache_file" >&5
- $as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
-   else
--    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
- $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-   fi
- fi
-@@ -24525,8 +22368,8 @@
-   ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-   #    will be set to the directory where LIBOBJS objects are built.
--  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
--  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
-+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
- done
- LIBOBJS=$ac_libobjs
- 
-@@ -24534,11 +22377,8 @@
- 
- 
- if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
-  if test -n "$EXEEXT"; then
-   am__EXEEXT_TRUE=
-@@ -24549,178 +22389,122 @@
- fi
- 
- if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "conditional \"AMDEP\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- 
-   ac_config_commands="$ac_config_commands po/stamp-it"
- 
- 
- if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"ENABLE_SK\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "conditional \"ENABLE_SK\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- 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.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "conditional \"am__fastdepCXX\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- 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.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "conditional \"am__fastdepCXX\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${WITH_SMCLIENT_TRUE}" && test -z "${WITH_SMCLIENT_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_SMCLIENT\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"WITH_SMCLIENT\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "conditional \"WITH_SMCLIENT\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${WITH_SMCLIENT_XSMP_TRUE}" && test -z "${WITH_SMCLIENT_XSMP_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_SMCLIENT_XSMP\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"WITH_SMCLIENT_XSMP\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "conditional \"WITH_SMCLIENT_XSMP\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${WITH_SMCLIENT_WIN32_TRUE}" && test -z "${WITH_SMCLIENT_WIN32_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_SMCLIENT_WIN32\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"WITH_SMCLIENT_WIN32\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "conditional \"WITH_SMCLIENT_WIN32\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${WITH_SMCLIENT_QUARTZ_TRUE}" && test -z "${WITH_SMCLIENT_QUARTZ_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_SMCLIENT_QUARTZ\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"WITH_SMCLIENT_QUARTZ\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "conditional \"WITH_SMCLIENT_QUARTZ\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_XVIDMODE_TRUE}" && test -z "${HAVE_XVIDMODE_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_XVIDMODE\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_XVIDMODE\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "conditional \"HAVE_XVIDMODE\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${ENABLE_PYTHON_TRUE}" && test -z "${ENABLE_PYTHON_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_PYTHON\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"ENABLE_PYTHON\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "conditional \"ENABLE_PYTHON\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${ENABLE_VALA_TRUE}" && test -z "${ENABLE_VALA_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_VALA\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"ENABLE_VALA\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "conditional \"ENABLE_VALA\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${ENABLE_BROWSER_PLUGINS_TRUE}" && test -z "${ENABLE_BROWSER_PLUGINS_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_BROWSER_PLUGINS\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"ENABLE_BROWSER_PLUGINS\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "conditional \"ENABLE_BROWSER_PLUGINS\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${ENABLE_GMP_PLUGIN_TRUE}" && test -z "${ENABLE_GMP_PLUGIN_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GMP_PLUGIN\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"ENABLE_GMP_PLUGIN\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "conditional \"ENABLE_GMP_PLUGIN\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${ENABLE_NARROWSPACE_PLUGIN_TRUE}" && test -z "${ENABLE_NARROWSPACE_PLUGIN_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_NARROWSPACE_PLUGIN\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"ENABLE_NARROWSPACE_PLUGIN\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "conditional \"ENABLE_NARROWSPACE_PLUGIN\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${ENABLE_MULLY_PLUGIN_TRUE}" && test -z "${ENABLE_MULLY_PLUGIN_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_MULLY_PLUGIN\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"ENABLE_MULLY_PLUGIN\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "conditional \"ENABLE_MULLY_PLUGIN\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${ENABLE_CONE_PLUGIN_TRUE}" && test -z "${ENABLE_CONE_PLUGIN_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_CONE_PLUGIN\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"ENABLE_CONE_PLUGIN\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "conditional \"ENABLE_CONE_PLUGIN\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_NAUTILUS_TRUE}" && test -z "${HAVE_NAUTILUS_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_NAUTILUS\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_NAUTILUS\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "conditional \"HAVE_NAUTILUS\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${WITH_DBUS_TRUE}" && test -z "${WITH_DBUS_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_DBUS\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"WITH_DBUS\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "conditional \"WITH_DBUS\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
+@@ -22120,10 +22480,22 @@
+   as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
 +if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then
 +  as_fn_error "conditional \"GTK_DOC_BUILD_HTML\" was never defined.
 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -17009,544 +2645,19 @@
 +if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then
 +  as_fn_error "conditional \"GTK_DOC_BUILD_PDF\" was never defined.
 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
++fi
  if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
+   as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
 +if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then
 +  as_fn_error "conditional \"GTK_DOC_USE_REBASE\" was never defined.
 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
++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:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
- $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
--cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+as_write_fail=0
-+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
- #! $SHELL
- # Generated by $as_me.
- # Run this file to recreate the current configuration.
-@@ -24730,17 +22514,18 @@
- debug=false
- ac_cs_recheck=false
- ac_cs_silent=false
--SHELL=\${CONFIG_SHELL-$SHELL}
--_ACEOF
- 
--cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
--## --------------------- ##
--## M4sh Initialization.  ##
--## --------------------- ##
-+SHELL=\${CONFIG_SHELL-$SHELL}
-+export SHELL
-+_ASEOF
-+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-+## -------------------- ##
-+## M4sh Initialization. ##
-+## -------------------- ##
- 
- # Be more Bourne compatible
- DUALCASE=1; export DUALCASE # for MKS sh
--if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+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
-@@ -24748,23 +22533,15 @@
-   alias -g '${1+"$@"}'='"$@"'
-   setopt NO_GLOB_SUBST
- else
--  case `(set -o) 2>/dev/null` in
--  *posix*) set -o posix ;;
-+  case `(set -o) 2>/dev/null` in #(
-+  *posix*) :
-+    set -o posix ;; #(
-+  *) :
-+     ;;
- esac
--
- fi
- 
- 
--
--
--# PATH needs CR
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
--
- as_nl='
- '
- export as_nl
-@@ -24772,7 +22549,13 @@
- 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
-+# Prefer a ksh shell builtin over an external printf program on Solaris,
-+# but without wasting forks for bash or zsh.
-+if test -z "$BASH_VERSION$ZSH_VERSION" \
-+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-+  as_echo='print -r --'
-+  as_echo_n='print -rn --'
-+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-   as_echo='printf %s\n'
-   as_echo_n='printf %s'
- else
-@@ -24783,7 +22566,7 @@
-     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-     as_echo_n_body='eval
-       arg=$1;
--      case $arg in
-+      case $arg in #(
-       *"$as_nl"*)
- 	expr "X$arg" : "X\\(.*\\)$as_nl";
- 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -24806,13 +22589,6 @@
-   }
- fi
- 
--# Support unset when possible.
--if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
--  as_unset=unset
--else
--  as_unset=false
--fi
--
- 
- # IFS
- # We need space, tab and new line, in precisely that order.  Quoting is
-@@ -24822,15 +22598,15 @@
- IFS=" ""	$as_nl"
- 
- # Find who we are.  Look in the path if we contain no directory separator.
--case $0 in
-+case $0 in #((
-   *[\\/]* ) as_myself=$0 ;;
-   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
--done
-+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+  done
- IFS=$as_save_IFS
- 
-      ;;
-@@ -24842,12 +22618,16 @@
- fi
- if test ! -f "$as_myself"; then
-   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
--  { (exit 1); exit 1; }
-+  exit 1
- fi
- 
--# Work around bugs in pre-3.0 UWIN ksh.
--for as_var in ENV MAIL MAILPATH
--do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+# Unset variables that we do not need and which cause bugs (e.g. in
-+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-+# suppresses any "Segmentation fault" message there.  '((' could
-+# trigger a bug in pdksh 5.2.14.
-+for as_var in BASH_ENV ENV MAIL MAILPATH
-+do eval test x\${$as_var+set} = xset \
-+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
- done
- PS1='$ '
- PS2='> '
-@@ -24859,7 +22639,89 @@
- LANGUAGE=C
- export LANGUAGE
- 
--# Required to use basename.
-+# CDPATH.
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-+
-+
-+# as_fn_error ERROR [LINENO LOG_FD]
-+# ---------------------------------
-+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-+# script with status $?, using 1 if that was 0.
-+as_fn_error ()
-+{
-+  as_status=$?; test $as_status -eq 0 && as_status=1
-+  if test "$3"; then
-+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-+  fi
-+  $as_echo "$as_me: error: $1" >&2
-+  as_fn_exit $as_status
-+} # as_fn_error
-+
-+
-+# as_fn_set_status STATUS
-+# -----------------------
-+# Set $? to STATUS, without forking.
-+as_fn_set_status ()
-+{
-+  return $1
-+} # as_fn_set_status
-+
-+# as_fn_exit STATUS
-+# -----------------
-+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-+as_fn_exit ()
-+{
-+  set +e
-+  as_fn_set_status $1
-+  exit $1
-+} # as_fn_exit
-+
-+# as_fn_unset VAR
-+# ---------------
-+# Portably unset VAR.
-+as_fn_unset ()
-+{
-+  { eval $1=; unset $1;}
-+}
-+as_unset=as_fn_unset
-+# as_fn_append VAR VALUE
-+# ----------------------
-+# Append the text in VALUE to the end of the definition contained in VAR. Take
-+# advantage of any shell optimizations that allow amortized linear growth over
-+# repeated appends, instead of the typical quadratic growth present in naive
-+# implementations.
-+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-+  eval 'as_fn_append ()
-+  {
-+    eval $1+=\$2
-+  }'
-+else
-+  as_fn_append ()
-+  {
-+    eval $1=\$$1\$2
-+  }
-+fi # as_fn_append
-+
-+# as_fn_arith ARG...
-+# ------------------
-+# Perform arithmetic evaluation on the ARGs, and store the result in the
-+# global $as_val. Take advantage of shells that can avoid forks. The arguments
-+# must be portable across $(()) and expr.
-+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-+  eval 'as_fn_arith ()
-+  {
-+    as_val=$(( $* ))
-+  }'
-+else
-+  as_fn_arith ()
-+  {
-+    as_val=`expr "$@" || test $? -eq 1`
-+  }
-+fi # as_fn_arith
-+
-+
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-    test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
-@@ -24873,8 +22735,12 @@
-   as_basename=false
- fi
- 
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+  as_dirname=dirname
-+else
-+  as_dirname=false
-+fi
- 
--# Name of the executable.
- as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- 	 X"$0" : 'X\(//\)$' \| \
-@@ -24894,76 +22760,25 @@
- 	  }
- 	  s/.*/./; q'`
- 
--# CDPATH.
--$as_unset CDPATH
--
--
--
--  as_lineno_1=$LINENO
--  as_lineno_2=$LINENO
--  test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
--
--  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
--  # uniformly replaced by the line number.  The first 'sed' inserts a
--  # line-number line after each line using $LINENO; the second 'sed'
--  # does the real work.  The second script uses 'N' to pair each
--  # line-number line with the line containing $LINENO, and appends
--  # trailing '-' during substitution so that $LINENO is not a special
--  # case at line end.
--  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
--  # scripts with optimization help from Paolo Bonzini.  Blame Lee
--  # E. McMahon (1931-1989) for sed's syntax.  :-)
--  sed -n '
--    p
--    /[$]LINENO/=
--  ' <$as_myself |
--    sed '
--      s/[$]LINENO.*/&-/
--      t lineno
--      b
--      :lineno
--      N
--      :loop
--      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
--      t loop
--      s/-\n.*//
--    ' >$as_me.lineno &&
--  chmod +x "$as_me.lineno" ||
--    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
--   { (exit 1); exit 1; }; }
--
--  # Don't try to exec as it changes $[0], causing all sort of problems
--  # (the dirname of $[0] is not the place where we might find the
--  # original and so on.  Autoconf is especially sensitive to this).
--  . "./$as_me.lineno"
--  # Exit status is that of the last command.
--  exit
--}
--
--
--if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
--  as_dirname=dirname
--else
--  as_dirname=false
--fi
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
- 
- ECHO_C= ECHO_N= ECHO_T=
--case `echo -n x` in
-+case `echo -n x` in #(((((
- -n*)
--  case `echo 'x\c'` in
-+  case `echo 'xy\c'` in
-   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
--  *)   ECHO_C='\c';;
-+  xy)  ECHO_C='\c';;
-+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-+       ECHO_T='	';;
-   esac;;
- *)
-   ECHO_N='-n';;
- esac
--if expr a : '\(a\)' >/dev/null 2>&1 &&
--   test "X`expr 00001 : '.*\(...\)'`" = X001; then
--  as_expr=expr
--else
--  as_expr=false
--fi
- 
- rm -f conf$$ conf$$.exe conf$$.file
- if test -d conf$$.dir; then
-@@ -24992,8 +22807,56 @@
- rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
- rmdir conf$$.dir 2>/dev/null
- 
-+
-+# as_fn_mkdir_p
-+# -------------
-+# Create "$as_dir" as a directory, including parents if necessary.
-+as_fn_mkdir_p ()
-+{
-+
-+  case $as_dir in #(
-+  -*) as_dir=./$as_dir;;
-+  esac
-+  test -d "$as_dir" || eval $as_mkdir_p || {
-+    as_dirs=
-+    while :; do
-+      case $as_dir in #(
-+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-+      *) as_qdir=$as_dir;;
-+      esac
-+      as_dirs="'$as_qdir' $as_dirs"
-+      as_dir=`$as_dirname -- "$as_dir" ||
-+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$as_dir" : 'X\(//\)[^/]' \| \
-+	 X"$as_dir" : 'X\(//\)$' \| \
-+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$as_dir" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+      test -d "$as_dir" && break
-+    done
-+    test -z "$as_dirs" || eval "mkdir $as_dirs"
-+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-+
-+
-+} # as_fn_mkdir_p
- if mkdir -p . 2>/dev/null; then
--  as_mkdir_p=:
-+  as_mkdir_p='mkdir -p "$as_dir"'
- else
-   test -d ./-p && rmdir ./-p
-   as_mkdir_p=false
-@@ -25012,10 +22875,10 @@
-       if test -d "$1"; then
- 	test -d "$1/.";
-       else
--	case $1 in
-+	case $1 in #(
- 	-*)set "./$1";;
- 	esac;
--	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- 	???[sx]*):;;*)false;;esac;fi
-     '\'' sh
-   '
-@@ -25030,13 +22893,19 @@
- 
- 
- exec 6>&1
-+## ----------------------------------- ##
-+## Main body of $CONFIG_STATUS script. ##
-+## ----------------------------------- ##
-+_ASEOF
-+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
- 
--# Save the log message, to keep $[0] and so on meaningful, and to
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+# Save the log message, to keep $0 and so on meaningful, and to
- # report actual input values of CONFIG_FILES etc. instead of their
- # values after options handling.
- ac_log="
- This file was extended by totem $as_me 2.29.91, which was
--generated by GNU Autoconf 2.63.  Invocation command line was
-+generated by GNU Autoconf 2.65.  Invocation command line was
- 
-   CONFIG_FILES    = $CONFIG_FILES
-   CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -25068,13 +22937,15 @@
- 
- cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- ac_cs_usage="\
--\`$as_me' instantiates files from templates according to the
--current configuration.
-+\`$as_me' instantiates files and other configuration actions
-+from templates according to the current configuration.  Unless the files
-+and actions are specified as TAGs, all are instantiated by default.
- 
--Usage: $0 [OPTION]... [FILE]...
-+Usage: $0 [OPTION]... [TAG]...
- 
-   -h, --help       print this help, then exit
-   -V, --version    print version number and configuration settings, then exit
-+      --config     print configuration, then exit
-   -q, --quiet, --silent
-                    do not print progress messages
-   -d, --debug      don't remove temporary files
-@@ -25093,16 +22964,17 @@
- Configuration commands:
- $config_commands
- 
--Report bugs to <bug-autoconf at gnu.org>."
-+Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=totem>."
- 
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
- ac_cs_version="\\
- totem config.status 2.29.91
--configured by $0, generated by GNU Autoconf 2.63,
--  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.65,
-+  with options \\"\$ac_cs_config\\"
- 
--Copyright (C) 2008 Free Software Foundation, Inc.
-+Copyright (C) 2009 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
- 
-@@ -25138,6 +23010,8 @@
-     ac_cs_recheck=: ;;
-   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-     $as_echo "$ac_cs_version"; exit ;;
-+  --config | --confi | --conf | --con | --co | --c )
-+    $as_echo "$ac_cs_config"; exit ;;
-   --debug | --debu | --deb | --de | --d | -d )
-     debug=: ;;
-   --file | --fil | --fi | --f )
-@@ -25145,20 +23019,19 @@
-     case $ac_optarg in
-     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-     esac
--    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
-+    as_fn_append 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'"
-+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
-     ac_need_defaults=false;;
-   --he | --h)
-     # Conflict between --help and --header
--    { $as_echo "$as_me: error: ambiguous option: $1
--Try \`$0 --help' for more information." >&2
--   { (exit 1); exit 1; }; };;
-+    as_fn_error "ambiguous option: \`$1'
-+Try \`$0 --help' for more information.";;
-   --help | --hel | -h )
-     $as_echo "$ac_cs_usage"; exit ;;
-   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -25166,11 +23039,10 @@
-     ac_cs_silent=: ;;
- 
-   # This is an error.
--  -*) { $as_echo "$as_me: error: unrecognized option: $1
--Try \`$0 --help' for more information." >&2
--   { (exit 1); exit 1; }; } ;;
-+  -*) as_fn_error "unrecognized option: \`$1'
-+Try \`$0 --help' for more information." ;;
- 
--  *) ac_config_targets="$ac_config_targets $1"
-+  *) as_fn_append ac_config_targets " $1"
-      ac_need_defaults=false ;;
- 
-   esac
-@@ -25583,6 +23455,7 @@
+@@ -23083,6 +23455,7 @@
      "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
      "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
      "src/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/Makefile" ;;
@@ -17554,594 +2665,9 @@
      "src/plugins/bemused/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/bemused/Makefile" ;;
      "src/plugins/coherence_upnp/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/coherence_upnp/Makefile" ;;
      "src/plugins/dbus-service/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/dbus-service/Makefile" ;;
-@@ -25630,9 +23503,7 @@
-     "docs/reference/version.xml") CONFIG_FILES="$CONFIG_FILES docs/reference/version.xml" ;;
-     "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;}
--   { (exit 1); exit 1; }; };;
-+  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-   esac
- done
- 
-@@ -25659,7 +23530,7 @@
-   trap 'exit_status=$?
-   { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
- ' 0
--  trap '{ (exit 1); exit 1; }' 1 2 13 15
-+  trap 'as_fn_exit 1' 1 2 13 15
- }
- # Create a (secure) tmp directory for tmp files.
- 
-@@ -25670,11 +23541,7 @@
- {
-   tmp=./conf$$-$RANDOM
-   (umask 077 && mkdir "$tmp")
--} ||
--{
--   $as_echo "$as_me: cannot create a temporary directory in ." >&2
--   { (exit 1); exit 1; }
--}
-+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
- 
- # Set up the scripts for CONFIG_FILES section.
- # No need to generate them if there are no CONFIG_FILES.
-@@ -25682,10 +23549,16 @@
- if test -n "$CONFIG_FILES"; then
- 
- 
--ac_cr='
'
-+ac_cr=`echo X | tr X '\015'`
-+# On cygwin, bash can eat \r inside `` if the user requested igncr.
-+# But we know of no other shell where ac_cr would be empty at this
-+# point, so we can use a bashism as a fallback.
-+if test "x$ac_cr" = x; then
-+  eval ac_cr=\$\'\\r\'
-+fi
- 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'
-+  ac_cs_awk_cr='\r'
- else
-   ac_cs_awk_cr=$ac_cr
- fi
-@@ -25699,24 +23572,18 @@
-   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; }; }
-+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
- 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; }; }
-+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
- 
-   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-   if test $ac_delim_n = $ac_delim_num; then
-     break
-   elif $ac_last_try; then
--    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-   else
-     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-   fi
-@@ -25738,7 +23605,7 @@
- t delim
- :nl
- h
--s/\(.\{148\}\).*/\1/
-+s/\(.\{148\}\)..*/\1/
- t more1
- s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
- p
-@@ -25752,7 +23619,7 @@
- t nl
- :delim
- h
--s/\(.\{148\}\).*/\1/
-+s/\(.\{148\}\)..*/\1/
- t more2
- s/["\\]/\\&/g; s/^/"/; s/$/"/
- p
-@@ -25805,9 +23672,7 @@
- else
-   cat
- fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
--  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
--$as_echo "$as_me: error: could not setup config files machinery" >&2;}
--   { (exit 1); exit 1; }; }
-+  || as_fn_error "could not setup config files machinery" "$LINENO" 5
- _ACEOF
- 
- # VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -25848,9 +23713,7 @@
-   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; }; }
-+    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
-   else
-     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-   fi
-@@ -25935,9 +23798,7 @@
- _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; }; }
-+  as_fn_error "could not setup config headers machinery" "$LINENO" 5
- fi # test -n "$CONFIG_HEADERS"
- 
- 
-@@ -25950,9 +23811,7 @@
-   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;}
--   { (exit 1); exit 1; }; };;
-+  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
-   :[FH]-) ac_tag=-:-;;
-   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-   esac
-@@ -25980,12 +23839,10 @@
- 	   [\\/$]*) 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;}
--   { (exit 1); exit 1; }; };;
-+	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-       esac
-       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
--      ac_file_inputs="$ac_file_inputs '$ac_f'"
-+      as_fn_append ac_file_inputs " '$ac_f'"
-     done
- 
-     # Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -25996,7 +23853,7 @@
- 	`' 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:${as_lineno-$LINENO}: creating $ac_file" >&5
- $as_echo "$as_me: creating $ac_file" >&6;}
-     fi
-     # Neutralize special characters interpreted by sed in replacement strings.
-@@ -26009,9 +23866,7 @@
- 
-     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; }; } ;;
-+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
-     esac
-     ;;
-   esac
-@@ -26039,47 +23894,7 @@
- 	    q
- 	  }
- 	  s/.*/./; q'`
--  { as_dir="$ac_dir"
--  case $as_dir in #(
--  -*) as_dir=./$as_dir;;
--  esac
--  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
--    as_dirs=
--    while :; do
--      case $as_dir in #(
--      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
--      *) as_qdir=$as_dir;;
--      esac
--      as_dirs="'$as_qdir' $as_dirs"
--      as_dir=`$as_dirname -- "$as_dir" ||
--$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--	 X"$as_dir" : 'X\(//\)[^/]' \| \
--	 X"$as_dir" : 'X\(//\)$' \| \
--	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
--$as_echo X"$as_dir" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
--	    s//\1/
--	    q
--	  }
--	  /^X\(\/\/\)[^/].*/{
--	    s//\1/
--	    q
--	  }
--	  /^X\(\/\/\)$/{
--	    s//\1/
--	    q
--	  }
--	  /^X\(\/\).*/{
--	    s//\1/
--	    q
--	  }
--	  s/.*/./; q'`
--      test -d "$as_dir" && break
--    done
--    test -z "$as_dirs" || eval "mkdir $as_dirs"
--  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
--$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
--   { (exit 1); exit 1; }; }; }
-+  as_dir="$ac_dir"; as_fn_mkdir_p
-   ac_builddir=.
- 
- case "$ac_dir" in
-@@ -26136,7 +23951,6 @@
- # 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/ {
-   p
-@@ -26146,12 +23960,11 @@
- /@docdir@/p
- /@infodir@/p
- /@localedir@/p
--/@mandir@/p
--'
-+/@mandir@/p'
- case `eval "sed -n \"\$ac_sed_dataroot\" $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:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
- $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -26161,7 +23974,7 @@
-   s&@infodir@&$infodir&g
-   s&@localedir@&$localedir&g
-   s&@mandir@&$mandir&g
--    s&\\\${datarootdir}&$datarootdir&g' ;;
-+  s&\\\${datarootdir}&$datarootdir&g' ;;
- esac
- _ACEOF
- 
-@@ -26190,14 +24003,12 @@
- $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; }; }
-+  || as_fn_error "could not create $ac_file" "$LINENO" 5
- 
- 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'
-+  { $as_echo "$as_me:${as_lineno-$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'
- which seems to be undefined.  Please make sure it is defined." >&2;}
-@@ -26207,9 +24018,7 @@
-   -) 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; }; }
-+  || as_fn_error "could not create $ac_file" "$LINENO" 5
-  ;;
-   :H)
-   #
-@@ -26220,25 +24029,19 @@
-       $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; }; }
-+      || as_fn_error "could not create $ac_file" "$LINENO" 5
-     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:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
- $as_echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       rm -f "$ac_file"
-       mv "$tmp/config.h" "$ac_file" \
--	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
--$as_echo "$as_me: error: could not create $ac_file" >&2;}
--   { (exit 1); exit 1; }; }
-+	|| as_fn_error "could not create $ac_file" "$LINENO" 5
-     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; }; }
-+      || as_fn_error "could not create -" "$LINENO" 5
-   fi
- # Compute "$ac_file"'s index in $config_headers.
- _am_arg="$ac_file"
-@@ -26276,7 +24079,7 @@
- 	  s/.*/./; q'`/stamp-h$_am_stamp_count
-  ;;
- 
--  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
-+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
- $as_echo "$as_me: executing $ac_file commands" >&6;}
-  ;;
-   esac
-@@ -26371,47 +24174,7 @@
- 	    q
- 	  }
- 	  s/.*/./; q'`
--      { as_dir=$dirpart/$fdir
--  case $as_dir in #(
--  -*) as_dir=./$as_dir;;
--  esac
--  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
--    as_dirs=
--    while :; do
--      case $as_dir in #(
--      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
--      *) as_qdir=$as_dir;;
--      esac
--      as_dirs="'$as_qdir' $as_dirs"
--      as_dir=`$as_dirname -- "$as_dir" ||
--$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--	 X"$as_dir" : 'X\(//\)[^/]' \| \
--	 X"$as_dir" : 'X\(//\)$' \| \
--	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
--$as_echo X"$as_dir" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
--	    s//\1/
--	    q
--	  }
--	  /^X\(\/\/\)[^/].*/{
--	    s//\1/
--	    q
--	  }
--	  /^X\(\/\/\)$/{
--	    s//\1/
--	    q
--	  }
--	  /^X\(\/\).*/{
--	    s//\1/
--	    q
--	  }
--	  s/.*/./; q'`
--      test -d "$as_dir" && break
--    done
--    test -z "$as_dirs" || eval "mkdir $as_dirs"
--  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
--$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
--   { (exit 1); exit 1; }; }; }
-+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
-       # echo "creating $dirpart/$file"
-       echo '# dummy' > "$dirpart/$file"
-     done
-@@ -27225,9 +24988,7 @@
-  ;;
-     "po/stamp-it":C)
-     if  ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
--       { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5
--$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}
--   { (exit 1); exit 1; }; }
-+       as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
-     fi
-     rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
-     >"po/stamp-it.tmp"
-@@ -27250,15 +25011,12 @@
- done # for ac_tag
- 
- 
--{ (exit 0); exit 0; }
-+as_fn_exit 0
- _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; }; }
-+  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
- 
- 
- # configure is writing to config.log, and then calls config.status.
-@@ -27279,37 +25037,37 @@
-   exec 5>>config.log
-   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-   # would make configure fail if this is the last instruction.
--  $ac_cs_success || { (exit 1); exit 1; }
-+  $ac_cs_success || as_fn_exit $?
- fi
- if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
--  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-+  { $as_echo "$as_me:${as_lineno-$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: Totem was configured with the following options:" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: Totem was configured with the following options:" >&5
- $as_echo "$as_me: Totem was configured with the following options:" >&6;}
--{ $as_echo "$as_me:$LINENO: ** Using the GStreamer-$GST_MAJORMINOR backend" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: ** Using the GStreamer-$GST_MAJORMINOR backend" >&5
- $as_echo "$as_me: ** Using the GStreamer-$GST_MAJORMINOR backend" >&6;}
- if test "x$MISSING_PLUGINS_LIBS" != "x"; then
--	{ $as_echo "$as_me:$LINENO: ** Easy codec installation support enabled" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: ** Easy codec installation support enabled" >&5
- $as_echo "$as_me: ** Easy codec installation support enabled" >&6;}
- else
--	{ $as_echo "$as_me:$LINENO:    Easy codec installation support disabled" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}:    Easy codec installation support disabled" >&5
- $as_echo "$as_me:    Easy codec installation support disabled" >&6;}
- fi
- if test x$enable_python = xyes ; then
--	{ $as_echo "$as_me:$LINENO: ** Python binding support enabled" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: ** Python binding support enabled" >&5
- $as_echo "$as_me: ** Python binding support enabled" >&6;}
- else
--	{ $as_echo "$as_me:$LINENO:    Python binding support disabled" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}:    Python binding support disabled" >&5
- $as_echo "$as_me:    Python binding support disabled" >&6;}
- fi
- if test x$with_vala = xyes ; then
--	{ $as_echo "$as_me:$LINENO: ** Vala binding support enabled" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: ** Vala binding support enabled" >&5
- $as_echo "$as_me: ** Vala binding support enabled" >&6;}
- else
--	{ $as_echo "$as_me:$LINENO:    Vala binding support disabled" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}:    Vala binding support disabled" >&5
- $as_echo "$as_me:    Vala binding support disabled" >&6;}
- fi
- if test "x${PLUGINS}" != "x" ; then
-@@ -27317,105 +25075,105 @@
- 		for plugin in ${PLUGINS}; do
- 			case ${allowed_plugin} in
- 				${plugin})
--					{ $as_echo "$as_me:$LINENO: ** ${allowed_plugin} plugin enabled" >&5
-+					{ $as_echo "$as_me:${as_lineno-$LINENO}: ** ${allowed_plugin} plugin enabled" >&5
- $as_echo "$as_me: ** ${allowed_plugin} plugin enabled" >&6;}
- 					continue 2
- 				;;
- 				*);;
- 			esac
- 		done
--		{ $as_echo "$as_me:$LINENO:    ${allowed_plugin} plugin disabled" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}:    ${allowed_plugin} plugin disabled" >&5
- $as_echo "$as_me:    ${allowed_plugin} plugin disabled" >&6;}
- 	done
- else
--	{ $as_echo "$as_me:$LINENO:    No Totem plugins enabled" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}:    No Totem plugins enabled" >&5
- $as_echo "$as_me:    No Totem plugins enabled" >&6;}
- fi
- if test x$enable_browser_plugins = xyes ; then
--	{ $as_echo "$as_me:$LINENO: ** Browser plugin enabled" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: ** Browser plugin enabled" >&5
- $as_echo "$as_me: ** Browser plugin enabled" >&6;}
- 	if test x$enable_gmp_plugin = xyes ; then
--		{ $as_echo "$as_me:$LINENO: ** GMP (Windows Media) plugin enabled" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: ** GMP (Windows Media) plugin enabled" >&5
- $as_echo "$as_me: ** GMP (Windows Media) plugin enabled" >&6;}
- 	else
--		{ $as_echo "$as_me:$LINENO:    GMP (Windows Media) plugin disabled" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}:    GMP (Windows Media) plugin disabled" >&5
- $as_echo "$as_me:    GMP (Windows Media) plugin disabled" >&6;}
- 	fi
- 	if test x$enable_narrowspace_plugin = xyes ; then
--		{ $as_echo "$as_me:$LINENO: ** NarrowSpace (QuickTime) plugin enabled" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: ** NarrowSpace (QuickTime) plugin enabled" >&5
- $as_echo "$as_me: ** NarrowSpace (QuickTime) plugin enabled" >&6;}
- 	else
--		{ $as_echo "$as_me:$LINENO:    NarrowSpace (QuickTime) plugin disabled" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}:    NarrowSpace (QuickTime) plugin disabled" >&5
- $as_echo "$as_me:    NarrowSpace (QuickTime) plugin disabled" >&6;}
- 	fi
- 	if test x$enable_mully_plugin = xyes ; then
--		{ $as_echo "$as_me:$LINENO: ** MullY (DivX) plugin enabled" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: ** MullY (DivX) plugin enabled" >&5
- $as_echo "$as_me: ** MullY (DivX) plugin enabled" >&6;}
- 	else
--		{ $as_echo "$as_me:$LINENO:    MullY (DivX) plugin disabled" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}:    MullY (DivX) plugin disabled" >&5
- $as_echo "$as_me:    MullY (DivX) plugin disabled" >&6;}
- 	fi
- 	if test x$enable_cone_plugin = xyes ; then
--		{ $as_echo "$as_me:$LINENO: ** Cone (VLC) plugin enabled" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: ** Cone (VLC) plugin enabled" >&5
- $as_echo "$as_me: ** Cone (VLC) plugin enabled" >&6;}
- 	else
--		{ $as_echo "$as_me:$LINENO:    Cone (VLC) plugin disabled" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}:    Cone (VLC) plugin disabled" >&5
- $as_echo "$as_me:    Cone (VLC) plugin disabled" >&6;}
- 	fi
- else
--	{ $as_echo "$as_me:$LINENO:    Browser plugin disabled" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}:    Browser plugin disabled" >&5
- $as_echo "$as_me:    Browser plugin disabled" >&6;}
- fi
- if test x$ENABLE_NAUTILUS = xyes ; then
--	{ $as_echo "$as_me:$LINENO: ** Nautilus properties page enabled" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: ** Nautilus properties page enabled" >&5
- $as_echo "$as_me: ** Nautilus properties page enabled" >&6;}
- else
--	{ $as_echo "$as_me:$LINENO:    Nautilus properties page disabled" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}:    Nautilus properties page disabled" >&5
- $as_echo "$as_me:    Nautilus properties page disabled" >&6;}
- fi
- if test x$disable_iso_codes_check = xno ; then
--	{ $as_echo "$as_me:$LINENO: ** iso-codes support checked" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: ** iso-codes support checked" >&5
- $as_echo "$as_me: ** iso-codes support checked" >&6;}
- else
--	{ $as_echo "$as_me:$LINENO:    iso-codes support checked at run-time" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}:    iso-codes support checked at run-time" >&5
- $as_echo "$as_me:    iso-codes support checked at run-time" >&6;}
- fi
- if test x$enable_xtest = xyes ; then
--	{ $as_echo "$as_me:$LINENO: ** XTest (legacy screensaver) support enabled" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: ** XTest (legacy screensaver) support enabled" >&5
- $as_echo "$as_me: ** XTest (legacy screensaver) support enabled" >&6;}
- else
--	{ $as_echo "$as_me:$LINENO:    XTest (legacy screensaver) support disabled" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}:    XTest (legacy screensaver) support disabled" >&5
- $as_echo "$as_me:    XTest (legacy screensaver) support disabled" >&6;}
- fi
- if test x$enable_dbus = xyes ; then
--	{ $as_echo "$as_me:$LINENO: ** D-Bus (gnome-screensaver) support enabled" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: ** D-Bus (gnome-screensaver) support enabled" >&5
- $as_echo "$as_me: ** D-Bus (gnome-screensaver) support enabled" >&6;}
- else
--	{ $as_echo "$as_me:$LINENO:    D-Bus (gnome-screensaver) support disabled" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}:    D-Bus (gnome-screensaver) support disabled" >&5
- $as_echo "$as_me:    D-Bus (gnome-screensaver) support disabled" >&6;}
- fi
- if test x$have_xvidmode = xyes ; then
--	{ $as_echo "$as_me:$LINENO: ** XVidmode support enabled" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: ** XVidmode support enabled" >&5
- $as_echo "$as_me: ** XVidmode support enabled" >&6;}
- else
--	{ $as_echo "$as_me:$LINENO:    XVidmode support disabled" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}:    XVidmode support disabled" >&5
- $as_echo "$as_me:    XVidmode support disabled" >&6;}
- fi
- if test x$have_xfree = xyes ; then
--	{ $as_echo "$as_me:$LINENO: ** XFree86 multimedia keys support enabled" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: ** XFree86 multimedia keys support enabled" >&5
- $as_echo "$as_me: ** XFree86 multimedia keys support enabled" >&6;}
- else
--	{ $as_echo "$as_me:$LINENO:    XFree86 multimedia keys support disabled" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}:    XFree86 multimedia keys support disabled" >&5
- $as_echo "$as_me:    XFree86 multimedia keys support disabled" >&6;}
- fi
- if test "$with_smclient" != "no" ; then
--	{ $as_echo "$as_me:$LINENO: ** SM client support enabled" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: ** SM client support enabled" >&5
- $as_echo "$as_me: ** SM client support enabled" >&6;}
- else
--	{ $as_echo "$as_me:$LINENO:    SM client support disabled" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}:    SM client support disabled" >&5
- $as_echo "$as_me:    SM client support disabled" >&6;}
- fi
- 
--{ $as_echo "$as_me:$LINENO: End options" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: End options" >&5
- $as_echo "$as_me: End options" >&6;}
- 
-diff -Naur totem-2.29.91.old/data/icons/16x16/Makefile.in totem-2.29.91/data/icons/16x16/Makefile.in
---- totem-2.29.91.old/data/icons/16x16/Makefile.in	2010-02-24 13:15:29.000000000 +0100
-+++ totem-2.29.91/data/icons/16x16/Makefile.in	2010-02-25 19:13:51.172952543 +0100
+diff -Naur totem-2.29.92.old/data/icons/16x16/Makefile.in totem-2.29.92/data/icons/16x16/Makefile.in
+--- totem-2.29.92.old/data/icons/16x16/Makefile.in	2010-03-15 18:51:31.000000000 +0100
++++ totem-2.29.92/data/icons/16x16/Makefile.in	2010-03-16 09:08:42.308669202 +0100
 @@ -91,6 +91,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -18160,17 +2686,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -206,6 +210,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/data/icons/22x22/Makefile.in totem-2.29.91/data/icons/22x22/Makefile.in
---- totem-2.29.91.old/data/icons/22x22/Makefile.in	2010-02-24 13:15:29.000000000 +0100
-+++ totem-2.29.91/data/icons/22x22/Makefile.in	2010-02-25 19:13:51.236951732 +0100
+diff -Naur totem-2.29.92.old/data/icons/22x22/Makefile.in totem-2.29.92/data/icons/22x22/Makefile.in
+--- totem-2.29.92.old/data/icons/22x22/Makefile.in	2010-03-15 18:51:31.000000000 +0100
++++ totem-2.29.92/data/icons/22x22/Makefile.in	2010-03-16 09:08:42.372668608 +0100
 @@ -91,6 +91,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -18189,17 +2707,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -206,6 +210,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/data/icons/24x24/Makefile.in totem-2.29.91/data/icons/24x24/Makefile.in
---- totem-2.29.91.old/data/icons/24x24/Makefile.in	2010-02-24 13:15:29.000000000 +0100
-+++ totem-2.29.91/data/icons/24x24/Makefile.in	2010-02-25 19:13:51.304951849 +0100
+diff -Naur totem-2.29.92.old/data/icons/24x24/Makefile.in totem-2.29.92/data/icons/24x24/Makefile.in
+--- totem-2.29.92.old/data/icons/24x24/Makefile.in	2010-03-15 18:51:31.000000000 +0100
++++ totem-2.29.92/data/icons/24x24/Makefile.in	2010-03-16 09:08:42.440668727 +0100
 @@ -91,6 +91,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -18218,17 +2728,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -206,6 +210,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/data/icons/32x32/Makefile.in totem-2.29.91/data/icons/32x32/Makefile.in
---- totem-2.29.91.old/data/icons/32x32/Makefile.in	2010-02-24 13:15:29.000000000 +0100
-+++ totem-2.29.91/data/icons/32x32/Makefile.in	2010-02-25 19:13:51.368952164 +0100
+diff -Naur totem-2.29.92.old/data/icons/32x32/Makefile.in totem-2.29.92/data/icons/32x32/Makefile.in
+--- totem-2.29.92.old/data/icons/32x32/Makefile.in	2010-03-15 18:51:31.000000000 +0100
++++ totem-2.29.92/data/icons/32x32/Makefile.in	2010-03-16 09:08:42.504668823 +0100
 @@ -91,6 +91,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -18247,17 +2749,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -206,6 +210,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/data/icons/48x48/Makefile.in totem-2.29.91/data/icons/48x48/Makefile.in
---- totem-2.29.91.old/data/icons/48x48/Makefile.in	2010-02-24 13:15:29.000000000 +0100
-+++ totem-2.29.91/data/icons/48x48/Makefile.in	2010-02-25 19:13:51.436952149 +0100
+diff -Naur totem-2.29.92.old/data/icons/48x48/Makefile.in totem-2.29.92/data/icons/48x48/Makefile.in
+--- totem-2.29.92.old/data/icons/48x48/Makefile.in	2010-03-15 18:51:32.000000000 +0100
++++ totem-2.29.92/data/icons/48x48/Makefile.in	2010-03-16 09:08:42.572668737 +0100
 @@ -91,6 +91,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -18276,17 +2770,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -206,6 +210,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/data/icons/Makefile.in totem-2.29.91/data/icons/Makefile.in
---- totem-2.29.91.old/data/icons/Makefile.in	2010-02-24 13:15:30.000000000 +0100
-+++ totem-2.29.91/data/icons/Makefile.in	2010-02-25 19:13:51.500952187 +0100
+diff -Naur totem-2.29.92.old/data/icons/Makefile.in totem-2.29.92/data/icons/Makefile.in
+--- totem-2.29.92.old/data/icons/Makefile.in	2010-03-15 18:51:32.000000000 +0100
++++ totem-2.29.92/data/icons/Makefile.in	2010-03-16 09:08:42.648668971 +0100
 @@ -107,6 +107,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -18305,17 +2791,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -222,6 +226,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/data/icons/scalable/Makefile.in totem-2.29.91/data/icons/scalable/Makefile.in
---- totem-2.29.91.old/data/icons/scalable/Makefile.in	2010-02-24 13:15:30.000000000 +0100
-+++ totem-2.29.91/data/icons/scalable/Makefile.in	2010-02-25 19:13:51.564952156 +0100
+diff -Naur totem-2.29.92.old/data/icons/scalable/Makefile.in totem-2.29.92/data/icons/scalable/Makefile.in
+--- totem-2.29.92.old/data/icons/scalable/Makefile.in	2010-03-15 18:51:32.000000000 +0100
++++ totem-2.29.92/data/icons/scalable/Makefile.in	2010-03-16 09:08:42.724668716 +0100
 @@ -91,6 +91,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -18334,17 +2812,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -206,6 +210,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/data/Makefile.in totem-2.29.91/data/Makefile.in
---- totem-2.29.91.old/data/Makefile.in	2010-02-24 13:15:29.000000000 +0100
-+++ totem-2.29.91/data/Makefile.in	2010-02-25 19:13:51.104952212 +0100
+diff -Naur totem-2.29.92.old/data/Makefile.in totem-2.29.92/data/Makefile.in
+--- totem-2.29.92.old/data/Makefile.in	2010-03-15 18:51:31.000000000 +0100
++++ totem-2.29.92/data/Makefile.in	2010-03-16 09:08:42.240668725 +0100
 @@ -141,6 +141,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -18363,17 +2833,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -256,6 +260,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/docs/Makefile.in totem-2.29.91/docs/Makefile.in
---- totem-2.29.91.old/docs/Makefile.in	2010-02-24 13:15:30.000000000 +0100
-+++ totem-2.29.91/docs/Makefile.in	2010-02-25 19:13:51.628952120 +0100
+diff -Naur totem-2.29.92.old/docs/Makefile.in totem-2.29.92/docs/Makefile.in
+--- totem-2.29.92.old/docs/Makefile.in	2010-03-15 18:51:32.000000000 +0100
++++ totem-2.29.92/docs/Makefile.in	2010-03-16 09:08:42.788668685 +0100
 @@ -107,6 +107,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -18392,17 +2854,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -222,6 +226,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/docs/reference/Makefile.in totem-2.29.91/docs/reference/Makefile.in
---- totem-2.29.91.old/docs/reference/Makefile.in	2010-02-24 13:15:30.000000000 +0100
-+++ totem-2.29.91/docs/reference/Makefile.in	2010-02-25 19:13:51.712952176 +0100
+diff -Naur totem-2.29.92.old/docs/reference/Makefile.in totem-2.29.92/docs/reference/Makefile.in
+--- totem-2.29.92.old/docs/reference/Makefile.in	2010-03-15 18:51:32.000000000 +0100
++++ totem-2.29.92/docs/reference/Makefile.in	2010-03-16 09:08:42.872669376 +0100
 @@ -76,6 +76,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -18421,15 +2875,7 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -191,6 +195,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-@@ -408,10 +413,10 @@
+@@ -409,10 +413,10 @@
  	$(DEPENDENCY_LIBS)
  
  @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -18443,7 +2889,7 @@
  @GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_RUN = $(LIBTOOL) --mode=execute
  
  # We set GPATH here; this gives us semantics for GNU make
-@@ -430,7 +435,9 @@
+@@ -431,7 +435,9 @@
  	$(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt \
  	version.xml.in
  DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
@@ -18454,7 +2900,7 @@
  
  SCANOBJ_FILES = \
  	$(DOC_MODULE).args 	 \
-@@ -445,6 +452,10 @@
+@@ -446,6 +452,10 @@
  	$(DOC_MODULE)-unused.txt
  
  CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
@@ -18465,7 +2911,7 @@
  @ENABLE_GTK_DOC_TRUE at TESTS_ENVIRONMENT = cd $(srcdir) && 
  @ENABLE_GTK_DOC_TRUE at TESTS = $(GTKDOC_CHECK)
  all: all-am
-@@ -735,10 +746,10 @@
+@@ -736,10 +746,10 @@
  	uninstall-local
  
  
@@ -18478,7 +2924,7 @@
  
  $(REPORT_FILES): sgml-build.stamp
  
-@@ -747,9 +758,9 @@
+@@ -748,9 +758,9 @@
  scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
  	@echo 'gtk-doc: Scanning header files'
  	@-chmod -R u+w $(srcdir)
@@ -18490,7 +2936,7 @@
  	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
  	else \
  	    cd $(srcdir) ; \
-@@ -757,7 +768,7 @@
+@@ -758,7 +768,7 @@
                 test -f $$i || touch $$i ; \
  	    done \
  	fi
@@ -18499,7 +2945,7 @@
  
  $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
  	@true
-@@ -767,23 +778,23 @@
+@@ -768,23 +778,23 @@
  tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
  	@echo 'gtk-doc: Rebuilding template files'
  	@-chmod -R u+w $(srcdir)
@@ -18529,7 +2975,7 @@
  
  sgml.stamp: sgml-build.stamp
  	@true
-@@ -793,18 +804,37 @@
+@@ -794,18 +804,37 @@
  html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
  	@echo 'gtk-doc: Building HTML'
  	@-chmod -R u+w $(srcdir)
@@ -18575,7 +3021,7 @@
  
  ##############
  
-@@ -814,14 +844,14 @@
+@@ -815,14 +844,14 @@
  
  distclean-local:
  	cd $(srcdir) && \
@@ -18592,7 +3038,7 @@
  	if test "$$installfiles" = '$(srcdir)/html/*'; \
  	then echo '-- Nothing to install' ; \
  	else \
-@@ -841,12 +871,11 @@
+@@ -842,12 +871,11 @@
  	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
  	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
  	  fi; \
@@ -18607,7 +3053,7 @@
  	  installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
  	else \
  	  installdir="$(DESTDIR)$(TARGET_DIR)"; \
-@@ -863,16 +892,14 @@
+@@ -864,16 +892,14 @@
  
  dist-hook: dist-check-gtkdoc dist-hook-local
  	mkdir $(distdir)/tmpl
@@ -18626,9 +3072,9 @@
  
  .PHONY : dist-hook-local docs
  
-diff -Naur totem-2.29.91.old/gtk-doc.make totem-2.29.91/gtk-doc.make
---- totem-2.29.91.old/gtk-doc.make	2010-02-24 13:15:24.000000000 +0100
-+++ totem-2.29.91/gtk-doc.make	2010-02-25 19:13:45.808961087 +0100
+diff -Naur totem-2.29.92.old/gtk-doc.make totem-2.29.92/gtk-doc.make
+--- totem-2.29.92.old/gtk-doc.make	2010-03-15 18:51:19.000000000 +0100
++++ totem-2.29.92/gtk-doc.make	2010-03-16 09:08:36.007703286 +0100
 @@ -5,13 +5,13 @@
  ####################################
  
@@ -18831,9 +3277,9 @@
 +	$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
  
  .PHONY : dist-hook-local docs
-diff -Naur totem-2.29.91.old/help/Makefile.in totem-2.29.91/help/Makefile.in
---- totem-2.29.91.old/help/Makefile.in	2010-02-24 13:15:30.000000000 +0100
-+++ totem-2.29.91/help/Makefile.in	2010-02-25 19:13:51.800953995 +0100
+diff -Naur totem-2.29.92.old/help/Makefile.in totem-2.29.92/help/Makefile.in
+--- totem-2.29.92.old/help/Makefile.in	2010-03-15 18:51:32.000000000 +0100
++++ totem-2.29.92/help/Makefile.in	2010-03-16 09:08:42.960669521 +0100
 @@ -92,6 +92,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -18852,17 +3298,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -207,6 +211,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/lib/Makefile.in totem-2.29.91/lib/Makefile.in
---- totem-2.29.91.old/lib/Makefile.in	2010-02-24 13:15:30.000000000 +0100
-+++ totem-2.29.91/lib/Makefile.in	2010-02-25 19:13:51.884952313 +0100
+diff -Naur totem-2.29.92.old/lib/Makefile.in totem-2.29.92/lib/Makefile.in
+--- totem-2.29.92.old/lib/Makefile.in	2010-03-15 18:51:33.000000000 +0100
++++ totem-2.29.92/lib/Makefile.in	2010-03-16 09:08:43.060669374 +0100
 @@ -104,6 +104,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -18881,17 +3319,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -219,6 +223,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/ltmain.sh totem-2.29.91/ltmain.sh
---- totem-2.29.91.old/ltmain.sh	2010-02-24 13:15:24.000000000 +0100
-+++ totem-2.29.91/ltmain.sh	2010-02-25 19:13:45.564953059 +0100
+diff -Naur totem-2.29.92.old/ltmain.sh totem-2.29.92/ltmain.sh
+--- totem-2.29.92.old/ltmain.sh	2010-03-15 18:51:19.000000000 +0100
++++ totem-2.29.92/ltmain.sh	2010-03-16 09:08:35.391671999 +0100
 @@ -65,7 +65,7 @@
  #       compiler:		$LTCC
  #       compiler flags:		$LTCFLAGS
@@ -18970,9 +3400,9 @@
  	  esac
  	  ;;
  	no)
-diff -Naur totem-2.29.91.old/Makefile.in totem-2.29.91/Makefile.in
---- totem-2.29.91.old/Makefile.in	2010-02-24 13:15:35.000000000 +0100
-+++ totem-2.29.91/Makefile.in	2010-02-25 19:13:54.800951551 +0100
+diff -Naur totem-2.29.92.old/Makefile.in totem-2.29.92/Makefile.in
+--- totem-2.29.92.old/Makefile.in	2010-03-15 18:51:39.000000000 +0100
++++ totem-2.29.92/Makefile.in	2010-03-16 09:08:46.115669384 +0100
 @@ -124,6 +124,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -18991,17 +3421,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -239,6 +243,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/po/Makefile.in.in totem-2.29.91/po/Makefile.in.in
---- totem-2.29.91.old/po/Makefile.in.in	2010-02-24 13:15:24.000000000 +0100
-+++ totem-2.29.91/po/Makefile.in.in	2010-02-25 19:13:45.776953877 +0100
+diff -Naur totem-2.29.92.old/po/Makefile.in.in totem-2.29.92/po/Makefile.in.in
+--- totem-2.29.92.old/po/Makefile.in.in	2010-03-15 18:51:19.000000000 +0100
++++ totem-2.29.92/po/Makefile.in.in	2010-03-16 09:08:35.940773138 +0100
 @@ -129,7 +129,7 @@
  	done
  
@@ -19011,9 +3433,9 @@
  
  # Define this as empty until I found a useful application.
  install-exec installcheck:
-diff -Naur totem-2.29.91.old/src/backend/Makefile.in totem-2.29.91/src/backend/Makefile.in
---- totem-2.29.91.old/src/backend/Makefile.in	2010-02-24 13:15:31.000000000 +0100
-+++ totem-2.29.91/src/backend/Makefile.in	2010-02-25 19:13:52.268952164 +0100
+diff -Naur totem-2.29.92.old/src/backend/Makefile.in totem-2.29.92/src/backend/Makefile.in
+--- totem-2.29.92.old/src/backend/Makefile.in	2010-03-15 18:51:33.000000000 +0100
++++ totem-2.29.92/src/backend/Makefile.in	2010-03-16 09:08:43.452668784 +0100
 @@ -121,6 +121,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -19032,17 +3454,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -236,6 +240,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/src/Makefile.in totem-2.29.91/src/Makefile.in
---- totem-2.29.91.old/src/Makefile.in	2010-02-24 13:15:31.000000000 +0100
-+++ totem-2.29.91/src/Makefile.in	2010-02-25 19:13:52.156983196 +0100
+diff -Naur totem-2.29.92.old/src/Makefile.in totem-2.29.92/src/Makefile.in
+--- totem-2.29.92.old/src/Makefile.in	2010-03-15 18:51:33.000000000 +0100
++++ totem-2.29.92/src/Makefile.in	2010-03-16 09:08:43.324668932 +0100
 @@ -343,6 +343,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -19061,17 +3475,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -458,6 +462,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/src/plugins/bbc/Makefile.in totem-2.29.91/src/plugins/bbc/Makefile.in
---- totem-2.29.91.old/src/plugins/bbc/Makefile.in	1970-01-01 01:00:00.000000000 +0100
-+++ totem-2.29.91/src/plugins/bbc/Makefile.in	2010-02-25 19:13:52.444951839 +0100
+diff -Naur totem-2.29.92.old/src/plugins/bbc/Makefile.in totem-2.29.92/src/plugins/bbc/Makefile.in
+--- totem-2.29.92.old/src/plugins/bbc/Makefile.in	1970-01-01 01:00:00.000000000 +0100
++++ totem-2.29.92/src/plugins/bbc/Makefile.in	2010-03-16 09:08:43.704668756 +0100
 @@ -0,0 +1,596 @@
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
 +# @configure_input@
@@ -19669,9 +4075,9 @@
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -Naur totem-2.29.91.old/src/plugins/bemused/Makefile.in totem-2.29.91/src/plugins/bemused/Makefile.in
---- totem-2.29.91.old/src/plugins/bemused/Makefile.in	2010-02-24 13:15:31.000000000 +0100
-+++ totem-2.29.91/src/plugins/bemused/Makefile.in	2010-02-25 19:13:52.532952207 +0100
+diff -Naur totem-2.29.92.old/src/plugins/bemused/Makefile.in totem-2.29.92/src/plugins/bemused/Makefile.in
+--- totem-2.29.92.old/src/plugins/bemused/Makefile.in	2010-03-15 18:51:34.000000000 +0100
++++ totem-2.29.92/src/plugins/bemused/Makefile.in	2010-03-16 09:08:43.812668734 +0100
 @@ -125,6 +125,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -19690,17 +4096,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -240,6 +244,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/src/plugins/brasero-disc-recorder/Makefile.in totem-2.29.91/src/plugins/brasero-disc-recorder/Makefile.in
---- totem-2.29.91.old/src/plugins/brasero-disc-recorder/Makefile.in	2010-02-24 13:15:31.000000000 +0100
-+++ totem-2.29.91/src/plugins/brasero-disc-recorder/Makefile.in	2010-02-25 19:13:52.620951592 +0100
+diff -Naur totem-2.29.92.old/src/plugins/brasero-disc-recorder/Makefile.in totem-2.29.92/src/plugins/brasero-disc-recorder/Makefile.in
+--- totem-2.29.92.old/src/plugins/brasero-disc-recorder/Makefile.in	2010-03-15 18:51:34.000000000 +0100
++++ totem-2.29.92/src/plugins/brasero-disc-recorder/Makefile.in	2010-03-16 09:08:43.900669233 +0100
 @@ -128,6 +128,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -19719,17 +4117,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -243,6 +247,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/src/plugins/coherence_upnp/Makefile.in totem-2.29.91/src/plugins/coherence_upnp/Makefile.in
---- totem-2.29.91.old/src/plugins/coherence_upnp/Makefile.in	2010-02-24 13:15:31.000000000 +0100
-+++ totem-2.29.91/src/plugins/coherence_upnp/Makefile.in	2010-02-25 19:13:52.692954594 +0100
+diff -Naur totem-2.29.92.old/src/plugins/coherence_upnp/Makefile.in totem-2.29.92/src/plugins/coherence_upnp/Makefile.in
+--- totem-2.29.92.old/src/plugins/coherence_upnp/Makefile.in	2010-03-15 18:51:34.000000000 +0100
++++ totem-2.29.92/src/plugins/coherence_upnp/Makefile.in	2010-03-16 09:08:43.972668809 +0100
 @@ -93,6 +93,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -19748,17 +4138,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -208,6 +212,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/src/plugins/dbus-service/Makefile.in totem-2.29.91/src/plugins/dbus-service/Makefile.in
---- totem-2.29.91.old/src/plugins/dbus-service/Makefile.in	2010-02-24 13:15:31.000000000 +0100
-+++ totem-2.29.91/src/plugins/dbus-service/Makefile.in	2010-02-25 19:13:52.768952025 +0100
+diff -Naur totem-2.29.92.old/src/plugins/dbus-service/Makefile.in totem-2.29.92/src/plugins/dbus-service/Makefile.in
+--- totem-2.29.92.old/src/plugins/dbus-service/Makefile.in	2010-03-15 18:51:34.000000000 +0100
++++ totem-2.29.92/src/plugins/dbus-service/Makefile.in	2010-03-16 09:08:44.040668717 +0100
 @@ -93,6 +93,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -19777,17 +4159,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -208,6 +212,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/src/plugins/galago/Makefile.in totem-2.29.91/src/plugins/galago/Makefile.in
---- totem-2.29.91.old/src/plugins/galago/Makefile.in	2010-02-24 13:15:32.000000000 +0100
-+++ totem-2.29.91/src/plugins/galago/Makefile.in	2010-02-25 19:13:52.856952175 +0100
+diff -Naur totem-2.29.92.old/src/plugins/galago/Makefile.in totem-2.29.92/src/plugins/galago/Makefile.in
+--- totem-2.29.92.old/src/plugins/galago/Makefile.in	2010-03-15 18:51:35.000000000 +0100
++++ totem-2.29.92/src/plugins/galago/Makefile.in	2010-03-16 09:08:44.128668802 +0100
 @@ -125,6 +125,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -19806,17 +4180,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -240,6 +244,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/src/plugins/gromit/Makefile.in totem-2.29.91/src/plugins/gromit/Makefile.in
---- totem-2.29.91.old/src/plugins/gromit/Makefile.in	2010-02-24 13:15:32.000000000 +0100
-+++ totem-2.29.91/src/plugins/gromit/Makefile.in	2010-02-25 19:13:52.944951700 +0100
+diff -Naur totem-2.29.92.old/src/plugins/gromit/Makefile.in totem-2.29.92/src/plugins/gromit/Makefile.in
+--- totem-2.29.92.old/src/plugins/gromit/Makefile.in	2010-03-15 18:51:35.000000000 +0100
++++ totem-2.29.92/src/plugins/gromit/Makefile.in	2010-03-16 09:08:44.223696874 +0100
 @@ -124,6 +124,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -19835,17 +4201,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -239,6 +243,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/src/plugins/iplayer/Makefile.in totem-2.29.91/src/plugins/iplayer/Makefile.in
---- totem-2.29.91.old/src/plugins/iplayer/Makefile.in	2010-02-24 13:15:32.000000000 +0100
-+++ totem-2.29.91/src/plugins/iplayer/Makefile.in	2010-02-25 19:13:53.020953055 +0100
+diff -Naur totem-2.29.92.old/src/plugins/iplayer/Makefile.in totem-2.29.92/src/plugins/iplayer/Makefile.in
+--- totem-2.29.92.old/src/plugins/iplayer/Makefile.in	2010-03-15 18:51:35.000000000 +0100
++++ totem-2.29.92/src/plugins/iplayer/Makefile.in	2010-03-16 09:08:44.311668606 +0100
 @@ -94,6 +94,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -19864,17 +4222,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -209,6 +213,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/src/plugins/jamendo/Makefile.in totem-2.29.91/src/plugins/jamendo/Makefile.in
---- totem-2.29.91.old/src/plugins/jamendo/Makefile.in	2010-02-24 13:15:32.000000000 +0100
-+++ totem-2.29.91/src/plugins/jamendo/Makefile.in	2010-02-25 19:13:53.096952871 +0100
+diff -Naur totem-2.29.92.old/src/plugins/jamendo/Makefile.in totem-2.29.92/src/plugins/jamendo/Makefile.in
+--- totem-2.29.92.old/src/plugins/jamendo/Makefile.in	2010-03-15 18:51:35.000000000 +0100
++++ totem-2.29.92/src/plugins/jamendo/Makefile.in	2010-03-16 09:08:44.383668749 +0100
 @@ -94,6 +94,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -19893,17 +4243,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -209,6 +213,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/src/plugins/lirc/Makefile.in totem-2.29.91/src/plugins/lirc/Makefile.in
---- totem-2.29.91.old/src/plugins/lirc/Makefile.in	2010-02-24 13:15:32.000000000 +0100
-+++ totem-2.29.91/src/plugins/lirc/Makefile.in	2010-02-25 19:13:53.192954944 +0100
+diff -Naur totem-2.29.92.old/src/plugins/lirc/Makefile.in totem-2.29.92/src/plugins/lirc/Makefile.in
+--- totem-2.29.92.old/src/plugins/lirc/Makefile.in	2010-03-15 18:51:35.000000000 +0100
++++ totem-2.29.92/src/plugins/lirc/Makefile.in	2010-03-16 09:08:44.475668771 +0100
 @@ -126,6 +126,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -19922,17 +4264,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -241,6 +245,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/src/plugins/Makefile.in totem-2.29.91/src/plugins/Makefile.in
---- totem-2.29.91.old/src/plugins/Makefile.in	2010-02-24 13:15:31.000000000 +0100
-+++ totem-2.29.91/src/plugins/Makefile.in	2010-02-25 19:13:52.372951625 +0100
+diff -Naur totem-2.29.92.old/src/plugins/Makefile.in totem-2.29.92/src/plugins/Makefile.in
+--- totem-2.29.92.old/src/plugins/Makefile.in	2010-03-15 18:51:34.000000000 +0100
++++ totem-2.29.92/src/plugins/Makefile.in	2010-03-16 09:08:43.560668817 +0100
 @@ -167,6 +167,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -19951,17 +4285,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -282,6 +286,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/src/plugins/media-player-keys/Makefile.in totem-2.29.91/src/plugins/media-player-keys/Makefile.in
---- totem-2.29.91.old/src/plugins/media-player-keys/Makefile.in	2010-02-24 13:15:32.000000000 +0100
-+++ totem-2.29.91/src/plugins/media-player-keys/Makefile.in	2010-02-25 19:13:53.292952001 +0100
+diff -Naur totem-2.29.92.old/src/plugins/media-player-keys/Makefile.in totem-2.29.92/src/plugins/media-player-keys/Makefile.in
+--- totem-2.29.92.old/src/plugins/media-player-keys/Makefile.in	2010-03-15 18:51:35.000000000 +0100
++++ totem-2.29.92/src/plugins/media-player-keys/Makefile.in	2010-03-16 09:08:44.567669567 +0100
 @@ -130,6 +130,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -19980,17 +4306,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -245,6 +249,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/src/plugins/mythtv/Makefile.in totem-2.29.91/src/plugins/mythtv/Makefile.in
---- totem-2.29.91.old/src/plugins/mythtv/Makefile.in	2010-02-24 13:15:33.000000000 +0100
-+++ totem-2.29.91/src/plugins/mythtv/Makefile.in	2010-02-25 19:13:53.384952173 +0100
+diff -Naur totem-2.29.92.old/src/plugins/mythtv/Makefile.in totem-2.29.92/src/plugins/mythtv/Makefile.in
+--- totem-2.29.92.old/src/plugins/mythtv/Makefile.in	2010-03-15 18:51:36.000000000 +0100
++++ totem-2.29.92/src/plugins/mythtv/Makefile.in	2010-03-16 09:08:44.659668624 +0100
 @@ -126,6 +126,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -20009,17 +4327,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -241,6 +245,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/src/plugins/ontop/Makefile.in totem-2.29.91/src/plugins/ontop/Makefile.in
---- totem-2.29.91.old/src/plugins/ontop/Makefile.in	2010-02-24 13:15:33.000000000 +0100
-+++ totem-2.29.91/src/plugins/ontop/Makefile.in	2010-02-25 19:13:53.472952675 +0100
+diff -Naur totem-2.29.92.old/src/plugins/ontop/Makefile.in totem-2.29.92/src/plugins/ontop/Makefile.in
+--- totem-2.29.92.old/src/plugins/ontop/Makefile.in	2010-03-15 18:51:36.000000000 +0100
++++ totem-2.29.92/src/plugins/ontop/Makefile.in	2010-03-16 09:08:44.747668639 +0100
 @@ -124,6 +124,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -20038,17 +4348,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -239,6 +243,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/src/plugins/opensubtitles/Makefile.in totem-2.29.91/src/plugins/opensubtitles/Makefile.in
---- totem-2.29.91.old/src/plugins/opensubtitles/Makefile.in	2010-02-24 13:15:33.000000000 +0100
-+++ totem-2.29.91/src/plugins/opensubtitles/Makefile.in	2010-02-25 19:13:53.548952286 +0100
+diff -Naur totem-2.29.92.old/src/plugins/opensubtitles/Makefile.in totem-2.29.92/src/plugins/opensubtitles/Makefile.in
+--- totem-2.29.92.old/src/plugins/opensubtitles/Makefile.in	2010-03-15 18:51:36.000000000 +0100
++++ totem-2.29.92/src/plugins/opensubtitles/Makefile.in	2010-03-16 09:08:44.819668716 +0100
 @@ -94,6 +94,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -20067,17 +4369,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -209,6 +213,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/src/plugins/properties/Makefile.in totem-2.29.91/src/plugins/properties/Makefile.in
---- totem-2.29.91.old/src/plugins/properties/Makefile.in	2010-02-24 13:15:33.000000000 +0100
-+++ totem-2.29.91/src/plugins/properties/Makefile.in	2010-02-25 19:13:53.648952776 +0100
+diff -Naur totem-2.29.92.old/src/plugins/properties/Makefile.in totem-2.29.92/src/plugins/properties/Makefile.in
+--- totem-2.29.92.old/src/plugins/properties/Makefile.in	2010-03-15 18:51:36.000000000 +0100
++++ totem-2.29.92/src/plugins/properties/Makefile.in	2010-03-16 09:08:44.919669202 +0100
 @@ -137,6 +137,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -20096,17 +4390,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -252,6 +256,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/src/plugins/publish/Makefile.in totem-2.29.91/src/plugins/publish/Makefile.in
---- totem-2.29.91.old/src/plugins/publish/Makefile.in	2010-02-24 13:15:33.000000000 +0100
-+++ totem-2.29.91/src/plugins/publish/Makefile.in	2010-02-25 19:13:53.744952609 +0100
+diff -Naur totem-2.29.92.old/src/plugins/publish/Makefile.in totem-2.29.92/src/plugins/publish/Makefile.in
+--- totem-2.29.92.old/src/plugins/publish/Makefile.in	2010-03-15 18:51:36.000000000 +0100
++++ totem-2.29.92/src/plugins/publish/Makefile.in	2010-03-16 09:08:45.007668716 +0100
 @@ -126,6 +126,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -20125,17 +4411,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -241,6 +245,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/src/plugins/pythonconsole/Makefile.in totem-2.29.91/src/plugins/pythonconsole/Makefile.in
---- totem-2.29.91.old/src/plugins/pythonconsole/Makefile.in	2010-02-24 13:15:33.000000000 +0100
-+++ totem-2.29.91/src/plugins/pythonconsole/Makefile.in	2010-02-25 19:13:53.816951977 +0100
+diff -Naur totem-2.29.92.old/src/plugins/pythonconsole/Makefile.in totem-2.29.92/src/plugins/pythonconsole/Makefile.in
+--- totem-2.29.92.old/src/plugins/pythonconsole/Makefile.in	2010-03-15 18:51:37.000000000 +0100
++++ totem-2.29.92/src/plugins/pythonconsole/Makefile.in	2010-03-16 09:08:45.083669087 +0100
 @@ -93,6 +93,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -20154,17 +4432,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -208,6 +212,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/src/plugins/sample-python/Makefile.in totem-2.29.91/src/plugins/sample-python/Makefile.in
---- totem-2.29.91.old/src/plugins/sample-python/Makefile.in	2010-02-24 13:15:33.000000000 +0100
-+++ totem-2.29.91/src/plugins/sample-python/Makefile.in	2010-02-25 19:13:53.880952014 +0100
+diff -Naur totem-2.29.92.old/src/plugins/sample-python/Makefile.in totem-2.29.92/src/plugins/sample-python/Makefile.in
+--- totem-2.29.92.old/src/plugins/sample-python/Makefile.in	2010-03-15 18:51:37.000000000 +0100
++++ totem-2.29.92/src/plugins/sample-python/Makefile.in	2010-03-16 09:08:45.143668754 +0100
 @@ -67,6 +67,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -20183,17 +4453,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -182,6 +186,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/src/plugins/sample-vala/Makefile.in totem-2.29.91/src/plugins/sample-vala/Makefile.in
---- totem-2.29.91.old/src/plugins/sample-vala/Makefile.in	2010-02-24 13:15:34.000000000 +0100
-+++ totem-2.29.91/src/plugins/sample-vala/Makefile.in	2010-02-25 19:13:53.972951837 +0100
+diff -Naur totem-2.29.92.old/src/plugins/sample-vala/Makefile.in totem-2.29.92/src/plugins/sample-vala/Makefile.in
+--- totem-2.29.92.old/src/plugins/sample-vala/Makefile.in	2010-03-15 18:51:37.000000000 +0100
++++ totem-2.29.92/src/plugins/sample-vala/Makefile.in	2010-03-16 09:08:45.235668649 +0100
 @@ -129,6 +129,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -20212,17 +4474,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -244,6 +248,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/src/plugins/screensaver/Makefile.in totem-2.29.91/src/plugins/screensaver/Makefile.in
---- totem-2.29.91.old/src/plugins/screensaver/Makefile.in	2010-02-24 13:15:34.000000000 +0100
-+++ totem-2.29.91/src/plugins/screensaver/Makefile.in	2010-02-25 19:13:54.064952784 +0100
+diff -Naur totem-2.29.92.old/src/plugins/screensaver/Makefile.in totem-2.29.92/src/plugins/screensaver/Makefile.in
+--- totem-2.29.92.old/src/plugins/screensaver/Makefile.in	2010-03-15 18:51:37.000000000 +0100
++++ totem-2.29.92/src/plugins/screensaver/Makefile.in	2010-03-16 09:08:45.351669152 +0100
 @@ -126,6 +126,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -20241,17 +4495,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -241,6 +245,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/src/plugins/screenshot/Makefile.in totem-2.29.91/src/plugins/screenshot/Makefile.in
---- totem-2.29.91.old/src/plugins/screenshot/Makefile.in	2010-02-24 13:15:34.000000000 +0100
-+++ totem-2.29.91/src/plugins/screenshot/Makefile.in	2010-02-25 19:13:54.168953920 +0100
+diff -Naur totem-2.29.92.old/src/plugins/screenshot/Makefile.in totem-2.29.92/src/plugins/screenshot/Makefile.in
+--- totem-2.29.92.old/src/plugins/screenshot/Makefile.in	2010-03-15 18:51:37.000000000 +0100
++++ totem-2.29.92/src/plugins/screenshot/Makefile.in	2010-03-16 09:08:45.455668677 +0100
 @@ -131,6 +131,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -20270,17 +4516,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -246,6 +250,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/src/plugins/sidebar-test/Makefile.in totem-2.29.91/src/plugins/sidebar-test/Makefile.in
---- totem-2.29.91.old/src/plugins/sidebar-test/Makefile.in	2010-02-24 13:15:34.000000000 +0100
-+++ totem-2.29.91/src/plugins/sidebar-test/Makefile.in	2010-02-25 19:13:54.256951897 +0100
+diff -Naur totem-2.29.92.old/src/plugins/sidebar-test/Makefile.in totem-2.29.92/src/plugins/sidebar-test/Makefile.in
+--- totem-2.29.92.old/src/plugins/sidebar-test/Makefile.in	2010-03-15 18:51:38.000000000 +0100
++++ totem-2.29.92/src/plugins/sidebar-test/Makefile.in	2010-03-16 09:08:45.543668401 +0100
 @@ -126,6 +126,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -20299,17 +4537,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -241,6 +245,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/src/plugins/skipto/Makefile.in totem-2.29.91/src/plugins/skipto/Makefile.in
---- totem-2.29.91.old/src/plugins/skipto/Makefile.in	2010-02-24 13:15:34.000000000 +0100
-+++ totem-2.29.91/src/plugins/skipto/Makefile.in	2010-02-25 19:13:54.360952963 +0100
+diff -Naur totem-2.29.92.old/src/plugins/skipto/Makefile.in totem-2.29.92/src/plugins/skipto/Makefile.in
+--- totem-2.29.92.old/src/plugins/skipto/Makefile.in	2010-03-15 18:51:38.000000000 +0100
++++ totem-2.29.92/src/plugins/skipto/Makefile.in	2010-03-16 09:08:45.643669103 +0100
 @@ -126,6 +126,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -20328,17 +4558,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -241,6 +245,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/src/plugins/thumbnail/Makefile.in totem-2.29.91/src/plugins/thumbnail/Makefile.in
---- totem-2.29.91.old/src/plugins/thumbnail/Makefile.in	2010-02-24 13:15:34.000000000 +0100
-+++ totem-2.29.91/src/plugins/thumbnail/Makefile.in	2010-02-25 19:13:54.448952418 +0100
+diff -Naur totem-2.29.92.old/src/plugins/thumbnail/Makefile.in totem-2.29.92/src/plugins/thumbnail/Makefile.in
+--- totem-2.29.92.old/src/plugins/thumbnail/Makefile.in	2010-03-15 18:51:38.000000000 +0100
++++ totem-2.29.92/src/plugins/thumbnail/Makefile.in	2010-03-16 09:08:45.731669118 +0100
 @@ -125,6 +125,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -20357,17 +4579,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -240,6 +244,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/src/plugins/totem/Makefile.in totem-2.29.91/src/plugins/totem/Makefile.in
---- totem-2.29.91.old/src/plugins/totem/Makefile.in	2010-02-24 13:15:35.000000000 +0100
-+++ totem-2.29.91/src/plugins/totem/Makefile.in	2010-02-25 19:13:54.524953703 +0100
+diff -Naur totem-2.29.92.old/src/plugins/totem/Makefile.in totem-2.29.92/src/plugins/totem/Makefile.in
+--- totem-2.29.92.old/src/plugins/totem/Makefile.in	2010-03-15 18:51:38.000000000 +0100
++++ totem-2.29.92/src/plugins/totem/Makefile.in	2010-03-16 09:08:45.799669386 +0100
 @@ -91,6 +91,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -20386,17 +4600,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -206,6 +210,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/src/plugins/tracker/Makefile.in totem-2.29.91/src/plugins/tracker/Makefile.in
---- totem-2.29.91.old/src/plugins/tracker/Makefile.in	2010-02-24 13:15:35.000000000 +0100
-+++ totem-2.29.91/src/plugins/tracker/Makefile.in	2010-02-25 19:13:54.628953517 +0100
+diff -Naur totem-2.29.92.old/src/plugins/tracker/Makefile.in totem-2.29.92/src/plugins/tracker/Makefile.in
+--- totem-2.29.92.old/src/plugins/tracker/Makefile.in	2010-03-15 18:51:38.000000000 +0100
++++ totem-2.29.92/src/plugins/tracker/Makefile.in	2010-03-16 09:08:45.895668877 +0100
 @@ -126,6 +126,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -20415,17 +4621,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -241,6 +245,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.29.91.old/src/plugins/youtube/Makefile.in totem-2.29.91/src/plugins/youtube/Makefile.in
---- totem-2.29.91.old/src/plugins/youtube/Makefile.in	2010-02-24 13:15:35.000000000 +0100
-+++ totem-2.29.91/src/plugins/youtube/Makefile.in	2010-02-25 19:13:54.724952374 +0100
+diff -Naur totem-2.29.92.old/src/plugins/youtube/Makefile.in totem-2.29.92/src/plugins/youtube/Makefile.in
+--- totem-2.29.92.old/src/plugins/youtube/Makefile.in	2010-03-15 18:51:39.000000000 +0100
++++ totem-2.29.92/src/plugins/youtube/Makefile.in	2010-03-16 09:08:45.983668740 +0100
 @@ -126,6 +126,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -20444,11 +4642,3 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -241,6 +245,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@

Modified: desktop/experimental/totem/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/patches/series?rev=23293&op=diff
==============================================================================
--- desktop/experimental/totem/debian/patches/series [utf-8] (original)
+++ desktop/experimental/totem/debian/patches/series [utf-8] Tue Mar 16 08:09:45 2010
@@ -1,4 +1,3 @@
 01_fake_keypresses.patch
 70_bbc_plugin.patch
 90_autotools.patch
-99_gst-bus_flush.patch




More information about the pkg-gnome-commits mailing list