r22236 - 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
Fri Nov 6 09:25:42 UTC 2009


Author: slomo
Date: Fri Nov  6 09:25:42 2009
New Revision: 22236

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22236
Log:
* Revert to epiphany 2.28 for unstable, 2.29 should be in experimental

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/14_inspect_element.patch
    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=22236&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/changelog [utf-8] Fri Nov  6 09:25:42 2009
@@ -1,18 +1,3 @@
-epiphany-browser (2.29.1-1) unstable; urgency=low
-
-  * New upstream release
-  - Reintroduces the custom context menu (Closes: #550915)
-  * debian/patches/99_autoreconf.patch:
-  - Refreshed.
-  * debian/14_inspect_element.patch:
-  - patch from upstream to reintroduce the 'Inspect
-    Element' option
-  * debian/control.in:
-  - Build-Depend on webkit >= 1.1.16
-  - Bump Standards-Version to 3.8.3
-
- -- Gustavo Noronha Silva <kov at debian.org>  Fri, 30 Oct 2009 10:50:02 -0200
-
 epiphany-browser (2.28.1-1) unstable; urgency=low
 
   * New upstream bugfix release:

Modified: desktop/unstable/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control?rev=22236&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/control [utf-8] Fri Nov  6 09:25:42 2009
@@ -23,7 +23,7 @@
                scrollkeeper,
                gnome-pkg-tools (>= 0.10),
                libxml-parser-perl,
-               libwebkit-dev (>= 1.1.16),
+               libwebkit-dev (>= 1.1.15),
                gobject-introspection (>= 0.6.3),
                libgirepository1.0-dev (>= 0.6.3),
                gir-repository-dev,
@@ -45,7 +45,7 @@
                sharutils,
                zip
 Build-Depends-Indep: libglib2.0-doc, libgtk2.0-doc
-Standards-Version: 3.8.3
+Standards-Version: 3.8.1
 Homepage: http://www.gnome.org/projects/epiphany/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/epiphany-browser/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/epiphany-browser/

Modified: desktop/unstable/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control.in?rev=22236&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control.in [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/control.in [utf-8] Fri Nov  6 09:25:42 2009
@@ -23,7 +23,7 @@
                scrollkeeper,
                gnome-pkg-tools (>= 0.10),
                libxml-parser-perl,
-               libwebkit-dev (>= 1.1.16),
+               libwebkit-dev (>= 1.1.15),
                gobject-introspection (>= 0.6.3),
                libgirepository1.0-dev (>= 0.6.3),
                gir-repository-dev,
@@ -45,7 +45,7 @@
                sharutils,
                zip
 Build-Depends-Indep: libglib2.0-doc, libgtk2.0-doc
-Standards-Version: 3.8.3
+Standards-Version: 3.8.1
 Homepage: http://www.gnome.org/projects/epiphany/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/epiphany-browser/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/epiphany-browser/

Modified: desktop/unstable/epiphany-browser/debian/patches/14_inspect_element.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/14_inspect_element.patch?rev=22236&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/14_inspect_element.patch [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/patches/14_inspect_element.patch [utf-8] Fri Nov  6 09:25:42 2009
@@ -1,133 +1,0 @@
-From c87401f28cb8ef3a645dfd5a687be6ddbbfe6790 Mon Sep 17 00:00:00 2001
-From: Gustavo Noronha Silva <gns at gnome.org>
-Date: Tue, 27 Oct 2009 08:09:57 -0200
-Subject: [PATCH] Provide the Inspect Element menu item again
-
-WebKit now provides API to start the web inspector, so we can restore
-the menu item.
-
-Bug #599473
----
- data/ui/epiphany-ui.xml |    8 ++++++++
- src/ephy-window.c       |    9 +++++++++
- src/popup-commands.c    |   21 +++++++++++++++++++++
- src/popup-commands.h    |    3 +++
- 4 files changed, 41 insertions(+), 0 deletions(-)
-
-diff --git a/data/ui/epiphany-ui.xml b/data/ui/epiphany-ui.xml
-index 1f3dcac..5be9e4f 100644
---- a/data/ui/epiphany-ui.xml
-+++ b/data/ui/epiphany-ui.xml
-@@ -117,6 +117,8 @@
- 		<menuitem name="SaveImageAsIP" action="SaveImageAs"/>
- 		<menuitem name="SetImageAsBackgroundIP" action="SetImageAsBackground"/>
- 		<menuitem name="CopyImageLocationIP" action="CopyImageLocation"/>
-+		<separator />
-+		<menuitem name="InspectElementIP" action="InspectElement"/>
- 	</popup>
- 
- 	<popup name="EphyDocumentPopup" action="PopupAction">
-@@ -134,6 +136,8 @@
- 		<menuitem name="SaveImageAsDP" action="SaveImageAs"/>
- 		<menuitem name="SetImageAsBackgroundDP" action="SetImageAsBackground"/>
- 		<menuitem name="CopyImageLocationDP" action="CopyImageLocation"/>
-+		<separator />
-+		<menuitem name="InspectElementDP" action="InspectElement"/>
- 	</popup>
- 
- 	<popup name="EphyLinkPopup" action="PopupAction">
-@@ -152,6 +156,8 @@
- 		<menuitem name="SaveImageAsLP" action="SaveImageAs"/>
- 		<menuitem name="SetImageAsBackgroundLP" action="SetImageAsBackground"/>
- 		<menuitem name="CopyImageLocationLP" action="CopyImageLocation"/>
-+		<separator />
-+		<menuitem name="InspectElementLP" action="InspectElement"/>
- 	</popup>
- 
- 	<popup name="EphyEmailLinkPopup" action="PopupAction">
-@@ -164,6 +170,8 @@
- 		<menuitem name="SaveImageAsELP" action="SaveImageAs"/>
- 		<menuitem name="SetImageAsBackgroundELP" action="SetImageAsBackground"/>
- 		<menuitem name="CopyImageLocationELP" action="CopyImageLocation"/>
-+		<separator />
-+		<menuitem name="InspectElementELP" action="InspectElement"/>
- 	</popup>
- 
- 	<popup name="EphyNotebookPopup" action="NotebookPopupAction">
-diff --git a/src/ephy-window.c b/src/ephy-window.c
-index df0c7df..a734e94 100644
---- a/src/ephy-window.c
-+++ b/src/ephy-window.c
-@@ -345,6 +345,10 @@ static const GtkActionEntry ephy_popups_entries [] = {
- 	  NULL, NULL },
- 	{ "StopImageAnimation", NULL, N_("St_op Animation"), NULL,
- 	  NULL, NULL },
-+
-+	/* Inspector */
-+	{ "InspectElement", NULL, N_("Inspect _Element"), NULL,
-+	  NULL, G_CALLBACK (popup_cmd_inspect_element) },
- };
- 
- static const struct
-@@ -1119,6 +1123,7 @@ update_popup_actions_visibility (EphyWindow *window,
- {
- 	GtkAction *action;
- 	GtkActionGroup *action_group;
-+	gboolean inspector_enabled;
- 
- 	action_group = window->priv->popups_action_group;
- 
-@@ -1133,6 +1138,10 @@ update_popup_actions_visibility (EphyWindow *window,
- 
- 	action = gtk_action_group_get_action (action_group, "OpenFrame");
- 	gtk_action_set_visible (action, is_frame);
-+
-+	inspector_enabled = eel_gconf_get_boolean (CONF_WEB_INSPECTOR_ENABLED);
-+	action = gtk_action_group_get_action (action_group, "InspectElement");
-+	gtk_action_set_visible (action, inspector_enabled);
- }
- 
- static void
-diff --git a/src/popup-commands.c b/src/popup-commands.c
-index cbaf1e4..755817e 100644
---- a/src/popup-commands.c
-+++ b/src/popup-commands.c
-@@ -521,3 +521,24 @@ popup_cmd_open_image (GtkAction *action,
- 	g_value_unset (&value);
- 	g_free (scheme);
- }
-+
-+void
-+popup_cmd_inspect_element (GtkAction *action, EphyWindow *window)
-+{
-+	EphyEmbedEvent *event;
-+	EphyEmbed *embed;
-+	WebKitWebInspector *inspector;
-+	guint x, y;
-+
-+	embed = ephy_embed_container_get_active_child
-+		(EPHY_EMBED_CONTAINER (window));
-+
-+	event = ephy_window_get_context_event (window);
-+	g_return_if_fail (event != NULL);
-+
-+	inspector = webkit_web_view_get_inspector
-+		(EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed));
-+
-+	ephy_embed_event_get_coords (event, &x, &y);
-+	webkit_web_inspector_inspect_coordinates (inspector, (gdouble)x, (gdouble)y);
-+}
-diff --git a/src/popup-commands.h b/src/popup-commands.h
-index b1531bd..ddfc676 100644
---- a/src/popup-commands.h
-+++ b/src/popup-commands.h
-@@ -65,3 +65,6 @@ void popup_cmd_download_link		(GtkAction *action,
- 
- void popup_cmd_save_image_as		(GtkAction *action,
- 					 EphyWindow *window);
-+
-+void popup_cmd_inspect_element		(GtkAction *action,
-+					 EphyWindow *window);
--- 
-1.6.5
-

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=22236&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] Fri Nov  6 09:25:42 2009
@@ -1,7 +1,6 @@
-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.28.1.old/aclocal.m4 epiphany-browser-2.28.1/aclocal.m4
+--- epiphany-browser-2.28.1.old/aclocal.m4	2009-10-18 17:25:07.000000000 +0200
++++ epiphany-browser-2.28.1/aclocal.m4	2009-10-20 08:13:20.000000000 +0200
 @@ -13,8 +13,8 @@
  
  m4_ifndef([AC_AUTOCONF_VERSION],
@@ -82,10 +81,10 @@
          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.28.1.old/config.guess epiphany-browser-2.28.1/config.guess
+diff -Naur epiphany-browser-2.28.1.old/config.h.in epiphany-browser-2.28.1/config.h.in
+--- epiphany-browser-2.28.1.old/config.h.in	2009-10-18 17:25:22.000000000 +0200
++++ epiphany-browser-2.28.1/config.h.in	2009-10-20 08:13:22.000000000 +0200
 @@ -169,6 +169,9 @@
  /* Define to the one symbol short name of this package. */
  #undef PACKAGE_TARNAME
@@ -96,15 +95,15 @@
  /* 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
+diff -Naur epiphany-browser-2.28.1.old/config.sub epiphany-browser-2.28.1/config.sub
+diff -Naur epiphany-browser-2.28.1.old/configure epiphany-browser-2.28.1/configure
+--- epiphany-browser-2.28.1.old/configure	2009-10-18 17:25:14.000000000 +0200
++++ epiphany-browser-2.28.1/configure	2009-10-20 08:13:22.000000000 +0200
 @@ -1,20 +1,22 @@
  #! /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.28.1.
++# Generated by GNU Autoconf 2.64 for GNOME Web Browser 2.28.1.
  #
  # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany>.
  #
@@ -899,14 +898,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.28.1'
+ PACKAGE_STRING='GNOME Web Browser 2.28.1'
  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 @@
+@@ -795,20 +750,12 @@
  SVN_BRANCH
  SVN_MODULE
  SVN_ROOT
@@ -928,7 +927,7 @@
  HAVE_GNOME_DOC_UTILS_FALSE
  HAVE_GNOME_DOC_UTILS_TRUE
  DISTCHECK_CONFIGURE_FLAGS
-@@ -1019,6 +966,7 @@
+@@ -1023,6 +970,7 @@
  program_transform_name
  prefix
  exec_prefix
@@ -936,7 +935,7 @@
  PACKAGE_BUGREPORT
  PACKAGE_STRING
  PACKAGE_VERSION
-@@ -1058,8 +1006,6 @@
+@@ -1062,8 +1010,6 @@
  enable_scrollkeeper
  with_html_dir
  enable_gtk_doc
@@ -945,7 +944,7 @@
  '
        ac_precious_vars='build_alias
  host_alias
-@@ -1193,8 +1139,7 @@
+@@ -1197,8 +1143,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 +954,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1220,8 +1165,7 @@
+@@ -1224,8 +1169,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 +964,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1425,8 +1369,7 @@
+@@ -1429,8 +1373,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 +974,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1442,8 +1385,7 @@
+@@ -1446,8 +1389,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 +984,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1473,17 +1415,17 @@
+@@ -1477,17 +1419,17 @@
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries=$ac_optarg ;;
  
@@ -1009,7 +1008,7 @@
      eval $ac_envvar=\$ac_optarg
      export $ac_envvar ;;
  
-@@ -1500,15 +1442,13 @@
+@@ -1504,15 +1446,13 @@
  
  if test -n "$ac_prev"; then
    ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -1027,7 +1026,7 @@
      *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
    esac
  fi
-@@ -1531,8 +1471,7 @@
+@@ -1535,8 +1475,7 @@
      [\\/$]* | ?:[\\/]* )  continue;;
      NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    esac
@@ -1037,7 +1036,7 @@
  done
  
  # There might be people who depend on the old broken behavior: `$host'
-@@ -1562,11 +1501,9 @@
+@@ -1566,11 +1505,9 @@
  ac_pwd=`pwd` && test -n "$ac_pwd" &&
  ac_ls_di=`ls -di .` &&
  ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -1051,7 +1050,7 @@
  
  
  # Find the source files, if location was not specified.
-@@ -1605,13 +1542,11 @@
+@@ -1609,13 +1546,11 @@
  fi
  if test ! -r "$srcdir/$ac_unique_file"; then
    test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -1067,7 +1066,7 @@
  	pwd)`
  # When building in place, set srcdir=.
  if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1685,7 +1620,8 @@
+@@ -1689,7 +1624,8 @@
    --infodir=DIR           info documentation [DATAROOTDIR/info]
    --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
    --mandir=DIR            man documentation [DATAROOTDIR/man]
@@ -1077,7 +1076,7 @@
    --htmldir=DIR           html documentation [DOCDIR]
    --dvidir=DIR            dvi documentation [DOCDIR]
    --pdfdir=DIR            pdf documentation [DOCDIR]
-@@ -1732,7 +1668,8 @@
+@@ -1736,7 +1672,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,7 +1086,7 @@
    --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 @@
+@@ -1747,8 +1684,6 @@
                            NetworkManager (default: disabled)
    --disable-scrollkeeper  do not make updates to the scrollkeeper database
    --enable-gtk-doc        use gtk-doc to build documentation [default=no]
@@ -1096,7 +1095,7 @@
  
  Optional Packages:
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-@@ -1844,40 +1779,451 @@
+@@ -1848,40 +1783,451 @@
  esac
  ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
  
@@ -1131,7 +1130,7 @@
 +test -n "$ac_init_help" && exit $ac_status
 +if $ac_init_version; then
 +  cat <<\_ACEOF
-+GNOME Web Browser configure 2.29.1
++GNOME Web Browser configure 2.28.1
 +generated by GNU Autoconf 2.64
 +
 +Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1460,7 +1459,7 @@
 -test -n "$ac_init_help" && exit $ac_status
 -if $ac_init_version; then
 -  cat <<\_ACEOF
--GNOME Web Browser configure 2.29.1
+-GNOME Web Browser configure 2.28.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 #((
@@ -1566,13 +1565,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.28.1, which was
 -generated by GNU Autoconf 2.63.  Invocation command line was
 +generated by GNU Autoconf 2.64.  Invocation command line was
  
    $ $0 $@
  
-@@ -1913,8 +2259,8 @@
+@@ -1917,8 +2263,8 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -1583,7 +1582,7 @@
  IFS=$as_save_IFS
  
  } >&5
-@@ -1951,9 +2297,9 @@
+@@ -1955,9 +2301,9 @@
        ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
      case $ac_pass in
@@ -1595,7 +1594,7 @@
        if test $ac_must_keep_next = true; then
  	ac_must_keep_next=false # Got value, back to normal.
        else
-@@ -1969,13 +2315,13 @@
+@@ -1973,13 +2319,13 @@
  	  -* ) ac_must_keep_next=true ;;
  	esac
        fi
@@ -1612,7 +1611,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 @@
+@@ -2004,13 +2350,13 @@
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
@@ -1628,7 +1627,7 @@
        esac ;;
      esac
    done
-@@ -2078,39 +2424,41 @@
+@@ -2082,39 +2428,41 @@
      exit $exit_status
  ' 0
  for ac_signal in 1 2 13 15; do
@@ -1675,7 +1674,7 @@
  
  # 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 @@
+@@ -2133,7 +2481,7 @@
  do
    test "x$ac_site_file" = xNONE && continue
    if test -r "$ac_site_file"; then
@@ -1684,7 +1683,7 @@
  $as_echo "$as_me: loading site script $ac_site_file" >&6;}
      sed 's/^/| /' "$ac_site_file" >&5
      . "$ac_site_file"
-@@ -2140,7 +2488,7 @@
+@@ -2144,7 +2492,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
@@ -1693,7 +1692,7 @@
  $as_echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
        [\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2148,14 +2496,14 @@
+@@ -2152,14 +2500,14 @@
      esac
    fi
  else
@@ -1712,7 +1711,7 @@
  # Check that the precious variables saved in the cache have kept the same
  # value.
  ac_cache_corrupted=false
-@@ -2166,11 +2514,11 @@
+@@ -2170,11 +2518,11 @@
    eval ac_new_val=\$ac_env_${ac_var}_value
    case $ac_old_set,$ac_new_set in
      set,)
@@ -1726,7 +1725,7 @@
  $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
        ac_cache_corrupted=: ;;
      ,);;
-@@ -2180,17 +2528,17 @@
+@@ -2184,17 +2532,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 +1747,7 @@
  $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
        fi;;
    esac
-@@ -2202,43 +2550,20 @@
+@@ -2206,43 +2554,20 @@
      esac
      case " $ac_configure_args " in
        *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
@@ -1799,7 +1798,7 @@
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -2292,24 +2617,16 @@
+@@ -2296,24 +2621,16 @@
  
  ac_aux_dir=
  for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -1832,7 +1831,7 @@
  fi
  
  # These three variables are undocumented and unsupported,
-@@ -2335,10 +2652,10 @@
+@@ -2339,10 +2656,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 +1844,7 @@
    $as_echo_n "(cached) " >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2346,11 +2663,11 @@
+@@ -2350,11 +2667,11 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -1861,7 +1860,7 @@
    /usr/ucb/* ) ;;
    *)
      # OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2387,7 +2704,7 @@
+@@ -2391,7 +2708,7 @@
      ;;
  esac
  
@@ -1870,7 +1869,7 @@
  IFS=$as_save_IFS
  
  rm -rf conftest.one conftest.two conftest.dir
-@@ -2403,7 +2720,7 @@
+@@ -2407,7 +2724,7 @@
      INSTALL=$ac_install_sh
    fi
  fi
@@ -1879,7 +1878,7 @@
  $as_echo "$INSTALL" >&6; }
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2414,7 +2731,7 @@
+@@ -2418,7 +2735,7 @@
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
@@ -1888,7 +1887,7 @@
  $as_echo_n "checking whether build environment is sane... " >&6; }
  # Just in case
  sleep 1
-@@ -2425,15 +2742,11 @@
+@@ -2429,15 +2746,11 @@
  '
  case `pwd` in
    *[\\\"\#\$\&\'\`$am_lf]*)
@@ -1906,7 +1905,7 @@
  esac
  
  # Do `set' in a subshell so we don't clobber the current shell's
-@@ -2455,11 +2768,8 @@
+@@ -2459,11 +2772,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 +1919,7 @@
     fi
  
     test "$2" = conftest.file
-@@ -2468,13 +2778,10 @@
+@@ -2472,13 +2782,10 @@
     # Ok.
     :
  else
@@ -1937,7 +1936,7 @@
  $as_echo "yes" >&6; }
  test "$program_prefix" != NONE &&
    program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2502,7 +2809,7 @@
+@@ -2506,7 +2813,7 @@
    am_missing_run="$MISSING --run "
  else
    am_missing_run=
@@ -1946,7 +1945,7 @@
  $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
  fi
  
-@@ -2523,9 +2830,9 @@
+@@ -2527,9 +2834,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 +1957,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$STRIP"; then
-@@ -2536,24 +2843,24 @@
+@@ -2540,24 +2847,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -1988,7 +1987,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -2563,9 +2870,9 @@
+@@ -2567,9 +2874,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 +1999,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_STRIP"; then
-@@ -2576,24 +2883,24 @@
+@@ -2580,24 +2887,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2030,7 +2029,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -2602,7 +2909,7 @@
+@@ -2606,7 +2913,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -2039,7 +2038,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -2615,10 +2922,10 @@
+@@ -2619,10 +2926,10 @@
  fi
  INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
  
@@ -2052,7 +2051,7 @@
    $as_echo_n "(cached) " >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2626,7 +2933,7 @@
+@@ -2630,7 +2937,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2061,7 +2060,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 @@
+@@ -2642,7 +2949,7 @@
  	   esac
  	 done
         done
@@ -2070,7 +2069,7 @@
  IFS=$as_save_IFS
  
  fi
-@@ -2654,7 +2961,7 @@
+@@ -2658,7 +2965,7 @@
      MKDIR_P="$ac_install_sh -d"
    fi
  fi
@@ -2079,7 +2078,7 @@
  $as_echo "$MKDIR_P" >&6; }
  
  mkdir_p="$MKDIR_P"
-@@ -2667,9 +2974,9 @@
+@@ -2671,9 +2978,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 +2090,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$AWK"; then
-@@ -2680,24 +2987,24 @@
+@@ -2684,24 +2991,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2121,7 +2120,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -2705,11 +3012,11 @@
+@@ -2709,11 +3016,11 @@
    test -n "$AWK" && break
  done
  
@@ -2135,7 +2134,7 @@
    $as_echo_n "(cached) " >&6
  else
    cat >conftest.make <<\_ACEOF
-@@ -2727,11 +3034,11 @@
+@@ -2731,11 +3038,11 @@
  rm -f conftest.make
  fi
  if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -2149,7 +2148,7 @@
  $as_echo "no" >&6; }
    SET_MAKE="MAKE=${MAKE-make}"
  fi
-@@ -2751,9 +3058,7 @@
+@@ -2755,9 +3062,7 @@
    am__isrc=' -I$(srcdir)'
    # test to see if srcdir already configured
    if test -f $srcdir/config.status; then
@@ -2160,16 +2159,16 @@
    fi
  fi
  
-@@ -2768,7 +3073,7 @@
+@@ -2772,7 +3077,7 @@
  
  
  # Define the identity of the package.
 - PACKAGE='epiphany'
 + PACKAGE='epiphany-browser'
-  VERSION='2.29.1'
- 
- 
-@@ -2804,7 +3109,7 @@
+  VERSION='2.28.1'
+ 
+ 
+@@ -2808,7 +3113,7 @@
  AMTAR=${AMTAR-"${am_missing_run}tar"}
  
  
@@ -2178,7 +2177,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 @@
+@@ -2881,13 +3186,13 @@
  done
  rm -rf conftest.dir
  
@@ -2194,7 +2193,7 @@
  $as_echo "$am_cv_prog_tar_ustar" >&6; }
  
  
-@@ -2893,7 +3198,7 @@
+@@ -2897,7 +3202,7 @@
  
  # Use AM_SILENT_RULES if present
  # Check whether --enable-silent-rules was given.
@@ -2203,7 +2202,7 @@
    enableval=$enable_silent_rules;
  fi
  
-@@ -2909,16 +3214,16 @@
+@@ -2913,16 +3218,16 @@
    enable_maintainer_mode=yes
  fi
  
@@ -2223,7 +2222,7 @@
  $as_echo "$USE_MAINTAINER_MODE" >&6; }
     if test $USE_MAINTAINER_MODE = yes; then
    MAINTAINER_MODE_TRUE=
-@@ -2933,7 +3238,7 @@
+@@ -2937,7 +3242,7 @@
  
  
  # Check whether --enable-shared was given.
@@ -2232,7 +2231,7 @@
    enableval=$enable_shared; p=${PACKAGE-default}
      case $enableval in
      yes) enable_shared=yes ;;
-@@ -2964,7 +3269,7 @@
+@@ -2968,7 +3273,7 @@
  
  
  # Check whether --enable-static was given.
@@ -2241,7 +2240,7 @@
    enableval=$enable_static; p=${PACKAGE-default}
      case $enableval in
      yes) enable_static=yes ;;
-@@ -3002,7 +3307,7 @@
+@@ -3005,7 +3310,7 @@
  
  case `pwd` in
    *\ * | *\	*)
@@ -2250,7 +2249,7 @@
  $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
  esac
  
-@@ -3027,35 +3332,27 @@
+@@ -3030,35 +3335,27 @@
  
  # Make sure we can run config.sub.
  $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -2293,7 +2292,7 @@
  esac
  build=$ac_cv_build
  ac_save_IFS=$IFS; IFS='-'
-@@ -3071,28 +3368,24 @@
+@@ -3074,28 +3371,24 @@
  case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
  
  
@@ -2327,7 +2326,7 @@
  esac
  host=$ac_cv_host
  ac_save_IFS=$IFS; IFS='-'
-@@ -3120,7 +3413,7 @@
+@@ -3123,7 +3416,7 @@
  .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
@@ -2336,7 +2335,7 @@
  $as_echo_n "checking for style of include used by $am_make... " >&6; }
  am__include="#"
  am__quote=
-@@ -3148,12 +3441,12 @@
+@@ -3151,12 +3444,12 @@
  fi
  
  
@@ -2351,7 +2350,7 @@
    enableval=$enable_dependency_tracking;
  fi
  
-@@ -3178,9 +3471,9 @@
+@@ -3181,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 +2362,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3191,24 +3484,24 @@
+@@ -3194,24 +3487,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2393,7 +2392,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3218,9 +3511,9 @@
+@@ -3221,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 +2404,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -3231,24 +3524,24 @@
+@@ -3234,24 +3527,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2435,7 +2434,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3257,7 +3550,7 @@
+@@ -3260,7 +3553,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -2444,7 +2443,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -3271,9 +3564,9 @@
+@@ -3274,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 +2455,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3284,24 +3577,24 @@
+@@ -3287,24 +3580,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2486,7 +2485,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3311,9 +3604,9 @@
+@@ -3314,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 +2497,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3325,18 +3618,18 @@
+@@ -3328,18 +3621,18 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2520,7 +2519,7 @@
  IFS=$as_save_IFS
  
  if test $ac_prog_rejected = yes; then
-@@ -3355,10 +3648,10 @@
+@@ -3358,10 +3651,10 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -2533,7 +2532,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3370,9 +3663,9 @@
+@@ -3373,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 +2544,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3383,24 +3676,24 @@
+@@ -3386,24 +3679,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2575,7 +2574,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3414,9 +3707,9 @@
+@@ -3417,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 +2586,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -3427,24 +3720,24 @@
+@@ -3430,24 +3723,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2617,7 +2616,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3457,7 +3750,7 @@
+@@ -3460,7 +3753,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -2626,7 +2625,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -3468,73 +3761,55 @@
+@@ -3471,73 +3764,55 @@
  fi
  
  
@@ -2725,7 +2724,7 @@
  $as_echo_n "checking for C compiler default output file name... " >&6; }
  ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
  
-@@ -3551,17 +3826,17 @@
+@@ -3554,17 +3829,17 @@
  done
  rm -f $ac_rmfiles
  
@@ -2748,7 +2747,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 @@
+@@ -3581,7 +3856,7 @@
  	# certainly right.
  	break;;
      *.* )
@@ -2757,7 +2756,7 @@
  	then :; else
  	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
  	fi
-@@ -3597,84 +3872,75 @@
+@@ -3600,84 +3875,75 @@
  else
    ac_file=''
  fi
@@ -2867,7 +2866,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 @@
+@@ -3692,32 +3958,24 @@
    esac
  done
  else
@@ -2907,7 +2906,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3726,17 +3984,17 @@
+@@ -3729,17 +3987,17 @@
  }
  _ACEOF
  rm -f conftest.o conftest.obj
@@ -2930,7 +2929,7 @@
    for ac_file in conftest.o conftest.obj conftest.*; do
    test -f "$ac_file" || continue;
    case $ac_file in
-@@ -3749,31 +4007,23 @@
+@@ -3752,31 +4010,23 @@
    $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -2969,7 +2968,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3787,37 +4037,16 @@
+@@ -3790,37 +4040,16 @@
    return 0;
  }
  _ACEOF
@@ -3010,7 +3009,7 @@
  $as_echo "$ac_cv_c_compiler_gnu" >&6; }
  if test $ac_compiler_gnu = yes; then
    GCC=yes
-@@ -3826,20 +4055,16 @@
+@@ -3829,20 +4058,16 @@
  fi
  ac_test_CFLAGS=${CFLAGS+set}
  ac_save_CFLAGS=$CFLAGS
@@ -3034,7 +3033,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3850,35 +4075,11 @@
+@@ -3853,35 +4078,11 @@
    return 0;
  }
  _ACEOF
@@ -3073,7 +3072,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3889,36 +4090,12 @@
+@@ -3892,36 +4093,12 @@
    return 0;
  }
  _ACEOF
@@ -3114,7 +3113,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3929,42 +4106,17 @@
+@@ -3932,42 +4109,17 @@
    return 0;
  }
  _ACEOF
@@ -3159,7 +3158,7 @@
  $as_echo "$ac_cv_prog_cc_g" >&6; }
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
-@@ -3981,18 +4133,14 @@
+@@ -3984,18 +4136,14 @@
      CFLAGS=
    fi
  fi
@@ -3181,7 +3180,7 @@
  /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdio.h>
-@@ -4049,32 +4197,9 @@
+@@ -4052,32 +4200,9 @@
  	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
  do
    CC="$ac_save_CC $ac_arg"
@@ -3215,7 +3214,7 @@
  rm -f core conftest.err conftest.$ac_objext
    test "x$ac_cv_prog_cc_c89" != "xno" && break
  done
-@@ -4085,17 +4210,19 @@
+@@ -4088,17 +4213,19 @@
  # AC_CACHE_VAL
  case "x$ac_cv_prog_cc_c89" in
    x)
@@ -3238,7 +3237,7 @@
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -4105,9 +4232,9 @@
+@@ -4108,9 +4235,9 @@
  
  depcc="$CC"   am_compiler_list=
  
@@ -3250,7 +3249,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -4215,7 +4342,7 @@
+@@ -4218,7 +4345,7 @@
  fi
  
  fi
@@ -3259,7 +3258,7 @@
  $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
-@@ -4230,9 +4357,9 @@
+@@ -4233,9 +4360,9 @@
  fi
  
  
@@ -3271,7 +3270,7 @@
    $as_echo_n "(cached) " >&6
  else
              ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -4240,7 +4367,7 @@
+@@ -4243,7 +4370,7 @@
         ac_script="$ac_script$as_nl$ac_script"
       done
       echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -3280,7 +3279,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 @@
+@@ -4252,7 +4379,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3289,7 +3288,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 @@
+@@ -4272,7 +4399,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 +3297,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 @@
+@@ -4287,19 +4414,17 @@
        $ac_path_SED_found && break 3
      done
    done
@@ -3321,7 +3320,7 @@
  $as_echo "$ac_cv_path_SED" >&6; }
   SED="$ac_cv_path_SED"
    rm -f conftest.sed
-@@ -4314,9 +4439,9 @@
+@@ -4317,9 +4442,9 @@
  
  
  
@@ -3333,7 +3332,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$GREP"; then
-@@ -4327,7 +4452,7 @@
+@@ -4330,7 +4455,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3342,7 +3341,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 @@
+@@ -4350,7 +4475,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 +3350,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 @@
+@@ -4365,26 +4490,24 @@
        $ac_path_GREP_found && break 3
      done
    done
@@ -3383,7 +3382,7 @@
    $as_echo_n "(cached) " >&6
  else
    if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4395,7 +4518,7 @@
+@@ -4398,7 +4521,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3392,7 +3391,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 @@
+@@ -4418,7 +4541,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 +3400,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 @@
+@@ -4433,12 +4556,10 @@
        $ac_path_EGREP_found && break 3
      done
    done
@@ -3416,7 +3415,7 @@
    fi
  else
    ac_cv_path_EGREP=$EGREP
-@@ -4443,14 +4564,14 @@
+@@ -4446,14 +4567,14 @@
  
     fi
  fi
@@ -3434,7 +3433,7 @@
    $as_echo_n "(cached) " >&6
  else
    if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -4464,7 +4585,7 @@
+@@ -4467,7 +4588,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3443,7 +3442,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 @@
+@@ -4487,7 +4608,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 +3451,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 @@
+@@ -4502,12 +4623,10 @@
        $ac_path_FGREP_found && break 3
      done
    done
@@ -3467,7 +3466,7 @@
    fi
  else
    ac_cv_path_FGREP=$FGREP
-@@ -4512,7 +4631,7 @@
+@@ -4515,7 +4634,7 @@
  
     fi
  fi
@@ -3476,7 +3475,7 @@
  $as_echo "$ac_cv_path_FGREP" >&6; }
   FGREP="$ac_cv_path_FGREP"
  
-@@ -4538,7 +4657,7 @@
+@@ -4541,7 +4660,7 @@
  
  
  # Check whether --with-gnu-ld was given.
@@ -3485,7 +3484,7 @@
    withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
  else
    with_gnu_ld=no
-@@ -4547,7 +4666,7 @@
+@@ -4550,7 +4669,7 @@
  ac_prog=ld
  if test "$GCC" = yes; then
    # Check if gcc -print-prog-name=ld gives a path.
@@ -3494,7 +3493,7 @@
  $as_echo_n "checking for ld used by $CC... " >&6; }
    case $host in
    *-*-mingw*)
-@@ -4577,13 +4696,13 @@
+@@ -4580,13 +4699,13 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -3511,7 +3510,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$LD"; then
-@@ -4614,18 +4733,16 @@
+@@ -4617,18 +4736,16 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -3535,7 +3534,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 @@
+@@ -4641,7 +4758,7 @@
    ;;
  esac
  fi
@@ -3544,7 +3543,7 @@
  $as_echo "$lt_cv_prog_gnu_ld" >&6; }
  with_gnu_ld=$lt_cv_prog_gnu_ld
  
-@@ -4650,9 +4767,9 @@
+@@ -4653,9 +4770,9 @@
  
  
  
@@ -3556,7 +3555,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$NM"; then
-@@ -4699,7 +4816,7 @@
+@@ -4702,7 +4819,7 @@
    : ${lt_cv_path_NM=no}
  fi
  fi
@@ -3565,7 +3564,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 @@
+@@ -4713,9 +4830,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 +3576,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$DUMPBIN"; then
-@@ -4723,24 +4840,24 @@
+@@ -4726,24 +4843,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3607,7 +3606,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -4754,9 +4871,9 @@
+@@ -4757,9 +4874,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 +3618,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_DUMPBIN"; then
-@@ -4767,24 +4884,24 @@
+@@ -4770,24 +4887,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3649,7 +3648,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -4797,7 +4914,7 @@
+@@ -4800,7 +4917,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -3658,7 +3657,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -4817,44 +4934,44 @@
+@@ -4820,44 +4937,44 @@
  
  
  
@@ -3671,16 +3670,16 @@
  else
    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:4830: $ac_compile\"" >&5)
++  (eval echo "\"\$as_me:4947: $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:4833: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++  (eval echo "\"\$as_me:4950: $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:4836: output\"" >&5)
++  (eval echo "\"\$as_me:4953: output\"" >&5)
    cat conftest.out >&5
    if $GREP 'External.*some_variable' conftest.out > /dev/null; then
      lt_cv_nm_interface="MS dumpbin"
@@ -3714,7 +3713,7 @@
    $as_echo_n "(cached) " >&6
  else
      i=0
-@@ -4972,10 +5089,10 @@
+@@ -4975,10 +5092,10 @@
  fi
  
  if test -n $lt_cv_sys_max_cmd_len ; then
@@ -3727,7 +3726,7 @@
  $as_echo "none" >&6; }
  fi
  max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -4989,7 +5106,7 @@
+@@ -4992,7 +5109,7 @@
  : ${MV="mv -f"}
  : ${RM="rm -f"}
  
@@ -3736,7 +3735,7 @@
  $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
  # Try some XSI features
  xsi_shell=no
-@@ -4999,17 +5116,17 @@
+@@ -5002,17 +5119,17 @@
      && eval 'test $(( 1 + 1 )) -eq 2 \
      && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
    && xsi_shell=yes
@@ -3757,7 +3756,7 @@
  $as_echo "$lt_shell_append" >&6; }
  
  
-@@ -5044,14 +5161,14 @@
+@@ -5047,14 +5164,14 @@
  
  
  
@@ -3775,7 +3774,7 @@
  $as_echo "$lt_cv_ld_reload_flag" >&6; }
  reload_flag=$lt_cv_ld_reload_flag
  case $reload_flag in
-@@ -5080,9 +5197,9 @@
+@@ -5083,9 +5200,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 +3786,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$OBJDUMP"; then
-@@ -5093,24 +5210,24 @@
+@@ -5096,24 +5213,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3817,7 +3816,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5120,9 +5237,9 @@
+@@ -5123,9 +5240,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 +3828,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_OBJDUMP"; then
-@@ -5133,24 +5250,24 @@
+@@ -5136,24 +5253,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3859,7 +3858,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5159,7 +5276,7 @@
+@@ -5162,7 +5279,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -3868,7 +3867,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -5179,9 +5296,9 @@
+@@ -5182,9 +5299,9 @@
  
  
  
@@ -3880,7 +3879,7 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -5300,7 +5417,7 @@
+@@ -5303,7 +5420,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -3889,7 +3888,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 @@
+@@ -5378,7 +5495,7 @@
  esac
  
  fi
@@ -3898,7 +3897,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 @@
+@@ -5398,9 +5515,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 +3909,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$AR"; then
-@@ -5408,24 +5525,24 @@
+@@ -5411,24 +5528,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3940,7 +3939,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5435,9 +5552,9 @@
+@@ -5438,9 +5555,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 +3951,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_AR"; then
-@@ -5448,24 +5565,24 @@
+@@ -5451,24 +5568,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3982,7 +3981,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5474,7 +5591,7 @@
+@@ -5477,7 +5594,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -3991,7 +3990,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -5500,9 +5617,9 @@
+@@ -5503,9 +5620,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 +4002,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$STRIP"; then
-@@ -5513,24 +5630,24 @@
+@@ -5516,24 +5633,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4033,7 +4032,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5540,9 +5657,9 @@
+@@ -5543,9 +5660,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 +4044,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_STRIP"; then
-@@ -5553,24 +5670,24 @@
+@@ -5556,24 +5673,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4075,7 +4074,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5579,7 +5696,7 @@
+@@ -5582,7 +5699,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -4084,7 +4083,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -5599,9 +5716,9 @@
+@@ -5602,9 +5719,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 +4095,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$RANLIB"; then
-@@ -5612,24 +5729,24 @@
+@@ -5615,24 +5732,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4126,7 +4125,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5639,9 +5756,9 @@
+@@ -5642,9 +5759,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 +4137,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_RANLIB"; then
-@@ -5652,24 +5769,24 @@
+@@ -5655,24 +5772,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4168,7 +4167,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5678,7 +5795,7 @@
+@@ -5681,7 +5798,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -4177,7 +4176,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -5756,9 +5873,9 @@
+@@ -5759,9 +5876,9 @@
  
  
  # Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -4189,7 +4188,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -5874,18 +5991,18 @@
+@@ -5877,18 +5994,18 @@
  int main(){nm_test_var='a';nm_test_func();return(0);}
  _LT_EOF
  
@@ -4214,7 +4213,7 @@
        # Try sorting and uniquifying the output.
        if sort "$nlist" | uniq > "$nlist"T; then
  	mv -f "$nlist"T "$nlist"
-@@ -5938,11 +6055,11 @@
+@@ -5941,11 +6058,11 @@
  	  lt_save_CFLAGS="$CFLAGS"
  	  LIBS="conftstm.$ac_objext"
  	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -4229,7 +4228,7 @@
  	    pipe_works=yes
  	  fi
  	  LIBS="$lt_save_LIBS"
-@@ -5976,10 +6093,10 @@
+@@ -5979,10 +6096,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 +4241,7 @@
  $as_echo "ok" >&6; }
  fi
  
-@@ -6006,7 +6123,7 @@
+@@ -6009,7 +6126,7 @@
  
  
  # Check whether --enable-libtool-lock was given.
@@ -4251,7 +4250,7 @@
    enableval=$enable_libtool_lock;
  fi
  
-@@ -6018,11 +6135,11 @@
+@@ -6021,11 +6138,11 @@
  ia64-*-hpux*)
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
@@ -4266,13 +4265,13 @@
      case `/usr/bin/file conftest.$ac_objext` in
        *ELF-32*)
  	HPUX_IA64_MODE="32"
-@@ -6036,12 +6153,12 @@
+@@ -6039,12 +6156,12 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 6039 "configure"' > conftest.$ac_ext
+-  echo '#line 6042 "configure"' > conftest.$ac_ext
 -  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  echo '#line 6156 "configure"' > conftest.$ac_ext
++  echo '#line 6159 "configure"' > conftest.$ac_ext
 +  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
@@ -4283,7 +4282,7 @@
      if test "$lt_cv_prog_gnu_ld" = yes; then
        case `/usr/bin/file conftest.$ac_objext` in
  	*32-bit*)
-@@ -6075,11 +6192,11 @@
+@@ -6078,11 +6195,11 @@
  s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
@@ -4298,7 +4297,7 @@
      case `/usr/bin/file conftest.o` in
        *32-bit*)
  	case $host in
-@@ -6128,9 +6245,9 @@
+@@ -6131,9 +6248,9 @@
    # On SCO OpenServer 5, we need -belf to get full-featured binaries.
    SAVE_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -belf"
@@ -4310,7 +4309,7 @@
    $as_echo_n "(cached) " >&6
  else
    ac_ext=c
-@@ -6139,11 +6256,7 @@
+@@ -6142,11 +6259,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 +4322,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -6154,38 +6267,13 @@
+@@ -6157,38 +6270,13 @@
    return 0;
  }
  _ACEOF
@@ -4366,7 +4365,7 @@
       ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -6193,7 +6281,7 @@
+@@ -6196,7 +6284,7 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  fi
@@ -4375,7 +4374,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 @@
+@@ -6206,11 +6294,11 @@
  sparc*-*solaris*)
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
@@ -4390,7 +4389,7 @@
      case `/usr/bin/file conftest.o` in
      *64-bit*)
        case $lt_cv_prog_gnu_ld in
-@@ -6233,9 +6321,9 @@
+@@ -6236,9 +6324,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 +4401,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$DSYMUTIL"; then
-@@ -6246,24 +6334,24 @@
+@@ -6249,24 +6337,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4432,7 +4431,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6273,9 +6361,9 @@
+@@ -6276,9 +6364,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 +4443,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_DSYMUTIL"; then
-@@ -6286,24 +6374,24 @@
+@@ -6289,24 +6377,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4474,7 +4473,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6312,7 +6400,7 @@
+@@ -6315,7 +6403,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -4483,7 +4482,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -6325,9 +6413,9 @@
+@@ -6328,9 +6416,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 +4494,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$NMEDIT"; then
-@@ -6338,24 +6426,24 @@
+@@ -6341,24 +6429,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4525,7 +4524,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6365,9 +6453,9 @@
+@@ -6368,9 +6456,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 +4536,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_NMEDIT"; then
-@@ -6378,24 +6466,24 @@
+@@ -6381,24 +6469,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4567,7 +4566,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6404,7 +6492,7 @@
+@@ -6407,7 +6495,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -4576,7 +4575,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -6417,9 +6505,9 @@
+@@ -6420,9 +6508,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 +4587,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$LIPO"; then
-@@ -6430,24 +6518,24 @@
+@@ -6433,24 +6521,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4618,7 +4617,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6457,9 +6545,9 @@
+@@ -6460,9 +6548,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 +4629,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_LIPO"; then
-@@ -6470,24 +6558,24 @@
+@@ -6473,24 +6561,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4660,7 +4659,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6496,7 +6584,7 @@
+@@ -6499,7 +6587,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -4669,7 +4668,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -6509,9 +6597,9 @@
+@@ -6512,9 +6600,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 +4680,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$OTOOL"; then
-@@ -6522,24 +6610,24 @@
+@@ -6525,24 +6613,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4711,7 +4710,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6549,9 +6637,9 @@
+@@ -6552,9 +6640,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 +4722,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_OTOOL"; then
-@@ -6562,24 +6650,24 @@
+@@ -6565,24 +6653,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4753,7 +4752,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6588,7 +6676,7 @@
+@@ -6591,7 +6679,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -4762,7 +4761,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -6601,9 +6689,9 @@
+@@ -6604,9 +6692,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 +4773,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$OTOOL64"; then
-@@ -6614,24 +6702,24 @@
+@@ -6617,24 +6705,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4804,7 +4803,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6641,9 +6729,9 @@
+@@ -6644,9 +6732,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 +4815,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_OTOOL64"; then
-@@ -6654,24 +6742,24 @@
+@@ -6657,24 +6745,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4846,7 +4845,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6680,7 +6768,7 @@
+@@ -6683,7 +6771,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -4855,7 +4854,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -6716,9 +6804,9 @@
+@@ -6719,9 +6807,9 @@
  
  
  
@@ -4867,7 +4866,7 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_apple_cc_single_mod=no
-@@ -6743,22 +6831,18 @@
+@@ -6746,22 +6834,18 @@
  	rm -f conftest.*
        fi
  fi
@@ -4894,7 +4893,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -6769,42 +6853,17 @@
+@@ -6772,42 +6856,17 @@
    return 0;
  }
  _ACEOF
@@ -4942,7 +4941,7 @@
  $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
      case $host_os in
      rhapsody* | darwin1.[012])
-@@ -6846,14 +6905,14 @@
+@@ -6849,14 +6908,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 +4958,7 @@
    $as_echo_n "(cached) " >&6
  else
        # Double quotes because CPP needs to be expanded
-@@ -6868,11 +6927,7 @@
+@@ -6871,11 +6930,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 +4971,7 @@
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-@@ -6881,78 +6936,34 @@
+@@ -6884,78 +6939,34 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -5056,7 +5055,7 @@
    break
  fi
  
-@@ -6964,7 +6975,7 @@
+@@ -6967,7 +6978,7 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -5065,7 +5064,7 @@
  $as_echo "$CPP" >&6; }
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
-@@ -6975,11 +6986,7 @@
+@@ -6978,11 +6989,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 +5077,7 @@
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-@@ -6988,87 +6995,40 @@
+@@ -6991,87 +6998,40 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -5175,7 +5174,7 @@
  fi
  
  ac_ext=c
-@@ -7078,16 +7038,12 @@
+@@ -7081,16 +7041,12 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
@@ -5195,7 +5194,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <stdarg.h>
-@@ -7102,48 +7058,23 @@
+@@ -7105,48 +7061,23 @@
    return 0;
  }
  _ACEOF
@@ -5249,7 +5248,7 @@
  else
    ac_cv_header_stdc=no
  fi
-@@ -7153,18 +7084,14 @@
+@@ -7156,18 +7087,14 @@
  
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -5271,7 +5270,7 @@
  else
    ac_cv_header_stdc=no
  fi
-@@ -7174,14 +7101,10 @@
+@@ -7177,14 +7104,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 +5287,7 @@
  /* end confdefs.h.  */
  #include <ctype.h>
  #include <stdlib.h>
-@@ -7208,181 +7131,34 @@
+@@ -7211,181 +7134,34 @@
    return 0;
  }
  _ACEOF
@@ -5492,7 +5491,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -7392,6 +7168,20 @@
+@@ -7395,6 +7171,20 @@
  done
  
  
@@ -5513,7 +5512,7 @@
  
  # Set options
  
-@@ -7405,7 +7195,7 @@
+@@ -7408,7 +7198,7 @@
  
  
  # Check whether --with-pic was given.
@@ -5522,7 +5521,7 @@
    withval=$with_pic; pic_mode="$withval"
  else
    pic_mode=default
-@@ -7421,7 +7211,7 @@
+@@ -7424,7 +7214,7 @@
  
  
    # Check whether --enable-fast-install was given.
@@ -5531,7 +5530,7 @@
    enableval=$enable_fast_install; p=${PACKAGE-default}
      case $enableval in
      yes) enable_fast_install=yes ;;
-@@ -7502,9 +7292,9 @@
+@@ -7505,9 +7295,9 @@
     setopt NO_GLOB_SUBST
  fi
  
@@ -5543,7 +5542,7 @@
    $as_echo_n "(cached) " >&6
  else
    rm -f .libs 2>/dev/null
-@@ -7517,7 +7307,7 @@
+@@ -7520,7 +7310,7 @@
  fi
  rmdir .libs 2>/dev/null
  fi
@@ -5552,7 +5551,7 @@
  $as_echo "$lt_cv_objdir" >&6; }
  objdir=$lt_cv_objdir
  
-@@ -7610,9 +7400,9 @@
+@@ -7613,9 +7403,9 @@
  case $deplibs_check_method in
  file_magic*)
    if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -5564,7 +5563,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $MAGIC_CMD in
