r22493 - in /desktop/unstable/epiphany-browser/debian: changelog control control.in patches/14_inspect_element.patch patches/99_autoreconf.patch patches/series

slomo at users.alioth.debian.org slomo at users.alioth.debian.org
Thu Dec 3 14:57:05 UTC 2009


Author: slomo
Date: Thu Dec  3 14:57:04 2009
New Revision: 22493

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22493
Log:
* New upstream release:
  + debian/patches/14_inspect_element.patch:
    - Dropped, merged upstream.
  + debian/patches/99_autoreconf.patch:
    - Regenerated for the new version.
  + debian/control.in:
    - Build depend on WebKit >= 1.1.17.

Removed:
    desktop/unstable/epiphany-browser/debian/patches/14_inspect_element.patch
Modified:
    desktop/unstable/epiphany-browser/debian/changelog
    desktop/unstable/epiphany-browser/debian/control
    desktop/unstable/epiphany-browser/debian/control.in
    desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch
    desktop/unstable/epiphany-browser/debian/patches/series

Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=22493&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/changelog [utf-8] Thu Dec  3 14:57:04 2009
@@ -1,3 +1,15 @@
+epiphany-browser (2.29.3-1) unstable; urgency=low
+
+  * New upstream release:
+    + debian/patches/14_inspect_element.patch:
+      - Dropped, merged upstream.
+    + debian/patches/99_autoreconf.patch:
+      - Regenerated for the new version.
+    + debian/control.in:
+      - Build depend on WebKit >= 1.1.17.
+
+ -- Sebastian Dröge <slomo at debian.org>  Thu, 03 Dec 2009 15:56:02 +0100
+
 epiphany-browser (2.29.1-2) unstable; urgency=low
 
   [ Gustavo Noronha Silva ]

Modified: desktop/unstable/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control?rev=22493&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/control [utf-8] Thu Dec  3 14:57:04 2009
@@ -1,3 +1,8 @@
+# This file is autogenerated. DO NOT EDIT!
+# 
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
 Source: epiphany-browser
 Section: gnome
 Priority: optional
@@ -23,7 +28,7 @@
                scrollkeeper,
                gnome-pkg-tools (>= 0.10),
                libxml-parser-perl,
-               libwebkit-dev (>= 1.1.16),
+               libwebkit-dev (>= 1.1.17),
                gobject-introspection (>= 0.6.3),
                libgirepository1.0-dev (>= 0.6.3),
                gir-repository-dev,

Modified: desktop/unstable/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control.in?rev=22493&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control.in [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/control.in [utf-8] Thu Dec  3 14:57:04 2009
@@ -23,7 +23,7 @@
                scrollkeeper,
                gnome-pkg-tools (>= 0.10),
                libxml-parser-perl,
-               libwebkit-dev (>= 1.1.16),
+               libwebkit-dev (>= 1.1.17),
                gobject-introspection (>= 0.6.3),
                libgirepository1.0-dev (>= 0.6.3),
                gir-repository-dev,

Modified: desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch?rev=22493&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch [utf-8] Thu Dec  3 14:57:04 2009
@@ -1,15 +1,14 @@
-Index: epiphany-browser-2.29.1/aclocal.m4
-===================================================================
---- epiphany-browser-2.29.1.orig/aclocal.m4	2009-10-26 17:15:25.000000000 -0200
-+++ epiphany-browser-2.29.1/aclocal.m4	2009-10-30 10:55:28.156331533 -0200
+diff -Naur epiphany-browser-2.29.3.old/aclocal.m4 epiphany-browser-2.29.3/aclocal.m4
+--- epiphany-browser-2.29.3.old/aclocal.m4	2009-11-30 19:28:21.000000000 +0100
++++ epiphany-browser-2.29.3/aclocal.m4	2009-12-03 15:54:33.639120045 +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.64],,
-+[m4_warning([this file was generated for autoconf 2.64.
++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'.])])
@@ -82,10 +81,141 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-Index: epiphany-browser-2.29.1/config.h.in
-===================================================================
---- epiphany-browser-2.29.1.orig/config.h.in	2009-10-26 17:15:52.000000000 -0200
-+++ epiphany-browser-2.29.1/config.h.in	2009-10-30 10:55:17.268299969 -0200
+diff -Naur epiphany-browser-2.29.3.old/config.guess epiphany-browser-2.29.3/config.guess
+--- epiphany-browser-2.29.3.old/config.guess	2009-11-18 13:38:47.000000000 +0100
++++ epiphany-browser-2.29.3/config.guess	2009-12-03 15:54:35.591096977 +0100
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+ #   Free Software Foundation, Inc.
+ 
+-timestamp='2009-04-27'
++timestamp='2009-06-10'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -170,7 +170,7 @@
+ 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ 		eval $set_cc_for_build
+ 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+-			| grep __ELF__ >/dev/null
++			| grep -q __ELF__
+ 		then
+ 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+ 		    # Return netbsd for either.  FIX?
+@@ -656,7 +656,7 @@
+ 	    # => hppa64-hp-hpux11.23
+ 
+ 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+-		grep __LP64__ >/dev/null
++		grep -q __LP64__
+ 	    then
+ 		HP_ARCH="hppa2.0w"
+ 	    else
+@@ -822,6 +822,9 @@
+     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ 	echo i${UNAME_MACHINE}-pc-mks
+ 	exit ;;
++    8664:Windows_NT:*)
++	echo x86_64-pc-mks
++	exit ;;
+     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+ 	# How do we know it's Interix rather than the generic POSIX subsystem?
+ 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+@@ -882,40 +885,17 @@
+     m68*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+-    mips:Linux:*:*)
++    mips:Linux:*:* | mips64:Linux:*:*)
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+ 	#undef CPU
+-	#undef mips
+-	#undef mipsel
++	#undef ${UNAME_MACHINE}
++	#undef ${UNAME_MACHINE}el
+ 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+-	CPU=mipsel
++	CPU=${UNAME_MACHINE}el
+ 	#else
+ 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+-	CPU=mips
+-	#else
+-	CPU=
+-	#endif
+-	#endif
+-EOF
+-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+-	    /^CPU/{
+-		s: ::g
+-		p
+-	    }'`"
+-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+-	;;
+-    mips64:Linux:*:*)
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#undef CPU
+-	#undef mips64
+-	#undef mips64el
+-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+-	CPU=mips64el
+-	#else
+-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+-	CPU=mips64
++	CPU=${UNAME_MACHINE}
+ 	#else
+ 	CPU=
+ 	#endif
+@@ -947,7 +927,7 @@
+ 	  EV67)  UNAME_MACHINE=alphaev67 ;;
+ 	  EV68*) UNAME_MACHINE=alphaev68 ;;
+         esac
+-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
++	objdump --private-headers /bin/sh | grep -q ld.so.1
+ 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ 	exit ;;
+@@ -1001,14 +981,6 @@
+ 	  elf32-i386)
+ 		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+ 		;;
+-	  a.out-i386-linux)
+-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+-		exit ;;
+-	  "")
+-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+-		# one that does not give us useful --help.
+-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+-		exit ;;
+ 	esac
+ 	# Determine whether the default compiler is a.out or elf
+ 	eval $set_cc_for_build
+@@ -1074,7 +1046,7 @@
+     i*86:syllable:*:*)
+ 	echo ${UNAME_MACHINE}-pc-syllable
+ 	exit ;;
+-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
++    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+ 	echo i386-unknown-lynxos${UNAME_RELEASE}
+ 	exit ;;
+     i*86:*DOS:*:*)
+@@ -1182,7 +1154,7 @@
+     rs6000:LynxOS:2.*:*)
+ 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ 	exit ;;
+-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
++    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+ 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+ 	exit ;;
+     SM[BE]S:UNIX_SV:*:*)
+diff -Naur epiphany-browser-2.29.3.old/config.h.in epiphany-browser-2.29.3/config.h.in
+--- epiphany-browser-2.29.3.old/config.h.in	2009-11-30 19:28:58.000000000 +0100
++++ epiphany-browser-2.29.3/config.h.in	2009-12-03 15:54:35.032120978 +0100
 @@ -169,6 +169,9 @@
  /* Define to the one symbol short name of this package. */
  #undef PACKAGE_TARNAME
@@ -96,22 +226,78 @@
  /* Define to the version of this package. */
  #undef PACKAGE_VERSION
  
-Index: epiphany-browser-2.29.1/configure
-===================================================================
---- epiphany-browser-2.29.1.orig/configure	2009-10-26 17:15:33.000000000 -0200
-+++ epiphany-browser-2.29.1/configure	2009-10-30 10:55:29.928299197 -0200
-@@ -1,20 +1,22 @@
+diff -Naur epiphany-browser-2.29.3.old/config.sub epiphany-browser-2.29.3/config.sub
+--- epiphany-browser-2.29.3.old/config.sub	2009-11-18 13:38:47.000000000 +0100
++++ epiphany-browser-2.29.3/config.sub	2009-12-03 15:54:35.595096368 +0100
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+ #   Free Software Foundation, Inc.
+ 
+-timestamp='2009-04-17'
++timestamp='2009-06-11'
+ 
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -153,6 +153,9 @@
+ 		os=
+ 		basic_machine=$1
+ 		;;
++        -bluegene*)
++	        os=-cnk
++		;;
+ 	-sim | -cisco | -oki | -wec | -winbond)
+ 		os=
+ 		basic_machine=$1
+@@ -467,6 +470,10 @@
+ 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		os=-linux
+ 		;;
++	bluegene*)
++		basic_machine=powerpc-ibm
++		os=-cnk
++		;;
+ 	c90)
+ 		basic_machine=c90-cray
+ 		os=-unicos
+@@ -1260,7 +1267,7 @@
+ 	# Each alternative MUST END IN A *, to match a version number.
+ 	# -sysv* is not here because it comes later, after sysvr4.
+ 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
++	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+ 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+ 	      | -kopensolaris* \
+ 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+@@ -1613,7 +1620,7 @@
+ 			-sunos*)
+ 				vendor=sun
+ 				;;
+-			-aix*)
++			-cnk*|-aix*)
+ 				vendor=ibm
+ 				;;
+ 			-beos*)
+diff -Naur epiphany-browser-2.29.3.old/configure epiphany-browser-2.29.3/configure
+--- epiphany-browser-2.29.3.old/configure	2009-11-30 19:28:32.000000000 +0100
++++ epiphany-browser-2.29.3/configure	2009-12-03 15:54:34.663093550 +0100
+@@ -1,20 +1,24 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.63 for GNOME Web Browser 2.29.1.
-+# Generated by GNU Autoconf 2.64 for GNOME Web Browser 2.29.1.
+-# Generated by GNU Autoconf 2.63 for GNOME Web Browser 2.29.3.
++# Generated by GNU Autoconf 2.65 for GNOME Web Browser 2.29.3.
  #
  # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany>.
  #
++#
  # 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.
++# 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.
@@ -129,7 +315,7 @@
    emulate sh
    NULLCMD=:
    # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -22,23 +24,15 @@
+@@ -22,23 +26,15 @@
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
  else
@@ -158,7 +344,7 @@
  as_nl='
  '
  export as_nl
-@@ -46,7 +40,13 @@
+@@ -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
@@ -173,7 +359,7 @@
    as_echo='printf %s\n'
    as_echo_n='printf %s'
  else
-@@ -57,7 +57,7 @@
+@@ -57,7 +59,7 @@
      as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
      as_echo_n_body='eval
        arg=$1;
@@ -182,7 +368,7 @@
        *"$as_nl"*)
  	expr "X$arg" : "X\\(.*\\)$as_nl";
  	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -80,13 +80,6 @@
+@@ -80,13 +82,6 @@
    }
  fi
  
@@ -196,7 +382,7 @@
  
  # IFS
  # We need space, tab and new line, in precisely that order.  Quoting is
-@@ -96,15 +89,15 @@
+@@ -96,15 +91,15 @@
  IFS=" ""	$as_nl"
  
  # Find who we are.  Look in the path if we contain no directory separator.
@@ -215,7 +401,7 @@
  IFS=$as_save_IFS
  
       ;;
-@@ -116,12 +109,16 @@
+@@ -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
@@ -236,7 +422,7 @@
  done
  PS1='$ '
  PS2='> '
-@@ -133,330 +130,301 @@
+@@ -133,330 +132,301 @@
  LANGUAGE=C
  export LANGUAGE
  
@@ -608,7 +794,7 @@
 +# Create "$as_dir" as a directory, including parents if necessary.
 +as_fn_mkdir_p ()
 +{
- 
++
 +  case $as_dir in #(
 +  -*) as_dir=./$as_dir;;
 +  esac
@@ -648,6 +834,7 @@
 +    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)
 -}
@@ -663,10 +850,6 @@
 -as_func_ret_failure () {
 -  return 1
 -}
- 
--exitcode=0
--if as_func_success; then
--  :
 +} # as_fn_mkdir_p
 +# as_fn_append VAR VALUE
 +# ----------------------
@@ -679,20 +862,16 @@
 +  {
 +    eval $1+=\$2
 +  }'
- else
--  exitcode=1
--  echo as_func_success failed.
--fi
++else
 +  as_fn_append ()
 +  {
 +    eval $1=\$$1\$2
 +  }
 +fi # as_fn_append
  
--if as_func_failure; then
--  exitcode=1
--  echo as_func_failure succeeded.
--fi
+-exitcode=0
+-if as_func_success; then
+-  :
 +# as_fn_arith ARG...
 +# ------------------
 +# Perform arithmetic evaluation on the ARGs, and store the result in the
@@ -703,16 +882,23 @@
 +  {
 +    as_val=$(( $* ))
 +  }'
-+else
+ 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
@@ -814,7 +1000,7 @@
    sed -n '
      p
      /[$]LINENO/=
-@@ -473,8 +441,7 @@
+@@ -473,8 +443,7 @@
        s/-\n.*//
      ' >$as_me.lineno &&
    chmod +x "$as_me.lineno" ||
@@ -824,7 +1010,7 @@
  
    # 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 +451,18 @@
+@@ -484,29 +453,18 @@
    exit
  }
  
@@ -859,7 +1045,7 @@
  
  rm -f conf$$ conf$$.exe conf$$.file
  if test -d conf$$.dir; then
-@@ -536,7 +492,7 @@
+@@ -536,7 +494,7 @@
  rmdir conf$$.dir 2>/dev/null
  
  if mkdir -p . 2>/dev/null; then
@@ -868,7 +1054,7 @@
  else
    test -d ./-p && rmdir ./-p
    as_mkdir_p=false
-@@ -555,10 +511,10 @@
+@@ -555,10 +513,10 @@
        if test -d "$1"; then
  	test -d "$1/.";
        else
@@ -881,7 +1067,7 @@
  	???[sx]*):;;*)false;;esac;fi
      '\'' sh
    '
-@@ -573,7 +529,6 @@
+@@ -573,7 +531,6 @@
  
  
  
@@ -889,7 +1075,17 @@
  # Check that we are running under the correct shell.
  SHELL=${CONFIG_SHELL-/bin/sh}
  
-@@ -740,14 +695,14 @@
+@@ -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,14 +698,14 @@
  subdirs=
  MFLAGS=
  MAKEFLAGS=
@@ -899,14 +1095,14 @@
  PACKAGE_NAME='GNOME Web Browser'
 -PACKAGE_TARNAME='epiphany'
 +PACKAGE_TARNAME='epiphany-browser'
- PACKAGE_VERSION='2.29.1'
- PACKAGE_STRING='GNOME Web Browser 2.29.1'
+ PACKAGE_VERSION='2.29.3'
+ PACKAGE_STRING='GNOME Web Browser 2.29.3'
  PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany'
 +PACKAGE_URL=''
  
  ac_unique_file="configure.ac"
  # Factoring default headers for most tests.
-@@ -794,20 +749,12 @@
+@@ -794,20 +752,12 @@
  SVN_BRANCH
  SVN_MODULE
  SVN_ROOT
@@ -928,7 +1124,7 @@
  HAVE_GNOME_DOC_UTILS_FALSE
  HAVE_GNOME_DOC_UTILS_TRUE
  DISTCHECK_CONFIGURE_FLAGS
-@@ -1019,6 +966,7 @@
+@@ -1019,6 +969,7 @@
  program_transform_name
  prefix
  exec_prefix
@@ -936,7 +1132,7 @@
  PACKAGE_BUGREPORT
  PACKAGE_STRING
  PACKAGE_VERSION
-@@ -1058,8 +1006,6 @@
+@@ -1058,8 +1009,6 @@
  enable_scrollkeeper
  with_html_dir
  enable_gtk_doc
@@ -945,7 +1141,7 @@
  '
        ac_precious_vars='build_alias
  host_alias
-@@ -1193,8 +1139,7 @@
+@@ -1193,8 +1142,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 &&
@@ -955,7 +1151,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1220,8 +1165,7 @@
+@@ -1220,8 +1168,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 &&
@@ -965,7 +1161,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1425,8 +1369,7 @@
+@@ -1425,8 +1372,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 &&
@@ -975,7 +1171,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1442,8 +1385,7 @@
+@@ -1442,8 +1388,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 &&
@@ -985,7 +1181,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1473,17 +1415,17 @@
+@@ -1473,17 +1418,17 @@
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries=$ac_optarg ;;
  
@@ -1009,7 +1205,7 @@
      eval $ac_envvar=\$ac_optarg
      export $ac_envvar ;;
  
-@@ -1500,15 +1442,13 @@
+@@ -1500,15 +1445,13 @@
  
  if test -n "$ac_prev"; then
    ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -1027,7 +1223,7 @@
      *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
    esac
  fi
-@@ -1531,8 +1471,7 @@
+@@ -1531,8 +1474,7 @@
      [\\/$]* | ?:[\\/]* )  continue;;
      NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    esac
@@ -1037,7 +1233,7 @@
  done
  
  # There might be people who depend on the old broken behavior: `$host'
-@@ -1562,11 +1501,9 @@
+@@ -1562,11 +1504,9 @@
  ac_pwd=`pwd` && test -n "$ac_pwd" &&
  ac_ls_di=`ls -di .` &&
  ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -1051,7 +1247,7 @@
  
  
  # Find the source files, if location was not specified.