-@@ -7663,10 +7453,10 @@
+@@ -7666,10 +7456,10 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -5577,7 +5576,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -7676,9 +7466,9 @@
+@@ -7679,9 +7469,9 @@
  
  if test -z "$lt_cv_path_MAGIC_CMD"; then
    if test -n "$ac_tool_prefix"; then
@@ -5589,7 +5588,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $MAGIC_CMD in
-@@ -7729,10 +7519,10 @@
+@@ -7732,10 +7522,10 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -5602,7 +5601,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -7813,9 +7603,9 @@
+@@ -7816,9 +7606,9 @@
  if test "$GCC" = yes; then
    lt_prog_compiler_no_builtin_flag=' -fno-builtin'
  
@@ -5614,21 +5613,21 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_rtti_exceptions=no
-@@ -7831,11 +7621,11 @@
+@@ -7834,11 +7624,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:7837: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7627: $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:7841: \$? = $ac_status" >&5
++   echo "$as_me:7631: \$? = $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 @@
+@@ -7851,7 +7641,7 @@
     $RM conftest*
  
  fi
@@ -5637,7 +5636,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 @@
+@@ -7871,7 +7661,7 @@
  lt_prog_compiler_pic=
  lt_prog_compiler_static=
  
@@ -5646,7 +5645,7 @@
  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  
    if test "$GCC" = yes; then