-@@ -1605,13 +1542,11 @@
+@@ -1605,13 +1545,11 @@
  fi
  if test ! -r "$srcdir/$ac_unique_file"; then
    test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -1067,7 +1263,7 @@
  	pwd)`
  # When building in place, set srcdir=.
  if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1685,7 +1620,8 @@
+@@ -1685,7 +1623,8 @@
    --infodir=DIR           info documentation [DATAROOTDIR/info]
    --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
    --mandir=DIR            man documentation [DATAROOTDIR/man]
@@ -1077,7 +1273,7 @@
    --htmldir=DIR           html documentation [DOCDIR]
    --dvidir=DIR            dvi documentation [DOCDIR]
    --pdfdir=DIR            pdf documentation [DOCDIR]
-@@ -1732,7 +1668,8 @@
+@@ -1732,7 +1671,8 @@
                            Turn on compiler warnings
    --enable-iso-c          Try to warn if code is not ISO C
    --enable-tests          Wheter to build tests (default: yes)
@@ -1087,59 +1283,41 @@
    --enable-introspection  Enable GObject introspection (default: disabled)
    --enable-seed           Enable Seed support (default: disabled)
    --enable-nss            Enable NSS support (default: enabled)
-@@ -1743,8 +1680,6 @@
+@@ -1742,9 +1682,7 @@
+                           Whether to enable automatic network status with
                            NetworkManager (default: disabled)
    --disable-scrollkeeper  do not make updates to the scrollkeeper database
-   --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]
++  --enable-gtk-doc        use gtk-doc to build documentation [[default=no]]
  
  Optional Packages:
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-@@ -1844,40 +1779,451 @@
- esac
- ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
- 
--    cd "$ac_dir" || { ac_status=$?; continue; }
--    # Check for guested configure.
--    if test -f "$ac_srcdir/configure.gnu"; then
--      echo &&
--      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
--    elif test -f "$ac_srcdir/configure"; then
--      echo &&
--      $SHELL "$ac_srcdir/configure" --help=recursive
--    else
--      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
--    fi || ac_status=$?
--    cd "$ac_pwd" || { ac_status=$?; break; }
--  done
-+    cd "$ac_dir" || { ac_status=$?; continue; }
-+    # Check for guested configure.
-+    if test -f "$ac_srcdir/configure.gnu"; then
-+      echo &&
-+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-+    elif test -f "$ac_srcdir/configure"; then
-+      echo &&
-+      $SHELL "$ac_srcdir/configure" --help=recursive
-+    else
-+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-+    fi || ac_status=$?
-+    cd "$ac_pwd" || { ac_status=$?; break; }
-+  done
-+fi
-+
-+test -n "$ac_init_help" && exit $ac_status
-+if $ac_init_version; then
-+  cat <<\_ACEOF
-+GNOME Web Browser configure 2.29.1
-+generated by GNU Autoconf 2.64
-+
+@@ -1770,7 +1708,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
+@@ -1863,21 +1801,432 @@
+ if $ac_init_version; then
+   cat <<\_ACEOF
+ GNOME Web Browser configure 2.29.3
+-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
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+   exit
+ fi
 +
 +## ------------------------ ##
 +## Autoconf initialization. ##
@@ -1179,7 +1357,7 @@
 +	ac_retval=1
 +fi
 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  return $ac_retval
++  as_fn_set_status $ac_retval
 +
 +} # ac_fn_c_try_compile
 +
@@ -1225,7 +1403,7 @@
 +  # 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;}
-+  return $ac_retval
++  as_fn_set_status $ac_retval
 +
 +} # ac_fn_c_try_link
 +
@@ -1293,7 +1471,7 @@
 +    ac_retval=1
 +fi
 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  return $ac_retval
++  as_fn_set_status $ac_retval
 +
 +} # ac_fn_c_try_cpp
 +
@@ -1335,7 +1513,7 @@
 +fi
 +  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  return $ac_retval
++  as_fn_set_status $ac_retval
 +
 +} # ac_fn_c_try_run
 +
@@ -1452,16 +1630,11 @@
 +  ac_header_preproc=yes
 +else
 +  ac_header_preproc=no
- fi
++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; }
- 
--test -n "$ac_init_help" && exit $ac_status
--if $ac_init_version; then
--  cat <<\_ACEOF
--GNOME Web Browser configure 2.29.1
--generated by GNU Autoconf 2.63
++
 +# So?  What about this header?
 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
 +  yes:no: )
@@ -1501,11 +1674,7 @@
 +$as_echo "$ac_res" >&6; }
 +fi
 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- 
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
--This configure script is free software; the Free Software Foundation
--gives unlimited permission to copy, distribute and modify it.
++
 +} # ac_fn_c_check_header_mongrel
 +
 +# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
@@ -1532,8 +1701,7 @@
 +  ;
 +  return 0;
 +}
- _ACEOF
--  exit
++_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
@@ -1555,7 +1723,7 @@
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
++fi
 +eval ac_res=\$$3
 +	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 +$as_echo "$ac_res" >&6; }
@@ -1566,13 +1734,13 @@
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  
- It was created by GNOME Web Browser $as_me 2.29.1, which was
+ It was created by GNOME Web Browser $as_me 2.29.3, which was
 -generated by GNU Autoconf 2.63.  Invocation command line was
-+generated by GNU Autoconf 2.64.  Invocation command line was
++generated by GNU Autoconf 2.65.  Invocation command line was
  
    $ $0 $@
  
-@@ -1913,8 +2259,8 @@
+@@ -1913,8 +2262,8 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -1583,7 +1751,7 @@
  IFS=$as_save_IFS
  
  } >&5
-@@ -1951,9 +2297,9 @@
+@@ -1951,9 +2300,9 @@
        ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
      case $ac_pass in
@@ -1595,7 +1763,7 @@
        if test $ac_must_keep_next = true; then
  	ac_must_keep_next=false # Got value, back to normal.
        else
-@@ -1969,13 +2315,13 @@
+@@ -1969,13 +2318,13 @@
  	  -* ) ac_must_keep_next=true ;;
  	esac
        fi
@@ -1612,7 +1780,7 @@
  
  # When interrupted or exit'd, cleanup temporary files, and complete
  # config.log.  We remove comments because anyway the quotes in there
-@@ -2000,13 +2346,13 @@
+@@ -2000,13 +2349,13 @@
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
@@ -1628,7 +1796,7 @@
        esac ;;
      esac
    done
-@@ -2078,39 +2424,41 @@
+@@ -2078,39 +2427,41 @@
      exit $exit_status
  ' 0
  for ac_signal in 1 2 13 15; do
@@ -1675,25 +1843,33 @@
  
  # Let the site file select an alternate cache file if it wants to.
  # Prefer an explicitly selected file to automatically selected ones.
-@@ -2129,7 +2477,7 @@
+@@ -2128,8 +2479,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
+-  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"
-@@ -2140,7 +2488,7 @@
-   # Some versions of bash will fail to source /dev/null (special
-   # files actually), so we avoid doing that.
-   if test -f "$cache_file"; then
+@@ -2137,10 +2488,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";;
-@@ -2148,14 +2496,14 @@
+@@ -2148,14 +2499,14 @@
      esac
    fi
  else
@@ -1712,7 +1888,7 @@
  # Check that the precious variables saved in the cache have kept the same
  # value.
  ac_cache_corrupted=false
-@@ -2166,11 +2514,11 @@
+@@ -2166,11 +2517,11 @@
    eval ac_new_val=\$ac_env_${ac_var}_value
    case $ac_old_set,$ac_new_set in
      set,)
@@ -1726,7 +1902,7 @@
  $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
        ac_cache_corrupted=: ;;
      ,);;
-@@ -2180,17 +2528,17 @@
+@@ -2180,17 +2531,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
@@ -1748,7 +1924,7 @@
  $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
        fi;;
    esac
-@@ -2202,43 +2550,20 @@
+@@ -2202,43 +2553,20 @@
      esac
      case " $ac_configure_args " in
        *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
@@ -1799,7 +1975,7 @@
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -2292,24 +2617,16 @@
+@@ -2292,24 +2620,16 @@
  
  ac_aux_dir=
  for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -1832,7 +2008,7 @@
  fi
  
  # These three variables are undocumented and unsupported,
-@@ -2335,10 +2652,10 @@
+@@ -2335,10 +2655,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.
@@ -1845,7 +2021,7 @@
    $as_echo_n "(cached) " >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2346,11 +2663,11 @@
+@@ -2346,11 +2666,11 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -1861,7 +2037,7 @@
    /usr/ucb/* ) ;;
    *)
      # OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2387,7 +2704,7 @@
+@@ -2387,7 +2707,7 @@
      ;;
  esac
  
@@ -1870,7 +2046,7 @@
  IFS=$as_save_IFS
  
  rm -rf conftest.one conftest.two conftest.dir
-@@ -2403,7 +2720,7 @@
+@@ -2403,7 +2723,7 @@
      INSTALL=$ac_install_sh
    fi
  fi
@@ -1879,7 +2055,7 @@
  $as_echo "$INSTALL" >&6; }
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2414,7 +2731,7 @@
+@@ -2414,7 +2734,7 @@
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
@@ -1888,7 +2064,7 @@
  $as_echo_n "checking whether build environment is sane... " >&6; }
  # Just in case
  sleep 1
-@@ -2425,15 +2742,11 @@
+@@ -2425,15 +2745,11 @@
  '
  case `pwd` in
    *[\\\"\#\$\&\'\`$am_lf]*)
@@ -1906,7 +2082,7 @@
  esac
  
  # Do `set' in a subshell so we don't clobber the current shell's
-@@ -2455,11 +2768,8 @@
+@@ -2455,11 +2771,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".
@@ -1920,7 +2096,7 @@
     fi
  
     test "$2" = conftest.file
-@@ -2468,13 +2778,10 @@
+@@ -2468,13 +2781,10 @@
     # Ok.
     :
  else
@@ -1937,7 +2113,7 @@
  $as_echo "yes" >&6; }
  test "$program_prefix" != NONE &&
    program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2502,7 +2809,7 @@
+@@ -2502,7 +2812,7 @@
    am_missing_run="$MISSING --run "
  else
    am_missing_run=
@@ -1946,7 +2122,7 @@
  $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
  fi
  
-@@ -2523,9 +2830,9 @@
+@@ -2523,9 +2833,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
@@ -1958,7 +2134,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$STRIP"; then
-@@ -2536,24 +2843,24 @@
+@@ -2536,24 +2846,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -1988,7 +2164,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -2563,9 +2870,9 @@
+@@ -2563,9 +2873,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
@@ -2000,7 +2176,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_STRIP"; then
-@@ -2576,24 +2883,24 @@
+@@ -2576,24 +2886,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2030,7 +2206,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -2602,7 +2909,7 @@
+@@ -2602,7 +2912,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -2039,7 +2215,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -2615,10 +2922,10 @@
+@@ -2615,10 +2925,10 @@
  fi
  INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
  
@@ -2052,7 +2228,7 @@
    $as_echo_n "(cached) " >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2626,7 +2933,7 @@
+@@ -2626,7 +2936,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2061,7 +2237,7 @@
  	 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 #(
-@@ -2638,7 +2945,7 @@
+@@ -2638,11 +2948,12 @@
  	   esac
  	 done
         done
@@ -2070,7 +2246,16 @@
  IFS=$as_save_IFS
  
  fi
-@@ -2654,7 +2961,7 @@
+ 
++  test -d ./--version && rmdir ./--version
+   if test "${ac_cv_path_mkdir+set}" = set; then
+     MKDIR_P="$ac_cv_path_mkdir -p"
+   else
+@@ -2650,11 +2961,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
@@ -2079,7 +2264,7 @@
  $as_echo "$MKDIR_P" >&6; }
  
  mkdir_p="$MKDIR_P"
-@@ -2667,9 +2974,9 @@
+@@ -2667,9 +2977,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
@@ -2091,7 +2276,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$AWK"; then
-@@ -2680,24 +2987,24 @@
+@@ -2680,24 +2990,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2121,7 +2306,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -2705,11 +3012,11 @@
+@@ -2705,11 +3015,11 @@
    test -n "$AWK" && break
  done
  
@@ -2135,7 +2320,7 @@
    $as_echo_n "(cached) " >&6
  else
    cat >conftest.make <<\_ACEOF
-@@ -2727,11 +3034,11 @@
+@@ -2727,11 +3037,11 @@
  rm -f conftest.make
  fi
  if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -2149,7 +2334,7 @@
  $as_echo "no" >&6; }
    SET_MAKE="MAKE=${MAKE-make}"
  fi
-@@ -2751,9 +3058,7 @@
+@@ -2751,9 +3061,7 @@
    am__isrc=' -I$(srcdir)'
    # test to see if srcdir already configured
    if test -f $srcdir/config.status; then
@@ -2160,16 +2345,16 @@
    fi
  fi
  
-@@ -2768,7 +3073,7 @@
+@@ -2768,7 +3076,7 @@
  
  
  # Define the identity of the package.
 - PACKAGE='epiphany'
 + PACKAGE='epiphany-browser'
-  VERSION='2.29.1'
- 
- 
-@@ -2804,7 +3109,7 @@
+  VERSION='2.29.3'
+ 
+ 
+@@ -2804,7 +3112,7 @@
  AMTAR=${AMTAR-"${am_missing_run}tar"}
  
  
@@ -2178,7 +2363,7 @@
  $as_echo_n "checking how to create a ustar tar archive... " >&6; }
  # Loop over all known methods to create a tar archive until one works.
  _am_tools='gnutar plaintar pax cpio none'
-@@ -2877,13 +3182,13 @@
+@@ -2877,13 +3185,13 @@
  done
  rm -rf conftest.dir
  
@@ -2194,7 +2379,7 @@
  $as_echo "$am_cv_prog_tar_ustar" >&6; }
  
  
-@@ -2893,7 +3198,7 @@
+@@ -2893,7 +3201,7 @@
  
  # Use AM_SILENT_RULES if present
  # Check whether --enable-silent-rules was given.
@@ -2203,7 +2388,7 @@
    enableval=$enable_silent_rules;
  fi
  
-@@ -2909,16 +3214,16 @@
+@@ -2909,16 +3217,16 @@
    enable_maintainer_mode=yes
  fi
  
@@ -2223,7 +2408,7 @@
  $as_echo "$USE_MAINTAINER_MODE" >&6; }
     if test $USE_MAINTAINER_MODE = yes; then
    MAINTAINER_MODE_TRUE=
-@@ -2933,7 +3238,7 @@
+@@ -2933,7 +3241,7 @@
  
  
  # Check whether --enable-shared was given.
@@ -2232,7 +2417,7 @@
    enableval=$enable_shared; p=${PACKAGE-default}
      case $enableval in
      yes) enable_shared=yes ;;
-@@ -2964,7 +3269,7 @@
+@@ -2964,7 +3272,7 @@
  
  
  # Check whether --enable-static was given.
@@ -2241,7 +2426,7 @@
    enableval=$enable_static; p=${PACKAGE-default}
      case $enableval in
      yes) enable_static=yes ;;
-@@ -3002,7 +3307,7 @@
+@@ -3002,7 +3310,7 @@
  
  case `pwd` in
    *\ * | *\	*)
@@ -2250,7 +2435,7 @@
  $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
  esac
  
-@@ -3027,35 +3332,27 @@
+@@ -3027,35 +3335,27 @@
  
  # Make sure we can run config.sub.
  $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -2293,7 +2478,7 @@
  esac
  build=$ac_cv_build
  ac_save_IFS=$IFS; IFS='-'
-@@ -3071,28 +3368,24 @@
+@@ -3071,28 +3371,24 @@
  case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
  
  
@@ -2327,7 +2512,7 @@
  esac
  host=$ac_cv_host
  ac_save_IFS=$IFS; IFS='-'
-@@ -3120,7 +3413,7 @@
+@@ -3120,7 +3416,7 @@
  .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
@@ -2336,7 +2521,7 @@
  $as_echo_n "checking for style of include used by $am_make... " >&6; }
  am__include="#"
  am__quote=
-@@ -3148,12 +3441,12 @@
+@@ -3148,12 +3444,12 @@
  fi
  
  
@@ -2351,7 +2536,7 @@
    enableval=$enable_dependency_tracking;
  fi
  
-@@ -3178,9 +3471,9 @@
+@@ -3178,9 +3474,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
@@ -2363,7 +2548,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3191,24 +3484,24 @@
+@@ -3191,24 +3487,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2393,7 +2578,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3218,9 +3511,9 @@
+@@ -3218,9 +3514,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
@@ -2405,7 +2590,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -3231,24 +3524,24 @@
+@@ -3231,24 +3527,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2435,7 +2620,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3257,7 +3550,7 @@
+@@ -3257,7 +3553,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -2444,7 +2629,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -3271,9 +3564,9 @@
+@@ -3271,9 +3567,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
@@ -2456,7 +2641,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3284,24 +3577,24 @@
+@@ -3284,24 +3580,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2486,7 +2671,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3311,9 +3604,9 @@
+@@ -3311,9 +3607,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
@@ -2498,7 +2683,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3325,18 +3618,18 @@
+@@ -3325,18 +3621,18 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2520,7 +2705,7 @@
  IFS=$as_save_IFS
  
  if test $ac_prog_rejected = yes; then
-@@ -3355,10 +3648,10 @@
+@@ -3355,10 +3651,10 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -2533,7 +2718,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3370,9 +3663,9 @@
+@@ -3370,9 +3666,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
@@ -2545,7 +2730,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3383,24 +3676,24 @@
+@@ -3383,24 +3679,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2575,7 +2760,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3414,9 +3707,9 @@
+@@ -3414,9 +3710,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
@@ -2587,7 +2772,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -3427,24 +3720,24 @@
+@@ -3427,24 +3723,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2617,7 +2802,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3457,7 +3750,7 @@
+@@ -3457,7 +3753,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -2626,7 +2811,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -3468,73 +3761,55 @@
+@@ -3468,57 +3764,37 @@
  fi
  
  
@@ -2689,8 +2874,8 @@
 +... rest of stderr output deleted ...
 +         10q' conftest.err >conftest.er1
 +    cat conftest.er1 >&5
-+    rm -f conftest.er1 conftest.err
 +  fi
++  rm -f conftest.er1 conftest.err
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }
 +done
@@ -2702,30 +2887,20 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 +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_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
+@@ -3534,8 +3810,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 "$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_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[^ ]*//'`
  
-@@ -3551,17 +3826,17 @@
+ # The possible output files:
+@@ -3551,17 +3827,17 @@
  done
  rm -f $ac_rmfiles
  
@@ -2748,7 +2923,7 @@
    # 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,
-@@ -3578,7 +3853,7 @@
+@@ -3578,7 +3854,7 @@
  	# certainly right.
  	break;;
      *.* )
@@ -2757,17 +2932,19 @@
  	then :; else
  	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
  	fi