-@@ -8140,7 +7930,7 @@
+@@ -8143,7 +7933,7 @@
      lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
      ;;
  esac
@@ -5655,7 +5654,7 @@
  $as_echo "$lt_prog_compiler_pic" >&6; }
  
  
-@@ -8152,9 +7942,9 @@
+@@ -8155,9 +7945,9 @@
  # Check to make sure the PIC flag actually works.
  #
  if test -n "$lt_prog_compiler_pic"; then
@@ -5667,21 +5666,21 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_pic_works=no
-@@ -8170,11 +7960,11 @@
+@@ -8173,11 +7963,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:8176: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7966: $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:8180: \$? = $ac_status" >&5
++   echo "$as_me:7970: \$? = $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 @@
+@@ -8190,7 +7980,7 @@
     $RM conftest*
  
  fi
@@ -5690,7 +5689,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 @@
+@@ -8214,9 +8004,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 +5701,7 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_static_works=no
-@@ -8239,7 +8029,7 @@
+@@ -8242,7 +8032,7 @@
     LDFLAGS="$save_LDFLAGS"
  
  fi
@@ -5711,7 +5710,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 @@
+@@ -8257,9 +8047,9 @@
  
  
  
@@ -5723,21 +5722,21 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_c_o=no
-@@ -8275,11 +8065,11 @@
+@@ -8278,11 +8068,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:8281: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8071: $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:8285: \$? = $ac_status" >&5
++   echo "$as_me:8075: \$? = $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 @@
+@@ -8304,7 +8094,7 @@
     $RM conftest*
  
  fi
@@ -5746,7 +5745,7 @@
  $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
  
  
-@@ -8309,9 +8099,9 @@
+@@ -8312,9 +8102,9 @@
  
  
  
@@ -5758,21 +5757,21 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_c_o=no
-@@ -8330,11 +8120,11 @@
+@@ -8333,11 +8123,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:8336: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8126: $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:8340: \$? = $ac_status" >&5
++   echo "$as_me:8130: \$? = $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 @@
+@@ -8359,7 +8149,7 @@
     $RM conftest*
  
  fi
@@ -5781,7 +5780,7 @@
  $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
  
  
-@@ -8365,7 +8155,7 @@
+@@ -8368,7 +8158,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 +5789,7 @@
  $as_echo_n "checking if we can lock with hard links... " >&6; }
    hard_links=yes
    $RM conftest*
-@@ -8373,10 +8163,10 @@
+@@ -8376,10 +8166,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 +5802,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 @@
+@@ -8392,7 +8182,7 @@
  
  
  
@@ -5812,7 +5811,7 @@
  $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
  
    runpath_var=
-@@ -8449,6 +8239,9 @@
+@@ -8452,6 +8242,9 @@
    openbsd*)
      with_gnu_ld=no
      ;;
@@ -5822,7 +5821,7 @@
    esac
  
    ld_shlibs=yes
-@@ -8631,7 +8424,7 @@
+@@ -8634,7 +8427,7 @@
        fi
        ;;
  
@@ -5831,7 +5830,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 @@
+@@ -8809,6 +8602,7 @@
  	if test "$aix_use_runtimelinking" = yes; then
  	  shared_flag="$shared_flag "'${wl}-G'
  	fi
@@ -5839,7 +5838,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -8831,11 +8625,7 @@
+@@ -8834,11 +8628,7 @@
  	allow_undefined_flag='-berok'
          # Determine the default libpath from the value encoded in an
          # empty executable.
@@ -5852,7 +5851,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -8846,27 +8636,7 @@
+@@ -8849,27 +8639,7 @@
    return 0;
  }
  _ACEOF
@@ -5881,7 +5880,7 @@
  
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
-@@ -8880,16 +8650,9 @@
+@@ -8883,16 +8653,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 +5899,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 @@
+@@ -8905,11 +8668,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an
  	 # empty executable.
@@ -5913,7 +5912,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -8917,27 +8676,7 @@
+@@ -8920,27 +8679,7 @@
    return 0;
  }
  _ACEOF
@@ -5942,7 +5941,7 @@
  
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
-@@ -8951,16 +8690,9 @@
+@@ -8954,16 +8693,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 +5960,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 @@
+@@ -9175,42 +8907,16 @@
  	# implicitly export all symbols.
          save_LDFLAGS="$LDFLAGS"
          LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
@@ -6009,7 +6008,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 @@
+@@ -9223,7 +8929,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -6018,7 +6017,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 @@
+@@ -9466,7 +9172,7 @@
      fi
    fi
  
@@ -6027,7 +6026,7 @@
  $as_echo "$ld_shlibs" >&6; }
  test "$ld_shlibs" = no && can_build_shared=no
  
-@@ -9500,16 +9206,16 @@
+@@ -9503,16 +9209,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 +6047,7 @@
          soname=conftest
          lib=conftest
          libobjs=conftest.$ac_objext
-@@ -9523,11 +9229,11 @@
+@@ -9526,11 +9232,11 @@
          libname=conftest
          lt_save_allow_undefined_flag=$allow_undefined_flag
          allow_undefined_flag=
@@ -6063,7 +6062,7 @@
          then
  	  archive_cmds_need_lc=no
          else
-@@ -9538,7 +9244,7 @@
+@@ -9541,7 +9247,7 @@
          cat conftest.err 1>&5
        fi
        $RM conftest*
@@ -6072,7 +6071,7 @@
  $as_echo "$archive_cmds_need_lc" >&6; }
        ;;
      esac
-@@ -9702,7 +9408,7 @@
+@@ -9705,7 +9411,7 @@
  
  
  
@@ -6081,7 +6080,7 @@
  $as_echo_n "checking dynamic linker characteristics... " >&6; }
  
  if test "$GCC" = yes; then
-@@ -10124,11 +9830,7 @@
+@@ -10127,11 +9833,7 @@
    save_libdir=$libdir
    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
         LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -6094,7 +6093,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -10139,41 +9841,13 @@
+@@ -10142,41 +9844,13 @@
    return 0;
  }
  _ACEOF
@@ -6140,7 +6139,7 @@
    LDFLAGS=$save_LDFLAGS
    libdir=$save_libdir
  
-@@ -10182,13 +9856,10 @@
+@@ -10185,13 +9859,10 @@
    # before this can be enabled.
    hardcode_into_libs=yes
  
@@ -6155,7 +6154,7 @@
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -10200,6 +9871,18 @@
+@@ -10203,6 +9874,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -6174,7 +6173,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -10388,7 +10071,7 @@
+@@ -10391,7 +10074,7 @@
    dynamic_linker=no
    ;;
  esac
@@ -6183,7 +6182,7 @@
  $as_echo "$dynamic_linker" >&6; }
  test "$dynamic_linker" = no && can_build_shared=no
  
-@@ -10490,7 +10173,7 @@
+@@ -10493,7 +10176,7 @@
  
  
  
@@ -6192,7 +6191,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 @@
+@@ -10518,7 +10201,7 @@
    # directories.
    hardcode_action=unsupported
  fi
@@ -6201,7 +6200,7 @@
  $as_echo "$hardcode_action" >&6; }
  
  if test "$hardcode_action" = relink ||