-@@ -3597,84 +3872,75 @@
+@@ -3597,84 +3873,42 @@
  else
    ac_file=''
  fi
 -
 -{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
- $as_echo "$ac_file" >&6; }
+-$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: failed program was:" >&5
++  { $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
@@ -2781,70 +2958,64 @@
 +{ as_fn_set_status 77
 +as_fn_error "C compiler cannot create executables
 +See \`config.log' for more details." "$LINENO" 5; }; }
- fi
--
++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.
+-# 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 "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
- $as_echo_n "checking whether the C compiler works... " >&6; }
+-$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'
+-# 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
-+  { { case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
+-  *\"* | *\`* | *\\*) 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=$?
+-  (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
-     cross_compiling=no
-   else
-     if test "$cross_compiling" = maybe; then
- 	cross_compiling=yes
-     else
+-    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:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 -{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
-+as_fn_error "cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
+-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; }; }; }
-+See \`config.log' for more details." "$LINENO" 5; }
-     fi
-   fi
- fi
+-    fi
+-  fi
+-fi
 -{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 
--rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
+-$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.
+-# 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 "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
- $as_echo_n "checking whether we are cross compiling... " >&6; }
+-$as_echo_n "checking whether we are cross compiling... " >&6; }
 -{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
- $as_echo "$cross_compiling" >&6; }
- 
+-$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; }
@@ -2867,7 +3038,7 @@
    # 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
-@@ -3689,32 +3955,24 @@
+@@ -3689,32 +3923,83 @@
    esac
  done
  else
@@ -2883,8 +3054,9 @@
 +See \`config.log' for more details." "$LINENO" 5; }
  fi
 -
- rm -f conftest$ac_cv_exeext
+-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; }
  
@@ -2892,6 +3064,65 @@
  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
@@ -2907,7 +3138,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3726,17 +3984,17 @@
+@@ -3726,17 +4011,17 @@
  }
  _ACEOF
  rm -f conftest.o conftest.obj
@@ -2930,7 +3161,7 @@
    for ac_file in conftest.o conftest.obj conftest.*; do
    test -f "$ac_file" || continue;
    case $ac_file in
-@@ -3749,31 +4007,23 @@
+@@ -3749,31 +4034,23 @@
    $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -2969,7 +3200,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3787,37 +4037,16 @@
+@@ -3787,37 +4064,16 @@
    return 0;
  }
  _ACEOF
@@ -3010,7 +3241,7 @@
  $as_echo "$ac_cv_c_compiler_gnu" >&6; }
  if test $ac_compiler_gnu = yes; then
    GCC=yes
-@@ -3826,20 +4055,16 @@
+@@ -3826,20 +4082,16 @@
  fi
  ac_test_CFLAGS=${CFLAGS+set}
  ac_save_CFLAGS=$CFLAGS
@@ -3034,7 +3265,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3850,35 +4075,11 @@
+@@ -3850,35 +4102,11 @@
    return 0;
  }
  _ACEOF
@@ -3073,7 +3304,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3889,36 +4090,12 @@
+@@ -3889,36 +4117,12 @@
    return 0;
  }
  _ACEOF
@@ -3114,7 +3345,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3929,42 +4106,17 @@
+@@ -3929,42 +4133,17 @@
    return 0;
  }
  _ACEOF
@@ -3159,7 +3390,7 @@
  $as_echo "$ac_cv_prog_cc_g" >&6; }
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
-@@ -3981,18 +4133,14 @@
+@@ -3981,18 +4160,14 @@
      CFLAGS=
    fi
  fi
@@ -3181,7 +3412,7 @@
  /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdio.h>
-@@ -4049,32 +4197,9 @@
+@@ -4049,32 +4224,9 @@
  	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
  do
    CC="$ac_save_CC $ac_arg"
@@ -3215,7 +3446,7 @@
  rm -f core conftest.err conftest.$ac_objext
    test "x$ac_cv_prog_cc_c89" != "xno" && break
  done
-@@ -4085,17 +4210,19 @@
+@@ -4085,17 +4237,19 @@
  # AC_CACHE_VAL
  case "x$ac_cv_prog_cc_c89" in
    x)
@@ -3238,7 +3469,7 @@
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -4105,9 +4232,9 @@
+@@ -4105,9 +4259,9 @@
  
  depcc="$CC"   am_compiler_list=
  
@@ -3250,7 +3481,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -4215,7 +4342,7 @@
+@@ -4215,7 +4369,7 @@
  fi
  
  fi
@@ -3259,7 +3490,7 @@
  $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
-@@ -4230,9 +4357,9 @@
+@@ -4230,9 +4384,9 @@
  fi
  
  
@@ -3271,7 +3502,7 @@
    $as_echo_n "(cached) " >&6
  else
              ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -4240,7 +4367,7 @@
+@@ -4240,7 +4394,7 @@
         ac_script="$ac_script$as_nl$ac_script"
       done
       echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -3280,7 +3511,7 @@
       if test -z "$SED"; then
    ac_path_SED_found=false
    # Loop through the user's path and test for each of PROGNAME-LIST
-@@ -4249,7 +4376,7 @@
+@@ -4249,7 +4403,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3289,7 +3520,7 @@
      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
-@@ -4269,7 +4396,7 @@
+@@ -4269,7 +4423,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
@@ -3298,7 +3529,7 @@
      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"
-@@ -4284,19 +4411,17 @@
+@@ -4284,19 +4438,17 @@
        $ac_path_SED_found && break 3
      done
    done
@@ -3321,7 +3552,7 @@
  $as_echo "$ac_cv_path_SED" >&6; }
   SED="$ac_cv_path_SED"
    rm -f conftest.sed
-@@ -4314,9 +4439,9 @@
+@@ -4314,9 +4466,9 @@
  
  
  
@@ -3333,7 +3564,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$GREP"; then
-@@ -4327,7 +4452,7 @@
+@@ -4327,7 +4479,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3342,7 +3573,7 @@
      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
-@@ -4347,7 +4472,7 @@
+@@ -4347,7 +4499,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
@@ -3351,7 +3582,7 @@
      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"
-@@ -4362,26 +4487,24 @@
+@@ -4362,26 +4514,24 @@
        $ac_path_GREP_found && break 3
      done
    done
@@ -3383,7 +3614,7 @@
    $as_echo_n "(cached) " >&6
  else
    if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4395,7 +4518,7 @@
+@@ -4395,7 +4545,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3392,7 +3623,7 @@
      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
-@@ -4415,7 +4538,7 @@
+@@ -4415,7 +4565,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
@@ -3401,7 +3632,7 @@
      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"
-@@ -4430,12 +4553,10 @@
+@@ -4430,12 +4580,10 @@
        $ac_path_EGREP_found && break 3
      done
    done
@@ -3416,7 +3647,7 @@
    fi
  else
    ac_cv_path_EGREP=$EGREP
-@@ -4443,14 +4564,14 @@
+@@ -4443,14 +4591,14 @@
  
     fi
  fi
@@ -3434,7 +3665,7 @@
    $as_echo_n "(cached) " >&6
  else
    if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -4464,7 +4585,7 @@
+@@ -4464,7 +4612,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3443,7 +3674,7 @@
      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
-@@ -4484,7 +4605,7 @@
+@@ -4484,7 +4632,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
@@ -3452,7 +3683,7 @@
      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"
-@@ -4499,12 +4620,10 @@
+@@ -4499,12 +4647,10 @@
        $ac_path_FGREP_found && break 3
      done
    done
@@ -3467,7 +3698,7 @@
    fi
  else
    ac_cv_path_FGREP=$FGREP
-@@ -4512,7 +4631,7 @@
+@@ -4512,7 +4658,7 @@
  
     fi
  fi
@@ -3476,7 +3707,7 @@
  $as_echo "$ac_cv_path_FGREP" >&6; }
   FGREP="$ac_cv_path_FGREP"
  
-@@ -4538,7 +4657,7 @@
+@@ -4538,7 +4684,7 @@
  
  
  # Check whether --with-gnu-ld was given.
@@ -3485,7 +3716,7 @@
    withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
  else
    with_gnu_ld=no
-@@ -4547,7 +4666,7 @@
+@@ -4547,7 +4693,7 @@
  ac_prog=ld
  if test "$GCC" = yes; then
    # Check if gcc -print-prog-name=ld gives a path.
@@ -3494,7 +3725,7 @@
  $as_echo_n "checking for ld used by $CC... " >&6; }
    case $host in
    *-*-mingw*)
-@@ -4577,13 +4696,13 @@
+@@ -4577,13 +4723,13 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -3511,7 +3742,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$LD"; then
-@@ -4614,18 +4733,16 @@
+@@ -4614,18 +4760,16 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -3535,7 +3766,7 @@
    $as_echo_n "(cached) " >&6
  else
    # I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -4638,7 +4755,7 @@
+@@ -4638,7 +4782,7 @@
    ;;
  esac
  fi
@@ -3544,7 +3775,7 @@
  $as_echo "$lt_cv_prog_gnu_ld" >&6; }
  with_gnu_ld=$lt_cv_prog_gnu_ld
  
-@@ -4650,9 +4767,9 @@
+@@ -4650,9 +4794,9 @@
  
  
  
@@ -3556,7 +3787,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$NM"; then
-@@ -4699,7 +4816,7 @@
+@@ -4699,7 +4843,7 @@
    : ${lt_cv_path_NM=no}
  fi
  fi
@@ -3565,7 +3796,7 @@
  $as_echo "$lt_cv_path_NM" >&6; }
  if test "$lt_cv_path_NM" != "no"; then
    NM="$lt_cv_path_NM"
-@@ -4710,9 +4827,9 @@
+@@ -4710,9 +4854,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
@@ -3577,7 +3808,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$DUMPBIN"; then
-@@ -4723,24 +4840,24 @@
+@@ -4723,24 +4867,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3607,7 +3838,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -4754,9 +4871,9 @@
+@@ -4754,9 +4898,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
@@ -3619,7 +3850,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_DUMPBIN"; then
-@@ -4767,24 +4884,24 @@
+@@ -4767,24 +4911,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3649,7 +3880,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -4797,7 +4914,7 @@
+@@ -4797,7 +4941,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -3658,7 +3889,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -4817,44 +4934,44 @@
+@@ -4817,44 +4961,44 @@
  
  
  
@@ -3672,15 +3903,15 @@
    lt_cv_nm_interface="BSD nm"
    echo "int some_variable = 0;" > conftest.$ac_ext
 -  (eval echo "\"\$as_me:4827: $ac_compile\"" >&5)
-+  (eval echo "\"\$as_me:4944: $ac_compile\"" >&5)
++  (eval echo "\"\$as_me:4971: $ac_compile\"" >&5)
    (eval "$ac_compile" 2>conftest.err)
    cat conftest.err >&5
 -  (eval echo "\"\$as_me:4830: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval echo "\"\$as_me:4947: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++  (eval echo "\"\$as_me:4974: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
    (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
    cat conftest.err >&5
 -  (eval echo "\"\$as_me:4833: output\"" >&5)
-+  (eval echo "\"\$as_me:4950: output\"" >&5)
++  (eval echo "\"\$as_me:4977: output\"" >&5)
    cat conftest.out >&5
    if $GREP 'External.*some_variable' conftest.out > /dev/null; then
      lt_cv_nm_interface="MS dumpbin"
@@ -3714,7 +3945,7 @@
    $as_echo_n "(cached) " >&6
  else
      i=0
-@@ -4972,10 +5089,10 @@
+@@ -4972,10 +5116,10 @@
  fi
  
  if test -n $lt_cv_sys_max_cmd_len ; then
@@ -3727,7 +3958,7 @@
  $as_echo "none" >&6; }
  fi
  max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -4989,7 +5106,7 @@
+@@ -4989,7 +5133,7 @@
  : ${MV="mv -f"}
  : ${RM="rm -f"}
  
@@ -3736,7 +3967,7 @@
  $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
  # Try some XSI features
  xsi_shell=no
-@@ -4999,17 +5116,17 @@
+@@ -4999,17 +5143,17 @@
      && eval 'test $(( 1 + 1 )) -eq 2 \
      && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
    && xsi_shell=yes
@@ -3757,7 +3988,7 @@
  $as_echo "$lt_shell_append" >&6; }
  
  
-@@ -5044,14 +5161,14 @@
+@@ -5044,14 +5188,14 @@
  
  
  
@@ -3775,7 +4006,7 @@
  $as_echo "$lt_cv_ld_reload_flag" >&6; }
  reload_flag=$lt_cv_ld_reload_flag
  case $reload_flag in
-@@ -5080,9 +5197,9 @@
+@@ -5080,9 +5224,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
@@ -3787,7 +4018,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$OBJDUMP"; then
-@@ -5093,24 +5210,24 @@
+@@ -5093,24 +5237,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3817,7 +4048,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5120,9 +5237,9 @@
+@@ -5120,9 +5264,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
@@ -3829,7 +4060,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_OBJDUMP"; then
-@@ -5133,24 +5250,24 @@
+@@ -5133,24 +5277,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3859,7 +4090,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5159,7 +5276,7 @@
+@@ -5159,7 +5303,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -3868,7 +4099,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -5179,9 +5296,9 @@
+@@ -5179,9 +5323,9 @@
  
  
  
@@ -3880,7 +4111,7 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -5300,7 +5417,7 @@
+@@ -5300,7 +5444,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -3889,7 +4120,7 @@
    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
-@@ -5375,7 +5492,7 @@
+@@ -5375,7 +5519,7 @@
  esac
  
  fi
@@ -3898,7 +4129,7 @@
  $as_echo "$lt_cv_deplibs_check_method" >&6; }
  file_magic_cmd=$lt_cv_file_magic_cmd
  deplibs_check_method=$lt_cv_deplibs_check_method
-@@ -5395,9 +5512,9 @@
+@@ -5395,9 +5539,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
@@ -3910,7 +4141,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$AR"; then
-@@ -5408,24 +5525,24 @@
+@@ -5408,24 +5552,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3940,7 +4171,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5435,9 +5552,9 @@
+@@ -5435,9 +5579,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
@@ -3952,7 +4183,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_AR"; then
-@@ -5448,24 +5565,24 @@
+@@ -5448,24 +5592,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3982,7 +4213,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5474,7 +5591,7 @@
+@@ -5474,7 +5618,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -3991,7 +4222,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -5500,9 +5617,9 @@
+@@ -5500,9 +5644,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
@@ -4003,7 +4234,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$STRIP"; then
-@@ -5513,24 +5630,24 @@
+@@ -5513,24 +5657,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4033,7 +4264,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5540,9 +5657,9 @@
+@@ -5540,9 +5684,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
@@ -4045,7 +4276,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_STRIP"; then
-@@ -5553,24 +5670,24 @@
+@@ -5553,24 +5697,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4075,7 +4306,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5579,7 +5696,7 @@
+@@ -5579,7 +5723,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -4084,7 +4315,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -5599,9 +5716,9 @@
+@@ -5599,9 +5743,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
@@ -4096,7 +4327,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$RANLIB"; then
-@@ -5612,24 +5729,24 @@
+@@ -5612,24 +5756,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4126,7 +4357,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5639,9 +5756,9 @@
+@@ -5639,9 +5783,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
@@ -4138,7 +4369,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_RANLIB"; then
-@@ -5652,24 +5769,24 @@
+@@ -5652,24 +5796,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4168,7 +4399,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5678,7 +5795,7 @@
+@@ -5678,7 +5822,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -4177,7 +4408,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -5756,9 +5873,9 @@
+@@ -5756,9 +5900,9 @@
  
  
  # Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -4189,7 +4420,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -5874,18 +5991,18 @@
+@@ -5874,18 +6018,18 @@
  int main(){nm_test_var='a';nm_test_func();return(0);}
  _LT_EOF
  
@@ -4214,7 +4445,7 @@
        # Try sorting and uniquifying the output.
        if sort "$nlist" | uniq > "$nlist"T; then
  	mv -f "$nlist"T "$nlist"
-@@ -5938,11 +6055,11 @@
+@@ -5938,11 +6082,11 @@
  	  lt_save_CFLAGS="$CFLAGS"
  	  LIBS="conftstm.$ac_objext"
  	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -4229,7 +4460,7 @@
  	    pipe_works=yes
  	  fi
  	  LIBS="$lt_save_LIBS"
-@@ -5976,10 +6093,10 @@
+@@ -5976,10 +6120,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
@@ -4242,7 +4473,7 @@
  $as_echo "ok" >&6; }
  fi
  
-@@ -6006,7 +6123,7 @@
+@@ -6006,7 +6150,7 @@
  
  
  # Check whether --enable-libtool-lock was given.
@@ -4251,7 +4482,7 @@
    enableval=$enable_libtool_lock;
  fi
  
-@@ -6018,11 +6135,11 @@
+@@ -6018,11 +6162,11 @@
  ia64-*-hpux*)
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
@@ -4266,13 +4497,13 @@
      case `/usr/bin/file conftest.$ac_objext` in
        *ELF-32*)
  	HPUX_IA64_MODE="32"
-@@ -6036,12 +6153,12 @@
+@@ -6036,12 +6180,12 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
 -  echo '#line 6039 "configure"' > conftest.$ac_ext
 -  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  echo '#line 6156 "configure"' > conftest.$ac_ext
++  echo '#line 6183 "configure"' > conftest.$ac_ext
 +  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
@@ -4283,7 +4514,7 @@
      if test "$lt_cv_prog_gnu_ld" = yes; then
        case `/usr/bin/file conftest.$ac_objext` in
  	*32-bit*)
-@@ -6075,11 +6192,11 @@
+@@ -6075,11 +6219,11 @@
  s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
@@ -4298,7 +4529,7 @@
      case `/usr/bin/file conftest.o` in
        *32-bit*)
  	case $host in
-@@ -6128,9 +6245,9 @@
+@@ -6128,9 +6272,9 @@
    # On SCO OpenServer 5, we need -belf to get full-featured binaries.
    SAVE_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -belf"
@@ -4310,7 +4541,7 @@
    $as_echo_n "(cached) " >&6
  else
    ac_ext=c
-@@ -6139,11 +6256,7 @@
+@@ -6139,11 +6283,7 @@
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
@@ -4323,7 +4554,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -6154,38 +6267,13 @@
+@@ -6154,38 +6294,13 @@
    return 0;
  }
  _ACEOF
@@ -4366,7 +4597,7 @@
       ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -6193,7 +6281,7 @@
+@@ -6193,7 +6308,7 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  fi
@@ -4375,7 +4606,7 @@
  $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
-@@ -6203,11 +6291,11 @@
+@@ -6203,11 +6318,11 @@
  sparc*-*solaris*)
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
@@ -4390,7 +4621,7 @@
      case `/usr/bin/file conftest.o` in
      *64-bit*)
        case $lt_cv_prog_gnu_ld in
-@@ -6233,9 +6321,9 @@
+@@ -6233,9 +6348,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
@@ -4402,7 +4633,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$DSYMUTIL"; then
-@@ -6246,24 +6334,24 @@
+@@ -6246,24 +6361,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4432,7 +4663,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6273,9 +6361,9 @@
+@@ -6273,9 +6388,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
@@ -4444,7 +4675,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_DSYMUTIL"; then
-@@ -6286,24 +6374,24 @@
+@@ -6286,24 +6401,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4474,7 +4705,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6312,7 +6400,7 @@
+@@ -6312,7 +6427,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -4483,7 +4714,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -6325,9 +6413,9 @@
+@@ -6325,9 +6440,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
@@ -4495,7 +4726,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$NMEDIT"; then
-@@ -6338,24 +6426,24 @@
+@@ -6338,24 +6453,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4525,7 +4756,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6365,9 +6453,9 @@
+@@ -6365,9 +6480,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
@@ -4537,7 +4768,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_NMEDIT"; then
-@@ -6378,24 +6466,24 @@
+@@ -6378,24 +6493,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4567,7 +4798,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6404,7 +6492,7 @@
+@@ -6404,7 +6519,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -4576,7 +4807,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -6417,9 +6505,9 @@
+@@ -6417,9 +6532,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
@@ -4588,7 +4819,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$LIPO"; then
-@@ -6430,24 +6518,24 @@
+@@ -6430,24 +6545,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4618,7 +4849,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6457,9 +6545,9 @@
+@@ -6457,9 +6572,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
@@ -4630,7 +4861,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_LIPO"; then
-@@ -6470,24 +6558,24 @@
+@@ -6470,24 +6585,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4660,7 +4891,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6496,7 +6584,7 @@
+@@ -6496,7 +6611,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -4669,7 +4900,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -6509,9 +6597,9 @@
+@@ -6509,9 +6624,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
@@ -4681,7 +4912,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$OTOOL"; then
-@@ -6522,24 +6610,24 @@
+@@ -6522,24 +6637,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4711,7 +4942,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6549,9 +6637,9 @@
+@@ -6549,9 +6664,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
@@ -4723,7 +4954,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_OTOOL"; then
-@@ -6562,24 +6650,24 @@
+@@ -6562,24 +6677,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4753,7 +4984,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6588,7 +6676,7 @@
+@@ -6588,7 +6703,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -4762,7 +4993,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -6601,9 +6689,9 @@
+@@ -6601,9 +6716,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
@@ -4774,7 +5005,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$OTOOL64"; then
-@@ -6614,24 +6702,24 @@
+@@ -6614,24 +6729,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4804,7 +5035,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6641,9 +6729,9 @@
+@@ -6641,9 +6756,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
@@ -4816,7 +5047,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_OTOOL64"; then
-@@ -6654,24 +6742,24 @@
+@@ -6654,24 +6769,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4846,7 +5077,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6680,7 +6768,7 @@
+@@ -6680,7 +6795,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -4855,7 +5086,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -6716,9 +6804,9 @@
+@@ -6716,9 +6831,9 @@
  
  
  
@@ -4867,7 +5098,7 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_apple_cc_single_mod=no
-@@ -6743,22 +6831,18 @@
+@@ -6743,22 +6858,18 @@
  	rm -f conftest.*
        fi
  fi
@@ -4894,7 +5125,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -6769,42 +6853,17 @@
+@@ -6769,42 +6880,17 @@
    return 0;
  }
  _ACEOF
@@ -4942,7 +5173,7 @@
  $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
      case $host_os in
      rhapsody* | darwin1.[012])
-@@ -6846,14 +6905,14 @@
+@@ -6846,14 +6932,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
@@ -4959,7 +5190,7 @@
    $as_echo_n "(cached) " >&6
  else
        # Double quotes because CPP needs to be expanded
-@@ -6868,11 +6927,7 @@
+@@ -6868,11 +6954,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.
@@ -4972,7 +5203,7 @@
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-@@ -6881,78 +6936,34 @@
+@@ -6881,78 +6963,34 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -5056,7 +5287,7 @@
    break
  fi
  
-@@ -6964,7 +6975,7 @@
+@@ -6964,7 +7002,7 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -5065,7 +5296,7 @@
  $as_echo "$CPP" >&6; }
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
-@@ -6975,11 +6986,7 @@
+@@ -6975,11 +7013,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.
@@ -5078,7 +5309,7 @@
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-@@ -6988,87 +6995,40 @@
+@@ -6988,87 +7022,40 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -5175,7 +5406,7 @@
  fi
  
  ac_ext=c
-@@ -7078,16 +7038,12 @@
+@@ -7078,16 +7065,12 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
@@ -5195,7 +5426,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <stdarg.h>
-@@ -7102,48 +7058,23 @@
+@@ -7102,48 +7085,23 @@
    return 0;
  }
  _ACEOF
@@ -5249,7 +5480,7 @@
  else
    ac_cv_header_stdc=no
  fi
-@@ -7153,18 +7084,14 @@
+@@ -7153,18 +7111,14 @@
  
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -5271,7 +5502,7 @@
  else
    ac_cv_header_stdc=no
  fi
-@@ -7174,14 +7101,10 @@
+@@ -7174,14 +7128,10 @@
  
  if test $ac_cv_header_stdc = yes; then
    # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -5288,7 +5519,7 @@
  /* end confdefs.h.  */
  #include <ctype.h>
  #include <stdlib.h>
-@@ -7208,181 +7131,34 @@
+@@ -7208,181 +7158,34 @@
    return 0;
  }
  _ACEOF
@@ -5452,9 +5683,10 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  eval "$as_ac_Header=yes"
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++else
 +  ac_cv_header_stdc=no
 +fi
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -5492,7 +5724,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -7392,6 +7168,20 @@
+@@ -7392,6 +7195,20 @@
  done
  
  
@@ -5513,7 +5745,7 @@
  
  # Set options
  
-@@ -7405,7 +7195,7 @@
+@@ -7405,7 +7222,7 @@
  
  
  # Check whether --with-pic was given.
@@ -5522,7 +5754,7 @@
    withval=$with_pic; pic_mode="$withval"
  else
    pic_mode=default
-@@ -7421,7 +7211,7 @@
+@@ -7421,7 +7238,7 @@
  
  
    # Check whether --enable-fast-install was given.
@@ -5531,7 +5763,7 @@
    enableval=$enable_fast_install; p=${PACKAGE-default}
      case $enableval in
      yes) enable_fast_install=yes ;;
-@@ -7502,9 +7292,9 @@
+@@ -7502,9 +7319,9 @@
     setopt NO_GLOB_SUBST
  fi
  
@@ -5543,7 +5775,7 @@
    $as_echo_n "(cached) " >&6
  else
    rm -f .libs 2>/dev/null
-@@ -7517,7 +7307,7 @@
+@@ -7517,7 +7334,7 @@
  fi
  rmdir .libs 2>/dev/null
  fi
@@ -5552,7 +5784,7 @@
  $as_echo "$lt_cv_objdir" >&6; }
  objdir=$lt_cv_objdir
  
-@@ -7610,9 +7400,9 @@
+@@ -7610,9 +7427,9 @@
  case $deplibs_check_method in
  file_magic*)
    if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -5564,7 +5796,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $MAGIC_CMD in
-@@ -7663,10 +7453,10 @@
+@@ -7663,10 +7480,10 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -5577,7 +5809,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -7676,9 +7466,9 @@
+@@ -7676,9 +7493,9 @@
  
  if test -z "$lt_cv_path_MAGIC_CMD"; then
    if test -n "$ac_tool_prefix"; then
@@ -5589,7 +5821,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $MAGIC_CMD in
-@@ -7729,10 +7519,10 @@
+@@ -7729,10 +7546,10 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -5602,7 +5834,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -7813,9 +7603,9 @@
+@@ -7813,9 +7630,9 @@
  if test "$GCC" = yes; then
    lt_prog_compiler_no_builtin_flag=' -fno-builtin'
  
@@ -5614,21 +5846,21 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_rtti_exceptions=no
-@@ -7831,11 +7621,11 @@
+@@ -7831,11 +7648,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:7834: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7624: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7651: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:7838: \$? = $ac_status" >&5
-+   echo "$as_me:7628: \$? = $ac_status" >&5
++   echo "$as_me:7655: \$? = $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.
-@@ -7848,7 +7638,7 @@
+@@ -7848,7 +7665,7 @@
     $RM conftest*
  
  fi
@@ -5637,7 +5869,7 @@
  $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
  
  if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -7868,7 +7658,7 @@
+@@ -7868,7 +7685,7 @@
  lt_prog_compiler_pic=
  lt_prog_compiler_static=
  
@@ -5646,7 +5878,7 @@
  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  
    if test "$GCC" = yes; then
-@@ -8140,7 +7930,7 @@
+@@ -8140,7 +7957,7 @@
      lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
      ;;
  esac
@@ -5655,7 +5887,7 @@
  $as_echo "$lt_prog_compiler_pic" >&6; }
  
  
-@@ -8152,9 +7942,9 @@
+@@ -8152,9 +7969,9 @@
  # Check to make sure the PIC flag actually works.
  #
  if test -n "$lt_prog_compiler_pic"; then
@@ -5667,21 +5899,21 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_pic_works=no
-@@ -8170,11 +7960,11 @@
+@@ -8170,11 +7987,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:8173: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7963: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7990: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:8177: \$? = $ac_status" >&5
-+   echo "$as_me:7967: \$? = $ac_status" >&5
++   echo "$as_me:7994: \$? = $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.
-@@ -8187,7 +7977,7 @@
+@@ -8187,7 +8004,7 @@
     $RM conftest*
  
  fi
@@ -5690,7 +5922,7 @@
  $as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
  
  if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -8211,9 +8001,9 @@
+@@ -8211,9 +8028,9 @@
  # Check to make sure the static flag actually works.
  #
  wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -5702,7 +5934,7 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_static_works=no
-@@ -8239,7 +8029,7 @@
+@@ -8239,7 +8056,7 @@
     LDFLAGS="$save_LDFLAGS"
  
  fi
@@ -5711,7 +5943,7 @@
  $as_echo "$lt_cv_prog_compiler_static_works" >&6; }
  
  if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -8254,9 +8044,9 @@
+@@ -8254,9 +8071,9 @@
  
  
  
@@ -5723,21 +5955,21 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_c_o=no
-@@ -8275,11 +8065,11 @@
+@@ -8275,11 +8092,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:8278: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8068: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8095: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:8282: \$? = $ac_status" >&5
-+   echo "$as_me:8072: \$? = $ac_status" >&5
++   echo "$as_me:8099: \$? = $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
-@@ -8301,7 +8091,7 @@
+@@ -8301,7 +8118,7 @@
     $RM conftest*
  
  fi
@@ -5746,7 +5978,7 @@
  $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
  
  
-@@ -8309,9 +8099,9 @@
+@@ -8309,9 +8126,9 @@
  
  
  
@@ -5758,21 +5990,21 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_c_o=no
-@@ -8330,11 +8120,11 @@
+@@ -8330,11 +8147,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:8333: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8123: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8150: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:8337: \$? = $ac_status" >&5
-+   echo "$as_me:8127: \$? = $ac_status" >&5
++   echo "$as_me:8154: \$? = $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
-@@ -8356,7 +8146,7 @@
+@@ -8356,7 +8173,7 @@
     $RM conftest*
  
  fi
@@ -5781,7 +6013,7 @@
  $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
  
  
-@@ -8365,7 +8155,7 @@
+@@ -8365,7 +8182,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
@@ -5790,7 +6022,7 @@
  $as_echo_n "checking if we can lock with hard links... " >&6; }
    hard_links=yes
    $RM conftest*
-@@ -8373,10 +8163,10 @@
+@@ -8373,10 +8190,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
@@ -5803,7 +6035,7 @@
  $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
      need_locks=warn
    fi
-@@ -8389,7 +8179,7 @@
+@@ -8389,7 +8206,7 @@
  
  
  
@@ -5812,7 +6044,7 @@
  $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
  
    runpath_var=
-@@ -8449,6 +8239,9 @@
+@@ -8449,6 +8266,9 @@
    openbsd*)
      with_gnu_ld=no
      ;;
@@ -5822,7 +6054,7 @@
    esac
  
    ld_shlibs=yes
-@@ -8631,7 +8424,7 @@
+@@ -8631,7 +8451,7 @@
        fi
        ;;
  
@@ -5831,7 +6063,7 @@
        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -8806,6 +8599,7 @@
+@@ -8806,6 +8626,7 @@
  	if test "$aix_use_runtimelinking" = yes; then
  	  shared_flag="$shared_flag "'${wl}-G'
  	fi
@@ -5839,7 +6071,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -8831,11 +8625,7 @@
+@@ -8831,11 +8652,7 @@
  	allow_undefined_flag='-berok'
          # Determine the default libpath from the value encoded in an
          # empty executable.
@@ -5852,7 +6084,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -8846,27 +8636,7 @@
+@@ -8846,27 +8663,7 @@
    return 0;
  }
  _ACEOF
@@ -5881,7 +6113,7 @@
  
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
-@@ -8880,16 +8650,9 @@
+@@ -8880,16 +8677,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
@@ -5900,7 +6132,7 @@
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -8902,11 +8665,7 @@
+@@ -8902,11 +8692,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an
  	 # empty executable.
@@ -5913,7 +6145,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -8917,27 +8676,7 @@
+@@ -8917,27 +8703,7 @@
    return 0;
  }
  _ACEOF
@@ -5942,7 +6174,7 @@
  
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
-@@ -8951,16 +8690,9 @@
+@@ -8951,16 +8717,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
@@ -5961,7 +6193,7 @@
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
  	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -9172,42 +8904,16 @@
+@@ -9172,42 +8931,16 @@
  	# implicitly export all symbols.
          save_LDFLAGS="$LDFLAGS"
          LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
@@ -6009,7 +6241,7 @@
          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'
-@@ -9220,7 +8926,7 @@
+@@ -9220,7 +8953,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -6018,7 +6250,7 @@
        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -9463,7 +9169,7 @@
+@@ -9463,7 +9196,7 @@
      fi
    fi
  
@@ -6027,7 +6259,7 @@
  $as_echo "$ld_shlibs" >&6; }
  test "$ld_shlibs" = no && can_build_shared=no
  
-@@ -9500,16 +9206,16 @@
+@@ -9500,16 +9233,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.
@@ -6048,7 +6280,7 @@
          soname=conftest
          lib=conftest
          libobjs=conftest.$ac_objext
-@@ -9523,11 +9229,11 @@
+@@ -9523,11 +9256,11 @@
          libname=conftest
          lt_save_allow_undefined_flag=$allow_undefined_flag
          allow_undefined_flag=
@@ -6063,7 +6295,7 @@
          then
  	  archive_cmds_need_lc=no
          else
-@@ -9538,7 +9244,7 @@
+@@ -9538,7 +9271,7 @@
          cat conftest.err 1>&5
        fi
        $RM conftest*
@@ -6072,7 +6304,7 @@
  $as_echo "$archive_cmds_need_lc" >&6; }
        ;;
      esac
-@@ -9702,7 +9408,7 @@
+@@ -9702,7 +9435,7 @@
  
  
  
@@ -6081,7 +6313,7 @@
  $as_echo_n "checking dynamic linker characteristics... " >&6; }
  
  if test "$GCC" = yes; then
-@@ -10124,11 +9830,7 @@
+@@ -10124,11 +9857,7 @@
    save_libdir=$libdir
    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
         LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -6094,7 +6326,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -10139,41 +9841,13 @@
+@@ -10139,41 +9868,13 @@
    return 0;
  }
  _ACEOF
@@ -6140,7 +6372,7 @@
    LDFLAGS=$save_LDFLAGS
    libdir=$save_libdir
  
-@@ -10182,13 +9856,10 @@
+@@ -10182,13 +9883,10 @@
    # before this can be enabled.
    hardcode_into_libs=yes
  
@@ -6155,7 +6387,7 @@
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -10200,6 +9871,18 @@
+@@ -10200,6 +9898,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -6174,7 +6406,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -10388,7 +10071,7 @@
+@@ -10388,7 +10098,7 @@
    dynamic_linker=no
    ;;
  esac
@@ -6183,7 +6415,7 @@
  $as_echo "$dynamic_linker" >&6; }
  test "$dynamic_linker" = no && can_build_shared=no
  
-@@ -10490,7 +10173,7 @@
+@@ -10490,7 +10200,7 @@
  
  
  
@@ -6192,7 +6424,7 @@
  $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
  hardcode_action=
  if test -n "$hardcode_libdir_flag_spec" ||
-@@ -10515,7 +10198,7 @@
+@@ -10515,7 +10225,7 @@
    # directories.
    hardcode_action=unsupported
  fi
@@ -6201,7 +6433,7 @@
  $as_echo "$hardcode_action" >&6; }
  
  if test "$hardcode_action" = relink ||
-@@ -10560,18 +10243,14 @@
+@@ -10560,18 +10270,14 @@
  
    darwin*)
    # if libdl is installed we need to link against it
@@ -6223,7 +6455,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -10589,43 +10268,18 @@
+@@ -10589,43 +10295,18 @@
    return 0;
  }
  _ACEOF
@@ -6273,7 +6505,7 @@
    lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
  else
  
-@@ -10638,106 +10292,18 @@
+@@ -10638,106 +10319,18 @@
      ;;
  
    *)
@@ -6385,7 +6617,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -10755,145 +10321,32 @@
+@@ -10755,145 +10348,32 @@
    return 0;
  }
  _ACEOF
@@ -6428,7 +6660,8 @@
  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; }
++{ $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
@@ -6518,8 +6751,6 @@
 -{ $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
@@ -6545,7 +6776,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -10911,57 +10364,28 @@
+@@ -10911,57 +10391,28 @@
    return 0;
  }
  _ACEOF
@@ -6612,7 +6843,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -10979,57 +10403,28 @@
+@@ -10979,57 +10430,28 @@
    return 0;
  }
  _ACEOF
@@ -6679,7 +6910,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -11047,43 +10442,18 @@
+@@ -11047,43 +10469,18 @@
    return 0;
  }
  _ACEOF
@@ -6729,7 +6960,7 @@
    lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
  fi
  
-@@ -11122,9 +10492,9 @@
+@@ -11122,9 +10519,9 @@
      save_LIBS="$LIBS"
      LIBS="$lt_cv_dlopen_libs $LIBS"
  
@@ -6741,16 +6972,16 @@
    $as_echo_n "(cached) " >&6
  else
    	  if test "$cross_compiling" = yes; then :
-@@ -11133,7 +10503,7 @@
+@@ -11133,7 +10530,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
 -#line 11136 "configure"
-+#line 10506 "configure"
++#line 10533 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11192,11 +10562,11 @@
+@@ -11192,11 +10589,11 @@
    return status;
  }
  _LT_EOF
@@ -6765,7 +6996,7 @@
      (./conftest; exit; ) >&5 2>/dev/null
      lt_status=$?
      case x$lt_status in
-@@ -11213,14 +10583,14 @@
+@@ -11213,14 +10610,14 @@
  
  
  fi
@@ -6783,16 +7014,16 @@
    $as_echo_n "(cached) " >&6
  else
    	  if test "$cross_compiling" = yes; then :
-@@ -11229,7 +10599,7 @@
+@@ -11229,7 +10626,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
 -#line 11232 "configure"
-+#line 10602 "configure"
++#line 10629 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11288,11 +10658,11 @@
+@@ -11288,11 +10685,11 @@
    return status;
  }
  _LT_EOF
@@ -6807,7 +7038,7 @@
      (./conftest; exit; ) >&5 2>/dev/null
      lt_status=$?
      case x$lt_status in
-@@ -11309,7 +10679,7 @@
+@@ -11309,7 +10706,7 @@
  
  
  fi
@@ -6816,7 +7047,7 @@
  $as_echo "$lt_cv_dlopen_self_static" >&6; }
      fi
  
-@@ -11348,12 +10718,12 @@
+@@ -11348,12 +10745,12 @@
  
  striplib=
  old_striplib=
@@ -6831,7 +7062,7 @@
  $as_echo "yes" >&6; }
  else
  # FIXME - insert some real tests, host_os isn't really good enough
-@@ -11362,15 +10732,15 @@
+@@ -11362,15 +10759,15 @@
      if test -n "$STRIP" ; then
        striplib="$STRIP -x"
        old_striplib="$STRIP -S"
@@ -6850,7 +7081,7 @@
  $as_echo "no" >&6; }
      ;;
    esac
-@@ -11388,12 +10758,12 @@
+@@ -11388,12 +10785,12 @@
  
  
    # Report which library types will actually be built
@@ -6866,7 +7097,7 @@
  $as_echo_n "checking whether to build shared libraries... " >&6; }
    test "$can_build_shared" = "no" && enable_shared=no
  
-@@ -11414,14 +10784,14 @@
+@@ -11414,14 +10811,14 @@
      fi
      ;;
    esac
@@ -6884,7 +7115,7 @@
  $as_echo "$enable_static" >&6; }
  
  
-@@ -11457,17 +10827,13 @@
+@@ -11457,17 +10854,13 @@
  
  
  
@@ -6905,7 +7136,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -11492,54 +10858,27 @@
+@@ -11492,54 +10885,27 @@
      ac_res=-l$ac_lib
      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
    fi
@@ -6968,7 +7199,7 @@
    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
  fi
-@@ -11552,9 +10891,9 @@
+@@ -11552,9 +10918,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
@@ -6980,7 +7211,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -11565,24 +10904,24 @@
+@@ -11565,24 +10931,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7010,7 +7241,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -11592,9 +10931,9 @@
+@@ -11592,9 +10958,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
@@ -7022,7 +7253,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -11605,24 +10944,24 @@
+@@ -11605,24 +10971,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7052,7 +7283,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -11631,7 +10970,7 @@
+@@ -11631,7 +10997,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -7061,7 +7292,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -11645,9 +10984,9 @@
+@@ -11645,9 +11011,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
@@ -7073,7 +7304,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -11658,24 +10997,24 @@
+@@ -11658,24 +11024,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7103,7 +7334,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -11685,9 +11024,9 @@
+@@ -11685,9 +11051,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
@@ -7115,7 +7346,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -11699,18 +11038,18 @@
+@@ -11699,18 +11065,18 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7137,7 +7368,7 @@
  IFS=$as_save_IFS
  
  if test $ac_prog_rejected = yes; then
-@@ -11729,10 +11068,10 @@
+@@ -11729,10 +11095,10 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -7150,7 +7381,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -11744,9 +11083,9 @@
+@@ -11744,9 +11110,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
@@ -7162,7 +7393,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -11757,24 +11096,24 @@
+@@ -11757,24 +11123,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7192,7 +7423,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -11788,9 +11127,9 @@
+@@ -11788,9 +11154,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
@@ -7204,7 +7435,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -11801,24 +11140,24 @@
+@@ -11801,24 +11167,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7234,7 +7465,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -11831,7 +11170,7 @@
+@@ -11831,7 +11197,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -7243,7 +7474,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -11842,62 +11181,42 @@
+@@ -11842,62 +11208,42 @@
  fi
  
  
@@ -7306,8 +7537,8 @@
 +... rest of stderr output deleted ...
 +         10q' conftest.err >conftest.er1
 +    cat conftest.er1 >&5
-+    rm -f conftest.er1 conftest.err
 +  fi
++  rm -f conftest.er1 conftest.err
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }
 +done
@@ -7328,7 +7559,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -11911,37 +11230,16 @@
+@@ -11911,37 +11257,16 @@
    return 0;
  }
  _ACEOF
@@ -7369,7 +7600,7 @@
  $as_echo "$ac_cv_c_compiler_gnu" >&6; }
  if test $ac_compiler_gnu = yes; then
    GCC=yes
-@@ -11950,20 +11248,16 @@
+@@ -11950,20 +11275,16 @@
  fi
  ac_test_CFLAGS=${CFLAGS+set}
  ac_save_CFLAGS=$CFLAGS
@@ -7393,7 +7624,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -11974,35 +11268,11 @@
+@@ -11974,35 +11295,11 @@
    return 0;
  }
  _ACEOF
@@ -7432,7 +7663,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -12013,36 +11283,12 @@
+@@ -12013,36 +11310,12 @@
    return 0;
  }
  _ACEOF
@@ -7473,7 +7704,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -12053,42 +11299,17 @@
+@@ -12053,42 +11326,17 @@
    return 0;
  }
  _ACEOF
@@ -7518,7 +7749,7 @@
  $as_echo "$ac_cv_prog_cc_g" >&6; }
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
-@@ -12105,18 +11326,14 @@
+@@ -12105,18 +11353,14 @@
      CFLAGS=
    fi
  fi
@@ -7540,7 +7771,7 @@
  /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdio.h>
-@@ -12173,32 +11390,9 @@
+@@ -12173,32 +11417,9 @@
  	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
  do
    CC="$ac_save_CC $ac_arg"
@@ -7574,7 +7805,7 @@
  rm -f core conftest.err conftest.$ac_objext
    test "x$ac_cv_prog_cc_c89" != "xno" && break
  done
-@@ -12209,17 +11403,19 @@
+@@ -12209,17 +11430,19 @@
  # AC_CACHE_VAL
  case "x$ac_cv_prog_cc_c89" in
    x)
@@ -7597,7 +7828,7 @@
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -12229,9 +11425,9 @@
+@@ -12229,9 +11452,9 @@
  
  depcc="$CC"   am_compiler_list=
  
@@ -7609,7 +7840,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -12339,7 +11535,7 @@
+@@ -12339,7 +11562,7 @@
  fi
  
  fi
@@ -7618,7 +7849,7 @@
  $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
-@@ -12362,9 +11558,9 @@
+@@ -12362,9 +11585,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
@@ -7630,7 +7861,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -12375,24 +11571,24 @@
+@@ -12375,24 +11598,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7660,7 +7891,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -12402,9 +11598,9 @@
+@@ -12402,9 +11625,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
@@ -7672,7 +7903,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -12415,24 +11611,24 @@
+@@ -12415,24 +11638,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7702,7 +7933,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -12441,7 +11637,7 @@
+@@ -12441,7 +11664,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -7711,7 +7942,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -12455,9 +11651,9 @@
+@@ -12455,9 +11678,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
@@ -7723,7 +7954,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -12468,24 +11664,24 @@
+@@ -12468,24 +11691,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7753,7 +7984,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -12495,9 +11691,9 @@
+@@ -12495,9 +11718,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
@@ -7765,7 +7996,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -12509,18 +11705,18 @@
+@@ -12509,18 +11732,18 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7787,7 +8018,7 @@
  IFS=$as_save_IFS
  
  if test $ac_prog_rejected = yes; then
-@@ -12539,10 +11735,10 @@
+@@ -12539,10 +11762,10 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -7800,7 +8031,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -12554,9 +11750,9 @@
+@@ -12554,9 +11777,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
@@ -7812,7 +8043,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -12567,24 +11763,24 @@
+@@ -12567,24 +11790,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7842,7 +8073,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -12598,9 +11794,9 @@
+@@ -12598,9 +11821,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
@@ -7854,7 +8085,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -12611,24 +11807,24 @@
+@@ -12611,24 +11834,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7884,7 +8115,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -12641,7 +11837,7 @@
+@@ -12641,7 +11864,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -7893,7 +8124,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -12652,62 +11848,42 @@
+@@ -12652,62 +11875,42 @@
  fi
  
  
@@ -7914,14 +8145,19 @@
  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
++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 --version >&5") 2>&5
--  ac_status=$?
++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); }
 -{ (ac_try="$ac_compiler -v >&5"
@@ -7936,19 +8172,14 @@
 -  $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
+-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=$?
+-  ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }
 +  if test -s conftest.err; then
@@ -7956,8 +8187,8 @@
 +... rest of stderr output deleted ...
 +         10q' conftest.err >conftest.er1
 +    cat conftest.er1 >&5
-+    rm -f conftest.er1 conftest.err
 +  fi
++  rm -f conftest.er1 conftest.err
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }
 +done
@@ -7978,7 +8209,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -12721,37 +11897,16 @@
+@@ -12721,37 +11924,16 @@
    return 0;
  }
  _ACEOF
@@ -8019,7 +8250,7 @@
  $as_echo "$ac_cv_c_compiler_gnu" >&6; }
  if test $ac_compiler_gnu = yes; then
    GCC=yes
-@@ -12760,20 +11915,16 @@
+@@ -12760,20 +11942,16 @@
  fi
  ac_test_CFLAGS=${CFLAGS+set}
  ac_save_CFLAGS=$CFLAGS
@@ -8043,7 +8274,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -12784,75 +11935,11 @@
+@@ -12784,75 +11962,11 @@
    return 0;
  }
  _ACEOF
@@ -8067,7 +8298,7 @@
 -       } && test -s conftest.$ac_objext; then
 +if ac_fn_c_try_compile "$LINENO"; then :
    ac_cv_prog_cc_g=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
@@ -8117,12 +8348,13 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
++else
 +  CFLAGS=""
 +      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
-@@ -12863,42 +11950,33 @@
+@@ -12863,42 +11977,33 @@
    return 0;
  }
  _ACEOF
@@ -8181,7 +8413,7 @@
  $as_echo "$ac_cv_prog_cc_g" >&6; }
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
-@@ -12915,18 +11993,14 @@
+@@ -12915,18 +12020,14 @@
      CFLAGS=
    fi
  fi
@@ -8203,7 +8435,7 @@
  /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdio.h>
-@@ -12983,32 +12057,9 @@
+@@ -12983,32 +12084,9 @@
  	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
  do
    CC="$ac_save_CC $ac_arg"
@@ -8237,7 +8469,7 @@
  rm -f core conftest.err conftest.$ac_objext
    test "x$ac_cv_prog_cc_c89" != "xno" && break
  done
-@@ -13019,17 +12070,19 @@
+@@ -13019,17 +12097,19 @@
  # AC_CACHE_VAL
  case "x$ac_cv_prog_cc_c89" in
    x)
@@ -8260,7 +8492,7 @@
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -13039,9 +12092,9 @@
+@@ -13039,9 +12119,9 @@
  
  depcc="$CC"   am_compiler_list=
  
@@ -8272,7 +8504,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -13149,7 +12202,7 @@
+@@ -13149,7 +12229,7 @@
  fi
  
  fi
@@ -8281,7 +8513,7 @@
  $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
-@@ -13167,16 +12220,12 @@
+@@ -13167,16 +12247,12 @@
  
  am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
  
@@ -8301,7 +8533,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <stdarg.h>
-@@ -13191,48 +12240,23 @@
+@@ -13191,48 +12267,23 @@
    return 0;
  }
  _ACEOF
@@ -8355,7 +8587,7 @@
  else
    ac_cv_header_stdc=no
  fi
-@@ -13242,18 +12266,14 @@
+@@ -13242,18 +12293,14 @@
  
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -8377,7 +8609,7 @@
  else
    ac_cv_header_stdc=no
  fi
-@@ -13263,14 +12283,10 @@
+@@ -13263,14 +12310,10 @@
  
  if test $ac_cv_header_stdc = yes; then
    # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -8394,7 +8626,7 @@
  /* end confdefs.h.  */
  #include <ctype.h>
  #include <stdlib.h>
-@@ -13297,60 +12313,31 @@
+@@ -13297,60 +12340,31 @@
    return 0;
  }
  _ACEOF
@@ -8464,7 +8696,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GLIB_GENMARSHAL in
-@@ -13363,14 +12350,14 @@
+@@ -13363,14 +12377,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8482,7 +8714,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -13378,19 +12365,19 @@
+@@ -13378,19 +12392,19 @@
  fi
  GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
  if test -n "$GLIB_GENMARSHAL"; then
@@ -8506,7 +8738,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GLIB_MKENUMS in
-@@ -13403,14 +12390,14 @@
+@@ -13403,14 +12417,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8524,7 +8756,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -13418,26 +12405,26 @@
+@@ -13418,26 +12432,26 @@
  fi
  GLIB_MKENUMS=$ac_cv_path_GLIB_MKENUMS
  if test -n "$GLIB_MKENUMS"; then
@@ -8556,7 +8788,7 @@
  $as_echo "$USE_NLS" >&6; }
  
  
-@@ -13445,35 +12432,31 @@
+@@ -13445,35 +12459,31 @@
  
  case "$am__api_version" in
      1.01234)
@@ -8598,7 +8830,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $INTLTOOL_UPDATE in
-@@ -13486,14 +12469,14 @@
+@@ -13486,14 +12496,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8616,7 +8848,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -13501,19 +12484,19 @@
+@@ -13501,19 +12511,19 @@
  fi
  INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
  if test -n "$INTLTOOL_UPDATE"; then
@@ -8640,7 +8872,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $INTLTOOL_MERGE in
-@@ -13526,14 +12509,14 @@
+@@ -13526,14 +12536,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8658,7 +8890,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -13541,19 +12524,19 @@
+@@ -13541,19 +12551,19 @@
  fi
  INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
  if test -n "$INTLTOOL_MERGE"; then
@@ -8682,7 +8914,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $INTLTOOL_EXTRACT in
-@@ -13566,14 +12549,14 @@
+@@ -13566,14 +12576,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8700,7 +8932,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -13581,18 +12564,16 @@
+@@ -13581,18 +12591,16 @@
  fi
  INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
  if test -n "$INTLTOOL_EXTRACT"; then
@@ -8722,7 +8954,7 @@
  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 $< $@'
-@@ -13635,12 +12616,88 @@
+@@ -13635,12 +12643,88 @@
  
  
  
@@ -8813,7 +9045,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $XGETTEXT in
-@@ -13653,14 +12710,14 @@
+@@ -13653,14 +12737,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8831,7 +9063,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -13668,19 +12725,19 @@
+@@ -13668,19 +12752,19 @@
  fi
  XGETTEXT=$ac_cv_path_XGETTEXT
  if test -n "$XGETTEXT"; then
@@ -8855,7 +9087,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $MSGMERGE in
-@@ -13693,14 +12750,14 @@
+@@ -13693,14 +12777,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8873,7 +9105,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -13708,19 +12765,19 @@
+@@ -13708,19 +12792,19 @@
  fi
  MSGMERGE=$ac_cv_path_MSGMERGE
  if test -n "$MSGMERGE"; then
@@ -8897,7 +9129,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $MSGFMT in
-@@ -13733,14 +12790,14 @@
+@@ -13733,14 +12817,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8915,7 +9147,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -13748,19 +12805,19 @@
+@@ -13748,19 +12832,19 @@
  fi
  MSGFMT=$ac_cv_path_MSGFMT
  if test -n "$MSGFMT"; then
@@ -8939,7 +9171,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GMSGFMT in
-@@ -13773,14 +12830,14 @@
+@@ -13773,14 +12857,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8957,7 +9189,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -13789,33 +12846,29 @@
+@@ -13789,33 +12873,29 @@
  fi
  GMSGFMT=$ac_cv_path_GMSGFMT
  if test -n "$GMSGFMT"; then
@@ -8997,7 +9229,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $INTLTOOL_PERL in
-@@ -13828,14 +12881,14 @@
+@@ -13828,14 +12908,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9015,7 +9247,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -13843,173 +12896,63 @@
+@@ -13843,173 +12923,63 @@
  fi
  INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
  if test -n "$INTLTOOL_PERL"; then
@@ -9062,9 +9294,10 @@
 -       { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
 -$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
 -   { (exit 1); exit 1; }; }
--   fi
--fi
--
++       as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
+    fi
+ fi
+ 
 -# Substitute ALL_LINGUAS so we can use it in po/Makefile
 -
 -
@@ -9156,10 +9389,7 @@
 -#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
 -choke me
 -#endif
-+       as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
-+   fi
-+fi
-+
+-
 +# Substitute ALL_LINGUAS so we can use it in po/Makefile
 +
 +
@@ -9168,7 +9398,7 @@
 +if test -z "$DATADIRNAME"; then
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
- 
++
  int
  main ()
  {
@@ -9224,7 +9454,7 @@
    DATADIRNAME=share
  else
    DATADIRNAME=lib
-@@ -14021,10 +12964,8 @@
+@@ -14021,10 +12991,8 @@
      ;;
      esac
  fi
@@ -9237,7 +9467,7 @@
  fi
  
  
-@@ -14038,9 +12979,9 @@
+@@ -14038,9 +13006,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
@@ -9249,7 +9479,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PKG_CONFIG in
-@@ -14053,14 +12994,14 @@
+@@ -14053,14 +13021,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9267,7 +9497,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -14068,10 +13009,10 @@
+@@ -14068,10 +13036,10 @@
  fi
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  if test -n "$PKG_CONFIG"; then
@@ -9280,7 +9510,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -14081,9 +13022,9 @@
+@@ -14081,9 +13049,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
@@ -9292,7 +9522,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $ac_pt_PKG_CONFIG in
-@@ -14096,14 +13037,14 @@
+@@ -14096,14 +13064,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9310,7 +9540,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -14111,10 +13052,10 @@
+@@ -14111,10 +13079,10 @@
  fi
  ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
  if test -n "$ac_pt_PKG_CONFIG"; then
@@ -9323,7 +9553,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -14123,7 +13064,7 @@
+@@ -14123,7 +13091,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -9332,7 +9562,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -14136,13 +13077,13 @@
+@@ -14136,13 +13104,13 @@
  fi
  if test -n "$PKG_CONFIG"; then
  	_pkg_min_version=0.9.0
@@ -9349,7 +9579,7 @@
  $as_echo "no" >&6; }
  		PKG_CONFIG=""
  	fi
-@@ -14151,7 +13092,7 @@
+@@ -14151,7 +13119,7 @@
  
  
  	# Check whether --enable-debug was given.
@@ -9358,7 +9588,7 @@
    enableval=$enable_debug;
  else
    enable_debug=no
-@@ -14160,16 +13101,14 @@
+@@ -14160,16 +13128,14 @@
  
  	if test x$enable_debug = xyes ; then
  
@@ -9377,7 +9607,7 @@
    enableval=$enable_compile_warnings;
  else
    enable_compile_warnings="maximum"
-@@ -14200,13 +13139,9 @@
+@@ -14200,13 +13166,9 @@
  	for option in -Wno-sign-compare; do
  		SAVE_CFLAGS="$CFLAGS"
  		CFLAGS="$CFLAGS $option"
@@ -9393,7 +9623,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -14217,35 +13152,14 @@
+@@ -14217,35 +13179,14 @@
    return 0;
  }
  _ACEOF
@@ -9432,7 +9662,7 @@
  $as_echo "$has_option" >&6; }
  		if test $has_option = yes; then
  		  warning_flags="$warning_flags $option"
-@@ -14259,26 +13173,24 @@
+@@ -14259,26 +13200,24 @@
  	fi
  	;;
      *)
@@ -9464,7 +9694,7 @@
  $as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; }
      complCFLAGS=
      if test "x$enable_iso_c" != "xno"; then
-@@ -14293,7 +13205,7 @@
+@@ -14293,7 +13232,7 @@
  	esac
  	fi
      fi
@@ -9473,7 +9703,7 @@
  $as_echo "$complCFLAGS" >&6; }
  
      WARN_CFLAGS="$warning_flags $complCFLAGS"
-@@ -14302,22 +13214,23 @@
+@@ -14302,22 +13241,23 @@
  
  
  
@@ -9503,7 +9733,7 @@
  
  	enable_debug=yes
  	DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
-@@ -14335,11 +13248,11 @@
+@@ -14335,11 +13275,11 @@
  GNOME_KEYRING_REQUIRED=2.26.0
  
  if test -n "$PKG_CONFIG" && \
@@ -9518,7 +9748,7 @@
    have_libnotify=yes
  else
    have_libnotify=no
-@@ -14349,24 +13262,22 @@
+@@ -14349,24 +13289,22 @@
  if test "$have_libnotify" = "yes"; then
    LIBNOTIFY_PACKAGE="libnotify >= $LIBNOTIFY_REQUIRED"
  
@@ -9547,7 +9777,7 @@
  $as_echo "$enable_tests" >&6; }
  
   if test "$enable_tests" = "yes"; then
-@@ -14380,14 +13291,15 @@
+@@ -14380,14 +13318,15 @@
  
  
  pkg_failed=no
@@ -9569,7 +9799,7 @@
  		  glib-2.0 >= \$GLIB_REQUIRED
  		  gmodule-2.0
  		  gthread-2.0
-@@ -14405,7 +13317,7 @@
+@@ -14405,7 +13344,7 @@
  		  webkit-1.0 >= \$WEBKIT_GTK_REQUIRED
  		  libsoup-gnome-2.4 >= \$LIBSOUP_GNOME_REQUIRED
  		  gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED
@@ -9578,7 +9808,7 @@
    ($PKG_CONFIG --exists --print-errors "
  		  glib-2.0 >= $GLIB_REQUIRED
  		  gmodule-2.0
-@@ -14426,8 +13338,8 @@
+@@ -14426,8 +13365,8 @@
  		  gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
  		  ") 2>&5
    ac_status=$?
@@ -9589,7 +9819,7 @@
    pkg_cv_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "
  		  glib-2.0 >= $GLIB_REQUIRED
  		  gmodule-2.0
-@@ -14450,14 +13362,16 @@
+@@ -14450,14 +13389,16 @@
  else
    pkg_failed=yes
  fi
@@ -9613,7 +9843,7 @@
  		  glib-2.0 >= \$GLIB_REQUIRED
  		  gmodule-2.0
  		  gthread-2.0
-@@ -14475,7 +13389,7 @@
+@@ -14475,7 +13416,7 @@
  		  webkit-1.0 >= \$WEBKIT_GTK_REQUIRED
  		  libsoup-gnome-2.4 >= \$LIBSOUP_GNOME_REQUIRED
  		  gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED
@@ -9622,7 +9852,7 @@
    ($PKG_CONFIG --exists --print-errors "
  		  glib-2.0 >= $GLIB_REQUIRED
  		  gmodule-2.0
-@@ -14496,8 +13410,8 @@
+@@ -14496,8 +13437,8 @@
  		  gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
  		  ") 2>&5
    ac_status=$?
@@ -9633,7 +9863,7 @@
    pkg_cv_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "
  		  glib-2.0 >= $GLIB_REQUIRED
  		  gmodule-2.0
-@@ -14520,8 +13434,9 @@
+@@ -14520,8 +13461,9 @@
  else
    pkg_failed=yes
  fi
@@ -9645,7 +9875,7 @@
  fi
  
  
-@@ -14534,7 +13449,7 @@
+@@ -14534,7 +13476,7 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -9654,7 +9884,7 @@
  		  glib-2.0 >= $GLIB_REQUIRED
  		  gmodule-2.0
  		  gthread-2.0
-@@ -14552,9 +13467,9 @@
+@@ -14552,9 +13494,9 @@
  		  webkit-1.0 >= $WEBKIT_GTK_REQUIRED
  		  libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
  		  gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
@@ -9666,7 +9896,7 @@
  		  glib-2.0 >= $GLIB_REQUIRED
  		  gmodule-2.0
  		  gthread-2.0
-@@ -14572,41 +13487,12 @@
+@@ -14572,41 +13514,12 @@
  		  webkit-1.0 >= $WEBKIT_GTK_REQUIRED
  		  libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
  		  gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
@@ -9710,7 +9940,7 @@
  		  glib-2.0 >= $GLIB_REQUIRED
  		  gmodule-2.0
  		  gthread-2.0
-@@ -14634,22 +13520,11 @@
+@@ -14634,22 +13547,11 @@
  Alternatively, you may set the environment variables DEPENDENCIES_CFLAGS
  and DEPENDENCIES_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
@@ -9736,7 +9966,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -14658,12 +13533,11 @@
+@@ -14658,12 +13560,11 @@
  See the pkg-config man page for more details.
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -9751,7 +9981,7 @@
  $as_echo "yes" >&6; }
  	:
  fi
-@@ -14674,40 +13548,44 @@
+@@ -14674,40 +13575,44 @@
  
  
  pkg_failed=no
@@ -9815,7 +10045,7 @@
  fi
  
  
-@@ -14720,14 +13598,14 @@
+@@ -14720,25 +13625,14 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -9829,25 +10059,25 @@
  	echo "$DBUS_PKG_ERRORS" >&5
  
 -	{ { $as_echo "$as_me:$LINENO: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
+-
+-$DBUS_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 DBUS_CFLAGS
+-and DBUS_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
 +	as_fn_error "Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
  
  $DBUS_PKG_ERRORS
  
-@@ -14737,33 +13615,11 @@
+@@ -14748,22 +13642,11 @@
  Alternatively, you may set the environment variables DBUS_CFLAGS
  and DBUS_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
--" >&5
--$as_echo "$as_me: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
--
--$DBUS_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 DBUS_CFLAGS
--and DBUS_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
@@ -9870,7 +10100,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -14772,21 +13628,20 @@
+@@ -14772,21 +13655,20 @@
  See the pkg-config man page for more details.
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -9896,7 +10126,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $DBUS_BINDING_TOOL in
-@@ -14799,14 +13654,14 @@
+@@ -14799,14 +13681,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9914,7 +10144,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_DBUS_BINDING_TOOL" && ac_cv_path_DBUS_BINDING_TOOL="no"
-@@ -14815,19 +13670,17 @@
+@@ -14815,19 +13697,17 @@
  fi
  DBUS_BINDING_TOOL=$ac_cv_path_DBUS_BINDING_TOOL
  if test -n "$DBUS_BINDING_TOOL"; then
@@ -9937,7 +10167,7 @@
  fi
  
  # *****
-@@ -14843,13 +13696,13 @@
+@@ -14843,13 +13723,13 @@
  
  
  # Check whether --with-gconf-source was given.
@@ -9953,7 +10183,7 @@
  $as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
  
    if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-@@ -14858,22 +13711,20 @@
+@@ -14858,22 +13738,20 @@
  
  
  # Check whether --with-gconf-schema-file-dir was given.
@@ -9980,7 +10210,7 @@
        esac
  fi
  
-@@ -14889,9 +13740,9 @@
+@@ -14889,9 +13767,9 @@
  
  # Extract the first word of "gconftool-2", so it can be a program name with args.
  set dummy gconftool-2; ac_word=$2
@@ -9992,17 +10222,16 @@
    $as_echo_n "(cached) " >&6
  else
    case $GCONFTOOL in
-@@ -14904,303 +13755,60 @@
+@@ -14904,303 +13782,60 @@
  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"
+-    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
+-    break 2
 -  fi
 -done
 -done
@@ -10184,6 +10413,9 @@
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
++    ac_cv_path_GCONFTOOL="$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
@@ -10336,7 +10568,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -15209,18 +13817,14 @@
+@@ -15209,18 +13844,14 @@
  
  done
  
@@ -10358,7 +10590,7 @@
  /* end confdefs.h.  */
  #ifndef __cplusplus
  typedef int foo_t;
-@@ -15229,41 +13833,17 @@
+@@ -15229,41 +13860,17 @@
  #endif
  
  _ACEOF
@@ -10402,7 +10634,7 @@
  case $ac_cv_c_inline in
    inline | yes) ;;
    *)
-@@ -15279,16 +13859,12 @@
+@@ -15279,16 +13886,12 @@
      ;;
  esac
  
@@ -10422,7 +10654,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/time.h>
-@@ -15303,190 +13879,31 @@
+@@ -15303,190 +13906,31 @@
    return 0;
  }
  _ACEOF
@@ -10624,7 +10856,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -15502,100 +13919,12 @@
+@@ -15502,100 +13946,12 @@
  
  
  
@@ -10731,7 +10963,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -15607,31 +13936,15 @@
+@@ -15607,31 +13963,15 @@
  
  
  
@@ -10767,12 +10999,10 @@
  /* end confdefs.h.  */
  /* Test program from Paul Eggert and Tony Leneis.  */
  #ifdef TIME_WITH_SYS_TIME
-@@ -15822,50 +14135,23 @@
- 	  return 1;
- 	else if (INT_MAX / 2 < j)
+@@ -15824,48 +14164,21 @@
  	  break;
--      if (! bigtime_test (INT_MAX))
--	return 1;
+       if (! bigtime_test (INT_MAX))
+ 	return 1;
 -    }
 -  return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
 -}
@@ -10799,8 +11029,6 @@
 -  ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+      if (! bigtime_test (INT_MAX))
-+	return 1;
 +    }
 +  return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
 +}
@@ -10829,7 +11057,7 @@
  $as_echo "$ac_cv_func_working_mktime" >&6; }
  if test $ac_cv_func_working_mktime = no; then
    case " $LIBOBJS " in
-@@ -15876,19 +14162,15 @@
+@@ -15876,19 +14189,15 @@
  
  fi
  
@@ -10853,7 +11081,7 @@
  /* end confdefs.h.  */
  
  $ac_includes_default
-@@ -15921,44 +14203,17 @@
+@@ -15921,44 +14230,17 @@
  }
  
  _ACEOF
@@ -10903,7 +11131,7 @@
  $as_echo "$ac_cv_func_strtod" >&6; }
  if test $ac_cv_func_strtod = no; then
    case " $LIBOBJS " in
-@@ -15967,105 +14222,20 @@
+@@ -15967,105 +14249,20 @@
   ;;
  esac
  
@@ -11014,7 +11242,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -16083,46 +14253,21 @@
+@@ -16083,46 +14280,21 @@
    return 0;
  }
  _ACEOF
@@ -11068,7 +11296,7 @@
  $as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;}
  fi
  
-@@ -16130,102 +14275,9 @@
+@@ -16130,102 +14302,9 @@
  
  fi
  
@@ -11173,7 +11401,7 @@
  else
  
  cat >>confdefs.h <<_ACEOF
-@@ -16249,48 +14301,23 @@
+@@ -16249,48 +14328,23 @@
  	_SAVE_CFLAGS=$CFLAGS
  	CFLAGS="$CFLAGS $_FLAGS"
  
@@ -11228,7 +11456,7 @@
  $as_echo "$ac_cv_have_declaration_after_statement" >&6; }
  
  	if test "$ac_cv_have_declaration_after_statement" = "yes"; then
-@@ -16309,151 +14336,12 @@
+@@ -16309,151 +14363,12 @@
  # Multimedia keys
  # ***************
  
@@ -11384,7 +11612,7 @@
  _ACEOF
  
  fi
-@@ -16467,16 +14355,16 @@
+@@ -16467,16 +14382,16 @@
  # GObject Introspection
  # *********************
  
@@ -11404,7 +11632,7 @@
  $as_echo "$enable_introspection" >&6; }
  
  G_IR_SCANNER=
-@@ -16491,40 +14379,44 @@
+@@ -16491,40 +14406,44 @@
    GOBJECT_INTROSPECTION_REQUIRED=0.6.2
  
  pkg_failed=no
@@ -11468,7 +11696,7 @@
  fi
  
  
-@@ -16537,26 +14429,15 @@
+@@ -16537,26 +14456,15 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -11499,7 +11727,7 @@
  $INTROSPECTION_PKG_ERRORS
  
  Consider adjusting the PKG_CONFIG_PATH environment variable if you
-@@ -16565,22 +14446,11 @@
+@@ -16565,22 +14473,11 @@
  Alternatively, you may set the environment variables INTROSPECTION_CFLAGS
  and INTROSPECTION_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
@@ -11525,7 +11753,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -16589,12 +14459,11 @@
+@@ -16589,12 +14486,11 @@
  See the pkg-config man page for more details.
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -11540,7 +11768,7 @@
  $as_echo "yes" >&6; }
  	:
  fi
-@@ -16606,9 +14475,7 @@
+@@ -16606,9 +14502,7 @@
    GIRTYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
  
  
@@ -11551,7 +11779,7 @@
  
  fi
  
-@@ -16631,22 +14498,20 @@
+@@ -16631,22 +14525,20 @@
  # Seed
  # ****
  
@@ -11578,7 +11806,7 @@
  fi
  
  if test "$enable_seed" = "yes"; then
-@@ -16655,40 +14520,44 @@
+@@ -16655,40 +14547,44 @@
    SEED_REQUIRED=2.27.91
  
  pkg_failed=no
@@ -11642,7 +11870,7 @@
  fi
  
  
-@@ -16701,25 +14570,14 @@
+@@ -16701,25 +14597,14 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -11671,7 +11899,7 @@
  
  $SEED_PKG_ERRORS
  
-@@ -16729,22 +14587,11 @@
+@@ -16729,22 +14614,11 @@
  Alternatively, you may set the environment variables SEED_CFLAGS
  and SEED_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
@@ -11697,7 +11925,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -16753,20 +14600,17 @@
+@@ -16753,20 +14627,17 @@
  See the pkg-config man page for more details.
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -11721,7 +11949,7 @@
  
  fi
  
-@@ -16785,56 +14629,60 @@
+@@ -16785,56 +14656,60 @@
  # NSS
  # ***
  
@@ -11804,7 +12032,7 @@
  fi
  
  
-@@ -16847,14 +14695,14 @@
+@@ -16847,14 +14722,14 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -11822,7 +12050,7 @@
  
  $NSS_PKG_ERRORS
  
-@@ -16864,33 +14712,11 @@
+@@ -16864,33 +14739,11 @@
  Alternatively, you may set the environment variables NSS_CFLAGS
  and NSS_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
@@ -11859,7 +12087,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -16899,20 +14725,17 @@
+@@ -16899,20 +14752,17 @@
  See the pkg-config man page for more details.
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -11883,7 +12111,7 @@
  
  fi
  
-@@ -16932,16 +14755,16 @@
+@@ -16932,16 +14782,16 @@
  
  # Zeroconf bookmarks sites
  
@@ -11903,7 +12131,7 @@
  $as_echo "$enable_zeroconf" >&6; }
  
  if test "$enable_zeroconf" != "no"; then
-@@ -16949,52 +14772,56 @@
+@@ -16949,52 +14799,56 @@
  
  
  pkg_failed=no
@@ -11981,7 +12209,7 @@
  fi
  
  
-@@ -17007,18 +14834,18 @@
+@@ -17007,18 +14861,18 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -12005,7 +12233,7 @@
  $as_echo "no" >&6; }
                  have_avahi=no
  elif test $pkg_failed = untried; then
-@@ -17026,15 +14853,13 @@
+@@ -17026,15 +14880,13 @@
  else
  	AVAHI_CFLAGS=$pkg_cv_AVAHI_CFLAGS
  	AVAHI_LIBS=$pkg_cv_AVAHI_LIBS
@@ -12023,7 +12251,7 @@
          elif test "$have_avahi" = "yes"; then
                  enable_zeroconf=yes
          else
-@@ -17044,9 +14869,7 @@
+@@ -17044,9 +14896,7 @@
  
  if test "$enable_zeroconf" = "yes"; then
  
@@ -12034,7 +12262,7 @@
  
  fi
  
-@@ -17061,55 +14884,59 @@
+@@ -17061,55 +14911,59 @@
  
  # NetworkManager
  
@@ -12116,7 +12344,7 @@
  fi
  
  
-@@ -17122,14 +14949,14 @@
+@@ -17122,14 +14976,14 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -12134,7 +12362,7 @@
  $as_echo "no" >&6; }
                  have_network_manager=no
  elif test $pkg_failed = untried; then
-@@ -17137,26 +14964,22 @@
+@@ -17137,26 +14991,22 @@
  else
  	NETWORK_MANAGER_CFLAGS=$pkg_cv_NETWORK_MANAGER_CFLAGS
  	NETWORK_MANAGER_LIBS=$pkg_cv_NETWORK_MANAGER_LIBS
@@ -12165,7 +12393,7 @@
  
  fi
  
-@@ -17197,18 +15020,18 @@
+@@ -17197,18 +15047,18 @@
  ISO_CODES_REQUIRED=0.35
  
  if test -n "$PKG_CONFIG" && \
@@ -12188,7 +12416,7 @@
  $as_echo_n "checking whether iso-codes has iso-639 and iso-3166 domains... " >&6; }
  	if $PKG_CONFIG --variable=domains iso-codes | grep -q 639 && \
  	   $PKG_CONFIG --variable=domains iso-codes | grep -q 3166 ; then
-@@ -17217,7 +15040,7 @@
+@@ -17217,7 +15067,7 @@
  		result=no
  		have_iso_codes=no
  	fi
@@ -12197,7 +12425,7 @@
  $as_echo "$result" >&6; }
  fi
  
-@@ -17228,14 +15051,10 @@
+@@ -17228,14 +15078,10 @@
  _ACEOF
  
  
@@ -12214,7 +12442,7 @@
  fi
  
  GETTEXT_PACKAGE=epiphany
-@@ -17246,151 +15065,12 @@
+@@ -17246,151 +15092,12 @@
  _ACEOF
  
  
@@ -12371,7 +12599,7 @@
  _ACEOF
  
  fi
-@@ -17398,16 +15078,12 @@
+@@ -17398,16 +15105,12 @@
  done
  
      if test $ac_cv_header_locale_h = yes; then
@@ -12391,7 +12619,7 @@
  /* end confdefs.h.  */
  #include <locale.h>
  int
-@@ -17418,207 +15094,45 @@
+@@ -17418,207 +15121,45 @@
    return 0;
  }
  _ACEOF
@@ -12624,7 +12852,7 @@
  /* end confdefs.h.  */
  
  #include <libintl.h>
-@@ -17631,54 +15145,25 @@
+@@ -17631,54 +15172,25 @@
    return 0;
  }
  _ACEOF
@@ -12687,7 +12915,7 @@
  /* end confdefs.h.  */
  
  #include <libintl.h>
-@@ -17691,141 +15176,26 @@
+@@ -17691,141 +15203,26 @@
    return 0;
  }
  _ACEOF
@@ -12839,7 +13067,7 @@
  _ACEOF
  
  fi
-@@ -17840,18 +15210,14 @@
+@@ -17840,18 +15237,14 @@
  	 || test "$gt_cv_func_ngettext_libc" != "yes" \
           || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
  
@@ -12861,7 +13089,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -17869,55 +15235,26 @@
+@@ -17869,55 +15262,26 @@
    return 0;
  }
  _ACEOF
@@ -12926,7 +13154,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -17935,55 +15272,26 @@
+@@ -17935,55 +15299,26 @@
    return 0;
  }
  _ACEOF
@@ -12991,7 +13219,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -18001,43 +15309,18 @@
+@@ -18001,43 +15336,18 @@
    return 0;
  }
  _ACEOF
@@ -13041,7 +13269,7 @@
    gt_cv_func_dgettext_libintl=yes
  fi
  
-@@ -18047,22 +15330,18 @@
+@@ -18047,22 +15357,18 @@
  
  
  	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -13069,7 +13297,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -18080,55 +15359,26 @@
+@@ -18080,55 +15386,26 @@
    return 0;
  }
  _ACEOF
@@ -13134,7 +13362,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -18146,160 +15396,45 @@
+@@ -18146,160 +15423,45 @@
    return 0;
  }
  _ACEOF
@@ -13324,7 +13552,7 @@
  _ACEOF
  
  fi
-@@ -18329,15 +15464,13 @@
+@@ -18329,15 +15491,13 @@
  
        if test "$gt_cv_have_gettext" = "yes"; then
  
@@ -13343,7 +13571,7 @@
    $as_echo_n "(cached) " >&6
  else
    case "$MSGFMT" in
-@@ -18362,118 +15495,28 @@
+@@ -18362,118 +15522,28 @@
  fi
  MSGFMT="$ac_cv_path_MSGFMT"
  if test "$MSGFMT" != "no"; then
@@ -13470,7 +13698,7 @@
  $as_echo_n "checking if msgfmt accepts -c... " >&6; }
  	  cat >conftest.foo <<_ACEOF
  
-@@ -18488,14 +15531,14 @@
+@@ -18488,14 +15558,14 @@
  "Content-Transfer-Encoding: 8bit\n"
  
  _ACEOF
@@ -13490,7 +13718,7 @@
  $as_echo "no" >&6; }
  echo "$as_me: failed input was:" >&5
  sed 's/^/| /' conftest.foo >&5
-@@ -18503,9 +15546,9 @@
+@@ -18503,9 +15573,9 @@
  
  	  # Extract the first word of "gmsgfmt", so it can be a program name with args.
  set dummy gmsgfmt; ac_word=$2
@@ -13502,7 +13730,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GMSGFMT in
-@@ -18518,14 +15561,14 @@
+@@ -18518,14 +15588,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -13520,7 +13748,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -18534,19 +15577,19 @@
+@@ -18534,19 +15604,19 @@
  fi
  GMSGFMT=$ac_cv_path_GMSGFMT
  if test -n "$GMSGFMT"; then
@@ -13544,7 +13772,7 @@
    $as_echo_n "(cached) " >&6
  else
    case "$XGETTEXT" in
-@@ -18571,18 +15614,14 @@
+@@ -18571,18 +15641,14 @@
  fi
  XGETTEXT="$ac_cv_path_XGETTEXT"
  if test "$XGETTEXT" != ":"; then
@@ -13566,7 +13794,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -18594,121 +15633,14 @@
+@@ -18594,121 +15660,14 @@
    return 0;
  }
  _ACEOF
@@ -13692,7 +13920,7 @@
    CATOBJEXT=.gmo
                 DATADIRNAME=share
  else
-@@ -18723,10 +15655,8 @@
+@@ -18723,10 +15682,8 @@
  	    ;;
  	    esac
  fi
@@ -13705,7 +13933,7 @@
            LIBS="$glib_save_LIBS"
  	  INSTOBJEXT=.mo
  	else
-@@ -18740,9 +15670,7 @@
+@@ -18740,9 +15697,7 @@
  
      if test "$gt_cv_have_gettext" = "yes" ; then
  
@@ -13716,7 +13944,7 @@
  
      fi
  
-@@ -18750,7 +15678,7 @@
+@@ -18750,7 +15705,7 @@
                    if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
          : ;
        else
@@ -13725,7 +13953,7 @@
  $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
          XGETTEXT=":"
        fi
-@@ -18783,7 +15711,7 @@
+@@ -18783,7 +15738,7 @@
       if test "x$ALL_LINGUAS" = "x"; then
         LINGUAS=
       else
@@ -13734,7 +13962,7 @@
  $as_echo_n "checking for catalogs to be installed... " >&6; }
         NEW_LINGUAS=
         for presentlang in $ALL_LINGUAS; do
-@@ -18808,7 +15736,7 @@
+@@ -18808,7 +15763,7 @@
           fi
         done
         LINGUAS=$NEW_LINGUAS
@@ -13743,7 +13971,7 @@
  $as_echo "$LINGUAS" >&6; }
       fi
  
-@@ -18856,7 +15784,7 @@
+@@ -18856,7 +15811,7 @@
  
  
  # Check whether --with-distributor-name was given.
@@ -13752,7 +13980,7 @@
    withval=$with_distributor_name; LSB_DISTRIBUTOR="$withval"
  fi
  
-@@ -18866,9 +15794,9 @@
+@@ -18866,9 +15821,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
@@ -13764,7 +13992,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$LSB_RELEASE"; then
-@@ -18879,24 +15807,24 @@
+@@ -18879,24 +15834,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -13794,7 +14022,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -18926,29 +15854,33 @@
+@@ -18926,29 +15881,33 @@
  
  gdu_cv_version_required=0.3.2
  
@@ -13835,7 +14063,7 @@
    withval=$with_help_dir;
  else
    with_help_dir='${datadir}/gnome/help'
-@@ -18959,7 +15891,7 @@
+@@ -18959,7 +15918,7 @@
  
  
  # Check whether --with-omf-dir was given.
@@ -13844,7 +14072,7 @@
    withval=$with_omf_dir;
  else
    with_omf_dir='${datadir}/omf'
-@@ -18970,7 +15902,7 @@
+@@ -18970,7 +15929,7 @@
  
  
  # Check whether --with-help-formats was given.
@@ -13853,7 +14081,7 @@
    withval=$with_help_formats;
  else
    with_help_formats=''
-@@ -18980,7 +15912,7 @@
+@@ -18980,7 +15939,7 @@
  
  
  # Check whether --enable-scrollkeeper was given.
@@ -13862,7 +14090,7 @@
    enableval=$enable_scrollkeeper;
  else
    enable_scrollkeeper=yes
-@@ -19003,143 +15935,15 @@
+@@ -19003,143 +15962,15 @@
    HAVE_GNOME_DOC_UTILS_FALSE='#'
  else
    HAVE_GNOME_DOC_UTILS_TRUE='#'
@@ -14009,7 +14237,7 @@
    withval=$with_html_dir;
  else
    with_html_dir='${datadir}/gtk-doc/html'
-@@ -19149,7 +15953,7 @@
+@@ -19149,7 +15980,7 @@
  
  
      # Check whether --enable-gtk-doc was given.
@@ -14018,7 +14246,7 @@
    enableval=$enable_gtk_doc;
  else
    enable_gtk_doc=no
-@@ -19158,42 +15962,66 @@
+@@ -19158,42 +15989,66 @@
  
    if test x$enable_gtk_doc = xyes; then
      if test -n "$PKG_CONFIG" && \
@@ -14105,7 +14333,7 @@
  
  
     if test x$enable_gtk_doc = xyes; then
-@@ -19204,22 +16032,6 @@
+@@ -19204,22 +16059,6 @@
    ENABLE_GTK_DOC_FALSE=
  fi
  
@@ -14128,7 +14356,7 @@
     if test -n "$LIBTOOL"; then
    GTK_DOC_USE_LIBTOOL_TRUE=
    GTK_DOC_USE_LIBTOOL_FALSE='#'
-@@ -19228,14 +16040,6 @@
+@@ -19228,14 +16067,6 @@
    GTK_DOC_USE_LIBTOOL_FALSE=
  fi
  
@@ -14143,7 +14371,7 @@
  
  
  # ****************************
-@@ -19254,9 +16058,7 @@
+@@ -19254,9 +16085,7 @@
  # ************
  
  
@@ -14154,7 +14382,7 @@
  
  
  ac_config_files="$ac_config_files Makefile data/Makefile data/epiphany-${EPIPHANY_API_VERSION}.pc:data/epiphany.pc.in data/epiphany.desktop.in data/bme.desktop.in data/glade/Makefile data/icons/Makefile data/art/Makefile data/ui/Makefile doc/Makefile doc/reference/Makefile lib/Makefile lib/egg/Makefile lib/widgets/Makefile embed/Makefile src/Makefile src/bookmarks/Makefile src/epiphany.h help/Makefile po/Makefile.in tests/Makefile"
-@@ -19289,13 +16091,13 @@
+@@ -19289,13 +16118,13 @@
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
@@ -14170,7 +14398,7 @@
        esac ;;
      esac
    done
-@@ -19303,8 +16105,8 @@
+@@ -19303,8 +16132,8 @@
    (set) 2>&1 |
      case $as_nl`(ac_space=' '; set) 2>&1` in #(
      *${as_nl}ac_space=\ *)
@@ -14181,7 +14409,7 @@
        sed -n \
  	"s/'/'\\\\''/g;
  	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -19327,11 +16129,11 @@
+@@ -19327,11 +16156,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" &&
@@ -14195,7 +14423,7 @@
  $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
    fi
  fi
-@@ -19351,8 +16153,8 @@
+@@ -19351,8 +16180,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.
@@ -14206,7 +14434,7 @@
  done
  LIBOBJS=$ac_libobjs
  
-@@ -19368,157 +16170,86 @@
+@@ -19368,157 +16197,86 @@
  fi
  
  if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -14401,7 +14629,7 @@
  #! $SHELL
  # Generated by $as_me.
  # Run this file to recreate the current configuration.
-@@ -19528,17 +16259,18 @@
+@@ -19528,17 +16286,18 @@
  debug=false
  ac_cs_recheck=false
  ac_cs_silent=false
@@ -14427,7 +14655,7 @@
    emulate sh
    NULLCMD=:
    # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -19546,23 +16278,15 @@
+@@ -19546,23 +16305,15 @@
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
  else
@@ -14456,7 +14684,7 @@
  as_nl='
  '
  export as_nl
-@@ -19570,7 +16294,13 @@
+@@ -19570,7 +16321,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
@@ -14471,7 +14699,7 @@
    as_echo='printf %s\n'
    as_echo_n='printf %s'
  else
-@@ -19581,7 +16311,7 @@
+@@ -19581,7 +16338,7 @@
      as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
      as_echo_n_body='eval
        arg=$1;
@@ -14480,7 +14708,7 @@
        *"$as_nl"*)
  	expr "X$arg" : "X\\(.*\\)$as_nl";
  	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -19604,13 +16334,6 @@
+@@ -19604,13 +16361,6 @@
    }
  fi
  
@@ -14494,7 +14722,7 @@
  
  # IFS
  # We need space, tab and new line, in precisely that order.  Quoting is
-@@ -19620,15 +16343,15 @@
+@@ -19620,15 +16370,15 @@
  IFS=" ""	$as_nl"
  
  # Find who we are.  Look in the path if we contain no directory separator.
@@ -14513,7 +14741,7 @@
  IFS=$as_save_IFS
  
       ;;
-@@ -19640,12 +16363,16 @@
+@@ -19640,12 +16390,16 @@
  fi
  if test ! -f "$as_myself"; then
    $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -14534,7 +14762,7 @@
  done
  PS1='$ '
  PS2='> '
-@@ -19657,7 +16384,89 @@
+@@ -19657,7 +16411,89 @@
  LANGUAGE=C
  export LANGUAGE
  
@@ -14625,7 +14853,7 @@
  if expr a : '\(a\)' >/dev/null 2>&1 &&
     test "X`expr 00001 : '.*\(...\)'`" = X001; then
    as_expr=expr
-@@ -19671,8 +16480,12 @@
+@@ -19671,8 +16507,12 @@
    as_basename=false
  fi
  
@@ -14639,7 +14867,7 @@
  as_me=`$as_basename -- "$0" ||
  $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
  	 X"$0" : 'X\(//\)$' \| \
-@@ -19692,76 +16505,25 @@
+@@ -19692,76 +16532,25 @@
  	  }
  	  s/.*/./; q'`
  
@@ -14727,7 +14955,7 @@
  
  rm -f conf$$ conf$$.exe conf$$.file
  if test -d conf$$.dir; then
-@@ -19790,8 +16552,56 @@
+@@ -19790,8 +16579,56 @@
  rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
  rmdir conf$$.dir 2>/dev/null
  
@@ -14785,7 +15013,7 @@
  else
    test -d ./-p && rmdir ./-p
    as_mkdir_p=false
-@@ -19810,10 +16620,10 @@
+@@ -19810,10 +16647,10 @@
        if test -d "$1"; then
  	test -d "$1/.";
        else
@@ -14798,7 +15026,7 @@
  	???[sx]*):;;*)false;;esac;fi
      '\'' sh
    '