-@@ -10560,18 +10243,14 @@
+@@ -10563,18 +10246,14 @@
  
    darwin*)
    # if libdl is installed we need to link against it
@@ -6223,7 +6222,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -10589,43 +10268,18 @@
+@@ -10592,43 +10271,18 @@
    return 0;
  }
  _ACEOF
@@ -6273,7 +6272,7 @@
    lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
  else
  
-@@ -10638,106 +10292,18 @@
+@@ -10641,106 +10295,18 @@
      ;;
  
    *)
@@ -6385,7 +6384,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -10755,145 +10321,32 @@
+@@ -10758,145 +10324,32 @@
    return 0;
  }
  _ACEOF
@@ -6428,10 +6427,12 @@
  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
++if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
+   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+ else
 -  { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
 -$as_echo_n "checking for dlopen... " >&6; }
 -if test "${ac_cv_func_dlopen+set}" = set; then
@@ -6518,11 +6519,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
 +  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
 +if test "x$ac_cv_func_dlopen" = x""yes; then :
    lt_cv_dlopen="dlopen"
@@ -6545,7 +6541,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -10911,57 +10364,28 @@
+@@ -10914,57 +10367,28 @@
    return 0;
  }
  _ACEOF
@@ -6612,7 +6608,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -10979,57 +10403,28 @@
+@@ -10982,57 +10406,28 @@
    return 0;
  }
  _ACEOF
@@ -6679,7 +6675,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -11047,43 +10442,18 @@
+@@ -11050,43 +10445,18 @@
    return 0;
  }
  _ACEOF
@@ -6729,7 +6725,7 @@
    lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
  fi
  
-@@ -11122,9 +10492,9 @@
+@@ -11125,9 +10495,9 @@
      save_LIBS="$LIBS"
      LIBS="$lt_cv_dlopen_libs $LIBS"
  
@@ -6741,16 +6737,16 @@
    $as_echo_n "(cached) " >&6
  else
    	  if test "$cross_compiling" = yes; then :
-@@ -11133,7 +10503,7 @@
+@@ -11136,7 +10506,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 11139 "configure"
++#line 10509 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11192,11 +10562,11 @@
+@@ -11195,11 +10565,11 @@
    return status;
  }
  _LT_EOF
@@ -6765,7 +6761,7 @@
      (./conftest; exit; ) >&5 2>/dev/null
      lt_status=$?
      case x$lt_status in
-@@ -11213,14 +10583,14 @@
+@@ -11216,14 +10586,14 @@
  
  
  fi
@@ -6783,16 +6779,16 @@
    $as_echo_n "(cached) " >&6
  else
    	  if test "$cross_compiling" = yes; then :
-@@ -11229,7 +10599,7 @@
+@@ -11232,7 +10602,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 11235 "configure"
++#line 10605 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11288,11 +10658,11 @@
+@@ -11291,11 +10661,11 @@
    return status;
  }
  _LT_EOF
@@ -6807,7 +6803,7 @@
      (./conftest; exit; ) >&5 2>/dev/null
      lt_status=$?
      case x$lt_status in
-@@ -11309,7 +10679,7 @@
+@@ -11312,7 +10682,7 @@
  
  
  fi
@@ -6816,7 +6812,7 @@
  $as_echo "$lt_cv_dlopen_self_static" >&6; }
      fi
  
-@@ -11348,12 +10718,12 @@
+@@ -11351,12 +10721,12 @@
  
  striplib=
  old_striplib=
@@ -6831,7 +6827,7 @@
  $as_echo "yes" >&6; }
  else
  # FIXME - insert some real tests, host_os isn't really good enough
-@@ -11362,15 +10732,15 @@
+@@ -11365,15 +10735,15 @@
      if test -n "$STRIP" ; then
        striplib="$STRIP -x"
        old_striplib="$STRIP -S"
@@ -6850,7 +6846,7 @@
  $as_echo "no" >&6; }
      ;;
    esac
-@@ -11388,12 +10758,12 @@
+@@ -11391,12 +10761,12 @@
  
  
    # Report which library types will actually be built
@@ -6866,7 +6862,7 @@
  $as_echo_n "checking whether to build shared libraries... " >&6; }
    test "$can_build_shared" = "no" && enable_shared=no
  
-@@ -11414,14 +10784,14 @@
+@@ -11417,14 +10787,14 @@
      fi
      ;;
    esac
@@ -6884,8 +6880,72 @@
  $as_echo "$enable_static" >&6; }
  
  
-@@ -11457,17 +10827,13 @@
- 
+@@ -11465,9 +10835,9 @@
+ # Josh Triplett <josh at freedesktop.org>
+ # Extract the first word of "bash", so it can be a program name with args.
+ set dummy bash; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_DOLT_BASH+set}" = set; then
++if test "${ac_cv_path_DOLT_BASH+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $DOLT_BASH in
+@@ -11480,14 +10850,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_DOLT_BASH="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+   ;;
+@@ -11495,15 +10865,15 @@
+ fi
+ DOLT_BASH=$ac_cv_path_DOLT_BASH
+ if test -n "$DOLT_BASH"; then
+-  { $as_echo "$as_me:$LINENO: result: $DOLT_BASH" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOLT_BASH" >&5
+ $as_echo "$DOLT_BASH" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking if dolt supports this host" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if dolt supports this host" >&5
+ $as_echo_n "checking if dolt supports this host... " >&6; }
+ dolt_supported=yes
+ if test x$DOLT_BASH = x; then
+@@ -11525,12 +10895,12 @@
+     ;;
+ esac
+ if test x$dolt_supported = xno ; then
+-    { $as_echo "$as_me:$LINENO: result: no, falling back to libtool" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, falling back to libtool" >&5
+ $as_echo "no, falling back to libtool" >&6; }
+     LTCOMPILE='$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(COMPILE)'
+     LTCXXCOMPILE='$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXXCOMPILE)'
+ else
+-    { $as_echo "$as_me:$LINENO: result: yes, replacing libtool" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, replacing libtool" >&5
+ $as_echo "yes, replacing libtool" >&6; }
+ 
+     cat <<__DOLTCOMPILE__EOF__ >doltcompile
+@@ -11658,17 +11028,13 @@
+ # end dolt
  
  
 -{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5
@@ -6905,7 +6965,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -11492,54 +10858,27 @@
+@@ -11693,54 +11059,27 @@
      ac_res=-l$ac_lib
      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
    fi
@@ -6968,7 +7028,7 @@
    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
  fi
-@@ -11552,9 +10891,9 @@
+@@ -11753,9 +11092,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 +7040,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -11565,24 +10904,24 @@
+@@ -11766,24 +11105,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7010,7 +7070,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -11592,9 +10931,9 @@
+@@ -11793,9 +11132,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 +7082,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -11605,24 +10944,24 @@
+@@ -11806,24 +11145,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7052,7 +7112,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -11631,7 +10970,7 @@
+@@ -11832,7 +11171,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -7061,7 +7121,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -11645,9 +10984,9 @@
+@@ -11846,9 +11185,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 +7133,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -11658,24 +10997,24 @@
+@@ -11859,24 +11198,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7103,7 +7163,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -11685,9 +11024,9 @@
+@@ -11886,9 +11225,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 +7175,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -11699,18 +11038,18 @@
+@@ -11900,18 +11239,18 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7137,7 +7197,7 @@
  IFS=$as_save_IFS
  
  if test $ac_prog_rejected = yes; then
-@@ -11729,10 +11068,10 @@
+@@ -11930,10 +11269,10 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -7150,7 +7210,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -11744,9 +11083,9 @@
+@@ -11945,9 +11284,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 +7222,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -11757,24 +11096,24 @@
+@@ -11958,24 +11297,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7192,7 +7252,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -11788,9 +11127,9 @@
+@@ -11989,9 +11328,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 +7264,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -11801,24 +11140,24 @@
+@@ -12002,24 +11341,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7234,7 +7294,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -11831,7 +11170,7 @@
+@@ -12032,7 +11371,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -7243,7 +7303,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -11842,62 +11181,42 @@
+@@ -12043,62 +11382,42 @@
  fi
  
  
@@ -7328,7 +7388,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -11911,37 +11230,16 @@
+@@ -12112,37 +11431,16 @@
    return 0;
  }
  _ACEOF
@@ -7369,7 +7429,7 @@
  $as_echo "$ac_cv_c_compiler_gnu" >&6; }
  if test $ac_compiler_gnu = yes; then
    GCC=yes
-@@ -11950,20 +11248,16 @@
+@@ -12151,20 +11449,16 @@
  fi
  ac_test_CFLAGS=${CFLAGS+set}
  ac_save_CFLAGS=$CFLAGS
@@ -7393,7 +7453,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -11974,35 +11268,11 @@
+@@ -12175,35 +11469,11 @@
    return 0;
  }
  _ACEOF
@@ -7432,7 +7492,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -12013,36 +11283,12 @@
+@@ -12214,36 +11484,12 @@
    return 0;
  }
  _ACEOF
@@ -7473,7 +7533,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -12053,42 +11299,17 @@
+@@ -12254,42 +11500,17 @@
    return 0;
  }
  _ACEOF
@@ -7518,7 +7578,7 @@
  $as_echo "$ac_cv_prog_cc_g" >&6; }
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
-@@ -12105,18 +11326,14 @@
+@@ -12306,18 +11527,14 @@
      CFLAGS=
    fi
  fi
@@ -7540,7 +7600,7 @@
  /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdio.h>
-@@ -12173,32 +11390,9 @@
+@@ -12374,32 +11591,9 @@
  	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
  do
    CC="$ac_save_CC $ac_arg"
@@ -7574,7 +7634,7 @@
  rm -f core conftest.err conftest.$ac_objext
    test "x$ac_cv_prog_cc_c89" != "xno" && break
  done
-@@ -12209,17 +11403,19 @@
+@@ -12410,17 +11604,19 @@
  # AC_CACHE_VAL
  case "x$ac_cv_prog_cc_c89" in
    x)
@@ -7597,7 +7657,7 @@
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -12229,9 +11425,9 @@
+@@ -12430,9 +11626,9 @@
  
  depcc="$CC"   am_compiler_list=
  
@@ -7609,7 +7669,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -12339,7 +11535,7 @@
+@@ -12540,7 +11736,7 @@
  fi
  
  fi
@@ -7618,7 +7678,7 @@
  $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
-@@ -12362,9 +11558,9 @@
+@@ -12563,9 +11759,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 +7690,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -12375,24 +11571,24 @@
+@@ -12576,24 +11772,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7660,7 +7720,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -12402,9 +11598,9 @@
+@@ -12603,9 +11799,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 +7732,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -12415,24 +11611,24 @@
+@@ -12616,24 +11812,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7702,7 +7762,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -12441,7 +11637,7 @@
+@@ -12642,7 +11838,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -7711,7 +7771,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -12455,9 +11651,9 @@
+@@ -12656,9 +11852,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 +7783,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -12468,24 +11664,24 @@
+@@ -12669,24 +11865,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7753,7 +7813,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -12495,9 +11691,9 @@
+@@ -12696,9 +11892,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 +7825,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -12509,18 +11705,18 @@
+@@ -12710,18 +11906,18 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7787,7 +7847,7 @@
  IFS=$as_save_IFS
  
  if test $ac_prog_rejected = yes; then
-@@ -12539,10 +11735,10 @@
+@@ -12740,10 +11936,10 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -7800,7 +7860,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -12554,9 +11750,9 @@
+@@ -12755,9 +11951,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 +7872,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -12567,24 +11763,24 @@
+@@ -12768,24 +11964,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7842,7 +7902,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -12598,9 +11794,9 @@
+@@ -12799,9 +11995,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 +7914,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -12611,24 +11807,24 @@
+@@ -12812,24 +12008,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7884,7 +7944,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -12641,7 +11837,7 @@
+@@ -12842,7 +12038,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -7893,7 +7953,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -12652,62 +11848,42 @@
+@@ -12853,62 +12049,42 @@
  fi
  
  
@@ -7914,14 +7974,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 +8001,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
@@ -7978,7 +8038,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -12721,37 +11897,16 @@
+@@ -12922,37 +12098,16 @@
    return 0;
  }
  _ACEOF
@@ -8019,7 +8079,7 @@
  $as_echo "$ac_cv_c_compiler_gnu" >&6; }
  if test $ac_compiler_gnu = yes; then
    GCC=yes
-@@ -12760,20 +11915,16 @@
+@@ -12961,20 +12116,16 @@
  fi
  ac_test_CFLAGS=${CFLAGS+set}
  ac_save_CFLAGS=$CFLAGS
@@ -8043,7 +8103,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -12784,75 +11935,11 @@
+@@ -12985,75 +12136,11 @@
    return 0;
  }
  _ACEOF
@@ -8067,7 +8127,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 +8177,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 @@
+@@ -13064,42 +12151,33 @@
    return 0;
  }
  _ACEOF
@@ -8181,7 +8242,7 @@
  $as_echo "$ac_cv_prog_cc_g" >&6; }
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
-@@ -12915,18 +11993,14 @@
+@@ -13116,18 +12194,14 @@
      CFLAGS=
    fi
  fi
@@ -8203,7 +8264,7 @@
  /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdio.h>
-@@ -12983,32 +12057,9 @@
+@@ -13184,32 +12258,9 @@
  	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
  do
    CC="$ac_save_CC $ac_arg"
@@ -8237,7 +8298,7 @@
  rm -f core conftest.err conftest.$ac_objext
    test "x$ac_cv_prog_cc_c89" != "xno" && break
  done
-@@ -13019,17 +12070,19 @@
+@@ -13220,17 +12271,19 @@
  # AC_CACHE_VAL
  case "x$ac_cv_prog_cc_c89" in
    x)
@@ -8260,7 +8321,7 @@
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -13039,9 +12092,9 @@
+@@ -13240,9 +12293,9 @@
  
  depcc="$CC"   am_compiler_list=
  
@@ -8272,7 +8333,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -13149,7 +12202,7 @@
+@@ -13350,7 +12403,7 @@
  fi
  
  fi
@@ -8281,7 +8342,7 @@
  $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
-@@ -13167,16 +12220,12 @@
+@@ -13368,16 +12421,12 @@
  
  am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
  
@@ -8301,7 +8362,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <stdarg.h>
-@@ -13191,48 +12240,23 @@
+@@ -13392,48 +12441,23 @@
    return 0;
  }
  _ACEOF
@@ -8355,7 +8416,7 @@
  else
    ac_cv_header_stdc=no
  fi
-@@ -13242,18 +12266,14 @@
+@@ -13443,18 +12467,14 @@
  
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -8377,7 +8438,7 @@
  else
    ac_cv_header_stdc=no
  fi
-@@ -13263,14 +12283,10 @@
+@@ -13464,14 +12484,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 +8455,7 @@
  /* end confdefs.h.  */
  #include <ctype.h>
  #include <stdlib.h>
-@@ -13297,60 +12313,31 @@
+@@ -13498,60 +12514,31 @@
    return 0;
  }
  _ACEOF
@@ -8464,7 +8525,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GLIB_GENMARSHAL in
-@@ -13363,14 +12350,14 @@
+@@ -13564,14 +12551,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8482,7 +8543,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -13378,19 +12365,19 @@
+@@ -13579,19 +12566,19 @@
  fi
  GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
  if test -n "$GLIB_GENMARSHAL"; then
@@ -8506,7 +8567,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GLIB_MKENUMS in
-@@ -13403,14 +12390,14 @@
+@@ -13604,14 +12591,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8524,7 +8585,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -13418,26 +12405,26 @@
+@@ -13619,26 +12606,26 @@
  fi
  GLIB_MKENUMS=$ac_cv_path_GLIB_MKENUMS
  if test -n "$GLIB_MKENUMS"; then
@@ -8556,7 +8617,7 @@
  $as_echo "$USE_NLS" >&6; }
  
  
-@@ -13445,35 +12432,31 @@
+@@ -13646,35 +12633,31 @@
  
  case "$am__api_version" in
      1.01234)
@@ -8598,7 +8659,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $INTLTOOL_UPDATE in
-@@ -13486,14 +12469,14 @@
+@@ -13687,14 +12670,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8616,7 +8677,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -13501,19 +12484,19 @@
+@@ -13702,19 +12685,19 @@
  fi
  INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
  if test -n "$INTLTOOL_UPDATE"; then
@@ -8640,7 +8701,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $INTLTOOL_MERGE in
-@@ -13526,14 +12509,14 @@
+@@ -13727,14 +12710,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8658,7 +8719,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -13541,19 +12524,19 @@
+@@ -13742,19 +12725,19 @@
  fi
  INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
  if test -n "$INTLTOOL_MERGE"; then
@@ -8682,7 +8743,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $INTLTOOL_EXTRACT in
-@@ -13566,14 +12549,14 @@
+@@ -13767,14 +12750,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8700,7 +8761,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -13581,18 +12564,16 @@
+@@ -13782,18 +12765,16 @@
  fi
  INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
  if test -n "$INTLTOOL_EXTRACT"; then
@@ -8722,7 +8783,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 @@
+@@ -13836,12 +12817,88 @@
  
  
  
@@ -8813,7 +8874,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $XGETTEXT in
-@@ -13653,14 +12710,14 @@
+@@ -13854,14 +12911,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8831,7 +8892,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -13668,19 +12725,19 @@
+@@ -13869,19 +12926,19 @@
  fi
  XGETTEXT=$ac_cv_path_XGETTEXT
  if test -n "$XGETTEXT"; then
@@ -8855,7 +8916,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $MSGMERGE in
-@@ -13693,14 +12750,14 @@
+@@ -13894,14 +12951,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8873,7 +8934,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -13708,19 +12765,19 @@
+@@ -13909,19 +12966,19 @@
  fi
  MSGMERGE=$ac_cv_path_MSGMERGE
  if test -n "$MSGMERGE"; then
@@ -8897,7 +8958,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $MSGFMT in
-@@ -13733,14 +12790,14 @@
+@@ -13934,14 +12991,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8915,7 +8976,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -13748,19 +12805,19 @@
+@@ -13949,19 +13006,19 @@
  fi
  MSGFMT=$ac_cv_path_MSGFMT
  if test -n "$MSGFMT"; then
@@ -8939,7 +9000,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GMSGFMT in
-@@ -13773,14 +12830,14 @@
+@@ -13974,14 +13031,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8957,7 +9018,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -13789,33 +12846,29 @@
+@@ -13990,33 +13047,29 @@
  fi
  GMSGFMT=$ac_cv_path_GMSGFMT
  if test -n "$GMSGFMT"; then
@@ -8997,7 +9058,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $INTLTOOL_PERL in
-@@ -13828,14 +12881,14 @@
+@@ -14029,14 +13082,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9015,7 +9076,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -13843,173 +12896,63 @@
+@@ -14044,173 +13097,63 @@
  fi
  INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
  if test -n "$INTLTOOL_PERL"; then