-@@ -19828,13 +16638,19 @@
+@@ -19828,13 +16665,19 @@
  
  
  exec 6>&1
@@ -14814,13 +15042,13 @@
  # report actual input values of CONFIG_FILES etc. instead of their
  # values after options handling.
  ac_log="
- This file was extended by GNOME Web Browser $as_me 2.29.1, which was
+ This file was extended by GNOME Web Browser $as_me 2.29.3, which was
 -generated by GNU Autoconf 2.63.  Invocation command line was
-+generated by GNU Autoconf 2.64.  Invocation command line was
++generated by GNU Autoconf 2.65.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -19866,10 +16682,11 @@
+@@ -19866,13 +16709,15 @@
  
  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  ac_cs_usage="\
@@ -14835,7 +15063,11 @@
  
    -h, --help       print this help, then exit
    -V, --version    print version number and configuration settings, then exit
-@@ -19891,16 +16708,16 @@
++      --config     print configuration, then exit
+   -q, --quiet, --silent
+                    do not print progress messages
+   -d, --debug      don't remove temporary files
+@@ -19891,16 +16736,17 @@
  Configuration commands:
  $config_commands
  
@@ -14844,18 +15076,29 @@
  
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  ac_cs_version="\\
- GNOME Web Browser config.status 2.29.1
+ GNOME Web Browser config.status 2.29.3
 -configured by $0, generated by GNU Autoconf 2.63,
-+configured by $0, generated by GNU Autoconf 2.64,
-   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+-  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."
  
-@@ -19943,20 +16760,19 @@
+@@ -19936,6 +16782,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 )
+@@ -19943,20 +16791,19 @@
      case $ac_optarg in
      *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
@@ -14880,7 +15123,7 @@
    --help | --hel | -h )
      $as_echo "$ac_cs_usage"; exit ;;
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -19964,11 +16780,10 @@
+@@ -19964,11 +16811,10 @@
      ac_cs_silent=: ;;
  
    # This is an error.
@@ -14895,7 +15138,7 @@
       ac_need_defaults=false ;;
  
    esac
-@@ -20303,9 +17118,7 @@
+@@ -20303,9 +17149,7 @@
      "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
      "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
  
@@ -14906,7 +15149,7 @@
    esac
  done
  
-@@ -20332,7 +17145,7 @@
+@@ -20332,7 +17176,7 @@
    trap 'exit_status=$?
    { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
  ' 0
@@ -14915,7 +15158,7 @@
  }
  # Create a (secure) tmp directory for tmp files.
  
-@@ -20343,11 +17156,7 @@
+@@ -20343,11 +17187,7 @@
  {
    tmp=./conf$$-$RANDOM
    (umask 077 && mkdir "$tmp")
@@ -14928,7 +15171,7 @@
  
  # Set up the scripts for CONFIG_FILES section.
  # No need to generate them if there are no CONFIG_FILES.
-@@ -20355,10 +17164,16 @@
+@@ -20355,10 +17195,16 @@
  if test -n "$CONFIG_FILES"; then
  
  
@@ -14947,7 +15190,7 @@
  else
    ac_cs_awk_cr=$ac_cr
  fi
-@@ -20372,24 +17187,18 @@
+@@ -20372,24 +17218,18 @@
    echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
    echo "_ACEOF"
  } >conf$$subs.sh ||