@@ -9062,7 +9123,8 @@
 -       { { $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
++       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,8 +9218,6 @@
 -#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
@@ -9224,7 +9284,7 @@
    DATADIRNAME=share
  else
    DATADIRNAME=lib
-@@ -14021,10 +12964,8 @@
+@@ -14222,10 +13165,8 @@
      ;;
      esac
  fi
@@ -9237,7 +9297,7 @@
  fi
  
  
-@@ -14038,9 +12979,9 @@
+@@ -14239,9 +13180,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 +9309,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PKG_CONFIG in
-@@ -14053,14 +12994,14 @@
+@@ -14254,14 +13195,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9267,7 +9327,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -14068,10 +13009,10 @@
+@@ -14269,10 +13210,10 @@
  fi
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  if test -n "$PKG_CONFIG"; then
@@ -9280,7 +9340,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -14081,9 +13022,9 @@
+@@ -14282,9 +13223,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 +9352,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $ac_pt_PKG_CONFIG in
-@@ -14096,14 +13037,14 @@
+@@ -14297,14 +13238,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9310,7 +9370,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -14111,10 +13052,10 @@
+@@ -14312,10 +13253,10 @@
  fi
  ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
  if test -n "$ac_pt_PKG_CONFIG"; then
@@ -9323,7 +9383,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -14123,7 +13064,7 @@
+@@ -14324,7 +13265,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -9332,7 +9392,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -14136,13 +13077,13 @@
+@@ -14337,13 +13278,13 @@
  fi
  if test -n "$PKG_CONFIG"; then
  	_pkg_min_version=0.9.0
@@ -9349,7 +9409,7 @@
  $as_echo "no" >&6; }
  		PKG_CONFIG=""
  	fi
-@@ -14151,7 +13092,7 @@
+@@ -14352,7 +13293,7 @@
  
  
  	# Check whether --enable-debug was given.
@@ -9358,7 +9418,7 @@
    enableval=$enable_debug;
  else
    enable_debug=no
-@@ -14160,16 +13101,14 @@
+@@ -14361,16 +13302,14 @@
  
  	if test x$enable_debug = xyes ; then
  
@@ -9377,7 +9437,7 @@
    enableval=$enable_compile_warnings;
  else
    enable_compile_warnings="maximum"
-@@ -14200,13 +13139,9 @@
+@@ -14401,13 +13340,9 @@
  	for option in -Wno-sign-compare; do
  		SAVE_CFLAGS="$CFLAGS"
  		CFLAGS="$CFLAGS $option"
@@ -9393,7 +9453,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -14217,35 +13152,14 @@
+@@ -14418,35 +13353,14 @@
    return 0;
  }
  _ACEOF
@@ -9432,7 +9492,7 @@
  $as_echo "$has_option" >&6; }
  		if test $has_option = yes; then
  		  warning_flags="$warning_flags $option"
-@@ -14259,26 +13173,24 @@
+@@ -14460,26 +13374,24 @@
  	fi
  	;;
      *)
@@ -9464,7 +9524,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 @@
+@@ -14494,7 +13406,7 @@
  	esac
  	fi
      fi
@@ -9473,7 +9533,7 @@
  $as_echo "$complCFLAGS" >&6; }
  
      WARN_CFLAGS="$warning_flags $complCFLAGS"
-@@ -14302,22 +13214,23 @@
+@@ -14503,22 +13415,23 @@
  
  
  
@@ -9503,7 +9563,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 @@
+@@ -14536,11 +13449,11 @@
  GNOME_KEYRING_REQUIRED=2.26.0
  
  if test -n "$PKG_CONFIG" && \
@@ -9518,7 +9578,7 @@
    have_libnotify=yes
  else
    have_libnotify=no
-@@ -14349,24 +13262,22 @@
+@@ -14550,24 +13463,22 @@
  if test "$have_libnotify" = "yes"; then
    LIBNOTIFY_PACKAGE="libnotify >= $LIBNOTIFY_REQUIRED"
  
@@ -9547,7 +9607,7 @@
  $as_echo "$enable_tests" >&6; }
  
   if test "$enable_tests" = "yes"; then
-@@ -14380,14 +13291,15 @@
+@@ -14581,14 +13492,15 @@
  
  
  pkg_failed=no
@@ -9569,7 +9629,7 @@
  		  glib-2.0 >= \$GLIB_REQUIRED
  		  gmodule-2.0
  		  gthread-2.0
-@@ -14405,7 +13317,7 @@
+@@ -14606,7 +13518,7 @@
  		  webkit-1.0 >= \$WEBKIT_GTK_REQUIRED
  		  libsoup-gnome-2.4 >= \$LIBSOUP_GNOME_REQUIRED
  		  gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED
@@ -9578,7 +9638,7 @@
    ($PKG_CONFIG --exists --print-errors "
  		  glib-2.0 >= $GLIB_REQUIRED
  		  gmodule-2.0
-@@ -14426,8 +13338,8 @@
+@@ -14627,8 +13539,8 @@
  		  gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
  		  ") 2>&5
    ac_status=$?
@@ -9589,7 +9649,7 @@
    pkg_cv_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "
  		  glib-2.0 >= $GLIB_REQUIRED
  		  gmodule-2.0
-@@ -14450,14 +13362,16 @@
+@@ -14651,14 +13563,16 @@
  else
    pkg_failed=yes
  fi
@@ -9613,7 +9673,7 @@
  		  glib-2.0 >= \$GLIB_REQUIRED
  		  gmodule-2.0
  		  gthread-2.0
-@@ -14475,7 +13389,7 @@
+@@ -14676,7 +13590,7 @@
  		  webkit-1.0 >= \$WEBKIT_GTK_REQUIRED
  		  libsoup-gnome-2.4 >= \$LIBSOUP_GNOME_REQUIRED
  		  gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED
@@ -9622,7 +9682,7 @@
    ($PKG_CONFIG --exists --print-errors "
  		  glib-2.0 >= $GLIB_REQUIRED
  		  gmodule-2.0
-@@ -14496,8 +13410,8 @@
+@@ -14697,8 +13611,8 @@
  		  gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
  		  ") 2>&5
    ac_status=$?
@@ -9633,7 +9693,7 @@
    pkg_cv_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "
  		  glib-2.0 >= $GLIB_REQUIRED
  		  gmodule-2.0
-@@ -14520,8 +13434,9 @@
+@@ -14721,8 +13635,9 @@
  else
    pkg_failed=yes
  fi
@@ -9645,7 +9705,7 @@
  fi
  
  
-@@ -14534,7 +13449,7 @@
+@@ -14735,7 +13650,7 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -9654,7 +9714,7 @@
  		  glib-2.0 >= $GLIB_REQUIRED
  		  gmodule-2.0
  		  gthread-2.0
-@@ -14552,9 +13467,9 @@
+@@ -14753,9 +13668,9 @@
  		  webkit-1.0 >= $WEBKIT_GTK_REQUIRED
  		  libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
  		  gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
@@ -9666,7 +9726,7 @@
  		  glib-2.0 >= $GLIB_REQUIRED
  		  gmodule-2.0
  		  gthread-2.0
-@@ -14572,41 +13487,12 @@
+@@ -14773,41 +13688,12 @@
  		  webkit-1.0 >= $WEBKIT_GTK_REQUIRED
  		  libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
  		  gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
@@ -9710,7 +9770,7 @@
  		  glib-2.0 >= $GLIB_REQUIRED
  		  gmodule-2.0
  		  gthread-2.0
-@@ -14634,22 +13520,11 @@
+@@ -14835,22 +13721,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 +9796,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -14658,12 +13533,11 @@
+@@ -14859,12 +13734,11 @@
  See the pkg-config man page for more details.
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -9751,7 +9811,7 @@
  $as_echo "yes" >&6; }
  	:
  fi
-@@ -14674,40 +13548,44 @@
+@@ -14875,40 +13749,44 @@
  
  
  pkg_failed=no
@@ -9815,7 +9875,7 @@
  fi
  
  
-@@ -14720,14 +13598,14 @@
+@@ -14921,25 +13799,14 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -9829,25 +9889,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 @@
+@@ -14949,22 +13816,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 +9930,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -14772,21 +13628,20 @@
+@@ -14973,21 +13829,20 @@
  See the pkg-config man page for more details.
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -9896,7 +9956,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $DBUS_BINDING_TOOL in
-@@ -14799,14 +13654,14 @@
+@@ -15000,14 +13855,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9914,7 +9974,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_DBUS_BINDING_TOOL" && ac_cv_path_DBUS_BINDING_TOOL="no"
-@@ -14815,19 +13670,17 @@
+@@ -15016,19 +13871,17 @@
  fi
  DBUS_BINDING_TOOL=$ac_cv_path_DBUS_BINDING_TOOL
  if test -n "$DBUS_BINDING_TOOL"; then
@@ -9937,7 +9997,7 @@
  fi
  
  # *****
-@@ -14843,13 +13696,13 @@
+@@ -15044,13 +13897,13 @@
  
  
  # Check whether --with-gconf-source was given.
@@ -9953,7 +10013,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 @@
+@@ -15059,22 +13912,20 @@
  
  
  # Check whether --with-gconf-schema-file-dir was given.
@@ -9980,7 +10040,7 @@
        esac
  fi
  
-@@ -14889,9 +13740,9 @@
+@@ -15090,9 +13941,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,7 +10052,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GCONFTOOL in
-@@ -14904,303 +13755,60 @@
+@@ -15105,303 +13956,60 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -10001,8 +10061,7 @@
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
+-    break 2
 -  fi
 -done
 -done
@@ -10184,6 +10243,8 @@
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
 +  fi
 +done
 +  done
@@ -10336,7 +10397,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -15209,18 +13817,14 @@
+@@ -15410,18 +14018,14 @@
  
  done
  
@@ -10358,7 +10419,7 @@
  /* end confdefs.h.  */
  #ifndef __cplusplus
  typedef int foo_t;
-@@ -15229,41 +13833,17 @@
+@@ -15430,41 +14034,17 @@
  #endif
  
  _ACEOF
@@ -10402,7 +10463,7 @@
  case $ac_cv_c_inline in
    inline | yes) ;;
    *)
-@@ -15279,16 +13859,12 @@
+@@ -15480,16 +14060,12 @@
      ;;
  esac
  
@@ -10422,7 +10483,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/time.h>
-@@ -15303,190 +13879,31 @@
+@@ -15504,190 +14080,31 @@
    return 0;
  }
  _ACEOF
@@ -10624,7 +10685,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -15502,100 +13919,12 @@
+@@ -15703,100 +14120,12 @@
  
  
  
@@ -10731,7 +10792,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -15607,31 +13936,15 @@
+@@ -15808,31 +14137,15 @@
  
  
  
@@ -10767,16 +10828,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)
- 	  break;
--      if (! bigtime_test (INT_MAX))
--	return 1;
--    }
--  return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
--}
--_ACEOF
+@@ -16029,44 +14342,17 @@
+   return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
+ }
+ _ACEOF
 -rm -f conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -10799,21 +10854,17 @@
 -  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 ());
-+}
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-   ac_cv_func_working_mktime=yes
- else
+-  ac_cv_func_working_mktime=yes
+-else
 -  $as_echo "$as_me: program exited with status $ac_status" >&5
 -$as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -( exit $ac_status )
 -ac_cv_func_working_mktime=no
++if ac_fn_c_try_run "$LINENO"; then :
++  ac_cv_func_working_mktime=yes
++else
 +  ac_cv_func_working_mktime=no
  fi
 -rm -rf conftest.dSYM
@@ -10829,7 +10880,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 @@
+@@ -16077,19 +14363,15 @@
  
  fi
  
@@ -10853,7 +10904,7 @@
  /* end confdefs.h.  */
  
  $ac_includes_default
-@@ -15921,44 +14203,17 @@
+@@ -16122,44 +14404,17 @@
  }
  
  _ACEOF
@@ -10903,7 +10954,7 @@
  $as_echo "$ac_cv_func_strtod" >&6; }
  if test $ac_cv_func_strtod = no; then
    case " $LIBOBJS " in
-@@ -15967,105 +14222,20 @@
+@@ -16168,105 +14423,20 @@
   ;;
  esac
  
@@ -11014,7 +11065,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -16083,46 +14253,21 @@
+@@ -16284,46 +14454,21 @@
    return 0;
  }
  _ACEOF
@@ -11068,7 +11119,7 @@
  $as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;}
  fi
  
-@@ -16130,102 +14275,9 @@
+@@ -16331,102 +14476,9 @@
  
  fi
  
@@ -11158,10 +11209,10 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
 +ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
 +if test "x$ac_cv_type_size_t" = x""yes; then :
  
+-
 -fi
 -
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -11173,7 +11224,7 @@
  else
  
  cat >>confdefs.h <<_ACEOF
-@@ -16249,48 +14301,23 @@
+@@ -16450,48 +14502,23 @@
  	_SAVE_CFLAGS=$CFLAGS
  	CFLAGS="$CFLAGS $_FLAGS"
  
@@ -11228,7 +11279,7 @@
  $as_echo "$ac_cv_have_declaration_after_statement" >&6; }
  
  	if test "$ac_cv_have_declaration_after_statement" = "yes"; then
-@@ -16309,151 +14336,12 @@
+@@ -16510,151 +14537,12 @@
  # Multimedia keys
  # ***************
  
@@ -11384,7 +11435,7 @@
  _ACEOF
  
  fi
-@@ -16467,16 +14355,16 @@
+@@ -16668,16 +14556,16 @@
  # GObject Introspection
  # *********************
  
@@ -11404,7 +11455,7 @@
  $as_echo "$enable_introspection" >&6; }
  
  G_IR_SCANNER=
-@@ -16491,40 +14379,44 @@
+@@ -16692,40 +14580,44 @@
    GOBJECT_INTROSPECTION_REQUIRED=0.6.2
  
  pkg_failed=no
@@ -11468,7 +11519,7 @@
  fi
  
  
-@@ -16537,26 +14429,15 @@
+@@ -16738,25 +14630,14 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -11493,23 +11544,19 @@
 -See the pkg-config man page for more details.
 -" >&5
 -$as_echo "$as_me: error: Package requirements (gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED) were not met:
--
 +	as_fn_error "Package requirements (gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED) were not met:
-+
+ 
  $INTROSPECTION_PKG_ERRORS
  
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
-@@ -16565,22 +14446,11 @@
+@@ -16766,22 +14647,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.
 -" >&2;}
 -   { (exit 1); exit 1; }; }