@@ -14975,7 +15218,25 @@
    else
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
-@@ -20478,9 +17287,7 @@
+@@ -20411,7 +17251,7 @@
+ t delim
+ :nl
+ h
+-s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
+ t more1
+ s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+ p
+@@ -20425,7 +17265,7 @@
+ t nl
+ :delim
+ h
+-s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
+ t more2
+ s/["\\]/\\&/g; s/^/"/; s/$/"/
+ p
+@@ -20478,9 +17318,7 @@
  else
    cat
  fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -14986,7 +15247,7 @@
  _ACEOF
  
  # VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -20521,9 +17328,7 @@
+@@ -20521,9 +17359,7 @@
    if test -z "$ac_t"; then
      break
    elif $ac_last_try; then
@@ -14997,7 +15258,7 @@
    else
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
-@@ -20608,9 +17413,7 @@
+@@ -20608,9 +17444,7 @@
  _ACAWK
  _ACEOF
  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -15008,7 +15269,7 @@
  fi # test -n "$CONFIG_HEADERS"
  
  
-@@ -20623,9 +17426,7 @@
+@@ -20623,9 +17457,7 @@
    esac
    case $ac_mode$ac_tag in
    :[FHL]*:*);;
@@ -15019,7 +15280,7 @@
    :[FH]-) ac_tag=-:-;;
    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    esac
-@@ -20653,12 +17454,10 @@
+@@ -20653,12 +17485,10 @@
  	   [\\/$]*) false;;
  	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
  	   esac ||
@@ -15034,7 +15295,7 @@
      done
  
      # Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -20669,7 +17468,7 @@
+@@ -20669,7 +17499,7 @@
  	`' by configure.'
      if test x"$ac_file" != x-; then
        configure_input="$ac_file.  $configure_input"
@@ -15043,7 +15304,7 @@
  $as_echo "$as_me: creating $ac_file" >&6;}
      fi
      # Neutralize special characters interpreted by sed in replacement strings.
-@@ -20682,9 +17481,7 @@
+@@ -20682,9 +17512,7 @@
  
      case $ac_tag in
      *:-:* | *:-) cat >"$tmp/stdin" \
@@ -15054,7 +15315,7 @@
      esac
      ;;
    esac
-@@ -20712,47 +17509,7 @@
+@@ -20712,47 +17540,7 @@
  	    q
  	  }
  	  s/.*/./; q'`
@@ -15103,7 +15364,7 @@
    ac_builddir=.
  
  case "$ac_dir" in
-@@ -20809,7 +17566,6 @@
+@@ -20809,7 +17597,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=
@@ -15111,7 +15372,7 @@
  ac_sed_dataroot='
  /datarootdir/ {
    p
-@@ -20819,12 +17575,11 @@
+@@ -20819,12 +17606,11 @@
  /@docdir@/p
  /@infodir@/p
  /@localedir@/p
@@ -15126,7 +15387,7 @@
  $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -20834,7 +17589,7 @@
+@@ -20834,7 +17620,7 @@
    s&@infodir@&$infodir&g
    s&@localedir@&$localedir&g
    s&@mandir@&$mandir&g
@@ -15135,7 +15396,7 @@
  esac
  _ACEOF
  
-@@ -20863,14 +17618,12 @@
+@@ -20863,14 +17649,12 @@
  $ac_datarootdir_hack
  "
  eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -15152,7 +15413,7 @@
  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;}
-@@ -20880,9 +17633,7 @@
+@@ -20880,9 +17664,7 @@
    -) cat "$tmp/out" && rm -f "$tmp/out";;
    *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
    esac \
@@ -15163,7 +15424,7 @@
   ;;
    :H)
    #
-@@ -20893,25 +17644,19 @@
+@@ -20893,25 +17675,19 @@
        $as_echo "/* $configure_input  */" \
        && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
      } >"$tmp/config.h" \
@@ -15193,7 +15454,7 @@
    fi
  # Compute "$ac_file"'s index in $config_headers.
  _am_arg="$ac_file"
-@@ -20949,7 +17694,7 @@
+@@ -20949,7 +17725,7 @@
  	  s/.*/./; q'`/stamp-h$_am_stamp_count
   ;;
  
@@ -15202,7 +15463,7 @@
  $as_echo "$as_me: executing $ac_file commands" >&6;}
   ;;
    esac
-@@ -21044,47 +17789,7 @@
+@@ -21044,47 +17820,7 @@
  	    q
  	  }
  	  s/.*/./; q'`
@@ -15251,7 +15512,7 @@
        # echo "creating $dirpart/$file"
        echo '# dummy' > "$dirpart/$file"
      done
-@@ -21730,10 +18435,8 @@
+@@ -21730,10 +18466,8 @@
          sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
        esac ;;
      "po/stamp-it":C)
@@ -15264,7 +15525,7 @@
      fi
      rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
      >"po/stamp-it.tmp"
-@@ -21756,15 +18459,12 @@
+@@ -21756,15 +18490,12 @@
  done # for ac_tag
  
  
@@ -15282,7 +15543,7 @@
  
  
  # configure is writing to config.log, and then calls config.status.
-@@ -21785,10 +18485,10 @@
+@@ -21785,10 +18516,10 @@
    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.
@@ -15295,10 +15556,9 @@
  $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
  fi
  
-Index: epiphany-browser-2.29.1/data/art/Makefile.in
-===================================================================
---- epiphany-browser-2.29.1.orig/data/art/Makefile.in	2009-10-26 17:15:28.000000000 -0200
-+++ epiphany-browser-2.29.1/data/art/Makefile.in	2009-10-30 10:55:31.468302394 -0200
+diff -Naur epiphany-browser-2.29.3.old/data/art/Makefile.in epiphany-browser-2.29.3/data/art/Makefile.in
+--- epiphany-browser-2.29.3.old/data/art/Makefile.in	2009-11-30 19:28:24.000000000 +0100
++++ epiphany-browser-2.29.3/data/art/Makefile.in	2009-12-03 15:54:35.943093881 +0100
 @@ -142,8 +142,6 @@
  GMSGFMT = @GMSGFMT@
  GREP = @GREP@
@@ -15346,10 +15606,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
-Index: epiphany-browser-2.29.1/data/glade/Makefile.in
-===================================================================
---- epiphany-browser-2.29.1.orig/data/glade/Makefile.in	2009-10-26 17:33:18.000000000 -0200
-+++ epiphany-browser-2.29.1/data/glade/Makefile.in	2009-10-30 10:55:31.540298438 -0200
+diff -Naur epiphany-browser-2.29.3.old/data/glade/Makefile.in epiphany-browser-2.29.3/data/glade/Makefile.in
+--- epiphany-browser-2.29.3.old/data/glade/Makefile.in	2009-11-30 19:28:24.000000000 +0100
++++ epiphany-browser-2.29.3/data/glade/Makefile.in	2009-12-03 15:54:36.003094246 +0100
 @@ -142,8 +142,6 @@
  GMSGFMT = @GMSGFMT@
  GREP = @GREP@