-+" "$LINENO" 5
- elif test $pkg_failed = untried; then
+-elif test $pkg_failed = untried; then
 -	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 -{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
 -is in your PATH or set the PKG_CONFIG environment variable to the full
 -path to pkg-config.
@@ -11521,11 +11568,15 @@
 -To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 -See \`config.log' for more details." >&5
 -$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
++" "$LINENO" 5
++elif test $pkg_failed = untried; then
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -16589,12 +14459,11 @@
+@@ -16790,12 +14660,11 @@
  See the pkg-config man page for more details.
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -11540,7 +11591,7 @@
  $as_echo "yes" >&6; }
  	:
  fi
-@@ -16606,9 +14475,7 @@
+@@ -16807,9 +14676,7 @@
    GIRTYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
  
  
@@ -11551,7 +11602,7 @@
  
  fi
  
-@@ -16631,22 +14498,20 @@
+@@ -16832,22 +14699,20 @@
  # Seed
  # ****
  
@@ -11578,7 +11629,7 @@
  fi
  
  if test "$enable_seed" = "yes"; then
-@@ -16655,40 +14520,44 @@
+@@ -16856,40 +14721,44 @@
    SEED_REQUIRED=2.27.91
  
  pkg_failed=no
@@ -11642,7 +11693,7 @@
  fi
  
  
-@@ -16701,25 +14570,14 @@
+@@ -16902,25 +14771,14 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -11671,7 +11722,7 @@
  
  $SEED_PKG_ERRORS
  
-@@ -16729,22 +14587,11 @@
+@@ -16930,22 +14788,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 +11748,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -16753,20 +14600,17 @@
+@@ -16954,20 +14801,17 @@
  See the pkg-config man page for more details.
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -11721,7 +11772,7 @@
  
  fi
  
-@@ -16785,56 +14629,60 @@
+@@ -16986,56 +14830,60 @@
  # NSS
  # ***
  
@@ -11804,7 +11855,7 @@
  fi
  
  
-@@ -16847,14 +14695,14 @@
+@@ -17048,25 +14896,14 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -11818,25 +11869,25 @@
  	echo "$NSS_PKG_ERRORS" >&5
  
 -	{ { $as_echo "$as_me:$LINENO: error: Package requirements (nss) were not met:
+-
+-$NSS_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 NSS_CFLAGS
+-and NSS_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 (nss) were not met:
 +	as_fn_error "Package requirements (nss) were not met:
  
  $NSS_PKG_ERRORS
  
-@@ -16864,33 +14712,11 @@
+@@ -17076,22 +14913,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.
--" >&5
--$as_echo "$as_me: error: Package requirements (nss) were not met:
--
--$NSS_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 NSS_CFLAGS
--and NSS_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
@@ -11859,7 +11910,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -16899,20 +14725,17 @@
+@@ -17100,20 +14926,17 @@
  See the pkg-config man page for more details.
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -11883,7 +11934,7 @@
  
  fi
  
-@@ -16932,16 +14755,16 @@
+@@ -17133,16 +14956,16 @@
  
  # Zeroconf bookmarks sites
  
@@ -11903,7 +11954,7 @@
  $as_echo "$enable_zeroconf" >&6; }
  
  if test "$enable_zeroconf" != "no"; then
-@@ -16949,52 +14772,56 @@
+@@ -17150,52 +14973,56 @@
  
  
  pkg_failed=no
@@ -11981,7 +12032,7 @@
  fi
  
  
-@@ -17007,18 +14834,18 @@
+@@ -17208,18 +15035,18 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -12005,7 +12056,7 @@
  $as_echo "no" >&6; }
                  have_avahi=no
  elif test $pkg_failed = untried; then
-@@ -17026,15 +14853,13 @@
+@@ -17227,15 +15054,13 @@
  else
  	AVAHI_CFLAGS=$pkg_cv_AVAHI_CFLAGS
  	AVAHI_LIBS=$pkg_cv_AVAHI_LIBS
@@ -12023,7 +12074,7 @@
          elif test "$have_avahi" = "yes"; then
                  enable_zeroconf=yes
          else
-@@ -17044,9 +14869,7 @@
+@@ -17245,9 +15070,7 @@
  
  if test "$enable_zeroconf" = "yes"; then
  
@@ -12034,7 +12085,7 @@
  
  fi
  
-@@ -17061,55 +14884,59 @@
+@@ -17262,55 +15085,59 @@
  
  # NetworkManager
  
@@ -12116,7 +12167,7 @@
  fi
  
  
-@@ -17122,14 +14949,14 @@
+@@ -17323,14 +15150,14 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -12134,7 +12185,7 @@
  $as_echo "no" >&6; }
                  have_network_manager=no
  elif test $pkg_failed = untried; then
-@@ -17137,26 +14964,22 @@
+@@ -17338,26 +15165,22 @@
  else
  	NETWORK_MANAGER_CFLAGS=$pkg_cv_NETWORK_MANAGER_CFLAGS
  	NETWORK_MANAGER_LIBS=$pkg_cv_NETWORK_MANAGER_LIBS
@@ -12165,7 +12216,7 @@
  
  fi
  
-@@ -17197,18 +15020,18 @@
+@@ -17398,18 +15221,18 @@
  ISO_CODES_REQUIRED=0.35
  
  if test -n "$PKG_CONFIG" && \
@@ -12188,7 +12239,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 @@
+@@ -17418,7 +15241,7 @@
  		result=no
  		have_iso_codes=no
  	fi
@@ -12197,7 +12248,7 @@
  $as_echo "$result" >&6; }
  fi
  
-@@ -17228,14 +15051,10 @@
+@@ -17429,14 +15252,10 @@
  _ACEOF
  
  
@@ -12214,7 +12265,7 @@
  fi
  
  GETTEXT_PACKAGE=epiphany
-@@ -17246,151 +15065,12 @@
+@@ -17447,151 +15266,12 @@
  _ACEOF
  
  
@@ -12371,7 +12422,7 @@
  _ACEOF
  
  fi
-@@ -17398,16 +15078,12 @@
+@@ -17599,16 +15279,12 @@
  done
  
      if test $ac_cv_header_locale_h = yes; then
@@ -12391,10 +12442,13 @@
  /* end confdefs.h.  */
  #include <locale.h>
  int
-@@ -17418,207 +15094,45 @@
-   return 0;
- }
- _ACEOF
+@@ -17616,210 +15292,48 @@
+ {
+ return LC_MESSAGES
+   ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -12416,9 +12470,8 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   am_cv_val_LC_MESSAGES=yes
- else
+-  am_cv_val_LC_MESSAGES=yes
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
@@ -12533,8 +12586,7 @@
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -  ac_header_preproc=no
-+  am_cv_val_LC_MESSAGES=no
- fi
+-fi
 -
 -rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
@@ -12574,19 +12626,26 @@
 -$as_echo_n "checking for libintl.h... " >&6; }
 -if test "${ac_cv_header_libintl_h+set}" = set; then
 -  $as_echo_n "(cached) " >&6
--else
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  am_cv_val_LC_MESSAGES=yes
+ else
 -  ac_cv_header_libintl_h=$ac_header_preproc
++  am_cv_val_LC_MESSAGES=no
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
+-$as_echo "$ac_cv_header_libintl_h" >&6; }
+-
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
  fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
--$as_echo "$ac_cv_header_libintl_h" >&6; }
+-if test "x$ac_cv_header_libintl_h" = x""yes; then
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
 +$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
 +    if test $am_cv_val_LC_MESSAGES = yes; then
- 
--fi
--if test "x$ac_cv_header_libintl_h" = x""yes; then
++
 +$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
 +
 +    fi
@@ -12624,7 +12683,7 @@
  /* end confdefs.h.  */
  
  #include <libintl.h>
-@@ -17631,54 +15145,25 @@
+@@ -17832,54 +15346,25 @@
    return 0;
  }
  _ACEOF
@@ -12687,7 +12746,7 @@
  /* end confdefs.h.  */
  
  #include <libintl.h>
-@@ -17691,141 +15176,26 @@
+@@ -17892,141 +15377,26 @@
    return 0;
  }
  _ACEOF
@@ -12839,7 +12898,7 @@
  _ACEOF
  
  fi
-@@ -17840,18 +15210,14 @@
+@@ -18041,18 +15411,14 @@
  	 || test "$gt_cv_func_ngettext_libc" != "yes" \
           || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
  
@@ -12861,7 +12920,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -17869,55 +15235,26 @@
+@@ -18070,55 +15436,26 @@
    return 0;
  }
  _ACEOF
@@ -12926,7 +12985,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -17935,55 +15272,26 @@
+@@ -18136,55 +15473,26 @@
    return 0;
  }
  _ACEOF
@@ -12991,7 +13050,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -18001,43 +15309,18 @@
+@@ -18202,43 +15510,18 @@
    return 0;
  }
  _ACEOF
@@ -13041,7 +13100,7 @@
    gt_cv_func_dgettext_libintl=yes
  fi
  
-@@ -18047,22 +15330,18 @@
+@@ -18248,22 +15531,18 @@
  
  
  	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -13069,7 +13128,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -18080,55 +15359,26 @@
+@@ -18281,55 +15560,26 @@
    return 0;
  }
  _ACEOF
@@ -13134,7 +13193,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -18146,160 +15396,45 @@
+@@ -18347,43 +15597,18 @@
    return 0;
  }
  _ACEOF
@@ -13177,18 +13236,17 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
--$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
+ $as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
 -if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then
--  gt_cv_func_dgettext_libintl=yes
--			libintl_extra_libs=-liconv
--else
--  :
--fi
--
--else
--  :
--fi
--
++if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
+   gt_cv_func_dgettext_libintl=yes
+ 			libintl_extra_libs=-liconv
+ else
+@@ -18394,113 +15619,23 @@
+   :
+ fi
+ 
 -        fi
 -
 -        #
@@ -13202,164 +13260,6 @@
 -          unset ac_cv_func_bind_textdomain_codeset
 -
 -for ac_func in bind_textdomain_codeset
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--
--int
--main ()
--{
--return $ac_func ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  eval "$as_ac_var=yes"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
-+$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
-+if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
-+  gt_cv_func_dgettext_libintl=yes
-+			libintl_extra_libs=-liconv
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
-+  :
- fi
- 
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+else
-+  :
- fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
-+
-+        fi
-+
-+        #
-+        # If we found libintl, then check in it for bind_textdomain_codeset();
-+        # we'll prefer libc if neither have bind_textdomain_codeset(),
-+        # and both have dgettext and ngettext
-+        #
-+        if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
-+          glib_save_LIBS="$LIBS"
-+          LIBS="$LIBS -lintl $libintl_extra_libs"
-+          unset ac_cv_func_bind_textdomain_codeset
-+          for ac_func in bind_textdomain_codeset
-+do :
-+  ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
- _ACEOF
- 
- fi
-@@ -18329,15 +15464,13 @@
- 
-       if test "$gt_cv_have_gettext" = "yes"; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETTEXT 1
--_ACEOF
-+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
- 
- 	# Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_MSGFMT+set}" = set; then
-+if test "${ac_cv_path_MSGFMT+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case "$MSGFMT" in
-@@ -18362,118 +15495,28 @@
- fi
- MSGFMT="$ac_cv_path_MSGFMT"
- if test "$MSGFMT" != "no"; then
--  { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
- $as_echo "$MSGFMT" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 	if test "$MSGFMT" != "no"; then
-           glib_save_LIBS="$LIBS"
-           LIBS="$LIBS $INTLLIBS"
--
--for ac_func in dcgettext
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -13452,6 +13352,155 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
++        fi
++
++        #
++        # If we found libintl, then check in it for bind_textdomain_codeset();
++        # we'll prefer libc if neither have bind_textdomain_codeset(),
++        # and both have dgettext and ngettext
++        #
++        if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
++          glib_save_LIBS="$LIBS"
++          LIBS="$LIBS -lintl $libintl_extra_libs"
++          unset ac_cv_func_bind_textdomain_codeset
++          for ac_func in bind_textdomain_codeset
++do :
++  ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_BIND_TEXTDOMAIN_CODESET 1
+ _ACEOF
+ 
+ fi
+@@ -18530,15 +15665,13 @@
+ 
+       if test "$gt_cv_have_gettext" = "yes"; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETTEXT 1
+-_ACEOF
++$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
+ 
+ 	# Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_MSGFMT+set}" = set; then
++if test "${ac_cv_path_MSGFMT+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case "$MSGFMT" in
+@@ -18563,118 +15696,28 @@
+ fi
+ MSGFMT="$ac_cv_path_MSGFMT"
+ if test "$MSGFMT" != "no"; then
+-  { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+ $as_echo "$MSGFMT" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 	if test "$MSGFMT" != "no"; then
+           glib_save_LIBS="$LIBS"
+           LIBS="$LIBS $INTLLIBS"
+-
+-for ac_func in dcgettext
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=no"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 +	  for ac_func in dcgettext
 +do :
 +  ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
@@ -13470,7 +13519,7 @@
  $as_echo_n "checking if msgfmt accepts -c... " >&6; }
  	  cat >conftest.foo <<_ACEOF
  
-@@ -18488,14 +15531,14 @@
+@@ -18689,14 +15732,14 @@
  "Content-Transfer-Encoding: 8bit\n"
  
  _ACEOF
@@ -13490,7 +13539,7 @@
  $as_echo "no" >&6; }
  echo "$as_me: failed input was:" >&5
  sed 's/^/| /' conftest.foo >&5
-@@ -18503,9 +15546,9 @@
+@@ -18704,9 +15747,9 @@
  
  	  # Extract the first word of "gmsgfmt", so it can be a program name with args.
  set dummy gmsgfmt; ac_word=$2
@@ -13502,7 +13551,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GMSGFMT in
-@@ -18518,14 +15561,14 @@
+@@ -18719,14 +15762,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -13520,7 +13569,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -18534,19 +15577,19 @@
+@@ -18735,19 +15778,19 @@
  fi
  GMSGFMT=$ac_cv_path_GMSGFMT
  if test -n "$GMSGFMT"; then
@@ -13544,7 +13593,7 @@
    $as_echo_n "(cached) " >&6
  else
    case "$XGETTEXT" in
-@@ -18571,18 +15614,14 @@
+@@ -18772,18 +15815,14 @@
  fi
  XGETTEXT="$ac_cv_path_XGETTEXT"
  if test "$XGETTEXT" != ":"; then
@@ -13566,7 +13615,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -18594,121 +15633,14 @@
+@@ -18795,121 +15834,14 @@
    return 0;
  }
  _ACEOF
@@ -13692,7 +13741,7 @@
    CATOBJEXT=.gmo
                 DATADIRNAME=share
  else
-@@ -18723,10 +15655,8 @@
+@@ -18924,10 +15856,8 @@
  	    ;;
  	    esac
  fi
@@ -13705,7 +13754,7 @@
            LIBS="$glib_save_LIBS"
  	  INSTOBJEXT=.mo
  	else
-@@ -18740,9 +15670,7 @@
+@@ -18941,9 +15871,7 @@
  
      if test "$gt_cv_have_gettext" = "yes" ; then
  
@@ -13716,7 +13765,7 @@
  
      fi
  
-@@ -18750,7 +15678,7 @@
+@@ -18951,7 +15879,7 @@
                    if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
          : ;
        else
@@ -13725,7 +13774,7 @@
  $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
          XGETTEXT=":"
        fi
-@@ -18783,7 +15711,7 @@
+@@ -18984,7 +15912,7 @@
       if test "x$ALL_LINGUAS" = "x"; then
         LINGUAS=
       else
@@ -13734,7 +13783,7 @@
  $as_echo_n "checking for catalogs to be installed... " >&6; }
         NEW_LINGUAS=
         for presentlang in $ALL_LINGUAS; do
-@@ -18808,7 +15736,7 @@
+@@ -19009,7 +15937,7 @@
           fi
         done
         LINGUAS=$NEW_LINGUAS
@@ -13743,7 +13792,7 @@
  $as_echo "$LINGUAS" >&6; }
       fi
  
-@@ -18856,7 +15784,7 @@
+@@ -19057,7 +15985,7 @@
  
  
  # Check whether --with-distributor-name was given.
@@ -13752,7 +13801,7 @@
    withval=$with_distributor_name; LSB_DISTRIBUTOR="$withval"
  fi
  
-@@ -18866,9 +15794,9 @@
+@@ -19067,9 +15995,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 +13813,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$LSB_RELEASE"; then
-@@ -18879,24 +15807,24 @@
+@@ -19080,24 +16008,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -13794,7 +13843,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -18926,29 +15854,33 @@
+@@ -19127,29 +16055,33 @@
  
  gdu_cv_version_required=0.3.2
  
@@ -13835,7 +13884,7 @@
    withval=$with_help_dir;
  else
    with_help_dir='${datadir}/gnome/help'
-@@ -18959,7 +15891,7 @@
+@@ -19160,7 +16092,7 @@
  
  
  # Check whether --with-omf-dir was given.
@@ -13844,7 +13893,7 @@
    withval=$with_omf_dir;
  else
    with_omf_dir='${datadir}/omf'
-@@ -18970,7 +15902,7 @@
+@@ -19171,7 +16103,7 @@
  
  
  # Check whether --with-help-formats was given.
@@ -13853,7 +13902,7 @@
    withval=$with_help_formats;
  else
    with_help_formats=''
-@@ -18980,7 +15912,7 @@
+@@ -19181,7 +16113,7 @@
  
  
  # Check whether --enable-scrollkeeper was given.
@@ -13862,17 +13911,10 @@
    enableval=$enable_scrollkeeper;
  else
    enable_scrollkeeper=yes
-@@ -19003,143 +15935,15 @@
-   HAVE_GNOME_DOC_UTILS_FALSE='#'
- else
-   HAVE_GNOME_DOC_UTILS_TRUE='#'
--  HAVE_GNOME_DOC_UTILS_FALSE=
--fi
--
--
--
--
--
+@@ -19211,136 +16143,8 @@
+ 
+ 
+ 
 -    # Extract the first word of "gtkdoc-check", so it can be a program name with args.
 -set dummy gtkdoc-check; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -13996,20 +14038,18 @@
 -else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
-+  HAVE_GNOME_DOC_UTILS_FALSE=
- fi
- 
- 
- 
- 
-+
+-fi
+-
+-
+-
+-
  # Check whether --with-html-dir was given.
 -if test "${with_html_dir+set}" = set; then
 +if test "${with_html_dir+set}" = set; then :
    withval=$with_html_dir;
  else
    with_html_dir='${datadir}/gtk-doc/html'
-@@ -19149,7 +15953,7 @@
+@@ -19350,7 +16154,7 @@
  
  
      # Check whether --enable-gtk-doc was given.
@@ -14018,7 +14058,7 @@
    enableval=$enable_gtk_doc;
  else
    enable_gtk_doc=no
-@@ -19158,42 +15962,66 @@
+@@ -19359,42 +16163,66 @@
  
    if test x$enable_gtk_doc = xyes; then
      if test -n "$PKG_CONFIG" && \
@@ -14035,20 +14075,16 @@
 -  { { $as_echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.0 installed to build $PACKAGE_NAME" >&5
 -$as_echo "$as_me: error: You need to have gtk-doc >= 1.0 installed to build $PACKAGE_NAME" >&2;}
 -   { (exit 1); exit 1; }; }
+-fi
 +  as_fn_error "You need to have gtk-doc >= 1.0 installed to build gtk-doc" "$LINENO" 5
- fi
-   fi
- 
--  { $as_echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5
++fi
++  fi
++
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
- $as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
--  { $as_echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5
++$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
- $as_echo "$enable_gtk_doc" >&6; }
- 
--    # Check whether --enable-gtk-doc-html was given.
--if test "${enable_gtk_doc_html+set}" = set; then
--  enableval=$enable_gtk_doc_html;
++$as_echo "$enable_gtk_doc" >&6; }
++
 +  for ac_prog in gtkdoc-check
 +do
 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -14057,9 +14093,7 @@
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
- else
--  enable_gtk_doc_html=yes
--fi
++else
 +  case $GTKDOC_CHECK in
 +  [\\/]* | ?:[\\/]*)
 +  ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.
@@ -14075,17 +14109,28 @@
 +    ac_cv_path_GTKDOC_CHECK="$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
+   fi
 +done
 +  done
 +IFS=$as_save_IFS
  
+-  { $as_echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5
+-$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
+-  { $as_echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5
+-$as_echo "$enable_gtk_doc" >&6; }
+-
+-    # Check whether --enable-gtk-doc-html was given.
+-if test "${enable_gtk_doc_html+set}" = set; then
+-  enableval=$enable_gtk_doc_html;
+-else
+-  enable_gtk_doc_html=yes
++  ;;
++esac
+ fi
+-
 -    # Check whether --enable-gtk-doc-pdf was given.
 -if test "${enable_gtk_doc_pdf+set}" = set; then
 -  enableval=$enable_gtk_doc_pdf;
-+  ;;
-+esac
-+fi
 +GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
 +if test -n "$GTKDOC_CHECK"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
@@ -14105,7 +14150,7 @@
  
  
     if test x$enable_gtk_doc = xyes; then
-@@ -19204,22 +16032,6 @@
+@@ -19405,22 +16233,6 @@
    ENABLE_GTK_DOC_FALSE=
  fi
  
@@ -14128,7 +14173,7 @@
     if test -n "$LIBTOOL"; then
    GTK_DOC_USE_LIBTOOL_TRUE=
    GTK_DOC_USE_LIBTOOL_FALSE='#'
-@@ -19228,14 +16040,6 @@
+@@ -19429,14 +16241,6 @@
    GTK_DOC_USE_LIBTOOL_FALSE=
  fi
  
@@ -14143,7 +14188,59 @@
  
  
  # ****************************
-@@ -19254,9 +16058,7 @@
+@@ -19456,9 +16260,9 @@
+ 
+ # Extract the first word of "gtk-builder-convert", so it can be a program name with args.
+ set dummy gtk-builder-convert; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_GTK_BUILDER_CONVERT+set}" = set; then
++if test "${ac_cv_path_GTK_BUILDER_CONVERT+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $GTK_BUILDER_CONVERT in
+@@ -19471,14 +16275,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_GTK_BUILDER_CONVERT="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_GTK_BUILDER_CONVERT" && ac_cv_path_GTK_BUILDER_CONVERT="false"
+@@ -19487,18 +16291,16 @@
+ fi
+ GTK_BUILDER_CONVERT=$ac_cv_path_GTK_BUILDER_CONVERT
+ if test -n "$GTK_BUILDER_CONVERT"; then
+-  { $as_echo "$as_me:$LINENO: result: $GTK_BUILDER_CONVERT" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_BUILDER_CONVERT" >&5
+ $as_echo "$GTK_BUILDER_CONVERT" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+ 
+ if test "$GTK_BUILDER_CONVERT" = "false"; then
+-  { { $as_echo "$as_me:$LINENO: error: gtk-builder-convert not found" >&5
+-$as_echo "$as_me: error: gtk-builder-convert not found" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "gtk-builder-convert not found" "$LINENO" 5
+ fi
+ 
+ # ************
+@@ -19506,9 +16308,7 @@
  # ************
  
  
@@ -14154,7 +14251,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 @@
+@@ -19541,13 +16341,13 @@
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
@@ -14170,7 +14267,7 @@
        esac ;;
      esac
    done
-@@ -19303,8 +16105,8 @@
+@@ -19555,8 +16355,8 @@
    (set) 2>&1 |
      case $as_nl`(ac_space=' '; set) 2>&1` in #(
      *${as_nl}ac_space=\ *)
@@ -14181,7 +14278,7 @@
        sed -n \
  	"s/'/'\\\\''/g;
  	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -19327,11 +16129,11 @@
+@@ -19579,11 +16379,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 +14292,7 @@
  $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
    fi
  fi
-@@ -19351,8 +16153,8 @@
+@@ -19603,8 +16403,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 +14303,7 @@
  done
  LIBOBJS=$ac_libobjs
  
-@@ -19368,157 +16170,86 @@
+@@ -19620,157 +16420,86 @@
  fi
  
  if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -14401,7 +14498,7 @@
  #! $SHELL
  # Generated by $as_me.
  # Run this file to recreate the current configuration.
-@@ -19528,17 +16259,18 @@
+@@ -19780,17 +16509,18 @@
  debug=false
  ac_cs_recheck=false
  ac_cs_silent=false
@@ -14427,7 +14524,7 @@
    emulate sh
    NULLCMD=:
    # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -19546,23 +16278,15 @@
+@@ -19798,23 +16528,15 @@
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
  else
@@ -14456,7 +14553,7 @@
  as_nl='
  '
  export as_nl
-@@ -19570,7 +16294,13 @@
+@@ -19822,7 +16544,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 +14568,7 @@
    as_echo='printf %s\n'
    as_echo_n='printf %s'
  else
-@@ -19581,7 +16311,7 @@
+@@ -19833,7 +16561,7 @@
      as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
      as_echo_n_body='eval
        arg=$1;
@@ -14480,7 +14577,7 @@
        *"$as_nl"*)
  	expr "X$arg" : "X\\(.*\\)$as_nl";
  	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -19604,13 +16334,6 @@
+@@ -19856,13 +16584,6 @@
    }
  fi
  
@@ -14494,7 +14591,7 @@
  
  # IFS
  # We need space, tab and new line, in precisely that order.  Quoting is
-@@ -19620,15 +16343,15 @@
+@@ -19872,15 +16593,15 @@
  IFS=" ""	$as_nl"
  
  # Find who we are.  Look in the path if we contain no directory separator.
@@ -14513,7 +14610,7 @@
  IFS=$as_save_IFS
  
       ;;
-@@ -19640,12 +16363,16 @@
+@@ -19892,12 +16613,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 +14631,7 @@
  done
  PS1='$ '
  PS2='> '
-@@ -19657,7 +16384,89 @@
+@@ -19909,7 +16634,89 @@
  LANGUAGE=C
  export LANGUAGE
  
@@ -14625,7 +14722,7 @@
  if expr a : '\(a\)' >/dev/null 2>&1 &&
     test "X`expr 00001 : '.*\(...\)'`" = X001; then
    as_expr=expr
-@@ -19671,8 +16480,12 @@
+@@ -19923,8 +16730,12 @@
    as_basename=false
  fi
  
@@ -14639,7 +14736,7 @@
  as_me=`$as_basename -- "$0" ||
  $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
  	 X"$0" : 'X\(//\)$' \| \
-@@ -19692,76 +16505,25 @@
+@@ -19944,76 +16755,25 @@
  	  }
  	  s/.*/./; q'`
  