@@ -15397,10 +15656,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
-Index: epiphany-browser-2.29.1/data/icons/Makefile.in
-===================================================================
---- epiphany-browser-2.29.1.orig/data/icons/Makefile.in	2009-10-26 17:15:29.000000000 -0200
-+++ epiphany-browser-2.29.1/data/icons/Makefile.in	2009-10-30 10:55:31.616298083 -0200
+diff -Naur epiphany-browser-2.29.3.old/data/icons/Makefile.in epiphany-browser-2.29.3/data/icons/Makefile.in
+--- epiphany-browser-2.29.3.old/data/icons/Makefile.in	2009-11-30 19:28:25.000000000 +0100
++++ epiphany-browser-2.29.3/data/icons/Makefile.in	2009-12-03 15:54:36.067095045 +0100
 @@ -120,8 +120,6 @@
  GMSGFMT = @GMSGFMT@
  GREP = @GREP@
@@ -15448,10 +15706,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
-Index: epiphany-browser-2.29.1/data/Makefile.in
-===================================================================
---- epiphany-browser-2.29.1.orig/data/Makefile.in	2009-10-26 17:15:28.000000000 -0200
-+++ epiphany-browser-2.29.1/data/Makefile.in	2009-10-30 10:55:31.392298692 -0200
+diff -Naur epiphany-browser-2.29.3.old/data/Makefile.in epiphany-browser-2.29.3/data/Makefile.in
+--- epiphany-browser-2.29.3.old/data/Makefile.in	2009-11-30 19:28:24.000000000 +0100
++++ epiphany-browser-2.29.3/data/Makefile.in	2009-12-03 15:54:35.875094660 +0100
 @@ -192,8 +192,6 @@
  GMSGFMT = @GMSGFMT@
  GREP = @GREP@
@@ -15499,10 +15756,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
-Index: epiphany-browser-2.29.1/data/ui/Makefile.in
-===================================================================
---- epiphany-browser-2.29.1.orig/data/ui/Makefile.in	2009-10-26 17:15:29.000000000 -0200
-+++ epiphany-browser-2.29.1/data/ui/Makefile.in	2009-10-30 10:55:31.688298027 -0200
+diff -Naur epiphany-browser-2.29.3.old/data/ui/Makefile.in epiphany-browser-2.29.3/data/ui/Makefile.in
+--- epiphany-browser-2.29.3.old/data/ui/Makefile.in	2009-11-30 19:28:25.000000000 +0100
++++ epiphany-browser-2.29.3/data/ui/Makefile.in	2009-12-03 15:54:36.132100228 +0100
 @@ -142,8 +142,6 @@
  GMSGFMT = @GMSGFMT@
  GREP = @GREP@
@@ -15550,10 +15806,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
-Index: epiphany-browser-2.29.1/doc/Makefile.in
-===================================================================
---- epiphany-browser-2.29.1.orig/doc/Makefile.in	2009-10-26 17:15:29.000000000 -0200
-+++ epiphany-browser-2.29.1/doc/Makefile.in	2009-10-30 10:55:31.768298129 -0200
+diff -Naur epiphany-browser-2.29.3.old/doc/Makefile.in epiphany-browser-2.29.3/doc/Makefile.in
+--- epiphany-browser-2.29.3.old/doc/Makefile.in	2009-11-30 19:28:25.000000000 +0100
++++ epiphany-browser-2.29.3/doc/Makefile.in	2009-12-03 15:54:36.196095649 +0100
 @@ -183,8 +183,6 @@
  GMSGFMT = @GMSGFMT@
  GREP = @GREP@
@@ -15601,10 +15856,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
-Index: epiphany-browser-2.29.1/doc/reference/Makefile.in
-===================================================================
---- epiphany-browser-2.29.1.orig/doc/reference/Makefile.in	2009-10-26 17:15:29.000000000 -0200
-+++ epiphany-browser-2.29.1/doc/reference/Makefile.in	2009-10-30 10:55:31.856299587 -0200
+diff -Naur epiphany-browser-2.29.3.old/doc/reference/Makefile.in epiphany-browser-2.29.3/doc/reference/Makefile.in
+--- epiphany-browser-2.29.3.old/doc/reference/Makefile.in	2009-11-30 19:28:25.000000000 +0100
++++ epiphany-browser-2.29.3/doc/reference/Makefile.in	2009-12-03 15:54:36.264094098 +0100
 @@ -121,8 +121,6 @@
  GMSGFMT = @GMSGFMT@
  GREP = @GREP@
@@ -15652,10 +15906,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
-Index: epiphany-browser-2.29.1/embed/Makefile.in
-===================================================================
---- epiphany-browser-2.29.1.orig/embed/Makefile.in	2009-10-26 17:15:29.000000000 -0200
-+++ epiphany-browser-2.29.1/embed/Makefile.in	2009-10-30 10:55:32.064298943 -0200
+diff -Naur epiphany-browser-2.29.3.old/embed/Makefile.in epiphany-browser-2.29.3/embed/Makefile.in
+--- epiphany-browser-2.29.3.old/embed/Makefile.in	2009-11-30 19:28:27.000000000 +0100
++++ epiphany-browser-2.29.3/embed/Makefile.in	2009-12-03 15:54:36.483094499 +0100
 @@ -197,8 +197,6 @@
  GMSGFMT = @GMSGFMT@
  GREP = @GREP@
@@ -15703,10 +15956,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
-Index: epiphany-browser-2.29.1/gnome-doc-utils.make
-===================================================================
---- epiphany-browser-2.29.1.orig/gnome-doc-utils.make	2009-10-22 13:24:10.000000000 -0200
-+++ epiphany-browser-2.29.1/gnome-doc-utils.make	2009-10-30 10:55:17.332304166 -0200
+diff -Naur epiphany-browser-2.29.3.old/gnome-doc-utils.make epiphany-browser-2.29.3/gnome-doc-utils.make
+--- epiphany-browser-2.29.3.old/gnome-doc-utils.make	2009-11-18 13:38:39.000000000 +0100
++++ epiphany-browser-2.29.3/gnome-doc-utils.make	2009-12-03 15:54:29.495161116 +0100
 @@ -92,6 +92,14 @@
  ## The name of the document being built
  DOC_MODULE ?=
@@ -16069,10 +16321,9 @@
 +	  echo "rm -f $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
 +	  rm -f "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
  	done
-Index: epiphany-browser-2.29.1/gtk-doc.make
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ epiphany-browser-2.29.1/gtk-doc.make	2009-10-30 10:55:17.332304166 -0200
+diff -Naur epiphany-browser-2.29.3.old/gtk-doc.make epiphany-browser-2.29.3/gtk-doc.make
+--- epiphany-browser-2.29.3.old/gtk-doc.make	1970-01-01 01:00:00.000000000 +0100
++++ epiphany-browser-2.29.3/gtk-doc.make	2009-12-03 15:54:29.407135399 +0100
 @@ -0,0 +1,196 @@
 +# -*- mode: makefile -*-
 +
@@ -16270,10 +16521,9 @@
 +	  gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
 +
 +.PHONY : dist-hook-local docs
-Index: epiphany-browser-2.29.1/help/Makefile.in
-===================================================================
---- epiphany-browser-2.29.1.orig/help/Makefile.in	2009-10-26 17:15:30.000000000 -0200
-+++ epiphany-browser-2.29.1/help/Makefile.in	2009-10-30 10:55:32.184299483 -0200
+diff -Naur epiphany-browser-2.29.3.old/help/Makefile.in epiphany-browser-2.29.3/help/Makefile.in
+--- epiphany-browser-2.29.3.old/help/Makefile.in	2009-11-30 19:28:27.000000000 +0100
++++ epiphany-browser-2.29.3/help/Makefile.in	2009-12-03 15:54:36.576095701 +0100
 @@ -143,8 +143,6 @@
  GMSGFMT = @GMSGFMT@
  GREP = @GREP@
@@ -16650,10 +16900,9 @@
  	done
  
  dist-hook: doc-dist-hook
-Index: epiphany-browser-2.29.1/lib/egg/Makefile.in
-===================================================================
---- epiphany-browser-2.29.1.orig/lib/egg/Makefile.in	2009-10-26 17:15:30.000000000 -0200
-+++ epiphany-browser-2.29.1/lib/egg/Makefile.in	2009-10-30 10:55:32.596798983 -0200
+diff -Naur epiphany-browser-2.29.3.old/lib/egg/Makefile.in epiphany-browser-2.29.3/lib/egg/Makefile.in
+--- epiphany-browser-2.29.3.old/lib/egg/Makefile.in	2009-11-30 19:28:28.000000000 +0100
++++ epiphany-browser-2.29.3/lib/egg/Makefile.in	2009-12-03 15:54:36.916095056 +0100
 @@ -166,8 +166,6 @@
  GMSGFMT = @GMSGFMT@
  GREP = @GREP@
@@ -16701,10 +16950,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
-Index: epiphany-browser-2.29.1/lib/Makefile.in
-===================================================================
---- epiphany-browser-2.29.1.orig/lib/Makefile.in	2009-10-26 17:15:30.000000000 -0200
-+++ epiphany-browser-2.29.1/lib/Makefile.in	2009-10-30 10:55:32.408300471 -0200
+diff -Naur epiphany-browser-2.29.3.old/lib/Makefile.in epiphany-browser-2.29.3/lib/Makefile.in
+--- epiphany-browser-2.29.3.old/lib/Makefile.in	2009-11-30 19:28:27.000000000 +0100
++++ epiphany-browser-2.29.3/lib/Makefile.in	2009-12-03 15:54:36.760094914 +0100
 @@ -264,8 +264,6 @@
  GMSGFMT = @GMSGFMT@
  GREP = @GREP@
@@ -16761,10 +17009,9 @@
  	$(AM_CPPFLAGS)
  
  libephymisc_la_CFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CFLAGS) \
-Index: epiphany-browser-2.29.1/lib/widgets/Makefile.in
-===================================================================
---- epiphany-browser-2.29.1.orig/lib/widgets/Makefile.in	2009-10-26 17:15:31.000000000 -0200
-+++ epiphany-browser-2.29.1/lib/widgets/Makefile.in	2009-10-30 10:55:32.740328202 -0200
+diff -Naur epiphany-browser-2.29.3.old/lib/widgets/Makefile.in epiphany-browser-2.29.3/lib/widgets/Makefile.in
+--- epiphany-browser-2.29.3.old/lib/widgets/Makefile.in	2009-11-30 19:28:28.000000000 +0100
++++ epiphany-browser-2.29.3/lib/widgets/Makefile.in	2009-12-03 15:54:37.028096445 +0100
 @@ -161,8 +161,6 @@
  GMSGFMT = @GMSGFMT@
  GREP = @GREP@
@@ -16812,10 +17059,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
-Index: epiphany-browser-2.29.1/ltmain.sh
-===================================================================
---- epiphany-browser-2.29.1.orig/ltmain.sh	2009-10-22 13:24:09.000000000 -0200
-+++ epiphany-browser-2.29.1/ltmain.sh	2009-10-30 10:55:17.344299129 -0200
+diff -Naur epiphany-browser-2.29.3.old/ltmain.sh epiphany-browser-2.29.3/ltmain.sh
+--- epiphany-browser-2.29.3.old/ltmain.sh	2009-11-18 13:38:39.000000000 +0100
++++ epiphany-browser-2.29.3/ltmain.sh	2009-12-03 15:54:28.536126028 +0100
 @@ -65,7 +65,7 @@
  #       compiler:		$LTCC
  #       compiler flags:		$LTCFLAGS
@@ -16894,10 +17140,9 @@
  	  esac
  	  ;;
  	no)
-Index: epiphany-browser-2.29.1/m4/gnome-doc-utils.m4
-===================================================================
---- epiphany-browser-2.29.1.orig/m4/gnome-doc-utils.m4	2009-10-22 13:24:10.000000000 -0200
-+++ epiphany-browser-2.29.1/m4/gnome-doc-utils.m4	2009-10-30 10:55:17.344299129 -0200
+diff -Naur epiphany-browser-2.29.3.old/m4/gnome-doc-utils.m4 epiphany-browser-2.29.3/m4/gnome-doc-utils.m4
+--- epiphany-browser-2.29.3.old/m4/gnome-doc-utils.m4	2009-11-18 13:38:39.000000000 +0100
++++ epiphany-browser-2.29.3/m4/gnome-doc-utils.m4	2009-12-03 15:54:29.528097774 +0100
 @@ -36,15 +36,19 @@
  # GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
  #
@@ -16919,10 +17164,9 @@
  	ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3])
  fi
  
-Index: epiphany-browser-2.29.1/m4/gtk-doc.m4
-===================================================================
---- epiphany-browser-2.29.1.orig/m4/gtk-doc.m4	2009-10-22 13:24:10.000000000 -0200
-+++ epiphany-browser-2.29.1/m4/gtk-doc.m4	2009-10-30 10:55:17.344299129 -0200
+diff -Naur epiphany-browser-2.29.3.old/m4/gtk-doc.m4 epiphany-browser-2.29.3/m4/gtk-doc.m4
+--- epiphany-browser-2.29.3.old/m4/gtk-doc.m4	2009-11-18 13:38:39.000000000 +0100
++++ epiphany-browser-2.29.3/m4/gtk-doc.m4	2009-12-03 15:54:29.391133434 +0100
 @@ -8,12 +8,6 @@
  [
    AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
@@ -16969,10 +17213,9 @@
    AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
 -  AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
  ])
-Index: epiphany-browser-2.29.1/m4/intltool.m4
-===================================================================
---- epiphany-browser-2.29.1.orig/m4/intltool.m4	2009-10-22 13:24:10.000000000 -0200
-+++ epiphany-browser-2.29.1/m4/intltool.m4	2009-10-30 10:55:17.344299129 -0200
+diff -Naur epiphany-browser-2.29.3.old/m4/intltool.m4 epiphany-browser-2.29.3/m4/intltool.m4
+--- epiphany-browser-2.29.3.old/m4/intltool.m4	2009-11-18 13:38:39.000000000 +0100
++++ epiphany-browser-2.29.3/m4/intltool.m4	2009-12-03 15:54:29.339200643 +0100
 @@ -75,25 +75,25 @@
      INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
     INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
@@ -17067,10 +17310,9 @@
  # deprecated macros
  AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
  # A hint is needed for aclocal from Automake <= 1.9.4:
-Index: epiphany-browser-2.29.1/m4/libtool.m4
-===================================================================
---- epiphany-browser-2.29.1.orig/m4/libtool.m4	2009-10-22 13:24:09.000000000 -0200
-+++ epiphany-browser-2.29.1/m4/libtool.m4	2009-10-30 10:55:17.348298964 -0200
+diff -Naur epiphany-browser-2.29.3.old/m4/libtool.m4 epiphany-browser-2.29.3/m4/libtool.m4
+--- epiphany-browser-2.29.3.old/m4/libtool.m4	2009-11-18 13:38:39.000000000 +0100
++++ epiphany-browser-2.29.3/m4/libtool.m4	2009-12-03 15:54:28.680124275 +0100
 @@ -2470,13 +2470,10 @@
    # before this can be enabled.
    hardcode_into_libs=yes
@@ -17169,10 +17411,9 @@
        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
  	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-Index: epiphany-browser-2.29.1/Makefile.in
-===================================================================
---- epiphany-browser-2.29.1.orig/Makefile.in	2009-10-26 17:15:32.000000000 -0200
-+++ epiphany-browser-2.29.1/Makefile.in	2009-10-30 10:55:33.652298047 -0200
+diff -Naur epiphany-browser-2.29.3.old/Makefile.in epiphany-browser-2.29.3/Makefile.in
+--- epiphany-browser-2.29.3.old/Makefile.in	2009-11-30 19:28:30.000000000 +0100
++++ epiphany-browser-2.29.3/Makefile.in	2009-12-03 15:54:37.827095960 +0100
 @@ -179,8 +179,6 @@
  GMSGFMT = @GMSGFMT@
  GREP = @GREP@
@@ -17220,10 +17461,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
-Index: epiphany-browser-2.29.1/po/Makefile.in.in
-===================================================================
---- epiphany-browser-2.29.1.orig/po/Makefile.in.in	2009-10-22 13:24:10.000000000 -0200
-+++ epiphany-browser-2.29.1/po/Makefile.in.in	2009-10-30 10:55:17.348298964 -0200
+diff -Naur epiphany-browser-2.29.3.old/po/Makefile.in.in epiphany-browser-2.29.3/po/Makefile.in.in
+--- epiphany-browser-2.29.3.old/po/Makefile.in.in	2009-11-18 13:38:39.000000000 +0100
++++ epiphany-browser-2.29.3/po/Makefile.in.in	2009-12-03 15:54:29.299192555 +0100
 @@ -21,7 +21,7 @@
  PACKAGE = @PACKAGE@
  VERSION = @VERSION@
@@ -17242,10 +17482,9 @@
  
  USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
  
-Index: epiphany-browser-2.29.1/src/bookmarks/Makefile.in
-===================================================================
---- epiphany-browser-2.29.1.orig/src/bookmarks/Makefile.in	2009-10-26 17:15:31.000000000 -0200
-+++ epiphany-browser-2.29.1/src/bookmarks/Makefile.in	2009-10-30 10:55:33.420798927 -0200
+diff -Naur epiphany-browser-2.29.3.old/src/bookmarks/Makefile.in epiphany-browser-2.29.3/src/bookmarks/Makefile.in
+--- epiphany-browser-2.29.3.old/src/bookmarks/Makefile.in	2009-11-30 19:28:29.000000000 +0100
++++ epiphany-browser-2.29.3/src/bookmarks/Makefile.in	2009-12-03 15:54:37.583094914 +0100
 @@ -209,8 +209,6 @@
  GMSGFMT = @GMSGFMT@
  GREP = @GREP@
@@ -17293,10 +17532,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
-Index: epiphany-browser-2.29.1/src/Makefile.in
-===================================================================
---- epiphany-browser-2.29.1.orig/src/Makefile.in	2009-10-26 17:15:31.000000000 -0200
-+++ epiphany-browser-2.29.1/src/Makefile.in	2009-10-30 10:55:33.204799352 -0200
+diff -Naur epiphany-browser-2.29.3.old/src/Makefile.in epiphany-browser-2.29.3/src/Makefile.in
+--- epiphany-browser-2.29.3.old/src/Makefile.in	2009-11-30 19:28:29.000000000 +0100
++++ epiphany-browser-2.29.3/src/Makefile.in	2009-12-03 15:54:37.403094662 +0100
 @@ -346,8 +346,6 @@
  GMSGFMT = @GMSGFMT@
  GREP = @GREP@
@@ -17355,10 +17593,9 @@
  	-DDATADIR=\""$(pkgdatadir)"\" 	\
  	-DGNOMELOCALEDIR=\"$(datadir)/locale\"	\
  	$(AM_CPPFLAGS)
-Index: epiphany-browser-2.29.1/tests/Makefile.in
-===================================================================
---- epiphany-browser-2.29.1.orig/tests/Makefile.in	2009-10-26 17:15:32.000000000 -0200
-+++ epiphany-browser-2.29.1/tests/Makefile.in	2009-10-30 10:55:33.516798870 -0200
+diff -Naur epiphany-browser-2.29.3.old/tests/Makefile.in epiphany-browser-2.29.3/tests/Makefile.in
+--- epiphany-browser-2.29.3.old/tests/Makefile.in	2009-11-30 19:28:30.000000000 +0100
++++ epiphany-browser-2.29.3/tests/Makefile.in	2009-12-03 15:54:37.671095475 +0100
 @@ -170,8 +170,6 @@
  GMSGFMT = @GMSGFMT@
  GREP = @GREP@

Modified: desktop/unstable/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/series?rev=22493&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/series [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/patches/series [utf-8] Thu Dec  3 14:57:04 2009
@@ -7,6 +7,5 @@
 07_bookmarks.patch
 10_smart_bookmarks.patch
 12_safetypes.patch
-14_inspect_element.patch
 99_autoreconf.patch
 99_ltmain_as-needed.patch




More information about the pkg-gnome-commits mailing list