@@ -14727,7 +14824,7 @@
  
  rm -f conf$$ conf$$.exe conf$$.file
  if test -d conf$$.dir; then
-@@ -19790,8 +16552,56 @@
+@@ -20042,8 +16802,56 @@
  rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
  rmdir conf$$.dir 2>/dev/null
  
@@ -14785,7 +14882,7 @@
  else
    test -d ./-p && rmdir ./-p
    as_mkdir_p=false
-@@ -19810,10 +16620,10 @@
+@@ -20062,10 +16870,10 @@
        if test -d "$1"; then
  	test -d "$1/.";
        else
@@ -14798,7 +14895,7 @@
  	???[sx]*):;;*)false;;esac;fi
      '\'' sh
    '
-@@ -19828,13 +16638,19 @@
+@@ -20080,13 +16888,19 @@
  
  
  exec 6>&1
@@ -14814,13 +14911,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.28.1, which was
 -generated by GNU Autoconf 2.63.  Invocation command line was
 +generated by GNU Autoconf 2.64.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -19866,10 +16682,11 @@
+@@ -20118,10 +16932,11 @@
  
  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  ac_cs_usage="\
@@ -14835,7 +14932,7 @@
  
    -h, --help       print this help, then exit
    -V, --version    print version number and configuration settings, then exit
-@@ -19891,16 +16708,16 @@
+@@ -20143,16 +16958,16 @@
  Configuration commands:
  $config_commands
  
@@ -14845,7 +14942,7 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  ac_cs_version="\\
- GNOME Web Browser config.status 2.29.1
+ GNOME Web Browser config.status 2.28.1
 -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'`\\"
@@ -14855,7 +14952,7 @@
  This config.status script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it."
  
-@@ -19943,20 +16760,19 @@
+@@ -20195,20 +17010,19 @@
      case $ac_optarg in
      *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
@@ -14880,7 +14977,7 @@
    --help | --hel | -h )
      $as_echo "$ac_cs_usage"; exit ;;
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -19964,11 +16780,10 @@
+@@ -20216,11 +17030,10 @@
      ac_cs_silent=: ;;
  
    # This is an error.
@@ -14895,7 +14992,7 @@
       ac_need_defaults=false ;;
  
    esac
-@@ -20303,9 +17118,7 @@
+@@ -20555,9 +17368,7 @@
      "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
      "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
  
@@ -14906,7 +15003,7 @@
    esac
  done
  
-@@ -20332,7 +17145,7 @@
+@@ -20584,7 +17395,7 @@
    trap 'exit_status=$?
    { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
  ' 0
@@ -14915,7 +15012,7 @@
  }
  # Create a (secure) tmp directory for tmp files.
  
-@@ -20343,11 +17156,7 @@
+@@ -20595,11 +17406,7 @@
  {
    tmp=./conf$$-$RANDOM
    (umask 077 && mkdir "$tmp")
@@ -14928,7 +15025,7 @@
  
  # Set up the scripts for CONFIG_FILES section.
  # No need to generate them if there are no CONFIG_FILES.
-@@ -20355,10 +17164,16 @@
+@@ -20607,10 +17414,16 @@
  if test -n "$CONFIG_FILES"; then
  
  
@@ -14947,7 +15044,7 @@
  else
    ac_cs_awk_cr=$ac_cr
  fi
-@@ -20372,24 +17187,18 @@
+@@ -20624,24 +17437,18 @@
    echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
    echo "_ACEOF"
  } >conf$$subs.sh ||
@@ -14975,7 +15072,7 @@
    else
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
-@@ -20478,9 +17287,7 @@
+@@ -20730,9 +17537,7 @@
  else
    cat
  fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -14986,7 +15083,7 @@
  _ACEOF
  
  # VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -20521,9 +17328,7 @@
+@@ -20773,9 +17578,7 @@
    if test -z "$ac_t"; then
      break
    elif $ac_last_try; then
@@ -14997,7 +15094,7 @@
    else
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
-@@ -20608,9 +17413,7 @@
+@@ -20860,9 +17663,7 @@
  _ACAWK
  _ACEOF
  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -15008,7 +15105,7 @@
  fi # test -n "$CONFIG_HEADERS"
  
  
-@@ -20623,9 +17426,7 @@
+@@ -20875,9 +17676,7 @@
    esac
    case $ac_mode$ac_tag in
    :[FHL]*:*);;
@@ -15019,7 +15116,7 @@
    :[FH]-) ac_tag=-:-;;
    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    esac
-@@ -20653,12 +17454,10 @@
+@@ -20905,12 +17704,10 @@
  	   [\\/$]*) false;;
  	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
  	   esac ||
@@ -15034,7 +15131,7 @@
      done
  
      # Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -20669,7 +17468,7 @@
+@@ -20921,7 +17718,7 @@
  	`' by configure.'
      if test x"$ac_file" != x-; then
        configure_input="$ac_file.  $configure_input"
@@ -15043,7 +15140,7 @@
  $as_echo "$as_me: creating $ac_file" >&6;}
      fi
      # Neutralize special characters interpreted by sed in replacement strings.
-@@ -20682,9 +17481,7 @@
+@@ -20934,9 +17731,7 @@
  
      case $ac_tag in
      *:-:* | *:-) cat >"$tmp/stdin" \
@@ -15054,7 +15151,7 @@
      esac
      ;;
    esac
-@@ -20712,47 +17509,7 @@
+@@ -20964,47 +17759,7 @@
  	    q
  	  }
  	  s/.*/./; q'`
@@ -15103,7 +15200,7 @@
    ac_builddir=.
  
  case "$ac_dir" in
-@@ -20809,7 +17566,6 @@
+@@ -21061,7 +17816,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 +15208,7 @@
  ac_sed_dataroot='
  /datarootdir/ {
    p
-@@ -20819,12 +17575,11 @@
+@@ -21071,12 +17825,11 @@
  /@docdir@/p
  /@infodir@/p
  /@localedir@/p
@@ -15126,7 +15223,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 @@
+@@ -21086,7 +17839,7 @@
    s&@infodir@&$infodir&g
    s&@localedir@&$localedir&g
    s&@mandir@&$mandir&g
@@ -15135,7 +15232,7 @@
  esac
  _ACEOF
  
-@@ -20863,14 +17618,12 @@
+@@ -21115,14 +17868,12 @@
  $ac_datarootdir_hack
  "
  eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -15152,7 +15249,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 @@
+@@ -21132,9 +17883,7 @@
    -) cat "$tmp/out" && rm -f "$tmp/out";;
    *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
    esac \
@@ -15163,7 +15260,7 @@
   ;;
    :H)
    #
-@@ -20893,25 +17644,19 @@
+@@ -21145,25 +17894,19 @@
        $as_echo "/* $configure_input  */" \
        && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
      } >"$tmp/config.h" \
@@ -15193,7 +15290,7 @@
    fi
  # Compute "$ac_file"'s index in $config_headers.
  _am_arg="$ac_file"
-@@ -20949,7 +17694,7 @@
+@@ -21201,7 +17944,7 @@
  	  s/.*/./; q'`/stamp-h$_am_stamp_count
   ;;
  
@@ -15202,7 +15299,7 @@
  $as_echo "$as_me: executing $ac_file commands" >&6;}
   ;;
    esac
-@@ -21044,47 +17789,7 @@
+@@ -21296,47 +18039,7 @@
  	    q
  	  }
  	  s/.*/./; q'`
@@ -15251,7 +15348,7 @@
        # echo "creating $dirpart/$file"
        echo '# dummy' > "$dirpart/$file"
      done
-@@ -21730,10 +18435,8 @@
+@@ -21982,10 +18685,8 @@
          sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
        esac ;;
      "po/stamp-it":C)
@@ -15264,7 +15361,7 @@
      fi
      rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
      >"po/stamp-it.tmp"
-@@ -21756,15 +18459,12 @@
+@@ -22008,15 +18709,12 @@
  done # for ac_tag
  
  
@@ -15282,7 +15379,7 @@
  
  
  # configure is writing to config.log, and then calls config.status.
-@@ -21785,10 +18485,10 @@
+@@ -22037,10 +18735,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,20 +15392,19 @@
  $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
-@@ -142,8 +142,6 @@
+diff -Naur epiphany-browser-2.28.1.old/data/art/Makefile.in epiphany-browser-2.28.1/data/art/Makefile.in
+--- epiphany-browser-2.28.1.old/data/art/Makefile.in	2009-10-18 17:25:10.000000000 +0200
++++ epiphany-browser-2.28.1/data/art/Makefile.in	2009-10-20 08:13:23.000000000 +0200
+@@ -144,8 +144,6 @@
  GMSGFMT = @GMSGFMT@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
 -GTKDOC_MKPDF = @GTKDOC_MKPDF@
 -GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@
  G_IR_COMPILER = @G_IR_COMPILER@
  G_IR_GENERATE = @G_IR_GENERATE@
- G_IR_SCANNER = @G_IR_SCANNER@
-@@ -156,29 +154,10 @@
+@@ -159,29 +157,10 @@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  INSTOBJEXT = @INSTOBJEXT@
  INTLLIBS = @INTLLIBS@
@@ -15338,7 +15434,7 @@
  INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
  INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
  LD = @LD@
-@@ -213,6 +192,7 @@
+@@ -218,6 +197,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15346,20 +15442,19 @@
  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
-@@ -142,8 +142,6 @@
+diff -Naur epiphany-browser-2.28.1.old/data/glade/Makefile.in epiphany-browser-2.28.1/data/glade/Makefile.in
+--- epiphany-browser-2.28.1.old/data/glade/Makefile.in	2009-10-18 17:25:10.000000000 +0200
++++ epiphany-browser-2.28.1/data/glade/Makefile.in	2009-10-20 08:13:23.000000000 +0200
+@@ -144,8 +144,6 @@
  GMSGFMT = @GMSGFMT@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
 -GTKDOC_MKPDF = @GTKDOC_MKPDF@
 -GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@
  G_IR_COMPILER = @G_IR_COMPILER@
  G_IR_GENERATE = @G_IR_GENERATE@
- G_IR_SCANNER = @G_IR_SCANNER@
-@@ -156,29 +154,10 @@
+@@ -159,29 +157,10 @@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  INSTOBJEXT = @INSTOBJEXT@
  INTLLIBS = @INTLLIBS@
@@ -15389,7 +15484,7 @@
  INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
  INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
  LD = @LD@
-@@ -213,6 +192,7 @@
+@@ -218,6 +197,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15397,20 +15492,19 @@
  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
-@@ -120,8 +120,6 @@
+diff -Naur epiphany-browser-2.28.1.old/data/icons/Makefile.in epiphany-browser-2.28.1/data/icons/Makefile.in
+--- epiphany-browser-2.28.1.old/data/icons/Makefile.in	2009-10-18 17:25:10.000000000 +0200
++++ epiphany-browser-2.28.1/data/icons/Makefile.in	2009-10-20 08:13:23.000000000 +0200
+@@ -122,8 +122,6 @@
  GMSGFMT = @GMSGFMT@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
 -GTKDOC_MKPDF = @GTKDOC_MKPDF@
 -GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@
  G_IR_COMPILER = @G_IR_COMPILER@
  G_IR_GENERATE = @G_IR_GENERATE@
- G_IR_SCANNER = @G_IR_SCANNER@
-@@ -134,29 +132,10 @@
+@@ -137,29 +135,10 @@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  INSTOBJEXT = @INSTOBJEXT@
  INTLLIBS = @INTLLIBS@
@@ -15440,7 +15534,7 @@
  INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
  INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
  LD = @LD@
-@@ -191,6 +170,7 @@
+@@ -196,6 +175,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15448,224 +15542,19 @@
  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
-@@ -192,8 +192,6 @@
+diff -Naur epiphany-browser-2.28.1.old/data/Makefile.in epiphany-browser-2.28.1/data/Makefile.in
+--- epiphany-browser-2.28.1.old/data/Makefile.in	2009-10-18 17:25:10.000000000 +0200
++++ epiphany-browser-2.28.1/data/Makefile.in	2009-10-20 08:13:23.000000000 +0200
+@@ -194,8 +194,6 @@
  GMSGFMT = @GMSGFMT@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
 -GTKDOC_MKPDF = @GTKDOC_MKPDF@
 -GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@
  G_IR_COMPILER = @G_IR_COMPILER@
  G_IR_GENERATE = @G_IR_GENERATE@
- G_IR_SCANNER = @G_IR_SCANNER@
-@@ -206,29 +204,10 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
- INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
- LD = @LD@
-@@ -263,6 +242,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-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
-@@ -142,8 +142,6 @@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- G_IR_COMPILER = @G_IR_COMPILER@
- G_IR_GENERATE = @G_IR_GENERATE@
- G_IR_SCANNER = @G_IR_SCANNER@
-@@ -156,29 +154,10 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
- INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
- LD = @LD@
-@@ -213,6 +192,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-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
-@@ -183,8 +183,6 @@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- G_IR_COMPILER = @G_IR_COMPILER@
- G_IR_GENERATE = @G_IR_GENERATE@
- G_IR_SCANNER = @G_IR_SCANNER@
-@@ -197,29 +195,10 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
- INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
- LD = @LD@
-@@ -254,6 +233,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-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
-@@ -121,8 +121,6 @@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- G_IR_COMPILER = @G_IR_COMPILER@
- G_IR_GENERATE = @G_IR_GENERATE@
- G_IR_SCANNER = @G_IR_SCANNER@
-@@ -135,29 +133,10 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
--INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
--INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
--INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
--INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
--INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
--INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
--INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
--INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
--INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
--INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
--INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
--INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
--INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
--INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
- INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
- LD = @LD@
-@@ -192,6 +171,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-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
-@@ -197,8 +197,6 @@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- G_IR_COMPILER = @G_IR_COMPILER@
- G_IR_GENERATE = @G_IR_GENERATE@
- G_IR_SCANNER = @G_IR_SCANNER@
-@@ -211,29 +209,10 @@
+@@ -209,29 +207,10 @@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  INSTOBJEXT = @INSTOBJEXT@
  INTLLIBS = @INTLLIBS@
@@ -15703,10 +15592,209 @@
  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.28.1.old/data/ui/Makefile.in epiphany-browser-2.28.1/data/ui/Makefile.in
+--- epiphany-browser-2.28.1.old/data/ui/Makefile.in	2009-10-18 17:25:10.000000000 +0200
++++ epiphany-browser-2.28.1/data/ui/Makefile.in	2009-10-20 08:13:23.000000000 +0200
+@@ -144,8 +144,6 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+-GTKDOC_MKPDF = @GTKDOC_MKPDF@
+-GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@
+ G_IR_COMPILER = @G_IR_COMPILER@
+ G_IR_GENERATE = @G_IR_GENERATE@
+@@ -159,29 +157,10 @@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+ INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+ LD = @LD@
+@@ -218,6 +197,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+diff -Naur epiphany-browser-2.28.1.old/doc/Makefile.in epiphany-browser-2.28.1/doc/Makefile.in
+--- epiphany-browser-2.28.1.old/doc/Makefile.in	2009-10-18 17:25:10.000000000 +0200
++++ epiphany-browser-2.28.1/doc/Makefile.in	2009-10-20 08:13:24.000000000 +0200
+@@ -185,8 +185,6 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+-GTKDOC_MKPDF = @GTKDOC_MKPDF@
+-GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@
+ G_IR_COMPILER = @G_IR_COMPILER@
+ G_IR_GENERATE = @G_IR_GENERATE@
+@@ -200,29 +198,10 @@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+ INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+ LD = @LD@
+@@ -259,6 +238,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+diff -Naur epiphany-browser-2.28.1.old/doc/reference/Makefile.in epiphany-browser-2.28.1/doc/reference/Makefile.in
+--- epiphany-browser-2.28.1.old/doc/reference/Makefile.in	2009-10-18 17:25:10.000000000 +0200
++++ epiphany-browser-2.28.1/doc/reference/Makefile.in	2009-10-20 08:13:24.000000000 +0200
+@@ -123,8 +123,6 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+-GTKDOC_MKPDF = @GTKDOC_MKPDF@
+-GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@
+ G_IR_COMPILER = @G_IR_COMPILER@
+ G_IR_GENERATE = @G_IR_GENERATE@
+@@ -138,29 +136,10 @@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+ INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+ LD = @LD@
+@@ -197,6 +176,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+diff -Naur epiphany-browser-2.28.1.old/embed/Makefile.in epiphany-browser-2.28.1/embed/Makefile.in
+--- epiphany-browser-2.28.1.old/embed/Makefile.in	2009-10-18 17:25:11.000000000 +0200
++++ epiphany-browser-2.28.1/embed/Makefile.in	2009-10-20 08:13:24.000000000 +0200
+@@ -195,8 +195,6 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+-GTKDOC_MKPDF = @GTKDOC_MKPDF@
+-GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@
+ G_IR_COMPILER = @G_IR_COMPILER@
+ G_IR_GENERATE = @G_IR_GENERATE@
+@@ -210,29 +208,10 @@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+ INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+ LD = @LD@
+@@ -269,6 +248,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+diff -Naur epiphany-browser-2.28.1.old/gnome-doc-utils.make epiphany-browser-2.28.1/gnome-doc-utils.make
+--- epiphany-browser-2.28.1.old/gnome-doc-utils.make	2009-10-02 09:01:27.000000000 +0200
++++ epiphany-browser-2.28.1/gnome-doc-utils.make	2009-10-20 08:13:16.000000000 +0200
 @@ -92,6 +92,14 @@
  ## The name of the document being built
  DOC_MODULE ?=
@@ -16069,10 +16157,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.28.1.old/gtk-doc.make epiphany-browser-2.28.1/gtk-doc.make
+--- epiphany-browser-2.28.1.old/gtk-doc.make	1970-01-01 01:00:00.000000000 +0100
++++ epiphany-browser-2.28.1/gtk-doc.make	2009-10-20 08:13:16.000000000 +0200
 @@ -0,0 +1,196 @@
 +# -*- mode: makefile -*-
 +
@@ -16270,20 +16357,19 @@
 +	  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
-@@ -143,8 +143,6 @@
+diff -Naur epiphany-browser-2.28.1.old/help/Makefile.in epiphany-browser-2.28.1/help/Makefile.in
+--- epiphany-browser-2.28.1.old/help/Makefile.in	2009-10-18 17:25:11.000000000 +0200
++++ epiphany-browser-2.28.1/help/Makefile.in	2009-10-20 08:13:24.000000000 +0200
+@@ -145,8 +145,6 @@
  GMSGFMT = @GMSGFMT@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
 -GTKDOC_MKPDF = @GTKDOC_MKPDF@
 -GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@
  G_IR_COMPILER = @G_IR_COMPILER@
  G_IR_GENERATE = @G_IR_GENERATE@
- G_IR_SCANNER = @G_IR_SCANNER@
-@@ -157,29 +155,10 @@
+@@ -160,29 +158,10 @@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  INSTOBJEXT = @INSTOBJEXT@
  INTLLIBS = @INTLLIBS@
@@ -16313,7 +16399,7 @@
  INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
  INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
  LD = @LD@
-@@ -214,6 +193,7 @@
+@@ -219,6 +198,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -16321,7 +16407,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
-@@ -295,6 +275,7 @@
+@@ -300,6 +280,7 @@
  	$(DOC_LINGUAS))
  
  _DOC_ABS_SRCDIR = @abs_srcdir@
@@ -16329,7 +16415,7 @@
  @ENABLE_SK_TRUE at _ENABLE_SK = true
  
  ################################################################################
-@@ -328,14 +309,16 @@
+@@ -333,14 +314,16 @@
  
  ################################################################################
  _DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml)
@@ -16348,7 +16434,7 @@
  
  _DOC_C_FIGURES = $(if $(DOC_FIGURES),					\
  	$(foreach fig,$(DOC_FIGURES),C/$(fig)),				\
-@@ -351,12 +334,16 @@
+@@ -356,12 +339,16 @@
  
  
  ###############################################################################
@@ -16366,7 +16452,7 @@
  _DOC_LC_INCLUDES = \
  	$(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES),	\
  		$(lc)/$(notdir $(inc)) ))
-@@ -368,7 +355,7 @@
+@@ -373,7 +360,7 @@
  		$(lc)/$(notdir $(doc)) ))
  
  _DOC_LC_DOCS = \
@@ -16375,7 +16461,7 @@
  	$(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML))
  
  _DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS),				\
-@@ -388,7 +375,8 @@
+@@ -393,7 +380,8 @@
  _clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf)
  _clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk)
  _clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
@@ -16385,7 +16471,7 @@
  DOC_MODULE = epiphany
  DOC_ENTITIES = legal.xml
  DOC_LINGUAS = ca cs bg de el en_GB es eu fi fr it ja oc nl ru sv uk
-@@ -648,6 +636,10 @@
+@@ -653,6 +641,10 @@
  
  DOC_MODULE ?=
  
@@ -16396,7 +16482,7 @@
  DOC_ENTITIES ?=
  
  DOC_INCLUDES ?=
-@@ -664,6 +656,7 @@
+@@ -669,6 +661,7 @@
  
  _db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
  _db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
@@ -16404,7 +16490,7 @@
  _chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
  _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
  _ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
-@@ -708,16 +701,16 @@
+@@ -713,16 +706,16 @@
  	done; \
  	if ! test -f $@; then \
  	  echo "(cd $(dir $@) && \
@@ -16425,7 +16511,7 @@
  	fi
  
  # FIXME: fix the dependancy
-@@ -726,15 +719,16 @@
+@@ -731,15 +724,16 @@
  $(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
  	if ! test -d $(dir $@); then mkdir $(dir $@); fi
  	if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
@@ -16445,7 +16531,7 @@
  
  $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
  	xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
-@@ -746,6 +740,8 @@
+@@ -751,6 +745,8 @@
  	$(_DOC_OMF_ALL)		$(_DOC_DSK_ALL)		\
  	$(_DOC_HTML_ALL)	$(_DOC_POFILES)
  
@@ -16454,7 +16540,7 @@
  .PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir
  
  clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML)
-@@ -764,7 +760,7 @@
+@@ -769,7 +765,7 @@
  	    rm -f "$$lc/.xml2po.mo"; \
  	  fi; \
  	done
@@ -16463,7 +16549,7 @@
  	@for lc in C $(_DOC_REAL_LINGUAS); do \
  	  for dir in `find $$lc -depth -type d`; do \
  	    if ! test $$dir -ef $(srcdir)/$$dir; then \
-@@ -787,10 +783,12 @@
+@@ -792,10 +788,12 @@
  	$(_clean_omf)		$(_clean_dsk)		\
  	$(_clean_lc)		$(_clean_dir)
  
@@ -16480,7 +16566,7 @@
  	$(if $(_DOC_OMF_IN),dist-doc-omf)
  #	$(if $(_DOC_DSK_IN),dist-doc-dsk)
  
-@@ -836,9 +834,12 @@
+@@ -841,9 +839,12 @@
  	echo "$(INSTALL_DATA) $$d$(_DOC_DSK_IN) $(distdir)/$(notdir $(_DOC_DSK_IN))"; \
  	$(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))"
  
@@ -16493,7 +16579,7 @@
  	$(if $(_DOC_OMF_IN),check-doc-omf)
  
  check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
-@@ -854,15 +855,33 @@
+@@ -859,15 +860,33 @@
  	  xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \
  	done
  
@@ -16528,7 +16614,7 @@
  	$(if $(_DOC_HTML_ALL),install-doc-html)		\
  	$(if $(_DOC_C_FIGURES),install-doc-figs)	\
  	$(if $(_DOC_OMF_IN),install-doc-omf)
-@@ -870,42 +889,46 @@
+@@ -875,42 +894,46 @@
  
  install-doc-docs:
  	@for lc in C $(_DOC_REAL_LINGUAS); do \
@@ -16586,7 +16672,7 @@
  	  done; \
  	done
  
-@@ -913,22 +936,24 @@
+@@ -918,22 +941,24 @@
  	echo install-html
  
  install-doc-omf:
@@ -16617,7 +16703,7 @@
  	$(if $(_DOC_HTML_ALL),uninstall-doc-html)	\
  	$(if $(_DOC_C_FIGURES),uninstall-doc-figs)	\
  	$(if $(_DOC_OMF_IN),uninstall-doc-omf)
-@@ -936,24 +961,24 @@
+@@ -941,24 +966,24 @@
  
  uninstall-doc-docs:
  	@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
@@ -16650,20 +16736,19 @@
  	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
-@@ -166,8 +166,6 @@
+diff -Naur epiphany-browser-2.28.1.old/lib/egg/Makefile.in epiphany-browser-2.28.1/lib/egg/Makefile.in
+--- epiphany-browser-2.28.1.old/lib/egg/Makefile.in	2009-10-18 17:25:11.000000000 +0200
++++ epiphany-browser-2.28.1/lib/egg/Makefile.in	2009-10-20 08:13:24.000000000 +0200
+@@ -164,8 +164,6 @@
  GMSGFMT = @GMSGFMT@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
 -GTKDOC_MKPDF = @GTKDOC_MKPDF@
 -GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@
  G_IR_COMPILER = @G_IR_COMPILER@
  G_IR_GENERATE = @G_IR_GENERATE@
- G_IR_SCANNER = @G_IR_SCANNER@
-@@ -180,29 +178,10 @@
+@@ -179,29 +177,10 @@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  INSTOBJEXT = @INSTOBJEXT@
  INTLLIBS = @INTLLIBS@
@@ -16693,7 +16778,7 @@
  INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
  INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
  LD = @LD@
-@@ -237,6 +216,7 @@
+@@ -238,6 +217,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -16701,20 +16786,19 @@
  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
-@@ -264,8 +264,6 @@
+diff -Naur epiphany-browser-2.28.1.old/lib/Makefile.in epiphany-browser-2.28.1/lib/Makefile.in
+--- epiphany-browser-2.28.1.old/lib/Makefile.in	2009-10-18 17:25:11.000000000 +0200
++++ epiphany-browser-2.28.1/lib/Makefile.in	2009-10-20 08:13:24.000000000 +0200
+@@ -262,8 +262,6 @@
  GMSGFMT = @GMSGFMT@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
 -GTKDOC_MKPDF = @GTKDOC_MKPDF@
 -GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@
  G_IR_COMPILER = @G_IR_COMPILER@
  G_IR_GENERATE = @G_IR_GENERATE@
- G_IR_SCANNER = @G_IR_SCANNER@
-@@ -278,29 +276,10 @@
+@@ -277,29 +275,10 @@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  INSTOBJEXT = @INSTOBJEXT@
  INTLLIBS = @INTLLIBS@
@@ -16744,7 +16828,7 @@
  INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
  INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
  LD = @LD@
-@@ -335,6 +314,7 @@
+@@ -336,6 +315,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -16752,7 +16836,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
-@@ -466,7 +446,7 @@
+@@ -467,7 +447,7 @@
  	-I$(top_srcdir)/lib/egg			\
  	-DDATADIR="\"$(datadir)\""		\
  	-DSHARE_DIR=\"$(pkgdatadir)\" 		\
@@ -16761,20 +16845,19 @@
  	$(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
-@@ -161,8 +161,6 @@
+diff -Naur epiphany-browser-2.28.1.old/lib/widgets/Makefile.in epiphany-browser-2.28.1/lib/widgets/Makefile.in
+--- epiphany-browser-2.28.1.old/lib/widgets/Makefile.in	2009-10-18 17:25:12.000000000 +0200
++++ epiphany-browser-2.28.1/lib/widgets/Makefile.in	2009-10-20 08:13:24.000000000 +0200
+@@ -159,8 +159,6 @@
  GMSGFMT = @GMSGFMT@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
 -GTKDOC_MKPDF = @GTKDOC_MKPDF@
 -GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@
  G_IR_COMPILER = @G_IR_COMPILER@
  G_IR_GENERATE = @G_IR_GENERATE@
- G_IR_SCANNER = @G_IR_SCANNER@
-@@ -175,29 +173,10 @@
+@@ -174,29 +172,10 @@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  INSTOBJEXT = @INSTOBJEXT@
  INTLLIBS = @INTLLIBS@
@@ -16804,7 +16887,7 @@
  INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
  INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
  LD = @LD@
-@@ -232,6 +211,7 @@
+@@ -233,6 +212,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -16812,10 +16895,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.28.1.old/ltmain.sh epiphany-browser-2.28.1/ltmain.sh
+--- epiphany-browser-2.28.1.old/ltmain.sh	2009-10-02 09:01:26.000000000 +0200
++++ epiphany-browser-2.28.1/ltmain.sh	2009-10-20 08:13:15.000000000 +0200
 @@ -65,7 +65,7 @@
  #       compiler:		$LTCC
  #       compiler flags:		$LTCFLAGS
@@ -16894,10 +16976,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.28.1.old/m4/gnome-doc-utils.m4 epiphany-browser-2.28.1/m4/gnome-doc-utils.m4
+--- epiphany-browser-2.28.1.old/m4/gnome-doc-utils.m4	2009-10-02 09:01:27.000000000 +0200
++++ epiphany-browser-2.28.1/m4/gnome-doc-utils.m4	2009-10-20 08:13:16.000000000 +0200
 @@ -36,15 +36,19 @@
  # GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
  #
@@ -16919,10 +17000,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.28.1.old/m4/gtk-doc.m4 epiphany-browser-2.28.1/m4/gtk-doc.m4
+--- epiphany-browser-2.28.1.old/m4/gtk-doc.m4	2009-10-02 09:01:27.000000000 +0200
++++ epiphany-browser-2.28.1/m4/gtk-doc.m4	2009-10-20 08:13:16.000000000 +0200
 @@ -8,12 +8,6 @@
  [
    AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
@@ -16969,10 +17049,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.28.1.old/m4/intltool.m4 epiphany-browser-2.28.1/m4/intltool.m4
+--- epiphany-browser-2.28.1.old/m4/intltool.m4	2009-10-02 09:01:27.000000000 +0200
++++ epiphany-browser-2.28.1/m4/intltool.m4	2009-10-20 08:13:16.000000000 +0200
 @@ -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 +17146,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.28.1.old/m4/libtool.m4 epiphany-browser-2.28.1/m4/libtool.m4
+--- epiphany-browser-2.28.1.old/m4/libtool.m4	2009-10-02 09:01:26.000000000 +0200
++++ epiphany-browser-2.28.1/m4/libtool.m4	2009-10-20 08:13:15.000000000 +0200
 @@ -2470,13 +2470,10 @@
    # before this can be enabled.
    hardcode_into_libs=yes
@@ -17169,20 +17247,19 @@
        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
-@@ -179,8 +179,6 @@
+diff -Naur epiphany-browser-2.28.1.old/Makefile.in epiphany-browser-2.28.1/Makefile.in
+--- epiphany-browser-2.28.1.old/Makefile.in	2009-10-18 17:25:13.000000000 +0200
++++ epiphany-browser-2.28.1/Makefile.in	2009-10-20 08:13:25.000000000 +0200
+@@ -181,8 +181,6 @@
  GMSGFMT = @GMSGFMT@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
 -GTKDOC_MKPDF = @GTKDOC_MKPDF@
 -GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@
  G_IR_COMPILER = @G_IR_COMPILER@
  G_IR_GENERATE = @G_IR_GENERATE@
- G_IR_SCANNER = @G_IR_SCANNER@
-@@ -193,29 +191,10 @@
+@@ -196,29 +194,10 @@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  INSTOBJEXT = @INSTOBJEXT@
  INTLLIBS = @INTLLIBS@
@@ -17212,7 +17289,7 @@
  INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
  INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
  LD = @LD@
-@@ -250,6 +229,7 @@
+@@ -255,6 +234,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17220,10 +17297,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.28.1.old/po/Makefile.in.in epiphany-browser-2.28.1/po/Makefile.in.in
+--- epiphany-browser-2.28.1.old/po/Makefile.in.in	2009-10-02 09:01:27.000000000 +0200
++++ epiphany-browser-2.28.1/po/Makefile.in.in	2009-10-20 08:13:16.000000000 +0200
 @@ -21,7 +21,7 @@
  PACKAGE = @PACKAGE@
  VERSION = @VERSION@
@@ -17242,20 +17318,19 @@
  
  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
-@@ -209,8 +209,6 @@
+diff -Naur epiphany-browser-2.28.1.old/src/bookmarks/Makefile.in epiphany-browser-2.28.1/src/bookmarks/Makefile.in
+--- epiphany-browser-2.28.1.old/src/bookmarks/Makefile.in	2009-10-18 17:25:12.000000000 +0200
++++ epiphany-browser-2.28.1/src/bookmarks/Makefile.in	2009-10-20 08:13:25.000000000 +0200
+@@ -207,8 +207,6 @@
  GMSGFMT = @GMSGFMT@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
 -GTKDOC_MKPDF = @GTKDOC_MKPDF@
 -GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@
  G_IR_COMPILER = @G_IR_COMPILER@
  G_IR_GENERATE = @G_IR_GENERATE@
- G_IR_SCANNER = @G_IR_SCANNER@
-@@ -223,29 +221,10 @@
+@@ -222,29 +220,10 @@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  INSTOBJEXT = @INSTOBJEXT@
  INTLLIBS = @INTLLIBS@
@@ -17285,7 +17360,7 @@
  INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
  INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
  LD = @LD@
-@@ -280,6 +259,7 @@
+@@ -281,6 +260,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17293,20 +17368,19 @@
  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
-@@ -346,8 +346,6 @@
+diff -Naur epiphany-browser-2.28.1.old/src/Makefile.in epiphany-browser-2.28.1/src/Makefile.in
+--- epiphany-browser-2.28.1.old/src/Makefile.in	2009-10-18 17:25:12.000000000 +0200
++++ epiphany-browser-2.28.1/src/Makefile.in	2009-10-20 08:13:25.000000000 +0200
+@@ -344,8 +344,6 @@
  GMSGFMT = @GMSGFMT@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
 -GTKDOC_MKPDF = @GTKDOC_MKPDF@
 -GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@
  G_IR_COMPILER = @G_IR_COMPILER@
  G_IR_GENERATE = @G_IR_GENERATE@
- G_IR_SCANNER = @G_IR_SCANNER@
-@@ -360,29 +358,10 @@
+@@ -359,29 +357,10 @@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  INSTOBJEXT = @INSTOBJEXT@
  INTLLIBS = @INTLLIBS@
@@ -17336,7 +17410,7 @@
  INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
  INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
  LD = @LD@
-@@ -417,6 +396,7 @@
+@@ -418,6 +397,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17344,7 +17418,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
-@@ -550,8 +530,8 @@
+@@ -551,8 +531,8 @@
  	-I$(top_srcdir)/lib/egg		\
  	-I$(top_srcdir)/lib/widgets   	\
  	-I$(top_srcdir)/src/bookmarks   \
@@ -17355,20 +17429,19 @@
  	-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
-@@ -170,8 +170,6 @@
+diff -Naur epiphany-browser-2.28.1.old/tests/Makefile.in epiphany-browser-2.28.1/tests/Makefile.in
+--- epiphany-browser-2.28.1.old/tests/Makefile.in	2009-10-18 17:25:13.000000000 +0200
++++ epiphany-browser-2.28.1/tests/Makefile.in	2009-10-20 08:13:25.000000000 +0200
+@@ -168,8 +168,6 @@
  GMSGFMT = @GMSGFMT@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
 -GTKDOC_MKPDF = @GTKDOC_MKPDF@
 -GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@
  G_IR_COMPILER = @G_IR_COMPILER@
  G_IR_GENERATE = @G_IR_GENERATE@
- G_IR_SCANNER = @G_IR_SCANNER@
-@@ -184,29 +182,10 @@
+@@ -183,29 +181,10 @@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  INSTOBJEXT = @INSTOBJEXT@
  INTLLIBS = @INTLLIBS@
@@ -17398,7 +17471,7 @@
  INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
  INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
  LD = @LD@
-@@ -241,6 +220,7 @@
+@@ -242,6 +221,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@

Modified: desktop/unstable/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/series?rev=22236&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/series [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/patches/series [utf-8] Fri Nov  6 09:25:42 2009
@@ -6,6 +6,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