r20862 - in /desktop/unstable/epiphany-browser/debian: changelog patches/10_smart_bookmarks.patch patches/99_autoreconf.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Mon Aug 10 14:49:33 UTC 2009
Author: joss
Date: Mon Aug 10 14:49:32 2009
New Revision: 20862
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20862
Log:
* New upstream translation and bugfix release.
* 10_smart_bookmarks.patch: replaced by a much simpler version that’s
more consistent, as suggested by Xan Lopez.
* 99_autoreconf.patch: updated for the new version.
Modified:
desktop/unstable/epiphany-browser/debian/changelog
desktop/unstable/epiphany-browser/debian/patches/10_smart_bookmarks.patch
desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch
Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=20862&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/changelog [utf-8] Mon Aug 10 14:49:32 2009
@@ -1,3 +1,12 @@
+epiphany-browser (2.26.3-1) unstable; urgency=low
+
+ * New upstream translation and bugfix release.
+ * 10_smart_bookmarks.patch: replaced by a much simpler version that’s
+ more consistent, as suggested by Xan Lopez.
+ * 99_autoreconf.patch: updated for the new version.
+
+ -- Josselin Mouette <joss at debian.org> Mon, 10 Aug 2009 15:29:31 +0200
+
epiphany-browser (2.26.1-1) unstable; urgency=low
* Add libglib2.0-doc and libgtk2.0-doc to b-d-i to ensure proper
Modified: desktop/unstable/epiphany-browser/debian/patches/10_smart_bookmarks.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/10_smart_bookmarks.patch?rev=20862&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/10_smart_bookmarks.patch [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/patches/10_smart_bookmarks.patch [utf-8] Mon Aug 10 14:49:32 2009
@@ -1,122 +1,14 @@
GNOME #571794
-Index: epiphany-2.24.3/src/bookmarks/ephy-bookmark-action.c
+Index: epiphany-2.26.3/src/bookmarks/ephy-bookmark-action.c
===================================================================
---- epiphany-2.24.3.orig/src/bookmarks/ephy-bookmark-action.c 2008-08-04 15:21:51.000000000 +0200
-+++ epiphany-2.24.3/src/bookmarks/ephy-bookmark-action.c 2009-02-20 13:34:30.388138066 +0100
-@@ -72,6 +72,7 @@ typedef struct
- GObject *weak_ptr;
- GtkWidget *entry;
- EphyLinkFlags flags;
-+ gboolean activate;
- } ClipboardCtx;
-
- G_DEFINE_TYPE (EphyBookmarkAction, ephy_bookmark_action, EPHY_TYPE_LINK_ACTION)
-@@ -81,12 +82,12 @@ clipboard_text_received_cb (GtkClipboard
- const char *text,
- ClipboardCtx *ctx)
- {
-- if (ctx->weak_ptr != NULL && text != NULL)
-+ if (ctx->weak_ptr != NULL && (ctx->activate || text != NULL))
- {
- /* This is to avoid middle-clicking on a non-empty smart bookmark
- * triggering another search.
- */
-- if (strcmp (text, gtk_entry_get_text (GTK_ENTRY (ctx->entry))) != 0)
-+ if (text != NULL && strcmp (text, gtk_entry_get_text (GTK_ENTRY (ctx->entry))) != 0)
- {
- gtk_entry_set_text (GTK_ENTRY (ctx->entry), text);
- }
-@@ -94,6 +95,11 @@ clipboard_text_received_cb (GtkClipboard
-
- if (ctx->weak_ptr != NULL)
- {
-+ if (ctx->activate)
-+ {
-+ ephy_bookmark_action_activate (EPHY_BOOKMARK_ACTION (ctx->weak_ptr),
-+ ctx->entry, ctx->flags);
-+ }
- GObject **object = &(ctx->weak_ptr);
- g_object_remove_weak_pointer (G_OBJECT (ctx->weak_ptr),
- (gpointer *)object);
-@@ -102,6 +108,33 @@ clipboard_text_received_cb (GtkClipboard
- g_slice_free (ClipboardCtx, ctx);
- }
-
-+static void
-+request_clipboard (GtkWidget *entry,
-+ EphyBookmarkAction *action,
-+ gboolean activate)
-+{
-+ ClipboardCtx *ctx;
-+ GObject **object;
-+
-+ ctx = g_slice_new (ClipboardCtx);
-+ ctx->flags = EPHY_LINK_NEW_TAB | EPHY_LINK_JUMP_TO;
-+ ctx->entry = entry;
-+ ctx->activate = activate;
-+
-+ /* We need to make sure we know if the action is destroyed between
-+ * requesting the clipboard contents, and receiving them.
-+ */
-+
-+ ctx->weak_ptr = G_OBJECT (action);
-+ object = &(ctx->weak_ptr);
-+ g_object_add_weak_pointer (ctx->weak_ptr, (gpointer *)object);
-+
-+ gtk_clipboard_request_text
-+ (gtk_widget_get_clipboard (entry, GDK_SELECTION_PRIMARY),
-+ (GtkClipboardTextReceivedFunc) clipboard_text_received_cb,
-+ ctx);
-+}
-+
- static gboolean
- entry_button_press_event_cb (GtkWidget *entry,
- GdkEventButton *event,
-@@ -109,25 +142,7 @@ entry_button_press_event_cb (GtkWidget *
- {
- if (event->button == 2) /* middle click */
- {
-- ClipboardCtx *ctx;
-- GObject **object;
--
-- ctx = g_slice_new (ClipboardCtx);
-- ctx->flags = EPHY_LINK_NEW_TAB | EPHY_LINK_JUMP_TO;
-- ctx->entry = entry;
--
-- /* We need to make sure we know if the action is destroyed between
-- * requesting the clipboard contents, and receiving them.
-- */
--
-- ctx->weak_ptr = G_OBJECT (action);
-- object = &(ctx->weak_ptr);
-- g_object_add_weak_pointer (ctx->weak_ptr, (gpointer *)object);
--
-- gtk_clipboard_request_text
-- (gtk_widget_get_clipboard (entry, GDK_SELECTION_PRIMARY),
-- (GtkClipboardTextReceivedFunc) clipboard_text_received_cb,
-- ctx);
-+ request_clipboard (entry, EPHY_BOOKMARK_ACTION (action), FALSE);
- return TRUE;
- }
-
-@@ -384,6 +399,7 @@ activate_cb (GtkWidget *widget,
- EphyBookmarkAction *action)
- {
- gboolean control = FALSE;
-+ gboolean is_middle_click;
- GdkEvent *event;
-
- event = gtk_get_current_event ();
-@@ -394,12 +410,30 @@ activate_cb (GtkWidget *widget,
- {
- control = (event->key.state & gtk_accelerator_get_default_mod_mask ()) == GDK_CONTROL_MASK;
- }
--
+--- epiphany-2.26.3.orig/src/bookmarks/ephy-bookmark-action.c 2009-05-28 21:26:22.000000000 +0200
++++ epiphany-2.26.3/src/bookmarks/ephy-bookmark-action.c 2009-08-10 15:44:49.860542930 +0200
+@@ -398,6 +398,18 @@ activate_cb (GtkWidget *widget,
gdk_event_free (event);
}
-+ /* If we are clicking on the button, use the entry instead */
++ /* If we are clicking on the button, activate the entry instead */
+ if (!GTK_IS_EDITABLE (widget))
+ {
+ GtkWidget *otherwidget = gtk_widget_get_parent (widget);
@@ -128,16 +20,6 @@
+ widget = otherwidget;
+ }
+
-+ is_middle_click = ephy_gui_is_middle_click ();
-+ if (is_middle_click && GTK_IS_EDITABLE (widget))
-+ {
-+ request_clipboard (widget, action, TRUE);
-+ return;
-+ }
-+
ephy_bookmark_action_activate
-- (action, widget, (control || ephy_gui_is_middle_click ()) ? EPHY_LINK_NEW_TAB : 0);
-+ (action, widget, (control || is_middle_click) ? EPHY_LINK_NEW_TAB : 0);
+ (action, widget, (control || ephy_gui_is_middle_click ()) ? EPHY_LINK_NEW_TAB : 0);
}
-
- static gboolean
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=20862&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] Mon Aug 10 14:49:32 2009
@@ -2,10 +2,10 @@
aclocal-1.10 -I m4
automake-1.10
autoconf
-Index: epiphany-2.26.1/aclocal.m4
+Index: epiphany-2.26.3/aclocal.m4
===================================================================
---- epiphany-2.26.1.orig/aclocal.m4 2009-04-12 17:49:42.000000000 +0200
-+++ epiphany-2.26.1/aclocal.m4 2009-05-06 13:24:17.633842258 +0200
+--- epiphany-2.26.3.orig/aclocal.m4 2009-06-29 14:22:28.000000000 +0200
++++ epiphany-2.26.3/aclocal.m4 2009-08-10 16:24:09.462138930 +0200
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
@@ -23,7 +23,30 @@
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
-@@ -876,7 +876,7 @@ else
+@@ -55,10 +55,11 @@ AC_DEFUN([AM_GCONF_SOURCE_2],
+ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
+
+ AC_ARG_ENABLE(schemas-install,
+- [ --disable-schemas-install Disable the schemas installation],
++ AC_HELP_STRING([--disable-schemas-install],
++ [Disable the schemas installation]),
+ [case ${enableval} in
+ yes|no) ;;
+- *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;;
++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
+ esac])
+ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
+ ])
+@@ -537,7 +538,7 @@ AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES]
+ AC_REQUIRE([AM_MAINTAINER_MODE])
+
+ if test $USE_MAINTAINER_MODE = yes; then
+- DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED"
++ DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DWNCK_DISABLE_DEPRECATED -DLIBSOUP_DISABLE_DEPRECATED"
+ else
+ DISABLE_DEPRECATED=""
+ fi
+@@ -876,7 +877,7 @@ else
fi[]dnl
])# PKG_CHECK_MODULES
@@ -32,7 +55,7 @@
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
-@@ -891,7 +891,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
+@@ -891,7 +892,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
@@ -41,7 +64,7 @@
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
-@@ -905,12 +905,12 @@ m4_define([_AM_AUTOCONF_VERSION], [])
+@@ -905,12 +906,12 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# AM_SET_CURRENT_AUTOMAKE_VERSION
# -------------------------------
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
@@ -57,7 +80,7 @@
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-@@ -1183,19 +1183,28 @@ _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+@@ -1183,19 +1184,28 @@ _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
@@ -89,7 +112,7 @@
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
-@@ -1556,13 +1565,13 @@ esac
+@@ -1556,13 +1566,13 @@ esac
# Helper functions for option handling. -*- Autoconf -*-
@@ -105,7 +128,7 @@
# _AM_MANGLE_OPTION(NAME)
# -----------------------
-@@ -1579,7 +1588,7 @@ AC_DEFUN([_AM_SET_OPTION],
+@@ -1579,7 +1589,7 @@ AC_DEFUN([_AM_SET_OPTION],
# ----------------------------------
# OPTIONS is a space-separated list of Automake options.
AC_DEFUN([_AM_SET_OPTIONS],
@@ -114,15 +137,15 @@
# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
# -------------------------------------------
-Index: epiphany-2.26.1/configure
+Index: epiphany-2.26.3/configure
===================================================================
---- epiphany-2.26.1.orig/configure 2009-04-12 17:49:58.000000000 +0200
-+++ epiphany-2.26.1/configure 2009-05-06 13:24:23.813337005 +0200
+--- epiphany-2.26.3.orig/configure 2009-06-29 14:22:39.000000000 +0200
++++ epiphany-2.26.3/configure 2009-08-10 16:24:15.569634023 +0200
@@ -1,11 +1,11 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.61 for GNOME Web Browser 2.26.1.
-+# Generated by GNU Autoconf 2.63 for GNOME Web Browser 2.26.1.
+-# Generated by GNU Autoconf 2.61 for GNOME Web Browser 2.26.3.
++# Generated by GNU Autoconf 2.63 for GNOME Web Browser 2.26.3.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany>.
#
@@ -371,10 +394,10 @@
PACKAGE_NAME='GNOME Web Browser'
-PACKAGE_TARNAME='epiphany'
+PACKAGE_TARNAME='epiphany-browser'
- PACKAGE_VERSION='2.26.1'
- PACKAGE_STRING='GNOME Web Browser 2.26.1'
+ PACKAGE_VERSION='2.26.3'
+ PACKAGE_STRING='GNOME Web Browser 2.26.3'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany'
-@@ -764,277 +786,317 @@ ac_includes_default="\
+@@ -764,285 +786,327 @@ ac_includes_default="\
# include <unistd.h>
#endif"
@@ -640,21 +663,37 @@
-DISTCHECK_CONFIGURE_FLAGS
-HAVE_GNOME_DOC_UTILS_TRUE
-HAVE_GNOME_DOC_UTILS_FALSE
+-GTKDOC_CHECK
+-GTKDOC_REBASE
+-GTKDOC_MKPDF
-HTML_DIR
--GTKDOC_CHECK
-ENABLE_GTK_DOC_TRUE
-ENABLE_GTK_DOC_FALSE
+-GTK_DOC_BUILD_HTML_TRUE
+-GTK_DOC_BUILD_HTML_FALSE
+-GTK_DOC_BUILD_PDF_TRUE
+-GTK_DOC_BUILD_PDF_FALSE
-GTK_DOC_USE_LIBTOOL_TRUE
-GTK_DOC_USE_LIBTOOL_FALSE
+-GTK_DOC_USE_REBASE_TRUE
+-GTK_DOC_USE_REBASE_FALSE
+ac_subst_vars='LTLIBOBJS
LIBOBJS
-LTLIBOBJS'
++GTK_DOC_USE_REBASE_FALSE
++GTK_DOC_USE_REBASE_TRUE
+GTK_DOC_USE_LIBTOOL_FALSE
+GTK_DOC_USE_LIBTOOL_TRUE
++GTK_DOC_BUILD_PDF_FALSE
++GTK_DOC_BUILD_PDF_TRUE
++GTK_DOC_BUILD_HTML_FALSE
++GTK_DOC_BUILD_HTML_TRUE
+ENABLE_GTK_DOC_FALSE
+ENABLE_GTK_DOC_TRUE
++HTML_DIR
++GTKDOC_MKPDF
++GTKDOC_REBASE
+GTKDOC_CHECK
-+HTML_DIR
+HAVE_GNOME_DOC_UTILS_FALSE
+HAVE_GNOME_DOC_UTILS_TRUE
+DISTCHECK_CONFIGURE_FLAGS
@@ -957,11 +996,13 @@
+enable_scrollkeeper
+with_html_dir
+enable_gtk_doc
++enable_gtk_doc_html
++enable_gtk_doc_pdf
+'
ac_precious_vars='build_alias
host_alias
target_alias
-@@ -1066,6 +1128,8 @@ SPELLCHECKER_LIBS'
+@@ -1074,6 +1138,8 @@ SPELLCHECKER_LIBS'
# Initialize some variables set by options.
ac_init_help=
ac_init_version=false
@@ -970,7 +1011,7 @@
# The variables have the same names as the options, with
# dashes changed to underlines.
cache_file=/dev/null
-@@ -1164,13 +1228,21 @@ do
+@@ -1172,13 +1238,21 @@ do
datarootdir=$ac_optarg ;;
-disable-* | --disable-*)
@@ -997,7 +1038,7 @@
-docdir | --docdir | --docdi | --doc | --do)
ac_prev=docdir ;;
-@@ -1183,13 +1255,21 @@ do
+@@ -1191,13 +1265,21 @@ do
dvidir=$ac_optarg ;;
-enable-* | --enable-*)
@@ -1024,7 +1065,7 @@
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -1380,22 +1460,38 @@ do
+@@ -1388,22 +1470,38 @@ do
ac_init_version=: ;;
-with-* | --with-*)
@@ -1073,7 +1114,7 @@
--x)
# Obsolete; use --with-x.
-@@ -1415,7 +1511,7 @@ do
+@@ -1423,7 +1521,7 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -1082,7 +1123,7 @@
Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; }
;;
-@@ -1424,16 +1520,16 @@ Try \`$0 --help' for more information."
+@@ -1432,16 +1530,16 @@ Try \`$0 --help' for more information."
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
# Reject names that are not valid shell variable names.
expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
@@ -1102,7 +1143,7 @@
: ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
;;
-@@ -1442,22 +1538,38 @@ done
+@@ -1450,22 +1548,38 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -1144,7 +1185,7 @@
{ (exit 1); exit 1; }; }
done
-@@ -1472,7 +1584,7 @@ target=$target_alias
+@@ -1480,7 +1594,7 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
@@ -1153,7 +1194,7 @@
If a cross compiler is detected then cross compile mode will be used." >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
-@@ -1488,10 +1600,10 @@ test "$silent" = yes && exec 6>/dev/null
+@@ -1496,10 +1610,10 @@ test "$silent" = yes && exec 6>/dev/null
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -1166,7 +1207,7 @@
{ (exit 1); exit 1; }; }
-@@ -1499,12 +1611,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+@@ -1507,12 +1621,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
if test -z "$srcdir"; then
ac_srcdir_defaulted=yes
# Try the directory containing this script, then the parent directory.
@@ -1185,7 +1226,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -1531,12 +1643,12 @@ else
+@@ -1539,12 +1653,12 @@ else
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -1200,7 +1241,7 @@
{ (exit 1); exit 1; }; }
pwd)`
# When building in place, set srcdir=.
-@@ -1585,9 +1697,9 @@ Configuration:
+@@ -1593,9 +1707,9 @@ Configuration:
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
@@ -1212,7 +1253,7 @@
By default, \`make install' will install all the files in
\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
-@@ -1597,25 +1709,26 @@ for instance \`--prefix=\$HOME'.
+@@ -1605,25 +1719,26 @@ for instance \`--prefix=\$HOME'.
For better control, use the options below.
Fine tuning of the installation directories:
@@ -1258,7 +1299,7 @@
_ACEOF
cat <<\_ACEOF
-@@ -1638,6 +1751,7 @@ if test -n "$ac_init_help"; then
+@@ -1646,6 +1761,7 @@ if test -n "$ac_init_help"; then
cat <<\_ACEOF
Optional Features:
@@ -1266,7 +1307,17 @@
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-maintainer-mode enable make rules and dependencies not useful
-@@ -1745,15 +1859,17 @@ fi
+@@ -1666,7 +1782,8 @@ Optional Features:
+ Turn on compiler warnings.
+
+ --enable-iso-cxx Try to warn if code is not ISO C++
+- --disable-schemas-install Disable the schemas installation
++ --disable-schemas-install
++ Disable the schemas installation
+ --enable-cpp-rtti Enable C++ RTTI
+ --disable-psm Disable PSM support (default: enabled)
+ --enable-filepicker Whether to enable the gtk+ native filepicker; not
+@@ -1755,15 +1872,17 @@ fi
if test "$ac_init_help" = "recursive"; then
# If there are subdirs, report their specific --help.
for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
@@ -1287,7 +1338,7 @@
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-@@ -1789,7 +1905,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
+@@ -1799,7 +1918,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
echo &&
$SHELL "$ac_srcdir/configure" --help=recursive
else
@@ -1296,10 +1347,10 @@
fi || ac_status=$?
cd "$ac_pwd" || { ac_status=$?; break; }
done
-@@ -1799,10 +1915,10 @@ test -n "$ac_init_help" && exit $ac_stat
+@@ -1809,10 +1928,10 @@ test -n "$ac_init_help" && exit $ac_stat
if $ac_init_version; then
cat <<\_ACEOF
- GNOME Web Browser configure 2.26.1
+ GNOME Web Browser configure 2.26.3
-generated by GNU Autoconf 2.61
+generated by GNU Autoconf 2.63
@@ -1309,16 +1360,16 @@
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
-@@ -1813,7 +1929,7 @@ This file contains any messages produced
+@@ -1823,7 +1942,7 @@ This file contains any messages produced
running configure, to aid debugging if configure makes a mistake.
- It was created by GNOME Web Browser $as_me 2.26.1, which was
+ It was created by GNOME Web Browser $as_me 2.26.3, which was
-generated by GNU Autoconf 2.61. Invocation command line was
+generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
-@@ -1849,7 +1965,7 @@ for as_dir in $PATH
+@@ -1859,7 +1978,7 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1327,7 +1378,7 @@
done
IFS=$as_save_IFS
-@@ -1884,7 +2000,7 @@ do
+@@ -1894,7 +2013,7 @@ do
| -silent | --silent | --silen | --sile | --sil)
continue ;;
*\'*)
@@ -1336,7 +1387,7 @@
esac
case $ac_pass in
1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-@@ -1936,11 +2052,12 @@ _ASBOX
+@@ -1946,11 +2065,12 @@ _ASBOX
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -1351,7 +1402,7 @@
*) $as_unset $ac_var ;;
esac ;;
esac
-@@ -1970,9 +2087,9 @@ _ASBOX
+@@ -1980,9 +2100,9 @@ _ASBOX
do
eval ac_val=\$$ac_var
case $ac_val in
@@ -1363,7 +1414,7 @@
done | sort
echo
-@@ -1987,9 +2104,9 @@ _ASBOX
+@@ -1997,9 +2117,9 @@ _ASBOX
do
eval ac_val=\$$ac_var
case $ac_val in
@@ -1375,7 +1426,7 @@
done | sort
echo
fi
-@@ -2005,8 +2122,8 @@ _ASBOX
+@@ -2015,8 +2135,8 @@ _ASBOX
echo
fi
test "$ac_signal" != 0 &&
@@ -1386,7 +1437,7 @@
} >&5
rm -f core *.core core.conftest.* &&
rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-@@ -2048,21 +2165,24 @@ _ACEOF
+@@ -2058,21 +2178,24 @@ _ACEOF
# Let the site file select an alternate cache file if it wants to.
@@ -1420,7 +1471,7 @@
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
fi
-@@ -2072,16 +2192,16 @@ if test -r "$cache_file"; then
+@@ -2082,16 +2205,16 @@ if test -r "$cache_file"; then
# Some versions of bash will fail to source /dev/null (special
# files actually), so we avoid doing that.
if test -f "$cache_file"; then
@@ -1441,7 +1492,7 @@
>$cache_file
fi
-@@ -2095,29 +2215,38 @@ for ac_var in $ac_precious_vars; do
+@@ -2105,29 +2228,38 @@ for ac_var in $ac_precious_vars; do
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
@@ -1492,7 +1543,7 @@
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
-@@ -2127,10 +2256,12 @@ echo "$as_me: current value: $ac_new_v
+@@ -2137,10 +2269,12 @@ echo "$as_me: current value: $ac_new_v
fi
done
if $ac_cache_corrupted; then
@@ -1509,7 +1560,7 @@
{ (exit 1); exit 1; }; }
fi
-@@ -2185,8 +2316,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s
+@@ -2195,8 +2329,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s
fi
done
if test -z "$ac_aux_dir"; then
@@ -1520,7 +1571,7 @@
{ (exit 1); exit 1; }; }
fi
-@@ -2201,34 +2332,34 @@ ac_configure="$SHELL $ac_aux_dir/configu
+@@ -2211,34 +2345,34 @@ ac_configure="$SHELL $ac_aux_dir/configu
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -1568,7 +1619,7 @@
{ (exit 1); exit 1; }; };;
esac
build=$ac_cv_build
-@@ -2245,27 +2376,27 @@ IFS=$ac_save_IFS
+@@ -2255,27 +2389,27 @@ IFS=$ac_save_IFS
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -1605,7 +1656,7 @@
{ (exit 1); exit 1; }; };;
esac
host=$ac_cv_host
-@@ -2358,11 +2489,12 @@ am__api_version='1.10'
+@@ -2368,11 +2502,12 @@ am__api_version='1.10'
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
@@ -1621,7 +1672,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -2391,17 +2523,29 @@ case $as_dir/ in
+@@ -2401,17 +2536,29 @@ case $as_dir/ in
# program-specific install script used by HP pwplus--don't use.
:
else
@@ -1653,7 +1704,7 @@
fi
if test "${ac_cv_path_install+set}" = set; then
-@@ -2414,8 +2558,8 @@ fi
+@@ -2424,8 +2571,8 @@ fi
INSTALL=$ac_install_sh
fi
fi
@@ -1664,7 +1715,7 @@
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
-@@ -2425,8 +2569,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
+@@ -2435,8 +2582,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -1675,7 +1726,7 @@
# Just in case
sleep 1
echo timestamp > conftest.file
-@@ -2449,9 +2593,9 @@ if (
+@@ -2459,9 +2606,9 @@ if (
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
@@ -1687,7 +1738,7 @@
alias in your environment" >&2;}
{ (exit 1); exit 1; }; }
fi
-@@ -2462,26 +2606,23 @@ then
+@@ -2472,26 +2619,23 @@ then
# Ok.
:
else
@@ -1721,7 +1772,7 @@
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
-@@ -2492,15 +2633,15 @@ if eval "$MISSING --run true"; then
+@@ -2502,15 +2646,15 @@ if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
else
am_missing_run=
@@ -1742,7 +1793,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-@@ -2535,8 +2676,8 @@ fi
+@@ -2545,8 +2689,8 @@ fi
MKDIR_P="$ac_install_sh -d"
fi
fi
@@ -1753,7 +1804,7 @@
mkdir_p="$MKDIR_P"
case $mkdir_p in
-@@ -2548,10 +2689,10 @@ for ac_prog in gawk mawk nawk awk
+@@ -2558,10 +2702,10 @@ for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -1767,7 +1818,7 @@
else
if test -n "$AWK"; then
ac_cv_prog_AWK="$AWK" # Let the user override the test.
-@@ -2564,7 +2705,7 @@ do
+@@ -2574,7 +2718,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AWK="$ac_prog"
@@ -1776,7 +1827,7 @@
break 2
fi
done
-@@ -2575,22 +2716,23 @@ fi
+@@ -2585,22 +2729,23 @@ fi
fi
AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
@@ -1808,7 +1859,7 @@
else
cat >conftest.make <<\_ACEOF
SHELL = /bin/sh
-@@ -2607,12 +2749,12 @@ esac
+@@ -2617,12 +2762,12 @@ esac
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -1825,7 +1876,7 @@
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2631,8 +2773,8 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
+@@ -2641,8 +2786,8 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
@@ -1836,16 +1887,16 @@
{ (exit 1); exit 1; }; }
fi
fi
-@@ -2648,7 +2790,7 @@ fi
+@@ -2658,7 +2803,7 @@ fi
# Define the identity of the package.
- PACKAGE='epiphany'
+ PACKAGE='epiphany-browser'
- VERSION='2.26.1'
-
-
-@@ -2687,10 +2829,10 @@ if test "$cross_compiling" != no; then
+ VERSION='2.26.3'
+
+
+@@ -2697,10 +2842,10 @@ if test "$cross_compiling" != no; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -1859,7 +1910,7 @@
else
if test -n "$STRIP"; then
ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-@@ -2703,7 +2845,7 @@ do
+@@ -2713,7 +2858,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
@@ -1868,7 +1919,7 @@
break 2
fi
done
-@@ -2714,11 +2856,11 @@ fi
+@@ -2724,11 +2869,11 @@ fi
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
@@ -1884,7 +1935,7 @@
fi
-@@ -2727,10 +2869,10 @@ if test -z "$ac_cv_prog_STRIP"; then
+@@ -2737,10 +2882,10 @@ if test -z "$ac_cv_prog_STRIP"; then
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -1898,7 +1949,7 @@
else
if test -n "$ac_ct_STRIP"; then
ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-@@ -2743,7 +2885,7 @@ do
+@@ -2753,7 +2898,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_STRIP="strip"
@@ -1907,7 +1958,7 @@
break 2
fi
done
-@@ -2754,11 +2896,11 @@ fi
+@@ -2764,11 +2909,11 @@ fi
fi
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
if test -n "$ac_ct_STRIP"; then
@@ -1923,7 +1974,7 @@
fi
if test "x$ac_ct_STRIP" = x; then
-@@ -2766,12 +2908,8 @@ fi
+@@ -2776,12 +2921,8 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -1938,7 +1989,7 @@
ac_tool_warned=yes ;;
esac
STRIP=$ac_ct_STRIP
-@@ -2790,8 +2928,8 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c
+@@ -2800,8 +2941,8 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c
AMTAR=${AMTAR-"${am_missing_run}tar"}
@@ -1949,7 +2000,7 @@
# Loop over all known methods to create a tar archive until one works.
_am_tools='gnutar plaintar pax cpio none'
_am_tools=${am_cv_prog_tar_ustar-$_am_tools}
-@@ -2864,13 +3002,13 @@ done
+@@ -2874,13 +3015,13 @@ done
rm -rf conftest.dir
if test "${am_cv_prog_tar_ustar+set}" = set; then
@@ -1966,7 +2017,7 @@
-@@ -2880,8 +3018,8 @@ echo "${ECHO_T}$am_cv_prog_tar_ustar" >&
+@@ -2890,8 +3031,8 @@ echo "${ECHO_T}$am_cv_prog_tar_ustar" >&
if test -z "$enable_maintainer_mode"; then
enable_maintainer_mode=yes
fi
@@ -1977,7 +2028,7 @@
# Check whether --enable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then
enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-@@ -2889,8 +3027,8 @@ else
+@@ -2899,8 +3040,8 @@ else
USE_MAINTAINER_MODE=no
fi
@@ -1988,7 +2039,7 @@
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
MAINTAINER_MODE_FALSE='#'
-@@ -2972,14 +3110,14 @@ enable_dlopen=yes
+@@ -2982,14 +3123,14 @@ enable_dlopen=yes
case `pwd` in
*\ * | *\ *)
@@ -2007,7 +2058,7 @@
-@@ -3007,8 +3145,8 @@ am__doit:
+@@ -3017,8 +3158,8 @@ am__doit:
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -2018,7 +2069,7 @@
am__include="#"
am__quote=
_am_result=none
-@@ -3035,8 +3173,8 @@ if test "$am__include" = "#"; then
+@@ -3045,8 +3186,8 @@ if test "$am__include" = "#"; then
fi
@@ -2029,7 +2080,7 @@
rm -f confinc confmf
# Check whether --enable-dependency-tracking was given.
-@@ -3065,10 +3203,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -3075,10 +3216,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -2043,7 +2094,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -3081,7 +3219,7 @@ do
+@@ -3091,7 +3232,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
@@ -2052,7 +2103,7 @@
break 2
fi
done
-@@ -3092,11 +3230,11 @@ fi
+@@ -3102,11 +3243,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -2068,7 +2119,7 @@
fi
-@@ -3105,10 +3243,10 @@ if test -z "$ac_cv_prog_CC"; then
+@@ -3115,10 +3256,10 @@ if test -z "$ac_cv_prog_CC"; then
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -2082,7 +2133,7 @@
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -3121,7 +3259,7 @@ do
+@@ -3131,7 +3272,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
@@ -2091,7 +2142,7 @@
break 2
fi
done
-@@ -3132,11 +3270,11 @@ fi
+@@ -3142,11 +3283,11 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
@@ -2107,7 +2158,7 @@
fi
if test "x$ac_ct_CC" = x; then
-@@ -3144,12 +3282,8 @@ fi
+@@ -3154,12 +3295,8 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2122,7 +2173,7 @@
ac_tool_warned=yes ;;
esac
CC=$ac_ct_CC
-@@ -3162,10 +3296,10 @@ if test -z "$CC"; then
+@@ -3172,10 +3309,10 @@ if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -2136,7 +2187,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -3178,7 +3312,7 @@ do
+@@ -3188,7 +3325,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
@@ -2145,7 +2196,7 @@
break 2
fi
done
-@@ -3189,11 +3323,11 @@ fi
+@@ -3199,11 +3336,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -2161,7 +2212,7 @@
fi
-@@ -3202,10 +3336,10 @@ fi
+@@ -3212,10 +3349,10 @@ fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -2175,7 +2226,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -3223,7 +3357,7 @@ do
+@@ -3233,7 +3370,7 @@ do
continue
fi
ac_cv_prog_CC="cc"
@@ -2184,7 +2235,7 @@
break 2
fi
done
-@@ -3246,11 +3380,11 @@ fi
+@@ -3256,11 +3393,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -2200,7 +2251,7 @@
fi
-@@ -3261,10 +3395,10 @@ if test -z "$CC"; then
+@@ -3271,10 +3408,10 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -2214,7 +2265,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -3277,7 +3411,7 @@ do
+@@ -3287,7 +3424,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
@@ -2223,7 +2274,7 @@
break 2
fi
done
-@@ -3288,11 +3422,11 @@ fi
+@@ -3298,11 +3435,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -2239,7 +2290,7 @@
fi
-@@ -3305,10 +3439,10 @@ if test -z "$CC"; then
+@@ -3315,10 +3452,10 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -2253,7 +2304,7 @@
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -3321,7 +3455,7 @@ do
+@@ -3331,7 +3468,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
@@ -2262,7 +2313,7 @@
break 2
fi
done
-@@ -3332,11 +3466,11 @@ fi
+@@ -3342,11 +3479,11 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
@@ -2278,7 +2329,7 @@
fi
-@@ -3348,12 +3482,8 @@ done
+@@ -3358,12 +3495,8 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2293,7 +2344,7 @@
ac_tool_warned=yes ;;
esac
CC=$ac_ct_CC
-@@ -3363,44 +3493,50 @@ fi
+@@ -3373,44 +3506,50 @@ fi
fi
@@ -2355,7 +2406,7 @@
(exit $ac_status); }
cat >conftest.$ac_ext <<_ACEOF
-@@ -3419,27 +3555,22 @@ main ()
+@@ -3429,27 +3568,22 @@ main ()
}
_ACEOF
ac_clean_files_save=$ac_clean_files
@@ -2392,7 +2443,7 @@
* ) ac_rmfiles="$ac_rmfiles $ac_file";;
esac
done
-@@ -3450,10 +3581,11 @@ case "(($ac_try" in
+@@ -3460,10 +3594,11 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -2406,7 +2457,7 @@
(exit $ac_status); }; then
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-@@ -3464,7 +3596,7 @@ for ac_file in $ac_files ''
+@@ -3474,7 +3609,7 @@ for ac_file in $ac_files ''
do
test -f "$ac_file" || continue
case $ac_file in
@@ -2415,7 +2466,7 @@
;;
[ab].out )
# We found the default executable, but exeext='' is most
-@@ -3491,25 +3623,27 @@ else
+@@ -3501,25 +3636,27 @@ else
ac_file=''
fi
@@ -2451,7 +2502,7 @@
# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
# If not cross compiling, check that we can run a simple program.
if test "$cross_compiling" != yes; then
-@@ -3518,49 +3652,53 @@ if test "$cross_compiling" != yes; then
+@@ -3528,49 +3665,53 @@ if test "$cross_compiling" != yes; then
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -2521,7 +2572,7 @@
(exit $ac_status); }; then
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
-@@ -3569,31 +3707,33 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -3579,31 +3720,33 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
@@ -2564,7 +2615,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3616,40 +3756,43 @@ case "(($ac_try" in
+@@ -3626,40 +3769,43 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -2620,7 +2671,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3675,20 +3818,21 @@ case "(($ac_try" in
+@@ -3685,20 +3831,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -2645,7 +2696,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
-@@ -3698,15 +3842,19 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -3708,15 +3855,19 @@ rm -f core conftest.err conftest.$ac_obj
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
@@ -2671,7 +2722,7 @@
else
ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
-@@ -3733,20 +3881,21 @@ case "(($ac_try" in
+@@ -3743,20 +3894,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -2696,7 +2747,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
CFLAGS=""
-@@ -3771,20 +3920,21 @@ case "(($ac_try" in
+@@ -3781,20 +3933,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -2721,7 +2772,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_c_werror_flag=$ac_save_c_werror_flag
-@@ -3810,20 +3960,21 @@ case "(($ac_try" in
+@@ -3820,20 +3973,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -2746,7 +2797,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -3838,8 +3989,8 @@ fi
+@@ -3848,8 +4002,8 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
@@ -2757,7 +2808,7 @@
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
-@@ -3855,10 +4006,10 @@ else
+@@ -3865,10 +4019,10 @@ else
CFLAGS=
fi
fi
@@ -2771,7 +2822,7 @@
else
ac_cv_prog_cc_c89=no
ac_save_CC=$CC
-@@ -3929,20 +4080,21 @@ case "(($ac_try" in
+@@ -3939,20 +4093,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -2796,7 +2847,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -3958,15 +4110,15 @@ fi
+@@ -3968,15 +4123,15 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -2818,7 +2869,7 @@
esac
-@@ -3978,10 +4130,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -3988,10 +4143,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CC" am_compiler_list=
@@ -2832,7 +2883,7 @@
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
-@@ -4069,8 +4221,8 @@ else
+@@ -4079,8 +4234,8 @@ else
fi
fi
@@ -2843,7 +2894,7 @@
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
if
-@@ -4084,48 +4236,43 @@ else
+@@ -4094,48 +4249,43 @@ else
fi
@@ -2905,7 +2956,7 @@
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
ac_count=`expr $ac_count + 1`
-@@ -4140,31 +4287,23 @@ case `"$ac_path_SED" --version 2>&1` in
+@@ -4150,31 +4300,23 @@ case `"$ac_path_SED" --version 2>&1` in
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
@@ -2945,7 +2996,7 @@
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -4181,42 +4320,37 @@ Xsed="$SED -e 1s/^X//"
+@@ -4191,42 +4333,37 @@ Xsed="$SED -e 1s/^X//"
@@ -3000,7 +3051,7 @@
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
ac_count=`expr $ac_count + 1`
-@@ -4231,74 +4365,60 @@ case `"$ac_path_GREP" --version 2>&1` in
+@@ -4241,74 +4378,60 @@ case `"$ac_path_GREP" --version 2>&1` in
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
@@ -3095,7 +3146,7 @@
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
ac_count=`expr $ac_count + 1`
-@@ -4313,75 +4433,61 @@ case `"$ac_path_EGREP" --version 2>&1` i
+@@ -4323,75 +4446,61 @@ case `"$ac_path_EGREP" --version 2>&1` i
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
@@ -3191,7 +3242,7 @@
"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
ac_count=`expr $ac_count + 1`
-@@ -4396,33 +4502,24 @@ case `"$ac_path_FGREP" --version 2>&1` i
+@@ -4406,33 +4515,24 @@ case `"$ac_path_FGREP" --version 2>&1` i
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
@@ -3233,7 +3284,7 @@
FGREP="$ac_cv_path_FGREP"
-@@ -4456,8 +4553,8 @@ fi
+@@ -4466,8 +4566,8 @@ fi
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -3244,7 +3295,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -4486,14 +4583,14 @@ echo $ECHO_N "checking for ld used by $C
+@@ -4496,14 +4596,14 @@ echo $ECHO_N "checking for ld used by $C
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -3264,7 +3315,7 @@
else
if test -z "$LD"; then
lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-@@ -4523,19 +4620,19 @@ fi
+@@ -4533,19 +4633,19 @@ fi
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -3293,7 +3344,7 @@
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
case `$LD -v 2>&1 </dev/null` in
-@@ -4547,8 +4644,8 @@ case `$LD -v 2>&1 </dev/null` in
+@@ -4557,8 +4657,8 @@ case `$LD -v 2>&1 </dev/null` in
;;
esac
fi
@@ -3304,7 +3355,7 @@
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -4559,10 +4656,10 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
+@@ -4569,10 +4669,10 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -3318,7 +3369,7 @@
else
if test -n "$NM"; then
# Let the user override the test.
-@@ -4608,8 +4705,8 @@ else
+@@ -4618,8 +4718,8 @@ else
: ${lt_cv_path_NM=no}
fi
fi
@@ -3329,7 +3380,7 @@
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
else
-@@ -4619,10 +4716,10 @@ else
+@@ -4629,10 +4729,10 @@ else
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
@@ -3343,7 +3394,7 @@
else
if test -n "$DUMPBIN"; then
ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
-@@ -4635,7 +4732,7 @@ do
+@@ -4645,7 +4745,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
@@ -3352,7 +3403,7 @@
break 2
fi
done
-@@ -4646,11 +4743,11 @@ fi
+@@ -4656,11 +4756,11 @@ fi
fi
DUMPBIN=$ac_cv_prog_DUMPBIN
if test -n "$DUMPBIN"; then
@@ -3368,7 +3419,7 @@
fi
-@@ -4663,10 +4760,10 @@ if test -z "$DUMPBIN"; then
+@@ -4673,10 +4773,10 @@ if test -z "$DUMPBIN"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -3382,7 +3433,7 @@
else
if test -n "$ac_ct_DUMPBIN"; then
ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
-@@ -4679,7 +4776,7 @@ do
+@@ -4689,7 +4789,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
@@ -3391,7 +3442,7 @@
break 2
fi
done
-@@ -4690,11 +4787,11 @@ fi
+@@ -4700,11 +4800,11 @@ fi
fi
ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
if test -n "$ac_ct_DUMPBIN"; then
@@ -3407,7 +3458,7 @@
fi
-@@ -4706,12 +4803,8 @@ done
+@@ -4716,12 +4816,8 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3422,7 +3473,7 @@
ac_tool_warned=yes ;;
esac
DUMPBIN=$ac_ct_DUMPBIN
-@@ -4730,45 +4823,45 @@ test -z "$NM" && NM=nm
+@@ -4740,45 +4836,45 @@ test -z "$NM" && NM=nm
@@ -3436,16 +3487,16 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
-- (eval echo "\"\$as_me:4740: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:4833: $ac_compile\"" >&5)
+- (eval echo "\"\$as_me:4750: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:4846: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
-- (eval echo "\"\$as_me:4743: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:4836: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+- (eval echo "\"\$as_me:4753: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:4849: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
-- (eval echo "\"\$as_me:4746: output\"" >&5)
-+ (eval echo "\"\$as_me:4839: output\"" >&5)
+- (eval echo "\"\$as_me:4756: output\"" >&5)
++ (eval echo "\"\$as_me:4852: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -3485,7 +3536,7 @@
else
i=0
teststring="ABCD"
-@@ -4789,7 +4882,7 @@ else
+@@ -4799,7 +4895,7 @@ else
lt_cv_sys_max_cmd_len=-1;
;;
@@ -3494,7 +3545,7 @@
# On Win9x/ME, this test blows up -- it succeeds, but takes
# about 5 minutes as the teststring grows exponentially.
# Worse, since 9x/ME are not pre-emptively multitasking,
-@@ -4885,11 +4978,11 @@ else
+@@ -4895,11 +4991,11 @@ else
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -3510,7 +3561,7 @@
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -4902,8 +4995,8 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
+@@ -4912,8 +5008,8 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
: ${MV="mv -f"}
: ${RM="rm -f"}
@@ -3521,7 +3572,7 @@
# Try some XSI features
xsi_shell=no
( _lt_dummy="a/b/c"
-@@ -4912,18 +5005,18 @@ xsi_shell=no
+@@ -4922,18 +5018,18 @@ xsi_shell=no
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -3546,7 +3597,7 @@
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -4957,31 +5050,132 @@ esac
+@@ -4967,31 +5063,132 @@ esac
@@ -3700,7 +3751,7 @@
-@@ -4991,10 +5185,10 @@ esac
+@@ -5001,10 +5198,10 @@ esac
@@ -3714,7 +3765,7 @@
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
lt_cv_file_magic_test_file=
-@@ -5044,6 +5238,12 @@ mingw* | pw32*)
+@@ -5054,6 +5251,12 @@ mingw* | pw32*)
fi
;;
@@ -3727,7 +3778,7 @@
darwin* | rhapsody*)
lt_cv_deplibs_check_method=pass_all
;;
-@@ -5181,8 +5381,8 @@ tpf*)
+@@ -5191,8 +5394,8 @@ tpf*)
esac
fi
@@ -3738,7 +3789,7 @@
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -5201,10 +5401,10 @@ test -z "$deplibs_check_method" && depli
+@@ -5211,10 +5414,10 @@ test -z "$deplibs_check_method" && depli
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
@@ -3752,7 +3803,7 @@
else
if test -n "$AR"; then
ac_cv_prog_AR="$AR" # Let the user override the test.
-@@ -5217,7 +5417,7 @@ do
+@@ -5227,7 +5430,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AR="${ac_tool_prefix}ar"
@@ -3761,7 +3812,7 @@
break 2
fi
done
-@@ -5228,11 +5428,11 @@ fi
+@@ -5238,11 +5441,11 @@ fi
fi
AR=$ac_cv_prog_AR
if test -n "$AR"; then
@@ -3777,7 +3828,7 @@
fi
-@@ -5241,10 +5441,10 @@ if test -z "$ac_cv_prog_AR"; then
+@@ -5251,10 +5454,10 @@ if test -z "$ac_cv_prog_AR"; then
ac_ct_AR=$AR
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
@@ -3791,7 +3842,7 @@
else
if test -n "$ac_ct_AR"; then
ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-@@ -5257,7 +5457,7 @@ do
+@@ -5267,7 +5470,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_AR="ar"
@@ -3800,7 +3851,7 @@
break 2
fi
done
-@@ -5268,11 +5468,11 @@ fi
+@@ -5278,11 +5481,11 @@ fi
fi
ac_ct_AR=$ac_cv_prog_ac_ct_AR
if test -n "$ac_ct_AR"; then
@@ -3816,7 +3867,7 @@
fi
if test "x$ac_ct_AR" = x; then
-@@ -5280,12 +5480,8 @@ fi
+@@ -5290,12 +5493,8 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3831,7 +3882,7 @@
ac_tool_warned=yes ;;
esac
AR=$ac_ct_AR
-@@ -5310,10 +5506,10 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
+@@ -5320,10 +5519,10 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
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
@@ -3845,7 +3896,7 @@
else
if test -n "$STRIP"; then
ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-@@ -5326,7 +5522,7 @@ do
+@@ -5336,7 +5535,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
@@ -3854,7 +3905,7 @@
break 2
fi
done
-@@ -5337,11 +5533,11 @@ fi
+@@ -5347,11 +5546,11 @@ fi
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
@@ -3870,7 +3921,7 @@
fi
-@@ -5350,10 +5546,10 @@ if test -z "$ac_cv_prog_STRIP"; then
+@@ -5360,10 +5559,10 @@ if test -z "$ac_cv_prog_STRIP"; then
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -3884,7 +3935,7 @@
else
if test -n "$ac_ct_STRIP"; then
ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-@@ -5366,7 +5562,7 @@ do
+@@ -5376,7 +5575,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_STRIP="strip"
@@ -3893,7 +3944,7 @@
break 2
fi
done
-@@ -5377,11 +5573,11 @@ fi
+@@ -5387,11 +5586,11 @@ fi
fi
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
if test -n "$ac_ct_STRIP"; then
@@ -3909,7 +3960,7 @@
fi
if test "x$ac_ct_STRIP" = x; then
-@@ -5389,12 +5585,8 @@ fi
+@@ -5399,12 +5598,8 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3924,7 +3975,7 @@
ac_tool_warned=yes ;;
esac
STRIP=$ac_ct_STRIP
-@@ -5413,10 +5605,10 @@ test -z "$STRIP" && STRIP=:
+@@ -5423,10 +5618,10 @@ test -z "$STRIP" && STRIP=:
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
@@ -3938,7 +3989,7 @@
else
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-@@ -5429,7 +5621,7 @@ do
+@@ -5439,7 +5634,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
@@ -3947,7 +3998,7 @@
break 2
fi
done
-@@ -5440,11 +5632,11 @@ fi
+@@ -5450,11 +5645,11 @@ fi
fi
RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
@@ -3963,7 +4014,7 @@
fi
-@@ -5453,10 +5645,10 @@ if test -z "$ac_cv_prog_RANLIB"; then
+@@ -5463,10 +5658,10 @@ if test -z "$ac_cv_prog_RANLIB"; then
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
@@ -3977,7 +4028,7 @@
else
if test -n "$ac_ct_RANLIB"; then
ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-@@ -5469,7 +5661,7 @@ do
+@@ -5479,7 +5674,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
@@ -3986,7 +4037,7 @@
break 2
fi
done
-@@ -5480,11 +5672,11 @@ fi
+@@ -5490,11 +5685,11 @@ fi
fi
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
if test -n "$ac_ct_RANLIB"; then
@@ -4002,7 +4053,7 @@
fi
if test "x$ac_ct_RANLIB" = x; then
-@@ -5492,12 +5684,8 @@ fi
+@@ -5502,12 +5697,8 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4017,7 +4068,7 @@
ac_tool_warned=yes ;;
esac
RANLIB=$ac_ct_RANLIB
-@@ -5574,10 +5762,10 @@ compiler=$CC
+@@ -5584,10 +5775,10 @@ compiler=$CC
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -4031,7 +4082,7 @@
else
# These are sane defaults that work on at least a few old systems.
-@@ -5594,7 +5782,7 @@ case $host_os in
+@@ -5604,7 +5795,7 @@ case $host_os in
aix*)
symcode='[BCDT]'
;;
@@ -4040,7 +4091,7 @@
symcode='[ABCDGISTW]'
;;
hpux*)
-@@ -5695,14 +5883,14 @@ _LT_EOF
+@@ -5705,14 +5896,14 @@ _LT_EOF
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -4057,7 +4108,7 @@
(exit $ac_status); } && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
-@@ -5759,7 +5947,7 @@ _LT_EOF
+@@ -5769,7 +5960,7 @@ _LT_EOF
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
@@ -4066,7 +4117,7 @@
(exit $ac_status); } && test -s conftest${ac_exeext}; then
pipe_works=yes
fi
-@@ -5794,11 +5982,11 @@ if test -z "$lt_cv_sys_global_symbol_pip
+@@ -5804,11 +5995,11 @@ if test -z "$lt_cv_sys_global_symbol_pip
lt_cv_sys_global_symbol_to_cdecl=
fi
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -4082,7 +4133,7 @@
fi
-@@ -5839,7 +6027,7 @@ ia64-*-hpux*)
+@@ -5849,7 +6040,7 @@ ia64-*-hpux*)
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -4091,12 +4142,12 @@
(exit $ac_status); }; then
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
-@@ -5854,11 +6042,11 @@ ia64-*-hpux*)
+@@ -5864,11 +6055,11 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 5857 "configure"' > conftest.$ac_ext
-+ echo '#line 6045 "configure"' > conftest.$ac_ext
+- echo '#line 5867 "configure"' > conftest.$ac_ext
++ echo '#line 6058 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -4105,7 +4156,7 @@
(exit $ac_status); }; then
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
-@@ -5896,7 +6084,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+@@ -5906,7 +6097,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -4114,7 +4165,7 @@
(exit $ac_status); }; then
case `/usr/bin/file conftest.o` in
*32-bit*)
-@@ -5946,10 +6134,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+@@ -5956,10 +6147,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -4128,7 +4179,7 @@
else
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -5978,26 +6166,30 @@ case "(($ac_try" in
+@@ -5988,26 +6179,30 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -4164,7 +4215,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
-@@ -6007,8 +6199,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -6017,8 +6212,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -4175,7 +4226,7 @@
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
CFLAGS="$SAVE_CFLAGS"
-@@ -6020,7 +6212,7 @@ sparc*-*solaris*)
+@@ -6030,7 +6225,7 @@ sparc*-*solaris*)
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -4184,7 +4235,7 @@
(exit $ac_status); }; then
case `/usr/bin/file conftest.o` in
*64-bit*)
-@@ -6047,10 +6239,10 @@ need_locks="$enable_libtool_lock"
+@@ -6057,10 +6252,10 @@ need_locks="$enable_libtool_lock"
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
@@ -4198,7 +4249,7 @@
else
if test -n "$DSYMUTIL"; then
ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-@@ -6063,7 +6255,7 @@ do
+@@ -6073,7 +6268,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
@@ -4207,7 +4258,7 @@
break 2
fi
done
-@@ -6074,11 +6266,11 @@ fi
+@@ -6084,11 +6279,11 @@ fi
fi
DSYMUTIL=$ac_cv_prog_DSYMUTIL
if test -n "$DSYMUTIL"; then
@@ -4223,7 +4274,7 @@
fi
-@@ -6087,10 +6279,10 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
+@@ -6097,10 +6292,10 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
ac_ct_DSYMUTIL=$DSYMUTIL
# Extract the first word of "dsymutil", so it can be a program name with args.
set dummy dsymutil; ac_word=$2
@@ -4237,7 +4288,7 @@
else
if test -n "$ac_ct_DSYMUTIL"; then
ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-@@ -6103,7 +6295,7 @@ do
+@@ -6113,7 +6308,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
@@ -4246,7 +4297,7 @@
break 2
fi
done
-@@ -6114,11 +6306,11 @@ fi
+@@ -6124,11 +6319,11 @@ fi
fi
ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
if test -n "$ac_ct_DSYMUTIL"; then
@@ -4262,7 +4313,7 @@
fi
if test "x$ac_ct_DSYMUTIL" = x; then
-@@ -6126,12 +6318,8 @@ fi
+@@ -6136,12 +6331,8 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4277,7 +4328,7 @@
ac_tool_warned=yes ;;
esac
DSYMUTIL=$ac_ct_DSYMUTIL
-@@ -6143,10 +6331,10 @@ fi
+@@ -6153,10 +6344,10 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
@@ -4291,7 +4342,7 @@
else
if test -n "$NMEDIT"; then
ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-@@ -6159,7 +6347,7 @@ do
+@@ -6169,7 +6360,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
@@ -4300,7 +4351,7 @@
break 2
fi
done
-@@ -6170,11 +6358,11 @@ fi
+@@ -6180,11 +6371,11 @@ fi
fi
NMEDIT=$ac_cv_prog_NMEDIT
if test -n "$NMEDIT"; then
@@ -4316,7 +4367,7 @@
fi
-@@ -6183,10 +6371,10 @@ if test -z "$ac_cv_prog_NMEDIT"; then
+@@ -6193,10 +6384,10 @@ if test -z "$ac_cv_prog_NMEDIT"; then
ac_ct_NMEDIT=$NMEDIT
# Extract the first word of "nmedit", so it can be a program name with args.
set dummy nmedit; ac_word=$2
@@ -4330,7 +4381,7 @@
else
if test -n "$ac_ct_NMEDIT"; then
ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-@@ -6199,7 +6387,7 @@ do
+@@ -6209,7 +6400,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_NMEDIT="nmedit"
@@ -4339,7 +4390,7 @@
break 2
fi
done
-@@ -6210,11 +6398,11 @@ fi
+@@ -6220,11 +6411,11 @@ fi
fi
ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
if test -n "$ac_ct_NMEDIT"; then
@@ -4355,7 +4406,7 @@
fi
if test "x$ac_ct_NMEDIT" = x; then
-@@ -6222,12 +6410,8 @@ fi
+@@ -6232,12 +6423,8 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4370,7 +4421,7 @@
ac_tool_warned=yes ;;
esac
NMEDIT=$ac_ct_NMEDIT
-@@ -6239,10 +6423,10 @@ fi
+@@ -6249,10 +6436,10 @@ fi
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
@@ -4384,7 +4435,7 @@
else
if test -n "$LIPO"; then
ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
-@@ -6255,7 +6439,7 @@ do
+@@ -6265,7 +6452,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
@@ -4393,7 +4444,7 @@
break 2
fi
done
-@@ -6266,11 +6450,11 @@ fi
+@@ -6276,11 +6463,11 @@ fi
fi
LIPO=$ac_cv_prog_LIPO
if test -n "$LIPO"; then
@@ -4409,7 +4460,7 @@
fi
-@@ -6279,10 +6463,10 @@ if test -z "$ac_cv_prog_LIPO"; then
+@@ -6289,10 +6476,10 @@ if test -z "$ac_cv_prog_LIPO"; then
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
@@ -4423,7 +4474,7 @@
else
if test -n "$ac_ct_LIPO"; then
ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
-@@ -6295,7 +6479,7 @@ do
+@@ -6305,7 +6492,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_LIPO="lipo"
@@ -4432,7 +4483,7 @@
break 2
fi
done
-@@ -6306,11 +6490,11 @@ fi
+@@ -6316,11 +6503,11 @@ fi
fi
ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
if test -n "$ac_ct_LIPO"; then
@@ -4448,7 +4499,7 @@
fi
if test "x$ac_ct_LIPO" = x; then
-@@ -6318,12 +6502,8 @@ fi
+@@ -6328,12 +6515,8 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4463,7 +4514,7 @@
ac_tool_warned=yes ;;
esac
LIPO=$ac_ct_LIPO
-@@ -6335,10 +6515,10 @@ fi
+@@ -6345,10 +6528,10 @@ fi
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
@@ -4477,7 +4528,7 @@
else
if test -n "$OTOOL"; then
ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
-@@ -6351,7 +6531,7 @@ do
+@@ -6361,7 +6544,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
@@ -4486,7 +4537,7 @@
break 2
fi
done
-@@ -6362,11 +6542,11 @@ fi
+@@ -6372,11 +6555,11 @@ fi
fi
OTOOL=$ac_cv_prog_OTOOL
if test -n "$OTOOL"; then
@@ -4502,7 +4553,7 @@
fi
-@@ -6375,10 +6555,10 @@ if test -z "$ac_cv_prog_OTOOL"; then
+@@ -6385,10 +6568,10 @@ if test -z "$ac_cv_prog_OTOOL"; then
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
@@ -4516,7 +4567,7 @@
else
if test -n "$ac_ct_OTOOL"; then
ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
-@@ -6391,7 +6571,7 @@ do
+@@ -6401,7 +6584,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_OTOOL="otool"
@@ -4525,7 +4576,7 @@
break 2
fi
done
-@@ -6402,11 +6582,11 @@ fi
+@@ -6412,11 +6595,11 @@ fi
fi
ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
if test -n "$ac_ct_OTOOL"; then
@@ -4541,7 +4592,7 @@
fi
if test "x$ac_ct_OTOOL" = x; then
-@@ -6414,12 +6594,8 @@ fi
+@@ -6424,12 +6607,8 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4556,7 +4607,7 @@
ac_tool_warned=yes ;;
esac
OTOOL=$ac_ct_OTOOL
-@@ -6431,10 +6607,10 @@ fi
+@@ -6441,10 +6620,10 @@ fi
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
@@ -4570,7 +4621,7 @@
else
if test -n "$OTOOL64"; then
ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
-@@ -6447,7 +6623,7 @@ do
+@@ -6457,7 +6636,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
@@ -4579,7 +4630,7 @@
break 2
fi
done
-@@ -6458,11 +6634,11 @@ fi
+@@ -6468,11 +6647,11 @@ fi
fi
OTOOL64=$ac_cv_prog_OTOOL64
if test -n "$OTOOL64"; then
@@ -4595,7 +4646,7 @@
fi
-@@ -6471,10 +6647,10 @@ if test -z "$ac_cv_prog_OTOOL64"; then
+@@ -6481,10 +6660,10 @@ if test -z "$ac_cv_prog_OTOOL64"; then
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
@@ -4609,7 +4660,7 @@
else
if test -n "$ac_ct_OTOOL64"; then
ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
-@@ -6487,7 +6663,7 @@ do
+@@ -6497,7 +6676,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_OTOOL64="otool64"
@@ -4618,7 +4669,7 @@
break 2
fi
done
-@@ -6498,11 +6674,11 @@ fi
+@@ -6508,11 +6687,11 @@ fi
fi
ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
if test -n "$ac_ct_OTOOL64"; then
@@ -4634,7 +4685,7 @@
fi
if test "x$ac_ct_OTOOL64" = x; then
-@@ -6510,12 +6686,8 @@ fi
+@@ -6520,12 +6699,8 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4649,7 +4700,7 @@
ac_tool_warned=yes ;;
esac
OTOOL64=$ac_ct_OTOOL64
-@@ -6550,10 +6722,10 @@ fi
+@@ -6560,10 +6735,10 @@ fi
@@ -4663,7 +4714,7 @@
else
lt_cv_apple_cc_single_mod=no
if test -z "${LT_MULTI_MODULE}"; then
-@@ -6577,12 +6749,12 @@ else
+@@ -6587,12 +6762,12 @@ else
rm -f conftest.*
fi
fi
@@ -4681,7 +4732,7 @@
else
lt_cv_ld_exported_symbols_list=no
save_LDFLAGS=$LDFLAGS
-@@ -6609,33 +6781,37 @@ case "(($ac_try" in
+@@ -6619,33 +6794,37 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -4726,7 +4777,7 @@
case $host_os in
rhapsody* | darwin1.[012])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-@@ -6676,15 +6852,15 @@ ac_cpp='$CPP $CPPFLAGS'
+@@ -6686,15 +6865,15 @@ ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -4745,7 +4796,7 @@
else
# Double quotes because CPP needs to be expanded
for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-@@ -6716,20 +6892,21 @@ case "(($ac_try" in
+@@ -6726,20 +6905,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -4770,7 +4821,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
-@@ -6753,13 +6930,14 @@ case "(($ac_try" in
+@@ -6763,13 +6943,14 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -4787,7 +4838,7 @@
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -6767,7 +6945,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -6777,7 +6958,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
# Broken: success on invalid input.
continue
else
@@ -4796,7 +4847,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
-@@ -6792,8 +6970,8 @@ fi
+@@ -6802,8 +6983,8 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
@@ -4807,7 +4858,7 @@
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
-@@ -6821,20 +6999,21 @@ case "(($ac_try" in
+@@ -6831,20 +7012,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -4832,7 +4883,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
-@@ -6858,13 +7037,14 @@ case "(($ac_try" in
+@@ -6868,13 +7050,14 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -4849,7 +4900,7 @@
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -6872,7 +7052,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -6882,7 +7065,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
# Broken: success on invalid input.
continue
else
@@ -4858,7 +4909,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
-@@ -6888,11 +7068,13 @@ rm -f conftest.err conftest.$ac_ext
+@@ -6898,11 +7081,13 @@ rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then
:
else
@@ -4875,7 +4926,7 @@
fi
ac_ext=c
-@@ -6902,10 +7084,10 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -6912,10 +7097,10 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -4889,7 +4940,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6932,20 +7114,21 @@ case "(($ac_try" in
+@@ -6942,20 +7127,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -4914,7 +4965,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_header_stdc=no
-@@ -7037,37 +7220,40 @@ case "(($ac_try" in
+@@ -7047,37 +7233,40 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -4963,7 +5014,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -7089,11 +7275,11 @@ fi
+@@ -7099,11 +7288,11 @@ fi
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
inttypes.h stdint.h unistd.h
do
@@ -4979,7 +5030,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -7111,20 +7297,21 @@ case "(($ac_try" in
+@@ -7121,20 +7310,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -5004,7 +5055,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_Header=no"
-@@ -7132,12 +7319,15 @@ fi
+@@ -7142,12 +7332,15 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -5025,7 +5076,7 @@
_ACEOF
fi
-@@ -7148,11 +7338,11 @@ done
+@@ -7158,11 +7351,11 @@ done
for ac_header in dlfcn.h
do
@@ -5041,7 +5092,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -7170,20 +7360,21 @@ case "(($ac_try" in
+@@ -7180,20 +7373,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -5066,7 +5117,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_Header=no"
-@@ -7191,12 +7382,15 @@ fi
+@@ -7201,12 +7395,15 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -5087,7 +5138,7 @@
_ACEOF
fi
-@@ -7314,10 +7508,10 @@ if test -n "${ZSH_VERSION+set}" ; then
+@@ -7324,10 +7521,10 @@ if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
fi
@@ -5101,7 +5152,7 @@
else
rm -f .libs 2>/dev/null
mkdir .libs 2>/dev/null
-@@ -7329,8 +7523,8 @@ else
+@@ -7339,8 +7536,8 @@ else
fi
rmdir .libs 2>/dev/null
fi
@@ -5112,7 +5163,7 @@
objdir=$lt_cv_objdir
-@@ -7422,10 +7616,10 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
+@@ -7432,10 +7629,10 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -5126,7 +5177,7 @@
else
case $MAGIC_CMD in
[\\/*] | ?:[\\/]*)
-@@ -7475,11 +7669,11 @@ fi
+@@ -7485,11 +7682,11 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -5142,7 +5193,7 @@
fi
-@@ -7488,10 +7682,10 @@ fi
+@@ -7498,10 +7695,10 @@ fi
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
@@ -5156,7 +5207,7 @@
else
case $MAGIC_CMD in
[\\/*] | ?:[\\/]*)
-@@ -7541,11 +7735,11 @@ fi
+@@ -7551,11 +7748,11 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -5172,7 +5223,7 @@
fi
-@@ -7625,10 +7819,10 @@ lt_prog_compiler_no_builtin_flag=
+@@ -7635,10 +7832,10 @@ lt_prog_compiler_no_builtin_flag=
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -5186,21 +5237,21 @@
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
-@@ -7643,11 +7837,11 @@ else
+@@ -7653,11 +7850,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:7646: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7840: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:7656: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7853: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:7650: \$? = $ac_status" >&5
-+ echo "$as_me:7844: \$? = $ac_status" >&5
+- echo "$as_me:7660: \$? = $ac_status" >&5
++ echo "$as_me:7857: \$? = $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.
-@@ -7660,8 +7854,8 @@ else
+@@ -7670,8 +7867,8 @@ else
$RM conftest*
fi
@@ -5211,7 +5262,7 @@
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-@@ -7680,8 +7874,8 @@ fi
+@@ -7690,8 +7887,8 @@ fi
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -5222,7 +5273,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
-@@ -7715,7 +7909,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -7725,7 +7922,7 @@ echo $ECHO_N "checking for $compiler opt
# PIC is the default for these OSes.
;;
@@ -5231,7 +5282,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
-@@ -7730,10 +7924,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -7740,10 +7937,11 @@ echo $ECHO_N "checking for $compiler opt
;;
hpux*)
@@ -5246,7 +5297,7 @@
# +Z the default
;;
*)
-@@ -7783,7 +7978,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -7793,7 +7991,7 @@ echo $ECHO_N "checking for $compiler opt
fi
;;
@@ -5255,7 +5306,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic='-DDLL_EXPORT'
-@@ -7813,11 +8008,25 @@ echo $ECHO_N "checking for $compiler opt
+@@ -7823,11 +8021,25 @@ echo $ECHO_N "checking for $compiler opt
linux* | k*bsd*-gnu)
case $cc_basename in
@@ -5282,7 +5333,7 @@
pgcc* | pgf77* | pgf90* | pgf95*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
-@@ -7937,8 +8146,8 @@ case $host_os in
+@@ -7947,8 +8159,8 @@ case $host_os in
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -5293,7 +5344,7 @@
-@@ -7949,10 +8158,10 @@ echo "${ECHO_T}$lt_prog_compiler_pic" >&
+@@ -7959,10 +8171,10 @@ echo "${ECHO_T}$lt_prog_compiler_pic" >&
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
@@ -5307,21 +5358,21 @@
else
lt_cv_prog_compiler_pic_works=no
ac_outfile=conftest.$ac_objext
-@@ -7967,11 +8176,11 @@ else
+@@ -7977,11 +8189,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:7970: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8179: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:7980: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8192: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:7974: \$? = $ac_status" >&5
-+ echo "$as_me:8183: \$? = $ac_status" >&5
+- echo "$as_me:7984: \$? = $ac_status" >&5
++ echo "$as_me:8196: \$? = $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.
-@@ -7984,8 +8193,8 @@ else
+@@ -7994,8 +8206,8 @@ else
$RM conftest*
fi
@@ -5332,7 +5383,7 @@
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
-@@ -8008,10 +8217,10 @@ fi
+@@ -8018,10 +8230,10 @@ fi
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -5346,7 +5397,7 @@
else
lt_cv_prog_compiler_static_works=no
save_LDFLAGS="$LDFLAGS"
-@@ -8036,8 +8245,8 @@ else
+@@ -8046,8 +8258,8 @@ else
LDFLAGS="$save_LDFLAGS"
fi
@@ -5357,7 +5408,7 @@
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
:
-@@ -8051,10 +8260,10 @@ fi
+@@ -8061,10 +8273,10 @@ fi
@@ -5371,21 +5422,21 @@
else
lt_cv_prog_compiler_c_o=no
$RM -r conftest 2>/dev/null
-@@ -8072,11 +8281,11 @@ else
+@@ -8082,11 +8294,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8075: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8284: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8085: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8297: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:8079: \$? = $ac_status" >&5
-+ echo "$as_me:8288: \$? = $ac_status" >&5
+- echo "$as_me:8089: \$? = $ac_status" >&5
++ echo "$as_me:8301: \$? = $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
-@@ -8098,18 +8307,18 @@ else
+@@ -8108,18 +8320,18 @@ else
$RM conftest*
fi
@@ -5409,21 +5460,21 @@
else
lt_cv_prog_compiler_c_o=no
$RM -r conftest 2>/dev/null
-@@ -8127,11 +8336,11 @@ else
+@@ -8137,11 +8349,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8130: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8339: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8140: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8352: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:8134: \$? = $ac_status" >&5
-+ echo "$as_me:8343: \$? = $ac_status" >&5
+- echo "$as_me:8144: \$? = $ac_status" >&5
++ echo "$as_me:8356: \$? = $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
-@@ -8153,8 +8362,8 @@ else
+@@ -8163,8 +8375,8 @@ else
$RM conftest*
fi
@@ -5434,7 +5485,7 @@
-@@ -8162,19 +8371,19 @@ echo "${ECHO_T}$lt_cv_prog_compiler_c_o"
+@@ -8172,19 +8384,19 @@ echo "${ECHO_T}$lt_cv_prog_compiler_c_o"
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
@@ -5460,7 +5511,7 @@
need_locks=warn
fi
else
-@@ -8186,8 +8395,8 @@ fi
+@@ -8196,8 +8408,8 @@ fi
@@ -5471,7 +5522,7 @@
runpath_var=
allow_undefined_flag=
-@@ -8231,7 +8440,7 @@ echo $ECHO_N "checking whether the $comp
+@@ -8241,7 +8453,7 @@ echo $ECHO_N "checking whether the $comp
extract_expsyms_cmds=
case $host_os in
@@ -5480,7 +5531,7 @@
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
-@@ -8246,6 +8455,9 @@ echo $ECHO_N "checking whether the $comp
+@@ -8256,6 +8468,9 @@ echo $ECHO_N "checking whether the $comp
openbsd*)
with_gnu_ld=no
;;
@@ -5490,7 +5541,7 @@
esac
ld_shlibs=yes
-@@ -8318,7 +8530,7 @@ _LT_EOF
+@@ -8328,7 +8543,7 @@ _LT_EOF
fi
;;
@@ -5499,7 +5550,7 @@
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
-@@ -8384,6 +8596,9 @@ _LT_EOF
+@@ -8394,6 +8609,9 @@ _LT_EOF
tmp_addflag=' -i_dynamic -nofor_main' ;;
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
@@ -5509,7 +5560,7 @@
xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
tmp_sharedflag='-qmkshrobj'
tmp_addflag= ;;
-@@ -8616,6 +8831,7 @@ _LT_EOF
+@@ -8626,6 +8844,7 @@ _LT_EOF
fi
fi
@@ -5517,7 +5568,7 @@
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to export.
always_export_symbols=yes
-@@ -8646,18 +8862,21 @@ case "(($ac_try" in
+@@ -8656,18 +8875,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -5543,7 +5594,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -8672,12 +8891,13 @@ if test -z "$aix_libpath"; then
+@@ -8682,12 +8904,13 @@ if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
@@ -5558,7 +5609,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -8713,18 +8933,21 @@ case "(($ac_try" in
+@@ -8723,18 +8946,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -5584,7 +5635,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -8739,12 +8962,13 @@ if test -z "$aix_libpath"; then
+@@ -8749,12 +8975,13 @@ if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
@@ -5599,7 +5650,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -8782,7 +9006,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -8792,7 +9019,7 @@ if test -z "$aix_libpath"; then aix_libp
export_dynamic_flag_spec=-rdynamic
;;
@@ -5608,7 +5659,7 @@
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
-@@ -8813,7 +9037,11 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -8823,7 +9050,11 @@ if test -z "$aix_libpath"; then aix_libp
whole_archive_flag_spec=''
link_all_deplibs=yes
allow_undefined_flag="$_lt_dar_allow_undefined"
@@ -5621,7 +5672,7 @@
output_verbose_link_cmd=echo
archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-@@ -8905,7 +9133,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -8915,7 +9146,7 @@ if test -z "$aix_libpath"; then aix_libp
archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
@@ -5630,7 +5681,7 @@
;;
*)
archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-@@ -8963,27 +9191,31 @@ case "(($ac_try" in
+@@ -8973,27 +9204,31 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -5667,7 +5718,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LDFLAGS="$save_LDFLAGS"
-@@ -9241,8 +9473,8 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -9251,8 +9486,8 @@ rm -f core conftest.err conftest.$ac_obj
fi
fi
@@ -5678,7 +5729,7 @@
test "$ld_shlibs" = no && can_build_shared=no
with_gnu_ld=$with_gnu_ld
-@@ -9278,15 +9510,15 @@ x|xyes)
+@@ -9288,15 +9523,15 @@ x|xyes)
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -5697,7 +5748,7 @@
(exit $ac_status); } 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -9304,7 +9536,7 @@ echo $ECHO_N "checking whether -lc shoul
+@@ -9314,7 +9549,7 @@ echo $ECHO_N "checking whether -lc shoul
if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
(eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
@@ -5706,7 +5757,7 @@
(exit $ac_status); }
then
archive_cmds_need_lc=no
-@@ -9316,8 +9548,8 @@ echo $ECHO_N "checking whether -lc shoul
+@@ -9326,8 +9561,8 @@ echo $ECHO_N "checking whether -lc shoul
cat conftest.err 1>&5
fi
$RM conftest*
@@ -5717,7 +5768,7 @@
;;
esac
fi
-@@ -9480,8 +9712,8 @@ esac
+@@ -9490,8 +9725,8 @@ esac
@@ -5728,7 +5779,7 @@
if test "$GCC" = yes; then
case $host_os in
-@@ -9643,14 +9875,14 @@ bsdi[45]*)
+@@ -9653,14 +9888,14 @@ bsdi[45]*)
# libtool to hard-code these into programs
;;
@@ -5745,7 +5796,7 @@
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
-@@ -9673,7 +9905,7 @@ cygwin* | mingw* | pw32*)
+@@ -9683,7 +9918,7 @@ cygwin* | mingw* | pw32*)
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
;;
@@ -5754,7 +5805,7 @@
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-@@ -9923,29 +10155,33 @@ case "(($ac_try" in
+@@ -9933,29 +10168,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -5793,7 +5844,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LDFLAGS=$save_LDFLAGS
-@@ -10154,7 +10390,7 @@ tpf*)
+@@ -10164,7 +10403,7 @@ tpf*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -5802,7 +5853,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
-@@ -10171,8 +10407,8 @@ uts4*)
+@@ -10181,8 +10420,8 @@ uts4*)
dynamic_linker=no
;;
esac
@@ -5813,7 +5864,7 @@
test "$dynamic_linker" = no && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -10273,8 +10509,8 @@ fi
+@@ -10283,8 +10522,8 @@ fi
@@ -5824,7 +5875,7 @@
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
test -n "$runpath_var" ||
-@@ -10298,8 +10534,8 @@ else
+@@ -10308,8 +10547,8 @@ else
# directories.
hardcode_action=unsupported
fi
@@ -5835,7 +5886,7 @@
if test "$hardcode_action" = relink ||
test "$inherit_rpath" = yes; then
-@@ -10331,7 +10567,7 @@ else
+@@ -10341,7 +10580,7 @@ else
lt_cv_dlopen_self=yes
;;
@@ -5844,7 +5895,7 @@
lt_cv_dlopen="LoadLibrary"
lt_cv_dlopen_libs=
;;
-@@ -10343,10 +10579,10 @@ else
+@@ -10353,10 +10592,10 @@ else
darwin*)
# if libdl is installed we need to link against it
@@ -5858,7 +5909,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
-@@ -10378,33 +10614,37 @@ case "(($ac_try" in
+@@ -10388,33 +10627,37 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -5904,7 +5955,7 @@
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -10417,10 +10657,10 @@ fi
+@@ -10427,10 +10670,10 @@ fi
;;
*)
@@ -5918,7 +5969,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -10473,38 +10713,42 @@ case "(($ac_try" in
+@@ -10483,38 +10726,42 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -5972,7 +6023,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldld $LIBS"
-@@ -10536,39 +10780,43 @@ case "(($ac_try" in
+@@ -10546,39 +10793,43 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -6027,7 +6078,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -10621,38 +10869,42 @@ case "(($ac_try" in
+@@ -10631,38 +10882,42 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -6081,7 +6132,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
-@@ -10684,39 +10936,43 @@ case "(($ac_try" in
+@@ -10694,39 +10949,43 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -6136,7 +6187,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsvld $LIBS"
-@@ -10748,39 +11004,43 @@ case "(($ac_try" in
+@@ -10758,39 +11017,43 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -6191,7 +6242,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldld $LIBS"
-@@ -10812,33 +11072,37 @@ case "(($ac_try" in
+@@ -10822,33 +11085,37 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -6237,7 +6288,7 @@
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -10877,10 +11141,10 @@ fi
+@@ -10887,10 +11154,10 @@ fi
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -6251,16 +6302,16 @@
else
if test "$cross_compiling" = yes; then :
lt_cv_dlopen_self=cross
-@@ -10888,7 +11152,7 @@ else
+@@ -10898,7 +11165,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 10891 "configure"
-+#line 11155 "configure"
+-#line 10901 "configure"
++#line 11168 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -10929,10 +11193,6 @@ else
+@@ -10939,10 +11206,6 @@ else
# endif
#endif
@@ -6271,7 +6322,7 @@
void fnord() { int i=42;}
int main ()
{
-@@ -10948,13 +11208,13 @@ int main ()
+@@ -10958,13 +11221,13 @@ int main ()
else
puts (dlerror ());
@@ -6287,7 +6338,7 @@
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
-@@ -10972,15 +11232,15 @@ rm -fr conftest*
+@@ -10982,15 +11245,15 @@ rm -fr conftest*
fi
@@ -6308,16 +6359,16 @@
else
if test "$cross_compiling" = yes; then :
lt_cv_dlopen_self_static=cross
-@@ -10988,7 +11248,7 @@ else
+@@ -10998,7 +11261,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 10991 "configure"
-+#line 11251 "configure"
+-#line 11001 "configure"
++#line 11264 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11029,10 +11289,6 @@ else
+@@ -11039,10 +11302,6 @@ else
# endif
#endif
@@ -6328,7 +6379,7 @@
void fnord() { int i=42;}
int main ()
{
-@@ -11048,13 +11304,13 @@ int main ()
+@@ -11058,13 +11317,13 @@ int main ()
else
puts (dlerror ());
@@ -6344,7 +6395,7 @@
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
-@@ -11072,8 +11328,8 @@ rm -fr conftest*
+@@ -11082,8 +11341,8 @@ rm -fr conftest*
fi
@@ -6355,7 +6406,7 @@
fi
CPPFLAGS="$save_CPPFLAGS"
-@@ -11111,13 +11367,13 @@ fi
+@@ -11121,13 +11380,13 @@ fi
striplib=
old_striplib=
@@ -6373,7 +6424,7 @@
else
# FIXME - insert some real tests, host_os isn't really good enough
case $host_os in
-@@ -11125,16 +11381,16 @@ else
+@@ -11135,16 +11394,16 @@ else
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -6396,7 +6447,7 @@
;;
esac
fi
-@@ -11151,13 +11407,13 @@ fi
+@@ -11161,13 +11420,13 @@ fi
# Report which library types will actually be built
@@ -6416,7 +6467,7 @@
test "$can_build_shared" = "no" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
-@@ -11177,15 +11433,15 @@ echo $ECHO_N "checking whether to build
+@@ -11187,15 +11446,15 @@ echo $ECHO_N "checking whether to build
fi
;;
esac
@@ -6438,7 +6489,7 @@
-@@ -11220,10 +11476,10 @@ CC="$lt_save_CC"
+@@ -11230,10 +11489,10 @@ CC="$lt_save_CC"
@@ -6452,7 +6503,7 @@
else
ac_func_search_save_LIBS=$LIBS
cat >conftest.$ac_ext <<_ACEOF
-@@ -11261,26 +11517,30 @@ case "(($ac_try" in
+@@ -11271,26 +11530,30 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -6488,7 +6539,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext
if test "${ac_cv_search_strerror+set}" = set; then
-@@ -11295,8 +11555,8 @@ fi
+@@ -11305,8 +11568,8 @@ fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
@@ -6499,7 +6550,7 @@
ac_res=$ac_cv_search_strerror
if test "$ac_res" != no; then
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-@@ -11311,10 +11571,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -11321,10 +11584,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -6513,7 +6564,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -11327,7 +11587,7 @@ do
+@@ -11337,7 +11600,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
@@ -6522,7 +6573,7 @@
break 2
fi
done
-@@ -11338,11 +11598,11 @@ fi
+@@ -11348,11 +11611,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -6538,7 +6589,7 @@
fi
-@@ -11351,10 +11611,10 @@ if test -z "$ac_cv_prog_CC"; then
+@@ -11361,10 +11624,10 @@ if test -z "$ac_cv_prog_CC"; then
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -6552,7 +6603,7 @@
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -11367,7 +11627,7 @@ do
+@@ -11377,7 +11640,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
@@ -6561,7 +6612,7 @@
break 2
fi
done
-@@ -11378,11 +11638,11 @@ fi
+@@ -11388,11 +11651,11 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
@@ -6577,7 +6628,7 @@
fi
if test "x$ac_ct_CC" = x; then
-@@ -11390,12 +11650,8 @@ fi
+@@ -11400,12 +11663,8 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6592,7 +6643,7 @@
ac_tool_warned=yes ;;
esac
CC=$ac_ct_CC
-@@ -11408,10 +11664,10 @@ if test -z "$CC"; then
+@@ -11418,10 +11677,10 @@ if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -6606,7 +6657,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -11424,7 +11680,7 @@ do
+@@ -11434,7 +11693,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
@@ -6615,7 +6666,7 @@
break 2
fi
done
-@@ -11435,11 +11691,11 @@ fi
+@@ -11445,11 +11704,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -6631,7 +6682,7 @@
fi
-@@ -11448,10 +11704,10 @@ fi
+@@ -11458,10 +11717,10 @@ fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -6645,7 +6696,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -11469,7 +11725,7 @@ do
+@@ -11479,7 +11738,7 @@ do
continue
fi
ac_cv_prog_CC="cc"
@@ -6654,7 +6705,7 @@
break 2
fi
done
-@@ -11492,11 +11748,11 @@ fi
+@@ -11502,11 +11761,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -6670,7 +6721,7 @@
fi
-@@ -11507,10 +11763,10 @@ if test -z "$CC"; then
+@@ -11517,10 +11776,10 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -6684,7 +6735,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -11523,7 +11779,7 @@ do
+@@ -11533,7 +11792,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
@@ -6693,7 +6744,7 @@
break 2
fi
done
-@@ -11534,11 +11790,11 @@ fi
+@@ -11544,11 +11803,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -6709,7 +6760,7 @@
fi
-@@ -11551,10 +11807,10 @@ if test -z "$CC"; then
+@@ -11561,10 +11820,10 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -6723,7 +6774,7 @@
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -11567,7 +11823,7 @@ do
+@@ -11577,7 +11836,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
@@ -6732,7 +6783,7 @@
break 2
fi
done
-@@ -11578,11 +11834,11 @@ fi
+@@ -11588,11 +11847,11 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
@@ -6748,7 +6799,7 @@
fi
-@@ -11594,12 +11850,8 @@ done
+@@ -11604,12 +11863,8 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6763,7 +6814,7 @@
ac_tool_warned=yes ;;
esac
CC=$ac_ct_CC
-@@ -11609,50 +11861,56 @@ fi
+@@ -11619,50 +11874,56 @@ fi
fi
@@ -6834,7 +6885,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -11678,20 +11936,21 @@ case "(($ac_try" in
+@@ -11688,20 +11949,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -6859,7 +6910,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
-@@ -11701,15 +11960,19 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -11711,15 +11973,19 @@ rm -f core conftest.err conftest.$ac_obj
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
@@ -6885,7 +6936,7 @@
else
ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
-@@ -11736,20 +11999,21 @@ case "(($ac_try" in
+@@ -11746,20 +12012,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -6910,7 +6961,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
CFLAGS=""
-@@ -11774,20 +12038,21 @@ case "(($ac_try" in
+@@ -11784,20 +12051,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -6935,7 +6986,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_c_werror_flag=$ac_save_c_werror_flag
-@@ -11813,20 +12078,21 @@ case "(($ac_try" in
+@@ -11823,20 +12091,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -6960,7 +7011,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -11841,8 +12107,8 @@ fi
+@@ -11851,8 +12120,8 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
@@ -6971,7 +7022,7 @@
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
-@@ -11858,10 +12124,10 @@ else
+@@ -11868,10 +12137,10 @@ else
CFLAGS=
fi
fi
@@ -6985,7 +7036,7 @@
else
ac_cv_prog_cc_c89=no
ac_save_CC=$CC
-@@ -11932,20 +12198,21 @@ case "(($ac_try" in
+@@ -11942,20 +12211,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7010,7 +7061,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -11961,15 +12228,15 @@ fi
+@@ -11971,15 +12241,15 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -7032,7 +7083,7 @@
esac
-@@ -11981,10 +12248,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -11991,10 +12261,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CC" am_compiler_list=
@@ -7046,7 +7097,7 @@
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
-@@ -12072,8 +12339,8 @@ else
+@@ -12082,8 +12352,8 @@ else
fi
fi
@@ -7057,7 +7108,7 @@
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
if
-@@ -12095,10 +12362,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -12105,10 +12375,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -7071,7 +7122,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -12111,7 +12378,7 @@ do
+@@ -12121,7 +12391,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
@@ -7080,7 +7131,7 @@
break 2
fi
done
-@@ -12122,11 +12389,11 @@ fi
+@@ -12132,11 +12402,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7096,7 +7147,7 @@
fi
-@@ -12135,10 +12402,10 @@ if test -z "$ac_cv_prog_CC"; then
+@@ -12145,10 +12415,10 @@ if test -z "$ac_cv_prog_CC"; then
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -7110,7 +7161,7 @@
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -12151,7 +12418,7 @@ do
+@@ -12161,7 +12431,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
@@ -7119,7 +7170,7 @@
break 2
fi
done
-@@ -12162,11 +12429,11 @@ fi
+@@ -12172,11 +12442,11 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
@@ -7135,7 +7186,7 @@
fi
if test "x$ac_ct_CC" = x; then
-@@ -12174,12 +12441,8 @@ fi
+@@ -12184,12 +12454,8 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7150,7 +7201,7 @@
ac_tool_warned=yes ;;
esac
CC=$ac_ct_CC
-@@ -12192,10 +12455,10 @@ if test -z "$CC"; then
+@@ -12202,10 +12468,10 @@ if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -7164,7 +7215,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -12208,7 +12471,7 @@ do
+@@ -12218,7 +12484,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
@@ -7173,7 +7224,7 @@
break 2
fi
done
-@@ -12219,11 +12482,11 @@ fi
+@@ -12229,11 +12495,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7189,7 +7240,7 @@
fi
-@@ -12232,10 +12495,10 @@ fi
+@@ -12242,10 +12508,10 @@ fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -7203,7 +7254,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -12253,7 +12516,7 @@ do
+@@ -12263,7 +12529,7 @@ do
continue
fi
ac_cv_prog_CC="cc"
@@ -7212,7 +7263,7 @@
break 2
fi
done
-@@ -12276,11 +12539,11 @@ fi
+@@ -12286,11 +12552,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7228,7 +7279,7 @@
fi
-@@ -12291,10 +12554,10 @@ if test -z "$CC"; then
+@@ -12301,10 +12567,10 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -7242,7 +7293,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -12307,7 +12570,7 @@ do
+@@ -12317,7 +12583,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
@@ -7251,7 +7302,7 @@
break 2
fi
done
-@@ -12318,11 +12581,11 @@ fi
+@@ -12328,11 +12594,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7267,7 +7318,7 @@
fi
-@@ -12335,10 +12598,10 @@ if test -z "$CC"; then
+@@ -12345,10 +12611,10 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -7281,7 +7332,7 @@
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -12351,7 +12614,7 @@ do
+@@ -12361,7 +12627,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
@@ -7290,7 +7341,7 @@
break 2
fi
done
-@@ -12362,11 +12625,11 @@ fi
+@@ -12372,11 +12638,11 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
@@ -7306,7 +7357,7 @@
fi
-@@ -12378,12 +12641,8 @@ done
+@@ -12388,12 +12654,8 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7321,7 +7372,7 @@
ac_tool_warned=yes ;;
esac
CC=$ac_ct_CC
-@@ -12393,50 +12652,56 @@ fi
+@@ -12403,50 +12665,56 @@ fi
fi
@@ -7392,7 +7443,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -12462,20 +12727,21 @@ case "(($ac_try" in
+@@ -12472,20 +12740,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7417,7 +7468,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
-@@ -12485,15 +12751,19 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -12495,15 +12764,19 @@ rm -f core conftest.err conftest.$ac_obj
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
@@ -7443,7 +7494,7 @@
else
ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
-@@ -12520,20 +12790,21 @@ case "(($ac_try" in
+@@ -12530,20 +12803,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7468,7 +7519,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
CFLAGS=""
-@@ -12558,20 +12829,21 @@ case "(($ac_try" in
+@@ -12568,20 +12842,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7493,7 +7544,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_c_werror_flag=$ac_save_c_werror_flag
-@@ -12597,20 +12869,21 @@ case "(($ac_try" in
+@@ -12607,20 +12882,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7518,7 +7569,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -12625,8 +12898,8 @@ fi
+@@ -12635,8 +12911,8 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
@@ -7529,7 +7580,7 @@
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
-@@ -12642,10 +12915,10 @@ else
+@@ -12652,10 +12928,10 @@ else
CFLAGS=
fi
fi
@@ -7543,7 +7594,7 @@
else
ac_cv_prog_cc_c89=no
ac_save_CC=$CC
-@@ -12716,20 +12989,21 @@ case "(($ac_try" in
+@@ -12726,20 +13002,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7568,7 +7619,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -12745,15 +13019,15 @@ fi
+@@ -12755,15 +13032,15 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -7590,7 +7641,7 @@
esac
-@@ -12765,10 +13039,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -12775,10 +13052,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CC" am_compiler_list=
@@ -7604,7 +7655,7 @@
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
-@@ -12856,8 +13130,8 @@ else
+@@ -12866,8 +13143,8 @@ else
fi
fi
@@ -7615,7 +7666,7 @@
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
if
-@@ -12874,10 +13148,10 @@ fi
+@@ -12884,10 +13161,10 @@ fi
am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
@@ -7629,7 +7680,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -12904,20 +13178,21 @@ case "(($ac_try" in
+@@ -12914,20 +13191,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7654,7 +7705,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_header_stdc=no
-@@ -13009,37 +13284,40 @@ case "(($ac_try" in
+@@ -13019,37 +13297,40 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7703,7 +7754,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -13063,10 +13341,10 @@ if test -z "$CXX"; then
+@@ -13073,10 +13354,10 @@ if test -z "$CXX"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -7717,7 +7768,7 @@
else
if test -n "$CXX"; then
ac_cv_prog_CXX="$CXX" # Let the user override the test.
-@@ -13079,7 +13357,7 @@ do
+@@ -13089,7 +13370,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
@@ -7726,7 +7777,7 @@
break 2
fi
done
-@@ -13090,11 +13368,11 @@ fi
+@@ -13100,11 +13381,11 @@ fi
fi
CXX=$ac_cv_prog_CXX
if test -n "$CXX"; then
@@ -7742,7 +7793,7 @@
fi
-@@ -13107,10 +13385,10 @@ if test -z "$CXX"; then
+@@ -13117,10 +13398,10 @@ if test -z "$CXX"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -7756,7 +7807,7 @@
else
if test -n "$ac_ct_CXX"; then
ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-@@ -13123,7 +13401,7 @@ do
+@@ -13133,7 +13414,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CXX="$ac_prog"
@@ -7765,7 +7816,7 @@
break 2
fi
done
-@@ -13134,11 +13412,11 @@ fi
+@@ -13144,11 +13425,11 @@ fi
fi
ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
if test -n "$ac_ct_CXX"; then
@@ -7781,7 +7832,7 @@
fi
-@@ -13150,12 +13428,8 @@ done
+@@ -13160,12 +13441,8 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7796,7 +7847,7 @@
ac_tool_warned=yes ;;
esac
CXX=$ac_ct_CXX
-@@ -13165,43 +13439,47 @@ fi
+@@ -13175,43 +13452,47 @@ fi
fi
fi
# Provide some information about the compiler.
@@ -7855,7 +7906,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -13227,20 +13505,21 @@ case "(($ac_try" in
+@@ -13237,20 +13518,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7880,7 +7931,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
-@@ -13250,15 +13529,19 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -13260,15 +13542,19 @@ rm -f core conftest.err conftest.$ac_obj
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
@@ -7906,7 +7957,7 @@
else
ac_save_cxx_werror_flag=$ac_cxx_werror_flag
ac_cxx_werror_flag=yes
-@@ -13285,20 +13568,21 @@ case "(($ac_try" in
+@@ -13295,20 +13581,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7931,7 +7982,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
CXXFLAGS=""
-@@ -13323,20 +13607,21 @@ case "(($ac_try" in
+@@ -13333,20 +13620,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7956,7 +8007,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-@@ -13362,20 +13647,21 @@ case "(($ac_try" in
+@@ -13372,20 +13660,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7981,7 +8032,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -13390,8 +13676,8 @@ fi
+@@ -13400,8 +13689,8 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cxx_werror_flag=$ac_save_cxx_werror_flag
fi
@@ -7992,7 +8043,7 @@
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS=$ac_save_CXXFLAGS
elif test $ac_cv_prog_cxx_g = yes; then
-@@ -13415,10 +13701,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -13425,10 +13714,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CXX" am_compiler_list=
@@ -8006,7 +8057,7 @@
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
-@@ -13506,8 +13792,8 @@ else
+@@ -13516,8 +13805,8 @@ else
fi
fi
@@ -8017,7 +8068,7 @@
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
if
-@@ -13536,10 +13822,10 @@ if test -z "$CXX"; then
+@@ -13546,10 +13835,10 @@ if test -z "$CXX"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -8031,7 +8082,7 @@
else
if test -n "$CXX"; then
ac_cv_prog_CXX="$CXX" # Let the user override the test.
-@@ -13552,7 +13838,7 @@ do
+@@ -13562,7 +13851,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
@@ -8040,7 +8091,7 @@
break 2
fi
done
-@@ -13563,11 +13849,11 @@ fi
+@@ -13573,11 +13862,11 @@ fi
fi
CXX=$ac_cv_prog_CXX
if test -n "$CXX"; then
@@ -8056,7 +8107,7 @@
fi
-@@ -13580,10 +13866,10 @@ if test -z "$CXX"; then
+@@ -13590,10 +13879,10 @@ if test -z "$CXX"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -8070,7 +8121,7 @@
else
if test -n "$ac_ct_CXX"; then
ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-@@ -13596,7 +13882,7 @@ do
+@@ -13606,7 +13895,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CXX="$ac_prog"
@@ -8079,7 +8130,7 @@
break 2
fi
done
-@@ -13607,11 +13893,11 @@ fi
+@@ -13617,11 +13906,11 @@ fi
fi
ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
if test -n "$ac_ct_CXX"; then
@@ -8095,7 +8146,7 @@
fi
-@@ -13623,12 +13909,8 @@ done
+@@ -13633,12 +13922,8 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8110,7 +8161,7 @@
ac_tool_warned=yes ;;
esac
CXX=$ac_ct_CXX
-@@ -13638,43 +13920,47 @@ fi
+@@ -13648,43 +13933,47 @@ fi
fi
fi
# Provide some information about the compiler.
@@ -8169,7 +8220,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -13700,20 +13986,21 @@ case "(($ac_try" in
+@@ -13710,20 +13999,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8194,7 +8245,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
-@@ -13723,15 +14010,19 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -13733,15 +14023,19 @@ rm -f core conftest.err conftest.$ac_obj
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
@@ -8220,7 +8271,7 @@
else
ac_save_cxx_werror_flag=$ac_cxx_werror_flag
ac_cxx_werror_flag=yes
-@@ -13758,20 +14049,21 @@ case "(($ac_try" in
+@@ -13768,20 +14062,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8245,7 +8296,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
CXXFLAGS=""
-@@ -13796,20 +14088,21 @@ case "(($ac_try" in
+@@ -13806,20 +14101,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8270,7 +8321,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-@@ -13835,20 +14128,21 @@ case "(($ac_try" in
+@@ -13845,20 +14141,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8295,7 +8346,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -13863,8 +14157,8 @@ fi
+@@ -13873,8 +14170,8 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cxx_werror_flag=$ac_save_cxx_werror_flag
fi
@@ -8306,7 +8357,7 @@
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS=$ac_save_CXXFLAGS
elif test $ac_cv_prog_cxx_g = yes; then
-@@ -13888,10 +14182,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -13898,10 +14195,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CXX" am_compiler_list=
@@ -8320,7 +8371,7 @@
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
-@@ -13979,8 +14273,8 @@ else
+@@ -13989,8 +14286,8 @@ else
fi
fi
@@ -8331,7 +8382,7 @@
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
if
-@@ -14002,11 +14296,11 @@ ac_cpp='$CXXCPP $CPPFLAGS'
+@@ -14012,11 +14309,11 @@ ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
@@ -8346,7 +8397,7 @@
else
# Double quotes because CXXCPP needs to be expanded
for CXXCPP in "$CXX -E" "/lib/cpp"
-@@ -14038,20 +14332,21 @@ case "(($ac_try" in
+@@ -14048,20 +14345,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8371,7 +8422,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
-@@ -14075,13 +14370,14 @@ case "(($ac_try" in
+@@ -14085,13 +14383,14 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8388,7 +8439,7 @@
(exit $ac_status); } >/dev/null && {
test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
-@@ -14089,7 +14385,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -14099,7 +14398,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
# Broken: success on invalid input.
continue
else
@@ -8397,7 +8448,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
-@@ -14114,8 +14410,8 @@ fi
+@@ -14124,8 +14423,8 @@ fi
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -8408,7 +8459,7 @@
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
do
-@@ -14143,20 +14439,21 @@ case "(($ac_try" in
+@@ -14153,20 +14452,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8433,7 +8484,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
-@@ -14180,13 +14477,14 @@ case "(($ac_try" in
+@@ -14190,13 +14490,14 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8450,7 +8501,7 @@
(exit $ac_status); } >/dev/null && {
test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
-@@ -14194,7 +14492,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -14204,7 +14505,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
# Broken: success on invalid input.
continue
else
@@ -8459,7 +8510,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
-@@ -14210,7 +14508,9 @@ rm -f conftest.err conftest.$ac_ext
+@@ -14220,7 +14521,9 @@ rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then
:
else
@@ -8470,7 +8521,7 @@
fi
ac_ext=c
-@@ -14360,8 +14660,8 @@ fi
+@@ -14370,8 +14673,8 @@ fi
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -8481,7 +8532,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -14390,14 +14690,14 @@ echo $ECHO_N "checking for ld used by $C
+@@ -14400,14 +14703,14 @@ echo $ECHO_N "checking for ld used by $C
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -8501,7 +8552,7 @@
else
if test -z "$LD"; then
lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-@@ -14427,19 +14727,19 @@ fi
+@@ -14437,19 +14740,19 @@ fi
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -8530,7 +8581,7 @@
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
case `$LD -v 2>&1 </dev/null` in
-@@ -14451,8 +14751,8 @@ case `$LD -v 2>&1 </dev/null` in
+@@ -14461,8 +14764,8 @@ case `$LD -v 2>&1 </dev/null` in
;;
esac
fi
@@ -8541,7 +8592,7 @@
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -14506,8 +14806,8 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
+@@ -14516,8 +14819,8 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
fi
# PORTME: fill in a description of your system's C++ link characteristics
@@ -8552,7 +8603,7 @@
ld_shlibs_CXX=yes
case $host_os in
aix3*)
-@@ -14596,6 +14896,7 @@ echo $ECHO_N "checking whether the $comp
+@@ -14606,6 +14909,7 @@ echo $ECHO_N "checking whether the $comp
fi
fi
@@ -8560,7 +8611,7 @@
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to
# export.
-@@ -14627,18 +14928,21 @@ case "(($ac_try" in
+@@ -14637,18 +14941,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8586,7 +8637,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -14653,12 +14957,13 @@ if test -z "$aix_libpath"; then
+@@ -14663,12 +14970,13 @@ if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
@@ -8601,7 +8652,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -14695,18 +15000,21 @@ case "(($ac_try" in
+@@ -14705,18 +15013,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8627,7 +8678,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -14721,12 +15029,13 @@ if test -z "$aix_libpath"; then
+@@ -14731,12 +15042,13 @@ if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
@@ -8642,7 +8693,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -14766,7 +15075,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14776,7 +15088,7 @@ if test -z "$aix_libpath"; then aix_libp
esac
;;
@@ -8651,7 +8702,7 @@
# _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_CXX='-L$libdir'
-@@ -14799,7 +15108,11 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14809,7 +15121,11 @@ if test -z "$aix_libpath"; then aix_libp
whole_archive_flag_spec_CXX=''
link_all_deplibs_CXX=yes
allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
@@ -8664,7 +8715,7 @@
output_verbose_link_cmd=echo
archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-@@ -15468,8 +15781,8 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15478,8 +15794,8 @@ if test -z "$aix_libpath"; then aix_libp
;;
esac
@@ -8675,7 +8726,7 @@
test "$ld_shlibs_CXX" = no && can_build_shared=no
GCC_CXX="$GXX"
-@@ -15499,7 +15812,7 @@ _LT_EOF
+@@ -15509,7 +15825,7 @@ _LT_EOF
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8684,7 +8735,7 @@
(exit $ac_status); }; then
# Parse the compiler output and extract the necessary
# objects, libraries and library flags.
-@@ -15681,8 +15994,8 @@ fi
+@@ -15691,8 +16007,8 @@ fi
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -8695,7 +8746,7 @@
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
-@@ -15716,7 +16029,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -15726,7 +16042,7 @@ echo $ECHO_N "checking for $compiler opt
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes.
;;
@@ -8704,7 +8755,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
-@@ -15742,10 +16055,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -15752,10 +16068,11 @@ echo $ECHO_N "checking for $compiler opt
fi
;;
hpux*)
@@ -8719,7 +8770,7 @@
;;
*)
lt_prog_compiler_pic_CXX='-fPIC'
-@@ -15843,12 +16157,19 @@ echo $ECHO_N "checking for $compiler opt
+@@ -15853,12 +16170,19 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_wl_CXX='--backend -Wl,'
lt_prog_compiler_pic_CXX='-fPIC'
;;
@@ -8741,7 +8792,7 @@
pgCC* | pgcpp*)
# Portland Group C++ compiler
lt_prog_compiler_wl_CXX='-Wl,'
-@@ -15990,8 +16311,8 @@ case $host_os in
+@@ -16000,8 +16324,8 @@ case $host_os in
lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
;;
esac
@@ -8752,7 +8803,7 @@
-@@ -15999,10 +16320,10 @@ echo "${ECHO_T}$lt_prog_compiler_pic_CXX
+@@ -16009,10 +16333,10 @@ echo "${ECHO_T}$lt_prog_compiler_pic_CXX
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic_CXX"; then
@@ -8766,21 +8817,21 @@
else
lt_cv_prog_compiler_pic_works_CXX=no
ac_outfile=conftest.$ac_objext
-@@ -16017,11 +16338,11 @@ else
+@@ -16027,11 +16351,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16020: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16341: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16030: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16354: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16024: \$? = $ac_status" >&5
-+ echo "$as_me:16345: \$? = $ac_status" >&5
+- echo "$as_me:16034: \$? = $ac_status" >&5
++ echo "$as_me:16358: \$? = $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.
-@@ -16034,8 +16355,8 @@ else
+@@ -16044,8 +16368,8 @@ else
$RM conftest*
fi
@@ -8791,7 +8842,7 @@
if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
-@@ -16055,10 +16376,10 @@ fi
+@@ -16065,10 +16389,10 @@ fi
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
@@ -8805,7 +8856,7 @@
else
lt_cv_prog_compiler_static_works_CXX=no
save_LDFLAGS="$LDFLAGS"
-@@ -16083,8 +16404,8 @@ else
+@@ -16093,8 +16417,8 @@ else
LDFLAGS="$save_LDFLAGS"
fi
@@ -8816,7 +8867,7 @@
if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
:
-@@ -16095,10 +16416,10 @@ fi
+@@ -16105,10 +16429,10 @@ fi
@@ -8830,21 +8881,21 @@
else
lt_cv_prog_compiler_c_o_CXX=no
$RM -r conftest 2>/dev/null
-@@ -16116,11 +16437,11 @@ else
+@@ -16126,11 +16450,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16119: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16440: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16129: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16453: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16123: \$? = $ac_status" >&5
-+ echo "$as_me:16444: \$? = $ac_status" >&5
+- echo "$as_me:16133: \$? = $ac_status" >&5
++ echo "$as_me:16457: \$? = $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
-@@ -16142,15 +16463,15 @@ else
+@@ -16152,15 +16476,15 @@ else
$RM conftest*
fi
@@ -8865,21 +8916,21 @@
else
lt_cv_prog_compiler_c_o_CXX=no
$RM -r conftest 2>/dev/null
-@@ -16168,11 +16489,11 @@ else
+@@ -16178,11 +16502,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16171: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16492: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16181: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16505: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16175: \$? = $ac_status" >&5
-+ echo "$as_me:16496: \$? = $ac_status" >&5
+- echo "$as_me:16185: \$? = $ac_status" >&5
++ echo "$as_me:16509: \$? = $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
-@@ -16194,8 +16515,8 @@ else
+@@ -16204,8 +16528,8 @@ else
$RM conftest*
fi
@@ -8890,7 +8941,7 @@
-@@ -16203,19 +16524,19 @@ echo "${ECHO_T}$lt_cv_prog_compiler_c_o_
+@@ -16213,19 +16537,19 @@ echo "${ECHO_T}$lt_cv_prog_compiler_c_o_
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
@@ -8916,7 +8967,7 @@
need_locks=warn
fi
else
-@@ -16224,8 +16545,8 @@ fi
+@@ -16234,8 +16558,8 @@ fi
@@ -8927,7 +8978,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
-@@ -16241,7 +16562,7 @@ echo $ECHO_N "checking whether the $comp
+@@ -16251,7 +16575,7 @@ echo $ECHO_N "checking whether the $comp
pw32*)
export_symbols_cmds_CXX="$ltdll_cmds"
;;
@@ -8936,7 +8987,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
;;
linux* | k*bsd*-gnu)
-@@ -16253,8 +16574,8 @@ echo $ECHO_N "checking whether the $comp
+@@ -16263,8 +16587,8 @@ echo $ECHO_N "checking whether the $comp
esac
exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
@@ -8947,7 +8998,7 @@
test "$ld_shlibs_CXX" = no && can_build_shared=no
with_gnu_ld_CXX=$with_gnu_ld
-@@ -16281,15 +16602,15 @@ x|xyes)
+@@ -16291,15 +16615,15 @@ x|xyes)
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -8966,7 +9017,7 @@
(exit $ac_status); } 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -16307,7 +16628,7 @@ echo $ECHO_N "checking whether -lc shoul
+@@ -16317,7 +16641,7 @@ echo $ECHO_N "checking whether -lc shoul
if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
(eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
@@ -8975,7 +9026,7 @@
(exit $ac_status); }
then
archive_cmds_need_lc_CXX=no
-@@ -16319,8 +16640,8 @@ echo $ECHO_N "checking whether -lc shoul
+@@ -16329,8 +16653,8 @@ echo $ECHO_N "checking whether -lc shoul
cat conftest.err 1>&5
fi
$RM conftest*
@@ -8986,7 +9037,7 @@
;;
esac
fi
-@@ -16390,8 +16711,8 @@ esac
+@@ -16400,8 +16724,8 @@ esac
@@ -8997,7 +9048,7 @@
library_names_spec=
libname_spec='lib$name'
-@@ -16502,14 +16823,14 @@ bsdi[45]*)
+@@ -16512,14 +16836,14 @@ bsdi[45]*)
# libtool to hard-code these into programs
;;
@@ -9014,7 +9065,7 @@
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
-@@ -16532,7 +16853,7 @@ cygwin* | mingw* | pw32*)
+@@ -16542,7 +16866,7 @@ cygwin* | mingw* | pw32*)
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
;;
@@ -9023,7 +9074,7 @@
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-@@ -16781,29 +17102,33 @@ case "(($ac_try" in
+@@ -16791,29 +17115,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9062,7 +9113,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LDFLAGS=$save_LDFLAGS
-@@ -17012,7 +17337,7 @@ tpf*)
+@@ -17022,7 +17350,7 @@ tpf*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -9071,7 +9122,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
-@@ -17029,8 +17354,8 @@ uts4*)
+@@ -17039,8 +17367,8 @@ uts4*)
dynamic_linker=no
;;
esac
@@ -9082,7 +9133,7 @@
test "$dynamic_linker" = no && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -17080,8 +17405,8 @@ fi
+@@ -17090,8 +17418,8 @@ fi
@@ -9093,7 +9144,7 @@
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" ||
test -n "$runpath_var_CXX" ||
-@@ -17105,8 +17430,8 @@ else
+@@ -17115,8 +17443,8 @@ else
# directories.
hardcode_action_CXX=unsupported
fi
@@ -9104,7 +9155,7 @@
if test "$hardcode_action_CXX" = relink ||
test "$inherit_rpath_CXX" = yes; then
-@@ -17147,10 +17472,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -17157,10 +17485,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Extract the first word of "glib-genmarshal", so it can be a program name with args.
set dummy glib-genmarshal; ac_word=$2
@@ -9118,7 +9169,7 @@
else
case $GLIB_GENMARSHAL in
[\\/]* | ?:[\\/]*)
-@@ -17165,7 +17490,7 @@ do
+@@ -17175,7 +17503,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext"
@@ -9127,7 +9178,7 @@
break 2
fi
done
-@@ -17177,20 +17502,20 @@ esac
+@@ -17187,20 +17515,20 @@ esac
fi
GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
if test -n "$GLIB_GENMARSHAL"; then
@@ -9155,7 +9206,7 @@
else
case $GLIB_MKENUMS in
[\\/]* | ?:[\\/]*)
-@@ -17205,7 +17530,7 @@ do
+@@ -17215,7 +17543,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GLIB_MKENUMS="$as_dir/$ac_word$ac_exec_ext"
@@ -9164,7 +9215,7 @@
break 2
fi
done
-@@ -17217,11 +17542,11 @@ esac
+@@ -17227,11 +17555,11 @@ esac
fi
GLIB_MKENUMS=$ac_cv_path_GLIB_MKENUMS
if test -n "$GLIB_MKENUMS"; then
@@ -9180,7 +9231,7 @@
fi
-@@ -17256,24 +17581,25 @@ case "(($ac_try" in
+@@ -17266,24 +17594,25 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9211,7 +9262,7 @@
{ (exit 1); exit 1; }; }
fi
-@@ -17286,8 +17612,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -17296,8 +17625,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -9222,7 +9273,7 @@
# Check whether --enable-nls was given.
if test "${enable_nls+set}" = set; then
enableval=$enable_nls; USE_NLS=$enableval
-@@ -17295,16 +17621,16 @@ else
+@@ -17305,16 +17634,16 @@ else
USE_NLS=yes
fi
@@ -9243,7 +9294,7 @@
{ (exit 1); exit 1; }; }
;;
*)
-@@ -17312,27 +17638,27 @@ echo "$as_me: error: Automake 1.5 or new
+@@ -17322,27 +17651,27 @@ echo "$as_me: error: Automake 1.5 or new
esac
if test -n "0.40.0"; then
@@ -9280,7 +9331,7 @@
else
case $INTLTOOL_UPDATE in
[\\/]* | ?:[\\/]*)
-@@ -17347,7 +17673,7 @@ do
+@@ -17357,7 +17686,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
@@ -9289,7 +9340,7 @@
break 2
fi
done
-@@ -17359,20 +17685,20 @@ esac
+@@ -17369,20 +17698,20 @@ esac
fi
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
if test -n "$INTLTOOL_UPDATE"; then
@@ -9317,7 +9368,7 @@
else
case $INTLTOOL_MERGE in
[\\/]* | ?:[\\/]*)
-@@ -17387,7 +17713,7 @@ do
+@@ -17397,7 +17726,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
@@ -9326,7 +9377,7 @@
break 2
fi
done
-@@ -17399,20 +17725,20 @@ esac
+@@ -17409,20 +17738,20 @@ esac
fi
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
if test -n "$INTLTOOL_MERGE"; then
@@ -9354,7 +9405,7 @@
else
case $INTLTOOL_EXTRACT in
[\\/]* | ?:[\\/]*)
-@@ -17427,7 +17753,7 @@ do
+@@ -17437,7 +17766,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
@@ -9363,7 +9414,7 @@
break 2
fi
done
-@@ -17439,17 +17765,17 @@ esac
+@@ -17449,17 +17778,17 @@ esac
fi
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
if test -n "$INTLTOOL_EXTRACT"; then
@@ -9387,7 +9438,7 @@
{ (exit 1); exit 1; }; }
fi
-@@ -17496,10 +17822,10 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
+@@ -17582,10 +17911,10 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
# Check the gettext tools to make sure they are GNU
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -9401,7 +9452,7 @@
else
case $XGETTEXT in
[\\/]* | ?:[\\/]*)
-@@ -17514,7 +17840,7 @@ do
+@@ -17600,7 +17929,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
@@ -9410,7 +9461,7 @@
break 2
fi
done
-@@ -17526,20 +17852,20 @@ esac
+@@ -17612,20 +17941,20 @@ esac
fi
XGETTEXT=$ac_cv_path_XGETTEXT
if test -n "$XGETTEXT"; then
@@ -9438,7 +9489,7 @@
else
case $MSGMERGE in
[\\/]* | ?:[\\/]*)
-@@ -17554,7 +17880,7 @@ do
+@@ -17640,7 +17969,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
@@ -9447,7 +9498,7 @@
break 2
fi
done
-@@ -17566,20 +17892,20 @@ esac
+@@ -17652,20 +17981,20 @@ esac
fi
MSGMERGE=$ac_cv_path_MSGMERGE
if test -n "$MSGMERGE"; then
@@ -9475,7 +9526,7 @@
else
case $MSGFMT in
[\\/]* | ?:[\\/]*)
-@@ -17594,7 +17920,7 @@ do
+@@ -17680,7 +18009,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
@@ -9484,7 +9535,7 @@
break 2
fi
done
-@@ -17606,20 +17932,20 @@ esac
+@@ -17692,20 +18021,20 @@ esac
fi
MSGFMT=$ac_cv_path_MSGFMT
if test -n "$MSGFMT"; then
@@ -9512,7 +9563,7 @@
else
case $GMSGFMT in
[\\/]* | ?:[\\/]*)
-@@ -17634,7 +17960,7 @@ do
+@@ -17720,7 +18049,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
@@ -9521,7 +9572,7 @@
break 2
fi
done
-@@ -17647,34 +17973,34 @@ esac
+@@ -17733,34 +18062,34 @@ esac
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -9567,7 +9618,7 @@
else
case $INTLTOOL_PERL in
[\\/]* | ?:[\\/]*)
-@@ -17689,7 +18015,7 @@ do
+@@ -17775,7 +18104,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
@@ -9576,7 +9627,7 @@
break 2
fi
done
-@@ -17701,33 +18027,33 @@ esac
+@@ -17787,40 +18116,40 @@ esac
fi
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
if test -n "$INTLTOOL_PERL"; then
@@ -9593,18 +9644,29 @@
if test -z "$INTLTOOL_PERL"; then
-- { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
--echo "$as_me: error: perl not found; required for intltool" >&2;}
-+ { { $as_echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
-+$as_echo "$as_me: error: perl not found; required for intltool" >&2;}
+- { { echo "$as_me:$LINENO: error: perl not found" >&5
+-echo "$as_me: error: perl not found" >&2;}
++ { { $as_echo "$as_me:$LINENO: error: perl not found" >&5
++$as_echo "$as_me: error: perl not found" >&2;}
{ (exit 1); exit 1; }; }
fi
- if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
-- { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
--echo "$as_me: error: perl 5.x required for intltool" >&2;}
-+ { { $as_echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
-+$as_echo "$as_me: error: perl 5.x required for intltool" >&2;}
+-{ echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5
+-echo $ECHO_N "checking for perl >= 5.8.1... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5
++$as_echo_n "checking for perl >= 5.8.1... " >&6; }
+ $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+ if test $? -ne 0; then
+- { { echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
+-echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
++ { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
++$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
{ (exit 1); exit 1; }; }
+ else
+ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+- { echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
+-echo "${ECHO_T}$IT_PERL_VERSION" >&6; }
++ { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
++$as_echo "$IT_PERL_VERSION" >&6; }
fi
if test "x" != "xno-xml"; then
- { echo "$as_me:$LINENO: checking for XML::Parser" >&5
@@ -9624,7 +9686,7 @@
{ (exit 1); exit 1; }; }
fi
fi
-@@ -17760,29 +18086,32 @@ case "(($ac_try" in
+@@ -17853,29 +18182,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9665,7 +9727,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -17835,32 +18164,36 @@ case "(($ac_try" in
+@@ -17928,32 +18260,36 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9710,7 +9772,7 @@
DATADIRNAME=share
else
DATADIRNAME=lib
-@@ -17873,6 +18206,7 @@ fi
+@@ -17966,6 +18302,7 @@ fi
esac
fi
@@ -9718,7 +9780,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -17888,10 +18222,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" !=
+@@ -17981,10 +18318,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" !=
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
@@ -9732,7 +9794,7 @@
else
case $PKG_CONFIG in
[\\/]* | ?:[\\/]*)
-@@ -17906,7 +18240,7 @@ do
+@@ -17999,7 +18336,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
@@ -9741,7 +9803,7 @@
break 2
fi
done
-@@ -17918,11 +18252,11 @@ esac
+@@ -18011,11 +18348,11 @@ esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -9757,7 +9819,7 @@
fi
-@@ -17931,10 +18265,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the
+@@ -18024,10 +18361,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the
ac_pt_PKG_CONFIG=$PKG_CONFIG
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -9771,7 +9833,7 @@
else
case $ac_pt_PKG_CONFIG in
[\\/]* | ?:[\\/]*)
-@@ -17949,7 +18283,7 @@ do
+@@ -18042,7 +18379,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
@@ -9780,7 +9842,7 @@
break 2
fi
done
-@@ -17961,11 +18295,11 @@ esac
+@@ -18054,11 +18391,11 @@ esac
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -9796,7 +9858,7 @@
fi
if test "x$ac_pt_PKG_CONFIG" = x; then
-@@ -17973,12 +18307,8 @@ fi
+@@ -18066,12 +18403,8 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9811,7 +9873,7 @@
ac_tool_warned=yes ;;
esac
PKG_CONFIG=$ac_pt_PKG_CONFIG
-@@ -17990,14 +18320,14 @@ fi
+@@ -18083,14 +18416,14 @@ fi
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -9832,7 +9894,7 @@
PKG_CONFIG=""
fi
-@@ -18054,8 +18384,8 @@ fi
+@@ -18147,8 +18480,8 @@ fi
for option in -Wno-sign-compare; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
@@ -9843,7 +9905,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -18077,20 +18407,21 @@ case "(($ac_try" in
+@@ -18170,20 +18503,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9868,7 +9930,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
has_option=no
-@@ -18098,8 +18429,8 @@ fi
+@@ -18191,8 +18525,8 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$SAVE_CFLAGS"
@@ -9879,7 +9941,7 @@
if test $has_option = yes; then
warning_flags="$warning_flags $option"
fi
-@@ -18112,16 +18443,16 @@ echo "${ECHO_T}$has_option" >&6; }
+@@ -18205,16 +18539,16 @@ echo "${ECHO_T}$has_option" >&6; }
fi
;;
*)
@@ -9902,7 +9964,7 @@
# Check whether --enable-iso-c was given.
if test "${enable_iso_c+set}" = set; then
-@@ -18131,8 +18462,8 @@ else
+@@ -18224,8 +18558,8 @@ else
fi
@@ -9913,7 +9975,7 @@
complCFLAGS=
if test "x$enable_iso_c" != "xno"; then
if test "x$GCC" = "xyes"; then
-@@ -18146,8 +18477,8 @@ echo $ECHO_N "checking what language com
+@@ -18239,8 +18573,8 @@ echo $ECHO_N "checking what language com
esac
fi
fi
@@ -9924,7 +9986,7 @@
WARN_CFLAGS="$warning_flags $complCFLAGS"
-@@ -18161,8 +18492,8 @@ else
+@@ -18254,8 +18588,8 @@ else
fi
@@ -9935,7 +9997,7 @@
warnCXXFLAGS=
if test "x$GXX" != xyes; then
enable_cxx_warnings=no
-@@ -18181,8 +18512,8 @@ echo $ECHO_N "checking what warning flag
+@@ -18274,8 +18608,8 @@ echo $ECHO_N "checking what warning flag
fi
fi
fi
@@ -9946,7 +10008,7 @@
# Check whether --enable-iso-cxx was given.
if test "${enable_iso_cxx+set}" = set; then
-@@ -18192,8 +18523,8 @@ else
+@@ -18285,8 +18619,8 @@ else
fi
@@ -9957,7 +10019,7 @@
complCXXFLAGS=
if test "x$enable_iso_cxx" != "xno"; then
if test "x$GXX" = "xyes"; then
-@@ -18208,8 +18539,8 @@ echo $ECHO_N "checking what language com
+@@ -18301,8 +18635,8 @@ echo $ECHO_N "checking what language com
esac
fi
fi
@@ -9968,7 +10030,7 @@
WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
-@@ -18245,20 +18576,20 @@ LIBCANBERRA_GTK_REQUIRED=0.3
+@@ -18338,20 +18672,20 @@ LIBCANBERRA_GTK_REQUIRED=0.3
DBUS_GLIB_REQUIRED=0.35
if test -n "$PKG_CONFIG" && \
@@ -9993,7 +10055,7 @@
(exit $ac_status); }; then
have_libcanberra_gtk=yes
else
-@@ -18286,15 +18617,15 @@ fi
+@@ -18379,15 +18713,15 @@ fi
pkg_failed=no
@@ -10012,7 +10074,7 @@
glib-2.0 >= \$GLIB_REQUIRED
gmodule-2.0
gio-unix-2.0 >= \$GLIB_REQUIRED
-@@ -18329,7 +18660,7 @@ if test -n "$PKG_CONFIG"; then
+@@ -18422,7 +18756,7 @@ if test -n "$PKG_CONFIG"; then
$LIBNOTIFY_PACKAGE
") 2>&5
ac_status=$?
@@ -10021,7 +10083,7 @@
(exit $ac_status); }; then
pkg_cv_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "
glib-2.0 >= $GLIB_REQUIRED
-@@ -18360,7 +18691,7 @@ if test -n "$PKG_CONFIG"; then
+@@ -18453,7 +18787,7 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_DEPENDENCIES_LIBS="$DEPENDENCIES_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -10030,7 +10092,7 @@
glib-2.0 >= \$GLIB_REQUIRED
gmodule-2.0
gio-unix-2.0 >= \$GLIB_REQUIRED
-@@ -18395,7 +18726,7 @@ if test -n "$PKG_CONFIG"; then
+@@ -18488,7 +18822,7 @@ if test -n "$PKG_CONFIG"; then
$LIBNOTIFY_PACKAGE
") 2>&5
ac_status=$?
@@ -10039,7 +10101,7 @@
(exit $ac_status); }; then
pkg_cv_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "
glib-2.0 >= $GLIB_REQUIRED
-@@ -18471,7 +18802,7 @@ fi
+@@ -18564,7 +18898,7 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$DEPENDENCIES_PKG_ERRORS" >&5
@@ -10048,7 +10110,7 @@
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
gio-unix-2.0 >= $GLIB_REQUIRED
-@@ -18498,7 +18829,7 @@ Alternatively, you may set the environme
+@@ -18591,7 +18925,7 @@ Alternatively, you may set the environme
and DEPENDENCIES_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
@@ -10057,7 +10119,7 @@
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
gio-unix-2.0 >= $GLIB_REQUIRED
-@@ -18527,7 +18858,9 @@ See the pkg-config man page for more det
+@@ -18620,7 +18954,9 @@ See the pkg-config man page for more det
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -10068,7 +10130,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -18537,7 +18870,7 @@ See the pkg-config man page for more det
+@@ -18630,7 +18966,7 @@ See the pkg-config man page for more det
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
@@ -10077,7 +10139,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -18547,12 +18880,12 @@ See the pkg-config man page for more det
+@@ -18640,12 +18976,12 @@ See the pkg-config man page for more det
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
@@ -10093,7 +10155,7 @@
:
fi
-@@ -18564,18 +18897,18 @@ fi
+@@ -18657,18 +18993,18 @@ fi
pkg_failed=no
@@ -10116,7 +10178,7 @@
(exit $ac_status); }; then
pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null`
else
-@@ -18590,10 +18923,10 @@ if test -n "$PKG_CONFIG"; then
+@@ -18683,10 +19019,10 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_DBUS_LIBS="$DBUS_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -10129,7 +10191,7 @@
(exit $ac_status); }; then
pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null`
else
-@@ -18621,7 +18954,7 @@ fi
+@@ -18714,7 +19050,7 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$DBUS_PKG_ERRORS" >&5
@@ -10138,7 +10200,7 @@
$DBUS_PKG_ERRORS
-@@ -18632,7 +18965,7 @@ Alternatively, you may set the environme
+@@ -18725,7 +19061,7 @@ Alternatively, you may set the environme
and DBUS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
@@ -10147,7 +10209,7 @@
$DBUS_PKG_ERRORS
-@@ -18645,7 +18978,9 @@ See the pkg-config man page for more det
+@@ -18738,7 +19074,9 @@ See the pkg-config man page for more det
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -10158,7 +10220,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -18655,7 +18990,7 @@ See the pkg-config man page for more det
+@@ -18748,7 +19086,7 @@ See the pkg-config man page for more det
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
@@ -10167,7 +10229,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -18665,12 +19000,12 @@ See the pkg-config man page for more det
+@@ -18758,12 +19096,12 @@ See the pkg-config man page for more det
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
@@ -10183,7 +10245,7 @@
:
fi
-@@ -18678,10 +19013,10 @@ fi
+@@ -18771,10 +19109,10 @@ fi
# Extract the first word of "dbus-binding-tool", so it can be a program name with args.
set dummy dbus-binding-tool; ac_word=$2
@@ -10197,7 +10259,7 @@
else
case $DBUS_BINDING_TOOL in
[\\/]* | ?:[\\/]*)
-@@ -18696,7 +19031,7 @@ do
+@@ -18789,7 +19127,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_DBUS_BINDING_TOOL="$as_dir/$ac_word$ac_exec_ext"
@@ -10206,7 +10268,7 @@
break 2
fi
done
-@@ -18709,18 +19044,18 @@ esac
+@@ -18802,18 +19140,18 @@ esac
fi
DBUS_BINDING_TOOL=$ac_cv_path_DBUS_BINDING_TOOL
if test -n "$DBUS_BINDING_TOOL"; then
@@ -10231,7 +10293,7 @@
{ (exit 1); exit 1; }; }
fi
-@@ -18743,8 +19078,8 @@ fi
+@@ -18836,8 +19174,8 @@ fi
@@ -10242,7 +10304,7 @@
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-@@ -18758,15 +19093,15 @@ fi
+@@ -18851,15 +19189,15 @@ fi
@@ -10262,7 +10324,7 @@
{ (exit 1); exit 1; }; } ;;
esac
fi
-@@ -18783,10 +19118,10 @@ fi
+@@ -18876,10 +19214,10 @@ fi
# Extract the first word of "gconftool-2", so it can be a program name with args.
set dummy gconftool-2; ac_word=$2
@@ -10276,7 +10338,7 @@
else
case $GCONFTOOL in
[\\/]* | ?:[\\/]*)
-@@ -18801,7 +19136,7 @@ do
+@@ -18894,7 +19232,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
@@ -10285,7 +10347,7 @@
break 2
fi
done
-@@ -18814,18 +19149,18 @@ esac
+@@ -18907,18 +19245,18 @@ esac
fi
GCONFTOOL=$ac_cv_path_GCONFTOOL
if test -n "$GCONFTOOL"; then
@@ -10310,7 +10372,7 @@
{ (exit 1); exit 1; }; }
fi
-@@ -18836,11 +19171,11 @@ fi
+@@ -18929,11 +19267,11 @@ fi
for ac_func in mkdtemp
do
@@ -10326,7 +10388,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -18893,35 +19228,42 @@ case "(($ac_try" in
+@@ -18986,35 +19324,42 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10379,7 +10441,7 @@
_ACEOF
fi
-@@ -18932,20 +19274,21 @@ done
+@@ -19025,20 +19370,21 @@ done
for ac_header in execinfo.h
do
@@ -10410,7 +10472,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -18961,32 +19304,33 @@ case "(($ac_try" in
+@@ -19054,32 +19400,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10451,7 +10513,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -19000,51 +19344,52 @@ case "(($ac_try" in
+@@ -19093,51 +19440,52 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10525,7 +10587,7 @@
( cat <<\_ASBOX
## ----------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany ##
-@@ -19053,21 +19398,24 @@ _ASBOX
+@@ -19146,21 +19494,24 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -10558,7 +10620,7 @@
_ACEOF
fi
-@@ -19089,10 +19437,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -19182,10 +19533,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $_FLAGS"
@@ -10572,7 +10634,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -19108,20 +19456,21 @@ case "(($ac_try" in
+@@ -19201,20 +19552,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10597,7 +10659,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_have_declaration_after_statement="no"
-@@ -19129,8 +19478,8 @@ fi
+@@ -19222,8 +19574,8 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -10608,7 +10670,7 @@
if test "$ac_cv_have_declaration_after_statement" = "yes"; then
MORE_WARN_FLAGS="$MORE_WARN_FLAGS $_FLAGS"
-@@ -19153,10 +19502,10 @@ for ac_prog in gawk mawk nawk awk
+@@ -19246,10 +19598,10 @@ for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -10622,7 +10684,7 @@
else
if test -n "$AWK"; then
ac_cv_prog_AWK="$AWK" # Let the user override the test.
-@@ -19169,7 +19518,7 @@ do
+@@ -19262,7 +19614,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AWK="$ac_prog"
@@ -10631,7 +10693,7 @@
break 2
fi
done
-@@ -19180,11 +19529,11 @@ fi
+@@ -19273,11 +19625,11 @@ fi
fi
AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
@@ -10647,7 +10709,7 @@
fi
-@@ -19196,8 +19545,8 @@ done
+@@ -19289,8 +19641,8 @@ done
# Check which gecko to use
# ************************
@@ -10658,7 +10720,7 @@
# Check whether --with-gecko was given.
-@@ -19230,25 +19579,25 @@ if test -z "$gecko_cv_gecko"; then
+@@ -19323,25 +19675,25 @@ if test -z "$gecko_cv_gecko"; then
done
fi
@@ -10692,7 +10754,7 @@
# Check whether --with-gecko-home was given.
-@@ -19331,10 +19680,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+@@ -19424,10 +19776,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
_SAVE_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS -fshort-wchar"
@@ -10706,7 +10768,7 @@
else
if test "$cross_compiling" = yes; then
gecko_cv_have_usable_wchar_option="maybe (cross-compiling)"
-@@ -19356,36 +19705,39 @@ case "(($ac_try" in
+@@ -19449,36 +19801,39 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10754,7 +10816,7 @@
CXXFLAGS="$_SAVE_CXXFLAGS"
-@@ -19409,8 +19761,8 @@ fi # if gecko_cv_have_gecko
+@@ -19502,8 +19857,8 @@ fi # if gecko_cv_have_gecko
if test "$gecko_cv_have_gecko" = "yes"; then
@@ -10765,7 +10827,7 @@
# Check whether --enable-cpp-rtti was given.
if test "${enable_cpp_rtti+set}" = set; then
enableval=$enable_cpp_rtti;
-@@ -19418,8 +19770,8 @@ else
+@@ -19511,8 +19866,8 @@ else
enable_cpp_rtti=no
fi
@@ -10776,7 +10838,7 @@
if test "$enable_cpp_rtti" = "no"; then
_GECKO_EXTRA_CXXFLAGS="-fno-rtti $_GECKO_EXTRA_CXXFLAGS"
-@@ -19444,8 +19796,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+@@ -19537,8 +19892,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
_SAVE_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS"
@@ -10787,7 +10849,7 @@
if test "$cross_compiling" = yes; then
result=maybe
else
-@@ -19473,40 +19825,43 @@ case "(($ac_try" in
+@@ -19566,40 +19921,43 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10843,7 +10905,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -19525,31 +19880,32 @@ case "(($ac_try" in
+@@ -19618,31 +19976,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10883,7 +10945,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -19568,28 +19924,29 @@ case "(($ac_try" in
+@@ -19661,28 +20020,29 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10918,7 +10980,7 @@
CPPFLAGS="$_SAVE_CPPFLAGS"
-@@ -19637,10 +19994,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+@@ -19730,10 +20090,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
_SAVE_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $_GECKO_CFLAGS"
@@ -10932,7 +10994,7 @@
else
if test "$cross_compiling" = yes; then
gecko_cv_gecko_version="1.7"
-@@ -19696,41 +20053,46 @@ case "(($ac_try" in
+@@ -19789,41 +20149,46 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10990,7 +11052,7 @@
CPPFLAGS="$_SAVE_CPPFLAGS"
-@@ -19744,8 +20106,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -19837,8 +20202,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
gecko_cv_gecko_version_int="$(echo "$gecko_cv_gecko_version" | $AWK -F . '{print $1 * 1000000 + $2 * 1000 + $3}')"
if test "$gecko_cv_gecko_version_int" -lt "1007000" -o "$gecko_cv_gecko_version_int" -gt "1009000"; then
@@ -11001,7 +11063,7 @@
{ (exit 1); exit 1; }; }
fi
-@@ -19784,10 +20146,10 @@ fi
+@@ -19877,10 +20242,10 @@ fi
if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
if test -n "$PKG_CONFIG" && \
@@ -11014,7 +11076,7 @@
(exit $ac_status); }; then
gecko_cv_have_gecko_1_9_1=yes gecko_cv_gecko_version="1.9.1" gecko_cv_gecko_version_int=1009001
else
-@@ -19843,14 +20205,14 @@ GECKO_GLUE_LIBS="$gecko_cv_glue_libs"
+@@ -19936,14 +20301,14 @@ GECKO_GLUE_LIBS="$gecko_cv_glue_libs"
if test "$gecko_cv_gecko_version_int" -lt "1008000"; then
@@ -11033,7 +11095,7 @@
{ (exit 1); exit 1; }; }
fi
-@@ -19858,8 +20220,8 @@ case "$gecko_cv_gecko" in
+@@ -19951,8 +20316,8 @@ case "$gecko_cv_gecko" in
xulrunner) min_version=1.8 ;;
libxul*) min_version=1.9 ;;
*firefox) min_version=1.5 ;;
@@ -11044,7 +11106,7 @@
{ (exit 1); exit 1; }; } ;;
esac
-@@ -19878,13 +20240,13 @@ else
+@@ -19971,13 +20336,13 @@ else
GECKO_LIBS="$GECKO_LIBS `pkg-config --libs ${gecko_cv_gecko}`"
fi
@@ -11064,7 +11126,7 @@
gecko_nspr=
if $PKG_CONFIG --exists mozilla-nspr; then
gecko_nspr=mozilla-nspr
-@@ -19895,19 +20257,19 @@ echo $ECHO_N "checking nspr in system...
+@@ -19988,19 +20353,19 @@ echo $ECHO_N "checking nspr in system...
gecko_nspr=nspr
fi
if test -z "$gecko_nspr"; then
@@ -11090,7 +11152,7 @@
fi
-@@ -19939,10 +20301,10 @@ fi
+@@ -20032,10 +20397,10 @@ fi
# programs works at all, so we don't get false test failures below
@@ -11104,7 +11166,7 @@
else
gecko_cv_xpcom_program_check=no
-@@ -19950,11 +20312,13 @@ gecko_cv_xpcom_program_check=no
+@@ -20043,11 +20408,13 @@ gecko_cv_xpcom_program_check=no
if test "$gecko_cv_have_gecko" != "yes"; then
@@ -11121,7 +11183,7 @@
fi
ac_ext=cpp
-@@ -20092,29 +20456,32 @@ case "(($ac_try" in
+@@ -20185,29 +20552,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11160,7 +11222,7 @@
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-@@ -20135,17 +20502,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -20228,17 +20598,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -11185,7 +11247,7 @@
fi
-@@ -20156,11 +20525,13 @@ fi
+@@ -20249,11 +20621,13 @@ fi
if test "$gecko_cv_have_gecko" != "yes"; then
@@ -11202,7 +11264,7 @@
fi
ac_ext=cpp
-@@ -20206,20 +20577,21 @@ done
+@@ -20299,20 +20673,21 @@ done
for ac_header in nsIX509Cert.h
do
@@ -11233,7 +11295,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20235,32 +20607,33 @@ case "(($ac_try" in
+@@ -20328,32 +20703,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11274,7 +11336,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20274,51 +20647,52 @@ case "(($ac_try" in
+@@ -20367,51 +20743,52 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11348,7 +11410,7 @@
( cat <<\_ASBOX
## ----------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany ##
-@@ -20327,21 +20701,24 @@ _ASBOX
+@@ -20420,21 +20797,24 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -11381,7 +11443,7 @@
_ACEOF
have_psm=yes
else
-@@ -20367,8 +20744,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -20460,8 +20840,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Make sure we don't accidentally build without PSM support
@@ -11392,7 +11454,7 @@
# Check whether --enable-psm was given.
if test "${enable_psm+set}" = set; then
enableval=$enable_psm;
-@@ -20376,16 +20753,16 @@ else
+@@ -20469,16 +20849,16 @@ else
enable_psm=yes
fi
@@ -11415,7 +11477,7 @@
fi
if test "$enable_psm" = "yes" -a "$have_psm" = "yes"; then
-@@ -20398,8 +20775,8 @@ fi
+@@ -20491,8 +20871,8 @@ fi
# Check whether to enable our filepicker component
@@ -11426,7 +11488,7 @@
# Check whether --enable-filepicker was given.
if test "${enable_filepicker+set}" = set; then
enableval=$enable_filepicker;
-@@ -20407,8 +20784,8 @@ else
+@@ -20500,8 +20880,8 @@ else
enable_filepicker=yes
fi
@@ -11437,7 +11499,7 @@
if test "$enable_filepicker" = "yes"; then
-@@ -20424,11 +20801,13 @@ fi
+@@ -20517,11 +20897,13 @@ fi
if test "$gecko_cv_have_gecko" != "yes"; then
@@ -11454,7 +11516,7 @@
fi
ac_ext=cpp
-@@ -20474,20 +20853,21 @@ done
+@@ -20567,20 +20949,21 @@ done
for ac_header in nsINonBlockingAlertService.h
do
@@ -11485,7 +11547,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20503,32 +20883,33 @@ case "(($ac_try" in
+@@ -20596,32 +20979,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11526,7 +11588,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20542,51 +20923,52 @@ case "(($ac_try" in
+@@ -20635,51 +21019,52 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11600,7 +11662,7 @@
( cat <<\_ASBOX
## ----------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany ##
-@@ -20595,21 +20977,24 @@ _ASBOX
+@@ -20688,21 +21073,24 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -11633,7 +11695,7 @@
_ACEOF
fi
-@@ -20637,11 +21022,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -20730,11 +21118,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "$gecko_cv_have_gecko" != "yes"; then
@@ -11650,7 +11712,7 @@
fi
ac_ext=cpp
-@@ -20687,20 +21074,21 @@ done
+@@ -20780,20 +21170,21 @@ done
for ac_header in nsIGlobalHistory3.h
do
@@ -11681,7 +11743,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20716,32 +21104,33 @@ case "(($ac_try" in
+@@ -20809,32 +21200,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11722,7 +11784,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20755,51 +21144,52 @@ case "(($ac_try" in
+@@ -20848,51 +21240,52 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11796,7 +11858,7 @@
( cat <<\_ASBOX
## ----------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany ##
-@@ -20808,21 +21198,24 @@ _ASBOX
+@@ -20901,21 +21294,24 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -11829,7 +11891,7 @@
_ACEOF
fi
-@@ -20850,11 +21243,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -20943,11 +21339,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "$gecko_cv_have_gecko" != "yes"; then
@@ -11846,7 +11908,7 @@
fi
ac_ext=cpp
-@@ -20900,20 +21295,21 @@ done
+@@ -20993,20 +21391,21 @@ done
for ac_header in nsIIOService2.h
do
@@ -11877,7 +11939,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20929,32 +21325,33 @@ case "(($ac_try" in
+@@ -21022,32 +21421,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11918,7 +11980,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20968,51 +21365,52 @@ case "(($ac_try" in
+@@ -21061,51 +21461,52 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11992,7 +12054,7 @@
( cat <<\_ASBOX
## ----------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany ##
-@@ -21021,21 +21419,24 @@ _ASBOX
+@@ -21114,21 +21515,24 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -12025,7 +12087,7 @@
_ACEOF
fi
-@@ -21063,11 +21464,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -21156,11 +21560,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "$gecko_cv_have_gecko" != "yes"; then
@@ -12042,7 +12104,7 @@
fi
ac_ext=cpp
-@@ -21113,20 +21516,21 @@ done
+@@ -21206,20 +21612,21 @@ done
for ac_header in nsIMutableArray.h
do
@@ -12073,7 +12135,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -21142,32 +21546,33 @@ case "(($ac_try" in
+@@ -21235,32 +21642,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12114,7 +12176,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -21181,51 +21586,52 @@ case "(($ac_try" in
+@@ -21274,51 +21682,52 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12188,7 +12250,7 @@
( cat <<\_ASBOX
## ----------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany ##
-@@ -21234,21 +21640,24 @@ _ASBOX
+@@ -21327,21 +21736,24 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -12221,7 +12283,7 @@
_ACEOF
fi
-@@ -21275,11 +21684,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -21368,11 +21780,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "$gecko_cv_have_gecko" != "yes"; then
@@ -12238,7 +12300,7 @@
fi
ac_ext=cpp
-@@ -21325,20 +21736,21 @@ done
+@@ -21418,20 +21832,21 @@ done
for ac_header in mozISpellCheckingEngine.h
do
@@ -12269,7 +12331,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -21354,32 +21766,33 @@ case "(($ac_try" in
+@@ -21447,32 +21862,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12310,7 +12372,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -21393,51 +21806,52 @@ case "(($ac_try" in
+@@ -21486,51 +21902,52 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12384,7 +12446,7 @@
( cat <<\_ASBOX
## ----------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany ##
-@@ -21446,21 +21860,24 @@ _ASBOX
+@@ -21539,21 +21956,24 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -12417,7 +12479,7 @@
_ACEOF
have_gecko_spell_checker=yes
else
-@@ -21489,11 +21906,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -21582,11 +22002,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "$gecko_cv_have_gecko" != "yes"; then
@@ -12434,7 +12496,7 @@
fi
ac_ext=cpp
-@@ -21539,20 +21958,21 @@ done
+@@ -21632,20 +22054,21 @@ done
for ac_header in nsIBadCertListener.h
do
@@ -12465,7 +12527,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -21568,32 +21988,33 @@ case "(($ac_try" in
+@@ -21661,32 +22084,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12506,7 +12568,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -21607,51 +22028,52 @@ case "(($ac_try" in
+@@ -21700,51 +22124,52 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12580,7 +12642,7 @@
( cat <<\_ASBOX
## ----------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany ##
-@@ -21660,21 +22082,24 @@ _ASBOX
+@@ -21753,21 +22178,24 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -12613,7 +12675,7 @@
_ACEOF
have_nsibadcertlistener=yes
else
-@@ -21703,11 +22128,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -21796,11 +22224,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "$gecko_cv_have_gecko" != "yes"; then
@@ -12630,7 +12692,7 @@
fi
ac_ext=cpp
-@@ -21753,20 +22180,21 @@ done
+@@ -21846,20 +22276,21 @@ done
for ac_header in nsIDOMNSLocation.h
do
@@ -12661,7 +12723,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -21782,32 +22210,33 @@ case "(($ac_try" in
+@@ -21875,32 +22306,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12702,7 +12764,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -21821,51 +22250,52 @@ case "(($ac_try" in
+@@ -21914,51 +22346,52 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12776,7 +12838,7 @@
( cat <<\_ASBOX
## ----------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany ##
-@@ -21874,21 +22304,24 @@ _ASBOX
+@@ -21967,21 +22400,24 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -12809,7 +12871,7 @@
_ACEOF
fi
-@@ -21915,11 +22348,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -22008,11 +22444,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "$gecko_cv_have_gecko" != "yes"; then
@@ -12826,7 +12888,7 @@
fi
ac_ext=cpp
-@@ -22054,20 +22489,21 @@ case "(($ac_try" in
+@@ -22147,20 +22585,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12851,7 +12913,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
have_nsIClientAuthUserDecision=no
-@@ -22232,20 +22668,21 @@ fi
+@@ -22325,20 +22764,21 @@ fi
for ac_header in X11/XF86keysym.h
do
@@ -12882,7 +12944,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22261,32 +22698,33 @@ case "(($ac_try" in
+@@ -22354,32 +22794,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12923,7 +12985,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22300,51 +22738,52 @@ case "(($ac_try" in
+@@ -22393,51 +22834,52 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12997,7 +13059,7 @@
( cat <<\_ASBOX
## ----------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany ##
-@@ -22353,21 +22792,24 @@ _ASBOX
+@@ -22446,21 +22888,24 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -13030,7 +13092,7 @@
_ACEOF
fi
-@@ -22381,8 +22823,8 @@ done
+@@ -22474,8 +22919,8 @@ done
EPIPHANY_FEATURES=
@@ -13041,7 +13103,7 @@
# Check whether --enable-python was given.
if test "${enable_python+set}" = set; then
-@@ -22392,8 +22834,8 @@ else
+@@ -22485,8 +22930,8 @@ else
fi
@@ -13052,7 +13114,7 @@
if test "$have_python" != "no"; then
-@@ -22402,8 +22844,8 @@ if test "$have_python" != "no"; then
+@@ -22495,8 +22940,8 @@ if test "$have_python" != "no"; then
if test -n "$PYTHON"; then
# If the user set $PYTHON, use it and don't search something else.
@@ -13063,7 +13125,7 @@
prog="import sys, string
# split strings by '.' and convert to numeric. Append some zeros
# because we need at least 4 digits for the hex conversion.
-@@ -22416,11 +22858,11 @@ sys.exit(sys.hexversion < minverhex)"
+@@ -22509,11 +22954,11 @@ sys.exit(sys.hexversion < minverhex)"
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -13079,7 +13141,7 @@
{ (exit 1); exit 1; }; }
fi
-@@ -22428,10 +22870,10 @@ fi
+@@ -22521,10 +22966,10 @@ fi
else
# Otherwise, try each interpreter until we find one that satisfies
# VERSION.
@@ -13093,7 +13155,7 @@
else
for am_cv_pathless_PYTHON in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do
-@@ -22453,18 +22895,18 @@ fi
+@@ -22546,18 +22991,18 @@ fi
done
fi
@@ -13117,7 +13179,7 @@
else
case $PYTHON in
[\\/]* | ?:[\\/]*)
-@@ -22479,7 +22921,7 @@ do
+@@ -22572,7 +23017,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
@@ -13126,7 +13188,7 @@
break 2
fi
done
-@@ -22491,11 +22933,11 @@ esac
+@@ -22584,11 +23029,11 @@ esac
fi
PYTHON=$ac_cv_path_PYTHON
if test -n "$PYTHON"; then
@@ -13142,7 +13204,7 @@
fi
-@@ -22509,15 +22951,15 @@ fi
+@@ -22602,15 +23047,15 @@ fi
else
@@ -13163,7 +13225,7 @@
PYTHON_VERSION=$am_cv_python_version
-@@ -22528,30 +22970,30 @@ echo "${ECHO_T}$am_cv_python_version" >&
+@@ -22621,30 +23066,30 @@ echo "${ECHO_T}$am_cv_python_version" >&
@@ -13204,7 +13266,7 @@
pythondir=$am_cv_python_pythondir
-@@ -22559,16 +23001,16 @@ echo "${ECHO_T}$am_cv_python_pythondir"
+@@ -22652,16 +23097,16 @@ echo "${ECHO_T}$am_cv_python_pythondir"
pkgpythondir=\${pythondir}/$PACKAGE
@@ -13226,7 +13288,7 @@
pyexecdir=$am_cv_python_pyexecdir
-@@ -22588,8 +23030,8 @@ fi
+@@ -22681,8 +23126,8 @@ fi
if test "$have_python" != "no"; then
@@ -13237,7 +13299,7 @@
py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
-@@ -22612,26 +23054,27 @@ case "(($ac_try" in
+@@ -22705,26 +23150,27 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13272,7 +13334,7 @@
have_python=no
fi
-@@ -22663,18 +23106,18 @@ if test "$have_python" != "no"; then
+@@ -22756,18 +23202,18 @@ if test "$have_python" != "no"; then
pkg_failed=no
@@ -13295,7 +13357,7 @@
(exit $ac_status); }; then
pkg_cv_PYGTK_CFLAGS=`$PKG_CONFIG --cflags "pygtk-2.0 >= $PYGTK_REQUIRED gnome-python-2.0 >= $GNOME_PYTHON_REQUIRED" 2>/dev/null`
else
-@@ -22689,10 +23132,10 @@ if test -n "$PKG_CONFIG"; then
+@@ -22782,10 +23228,10 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_PYGTK_LIBS="$PYGTK_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -13308,7 +13370,7 @@
(exit $ac_status); }; then
pkg_cv_PYGTK_LIBS=`$PKG_CONFIG --libs "pygtk-2.0 >= $PYGTK_REQUIRED gnome-python-2.0 >= $GNOME_PYTHON_REQUIRED" 2>/dev/null`
else
-@@ -22720,16 +23163,16 @@ fi
+@@ -22813,16 +23259,16 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$PYGTK_PKG_ERRORS" >&5
@@ -13329,7 +13391,7 @@
:
fi
-@@ -22738,23 +23181,23 @@ fi
+@@ -22831,23 +23277,23 @@ fi
fi
if test "$have_python" != "no"; then
@@ -13365,7 +13427,7 @@
-@@ -22764,8 +23207,8 @@ echo "${ECHO_T}$PYGTK_H2DEF" >&6; }
+@@ -22857,8 +23303,8 @@ echo "${ECHO_T}$PYGTK_H2DEF" >&6; }
FLAGS="-fno-strict-aliasing"
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $FLAGS"
@@ -13376,7 +13438,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22787,20 +23230,21 @@ case "(($ac_try" in
+@@ -22880,20 +23326,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13401,7 +13463,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
compiler_has_option=no
-@@ -22808,8 +23252,8 @@ fi
+@@ -22901,8 +23348,8 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$save_CFLAGS"
@@ -13412,7 +13474,7 @@
if test $compiler_has_option = yes; then
NO_STRICT_ALIASING_CFLAGS="$FLAGS"
fi
-@@ -22818,13 +23262,13 @@ fi
+@@ -22911,13 +23358,13 @@ fi
if test "$have_python" != "yes"; then
if test "$enable_python" = "yes"; then
@@ -13430,7 +13492,7 @@
fi
elif test "$enable_python" != "no"; then
enable_python=yes
-@@ -22854,8 +23298,8 @@ fi
+@@ -22947,8 +23394,8 @@ fi
# Gecko 1.9 can handle .desktop files from file: URLs itself, but we
# also support windows .lnk files, so always enable this plugin
@@ -13441,7 +13503,7 @@
# Check whether --enable-desktop-file-plugin was given.
if test "${enable_desktop_file_plugin+set}" = set; then
enableval=$enable_desktop_file_plugin;
-@@ -22863,25 +23307,25 @@ else
+@@ -22956,25 +23403,25 @@ else
enable_desktop_file_plugin=yes
fi
@@ -13473,7 +13535,7 @@
(exit $ac_status); }; then
pkg_cv_DESKTOP_FILE_PLUGIN_DEP_CFLAGS=`$PKG_CONFIG --cflags "${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0" 2>/dev/null`
else
-@@ -22896,10 +23340,10 @@ if test -n "$PKG_CONFIG"; then
+@@ -22989,10 +23436,10 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_DESKTOP_FILE_PLUGIN_DEP_LIBS="$DESKTOP_FILE_PLUGIN_DEP_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -13486,7 +13548,7 @@
(exit $ac_status); }; then
pkg_cv_DESKTOP_FILE_PLUGIN_DEP_LIBS=`$PKG_CONFIG --libs "${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0" 2>/dev/null`
else
-@@ -22927,7 +23371,7 @@ fi
+@@ -23020,7 +23467,7 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$DESKTOP_FILE_PLUGIN_DEP_PKG_ERRORS" >&5
@@ -13495,7 +13557,7 @@
$DESKTOP_FILE_PLUGIN_DEP_PKG_ERRORS
-@@ -22938,7 +23382,7 @@ Alternatively, you may set the environme
+@@ -23031,7 +23478,7 @@ Alternatively, you may set the environme
and DESKTOP_FILE_PLUGIN_DEP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
@@ -13504,7 +13566,7 @@
$DESKTOP_FILE_PLUGIN_DEP_PKG_ERRORS
-@@ -22951,7 +23395,9 @@ See the pkg-config man page for more det
+@@ -23044,7 +23491,9 @@ See the pkg-config man page for more det
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -13515,7 +13577,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -22961,7 +23407,7 @@ See the pkg-config man page for more det
+@@ -23054,7 +23503,7 @@ See the pkg-config man page for more det
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
@@ -13524,7 +13586,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -22971,29 +23417,29 @@ See the pkg-config man page for more det
+@@ -23064,29 +23513,29 @@ See the pkg-config man page for more det
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
@@ -13561,7 +13623,7 @@
(exit $ac_status); }; then
pkg_cv_DESKTOP_FILE_PLUGIN_DEP_CFLAGS=`$PKG_CONFIG --cflags "${gecko_cv_gecko}-xpcom ${gecko_cv_gecko}-plugin gtk+-2.0 >= 2.6.0" 2>/dev/null`
else
-@@ -23008,10 +23454,10 @@ if test -n "$PKG_CONFIG"; then
+@@ -23101,10 +23550,10 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_DESKTOP_FILE_PLUGIN_DEP_LIBS="$DESKTOP_FILE_PLUGIN_DEP_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -13574,7 +13636,7 @@
(exit $ac_status); }; then
pkg_cv_DESKTOP_FILE_PLUGIN_DEP_LIBS=`$PKG_CONFIG --libs "${gecko_cv_gecko}-xpcom ${gecko_cv_gecko}-plugin gtk+-2.0 >= 2.6.0" 2>/dev/null`
else
-@@ -23039,7 +23485,7 @@ fi
+@@ -23132,7 +23581,7 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$DESKTOP_FILE_PLUGIN_DEP_PKG_ERRORS" >&5
@@ -13583,7 +13645,7 @@
$DESKTOP_FILE_PLUGIN_DEP_PKG_ERRORS
-@@ -23050,7 +23496,7 @@ Alternatively, you may set the environme
+@@ -23143,7 +23592,7 @@ Alternatively, you may set the environme
and DESKTOP_FILE_PLUGIN_DEP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
@@ -13592,7 +13654,7 @@
$DESKTOP_FILE_PLUGIN_DEP_PKG_ERRORS
-@@ -23063,7 +23509,9 @@ See the pkg-config man page for more det
+@@ -23156,7 +23605,9 @@ See the pkg-config man page for more det
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -13603,7 +13665,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -23073,7 +23521,7 @@ See the pkg-config man page for more det
+@@ -23166,7 +23617,7 @@ See the pkg-config man page for more det
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
@@ -13612,7 +13674,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -23083,12 +23531,12 @@ See the pkg-config man page for more det
+@@ -23176,12 +23627,12 @@ See the pkg-config man page for more det
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
@@ -13628,7 +13690,7 @@
:
fi
fi
-@@ -23119,8 +23567,8 @@ fi
+@@ -23212,8 +23663,8 @@ fi
# Zeroconf bookmarks sites
@@ -13639,7 +13701,7 @@
# Check whether --enable-zeroconf was given.
if test "${enable_zeroconf+set}" = set; then
enableval=$enable_zeroconf;
-@@ -23128,26 +23576,26 @@ else
+@@ -23221,26 +23672,26 @@ else
enable_zeroconf=auto
fi
@@ -13672,7 +13734,7 @@
(exit $ac_status); }; then
pkg_cv_AVAHI_CFLAGS=`$PKG_CONFIG --cflags "avahi-gobject >= $AVAHI_REQUIRED" 2>/dev/null`
else
-@@ -23162,10 +23610,10 @@ if test -n "$PKG_CONFIG"; then
+@@ -23255,10 +23706,10 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_AVAHI_LIBS="$AVAHI_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -13685,7 +13747,7 @@
(exit $ac_status); }; then
pkg_cv_AVAHI_LIBS=`$PKG_CONFIG --libs "avahi-gobject >= $AVAHI_REQUIRED" 2>/dev/null`
else
-@@ -23193,22 +23641,22 @@ fi
+@@ -23286,22 +23737,22 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$AVAHI_PKG_ERRORS" >&5
@@ -13714,7 +13776,7 @@
{ (exit 1); exit 1; }; }
elif test "$have_avahi" = "yes"; then
enable_zeroconf=yes
-@@ -23239,8 +23687,8 @@ fi
+@@ -23332,8 +23783,8 @@ fi
# NetworkManager
@@ -13725,7 +13787,7 @@
# Check whether --enable-network-manager was given.
if test "${enable_network_manager+set}" = set; then
enableval=$enable_network_manager;
-@@ -23248,27 +23696,28 @@ else
+@@ -23341,27 +23792,28 @@ else
enable_network_manager=no
fi
@@ -13765,7 +13827,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23284,32 +23733,33 @@ case "(($ac_try" in
+@@ -23377,32 +23829,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13806,7 +13868,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23323,51 +23773,52 @@ case "(($ac_try" in
+@@ -23416,51 +23869,52 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13880,7 +13942,7 @@
( cat <<\_ASBOX
## ----------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany ##
-@@ -23376,21 +23827,24 @@ _ASBOX
+@@ -23469,21 +23923,24 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -13913,7 +13975,7 @@
_ACEOF
have_network_manager=yes
else
-@@ -23401,12 +23855,12 @@ done
+@@ -23494,12 +23951,12 @@ done
if test "$enable_network_manager" = "yes" -a "$have_network_manager" = "no"; then
@@ -13930,7 +13992,7 @@
fi
fi
-@@ -23433,8 +23887,8 @@ fi
+@@ -23526,8 +23983,8 @@ fi
if test "$gecko_cv_gecko_version_int" -ge "1008001"; then
# Default to 'disabled' until it's fully functional
@@ -13941,7 +14003,7 @@
# Check whether --enable-spell-checker was given.
if test "${enable_spell_checker+set}" = set; then
enableval=$enable_spell_checker;
-@@ -23442,15 +23896,15 @@ else
+@@ -23535,15 +23992,15 @@ else
enable_spell_checker=no
fi
@@ -13961,7 +14023,7 @@
{ (exit 1); exit 1; }; }
fi
-@@ -23460,18 +23914,18 @@ if test "$enable_spell_checker" = "yes"
+@@ -23553,18 +24010,18 @@ if test "$enable_spell_checker" = "yes"
pkg_failed=no
@@ -13984,7 +14046,7 @@
(exit $ac_status); }; then
pkg_cv_SPELLCHECKER_CFLAGS=`$PKG_CONFIG --cflags "enchant >= $ENCHANT_REQUIRED" 2>/dev/null`
else
-@@ -23486,10 +23940,10 @@ if test -n "$PKG_CONFIG"; then
+@@ -23579,10 +24036,10 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_SPELLCHECKER_LIBS="$SPELLCHECKER_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -13997,7 +14059,7 @@
(exit $ac_status); }; then
pkg_cv_SPELLCHECKER_LIBS=`$PKG_CONFIG --libs "enchant >= $ENCHANT_REQUIRED" 2>/dev/null`
else
-@@ -23517,7 +23971,7 @@ fi
+@@ -23610,7 +24067,7 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$SPELLCHECKER_PKG_ERRORS" >&5
@@ -14006,7 +14068,7 @@
$SPELLCHECKER_PKG_ERRORS
-@@ -23528,7 +23982,7 @@ Alternatively, you may set the environme
+@@ -23621,7 +24078,7 @@ Alternatively, you may set the environme
and SPELLCHECKER_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
@@ -14015,7 +14077,7 @@
$SPELLCHECKER_PKG_ERRORS
-@@ -23541,7 +23995,9 @@ See the pkg-config man page for more det
+@@ -23634,7 +24091,9 @@ See the pkg-config man page for more det
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -14026,7 +14088,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -23551,7 +24007,7 @@ See the pkg-config man page for more det
+@@ -23644,7 +24103,7 @@ See the pkg-config man page for more det
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
@@ -14035,7 +14097,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -23561,12 +24017,12 @@ See the pkg-config man page for more det
+@@ -23654,12 +24113,12 @@ See the pkg-config man page for more det
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
@@ -14051,7 +14113,7 @@
:
fi
-@@ -23618,10 +24074,10 @@ AM_CXXFLAGS="$AM_CXXFLAGS $WARN_CXXFLAGS
+@@ -23711,10 +24170,10 @@ AM_CXXFLAGS="$AM_CXXFLAGS $WARN_CXXFLAGS
ISO_CODES_REQUIRED=0.35
if test -n "$PKG_CONFIG" && \
@@ -14064,7 +14126,7 @@
(exit $ac_status); }; then
have_iso_codes=yes
else
-@@ -23629,8 +24085,8 @@ else
+@@ -23722,8 +24181,8 @@ else
fi
if test "$have_iso_codes" = "yes"; then
@@ -14075,7 +14137,7 @@
if $PKG_CONFIG --variable=domains iso-codes | grep -q 639 && \
$PKG_CONFIG --variable=domains iso-codes | grep -q 3166 ; then
result=yes
-@@ -23638,8 +24094,8 @@ echo $ECHO_N "checking whether iso-codes
+@@ -23731,8 +24190,8 @@ echo $ECHO_N "checking whether iso-codes
result=no
have_iso_codes=no
fi
@@ -14086,7 +14148,7 @@
fi
if test "$have_iso_codes" = "yes"; then
-@@ -23654,8 +24110,8 @@ cat >>confdefs.h <<\_ACEOF
+@@ -23747,8 +24206,8 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
else
@@ -14097,7 +14159,7 @@
{ (exit 1); exit 1; }; }
fi
-@@ -23670,20 +24126,21 @@ _ACEOF
+@@ -23763,20 +24222,21 @@ _ACEOF
for ac_header in locale.h
do
@@ -14128,7 +14190,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23699,32 +24156,33 @@ case "(($ac_try" in
+@@ -23792,32 +24252,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14169,7 +14231,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23738,51 +24196,52 @@ case "(($ac_try" in
+@@ -23831,51 +24292,52 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14243,7 +14305,7 @@
( cat <<\_ASBOX
## ----------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany ##
-@@ -23791,21 +24250,24 @@ _ASBOX
+@@ -23884,21 +24346,24 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -14276,7 +14338,7 @@
_ACEOF
fi
-@@ -23813,10 +24275,10 @@ fi
+@@ -23906,10 +24371,10 @@ fi
done
if test $ac_cv_header_locale_h = yes; then
@@ -14290,7 +14352,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -23839,31 +24301,35 @@ case "(($ac_try" in
+@@ -23932,31 +24397,35 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14333,7 +14395,7 @@
if test $am_cv_val_LC_MESSAGES = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -23882,17 +24348,17 @@ _ACEOF
+@@ -23975,17 +24444,17 @@ _ACEOF
INTLLIBS=
if test "${ac_cv_header_libintl_h+set}" = set; then
@@ -14358,7 +14420,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23908,32 +24374,33 @@ case "(($ac_try" in
+@@ -24001,32 +24470,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14399,7 +14461,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23947,51 +24414,52 @@ case "(($ac_try" in
+@@ -24040,51 +24510,52 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14473,7 +14535,7 @@
( cat <<\_ASBOX
## ----------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany ##
-@@ -24000,28 +24468,28 @@ _ASBOX
+@@ -24093,28 +24564,28 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -14511,7 +14573,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -24046,38 +24514,42 @@ case "(($ac_try" in
+@@ -24139,38 +24610,42 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14564,7 +14626,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -24102,43 +24574,47 @@ case "(($ac_try" in
+@@ -24195,43 +24670,47 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14623,7 +14685,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -24191,35 +24667,42 @@ case "(($ac_try" in
+@@ -24284,35 +24763,42 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14676,7 +14738,7 @@
_ACEOF
fi
-@@ -24234,10 +24717,10 @@ done
+@@ -24327,10 +24813,10 @@ done
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
@@ -14690,7 +14752,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl $LIBS"
-@@ -24269,37 +24752,41 @@ case "(($ac_try" in
+@@ -24362,37 +24848,41 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14743,7 +14805,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl $LIBS"
-@@ -24331,37 +24818,41 @@ case "(($ac_try" in
+@@ -24424,37 +24914,41 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14796,7 +14858,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl $LIBS"
-@@ -24393,33 +24884,37 @@ case "(($ac_try" in
+@@ -24486,33 +24980,37 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14842,7 +14904,7 @@
gt_cv_func_dgettext_libintl=yes
fi
-@@ -24429,14 +24924,14 @@ fi
+@@ -24522,14 +25020,14 @@ fi
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -14864,7 +14926,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl -liconv $LIBS"
-@@ -24468,37 +24963,41 @@ case "(($ac_try" in
+@@ -24561,37 +25059,41 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14917,7 +14979,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl -liconv $LIBS"
-@@ -24530,33 +25029,37 @@ case "(($ac_try" in
+@@ -24623,33 +25125,37 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14963,7 +15025,7 @@
gt_cv_func_dgettext_libintl=yes
libintl_extra_libs=-liconv
else
-@@ -24581,11 +25084,11 @@ fi
+@@ -24674,11 +25180,11 @@ fi
for ac_func in bind_textdomain_codeset
do
@@ -14979,7 +15041,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -24638,35 +25141,42 @@ case "(($ac_try" in
+@@ -24731,35 +25237,42 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15032,7 +15094,7 @@
_ACEOF
fi
-@@ -24702,10 +25212,10 @@ _ACEOF
+@@ -24795,10 +25308,10 @@ _ACEOF
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
@@ -15046,7 +15108,7 @@
else
case "$MSGFMT" in
/*)
-@@ -24729,11 +25239,11 @@ esac
+@@ -24822,11 +25335,11 @@ esac
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
@@ -15062,7 +15124,7 @@
fi
if test "$MSGFMT" != "no"; then
glib_save_LIBS="$LIBS"
-@@ -24741,11 +25251,11 @@ fi
+@@ -24834,11 +25347,11 @@ fi
for ac_func in dcgettext
do
@@ -15078,7 +15140,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -24798,43 +25308,50 @@ case "(($ac_try" in
+@@ -24891,43 +25404,50 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15141,7 +15203,7 @@
cat >conftest.foo <<_ACEOF
msgid ""
-@@ -24848,25 +25365,25 @@ msgstr ""
+@@ -24941,25 +25461,25 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -15176,7 +15238,7 @@
else
case $GMSGFMT in
[\\/]* | ?:[\\/]*)
-@@ -24881,7 +25398,7 @@ do
+@@ -24974,7 +25494,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
@@ -15185,7 +15247,7 @@
break 2
fi
done
-@@ -24894,20 +25411,20 @@ esac
+@@ -24987,20 +25507,20 @@ esac
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -15213,7 +15275,7 @@
else
case "$XGETTEXT" in
/*)
-@@ -24931,11 +25448,11 @@ esac
+@@ -25024,11 +25544,11 @@ esac
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
@@ -15229,7 +15291,7 @@
fi
cat >conftest.$ac_ext <<_ACEOF
-@@ -24960,30 +25477,33 @@ case "(($ac_try" in
+@@ -25053,30 +25573,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15271,7 +15333,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -25036,32 +25556,36 @@ case "(($ac_try" in
+@@ -25129,32 +25652,36 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15316,7 +15378,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -25077,6 +25601,7 @@ fi
+@@ -25170,6 +25697,7 @@ fi
esac
fi
@@ -15324,7 +15386,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$glib_save_LIBS"
-@@ -25102,8 +25627,8 @@ _ACEOF
+@@ -25195,8 +25723,8 @@ _ACEOF
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -15335,7 +15397,7 @@
XGETTEXT=":"
fi
fi
-@@ -25135,8 +25660,8 @@ echo "${ECHO_T}found xgettext program is
+@@ -25228,8 +25756,8 @@ echo "${ECHO_T}found xgettext program is
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -15346,7 +15408,7 @@
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
useit=no
-@@ -25160,8 +25685,8 @@ echo $ECHO_N "checking for catalogs to b
+@@ -25253,8 +25781,8 @@ echo $ECHO_N "checking for catalogs to b
fi
done
LINGUAS=$NEW_LINGUAS
@@ -15357,7 +15419,7 @@
fi
if test -n "$LINGUAS"; then
-@@ -25216,10 +25741,10 @@ if test -z "$LSB_DISTRIBUTOR"; then
+@@ -25309,10 +25837,10 @@ if test -z "$LSB_DISTRIBUTOR"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -15371,7 +15433,7 @@
else
if test -n "$LSB_RELEASE"; then
ac_cv_prog_LSB_RELEASE="$LSB_RELEASE" # Let the user override the test.
-@@ -25232,7 +25757,7 @@ do
+@@ -25325,7 +25853,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_LSB_RELEASE="$ac_prog"
@@ -15380,7 +15442,7 @@
break 2
fi
done
-@@ -25243,11 +25768,11 @@ fi
+@@ -25336,11 +25864,11 @@ fi
fi
LSB_RELEASE=$ac_cv_prog_LSB_RELEASE
if test -n "$LSB_RELEASE"; then
@@ -15396,7 +15458,7 @@
fi
-@@ -25277,10 +25802,10 @@ _ACEOF
+@@ -25370,10 +25898,10 @@ _ACEOF
gdu_cv_version_required=0.3.2
if test -n "$PKG_CONFIG" && \
@@ -15409,7 +15471,7 @@
(exit $ac_status); }; then
gdu_cv_have_gdu=yes
else
-@@ -25290,8 +25815,8 @@ fi
+@@ -25383,8 +25911,8 @@ fi
if test "$gdu_cv_have_gdu" = "yes"; then
:
else
@@ -15420,7 +15482,124 @@
{ (exit 1); exit 1; }; }
fi
-@@ -25380,32 +25905,32 @@ fi
+@@ -25455,10 +25983,10 @@ fi
+
+ # Extract the first word of "gtkdoc-check", so it can be a program name with args.
+ set dummy gtkdoc-check; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++ $as_echo_n "(cached) " >&6
+ else
+ case $GTKDOC_CHECK in
+ [\\/]* | ?:[\\/]*)
+@@ -25473,7 +26001,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -25485,11 +26013,11 @@ esac
+ fi
+ GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
+ if test -n "$GTKDOC_CHECK"; then
+- { echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5
+-echo "${ECHO_T}$GTKDOC_CHECK" >&6; }
++ { $as_echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5
++$as_echo "$GTKDOC_CHECK" >&6; }
+ else
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++ { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+
+
+@@ -25497,10 +26025,10 @@ fi
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++ $as_echo_n "(cached) " >&6
+ else
+ case $GTKDOC_REBASE in
+ [\\/]* | ?:[\\/]*)
+@@ -25515,7 +26043,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -25527,11 +26055,11 @@ esac
+ fi
+ GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
+ if test -n "$GTKDOC_REBASE"; then
+- { echo "$as_me:$LINENO: result: $GTKDOC_REBASE" >&5
+-echo "${ECHO_T}$GTKDOC_REBASE" >&6; }
++ { $as_echo "$as_me:$LINENO: result: $GTKDOC_REBASE" >&5
++$as_echo "$GTKDOC_REBASE" >&6; }
+ else
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++ { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+
+
+@@ -25541,10 +26069,10 @@ test -n "$GTKDOC_REBASE" || GTKDOC_REBAS
+
+ # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
+ set dummy gtkdoc-mkpdf; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++ $as_echo_n "(cached) " >&6
+ else
+ case $GTKDOC_MKPDF in
+ [\\/]* | ?:[\\/]*)
+@@ -25559,7 +26087,7 @@ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+@@ -25571,11 +26099,11 @@ esac
+ fi
+ GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
+ if test -n "$GTKDOC_MKPDF"; then
+- { echo "$as_me:$LINENO: result: $GTKDOC_MKPDF" >&5
+-echo "${ECHO_T}$GTKDOC_MKPDF" >&6; }
++ { $as_echo "$as_me:$LINENO: result: $GTKDOC_MKPDF" >&5
++$as_echo "$GTKDOC_MKPDF" >&6; }
+ else
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++ { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+
+
+@@ -25601,23 +26129,23 @@ fi
if test x$enable_gtk_doc = xyes; then
if test -n "$PKG_CONFIG" && \
@@ -15433,10 +15612,10 @@
(exit $ac_status); }; then
:
else
-- { { echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.0 installed to build gtk-doc" >&5
--echo "$as_me: error: You need to have gtk-doc >= 1.0 installed to build gtk-doc" >&2;}
-+ { { $as_echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.0 installed to build gtk-doc" >&5
-+$as_echo "$as_me: error: You need to have gtk-doc >= 1.0 installed to build gtk-doc" >&2;}
+- { { echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.0 installed to build $PACKAGE_NAME" >&5
+-echo "$as_me: error: You need to have gtk-doc >= 1.0 installed to build $PACKAGE_NAME" >&2;}
++ { { $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
fi
@@ -15450,46 +15629,9 @@
+ { $as_echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5
+$as_echo "$enable_gtk_doc" >&6; }
- for ac_prog in gtkdoc-check
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ $as_echo_n "(cached) " >&6
- else
- case $GTKDOC_CHECK in
- [\\/]* | ?:[\\/]*)
-@@ -25420,7 +25945,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -25432,11 +25957,11 @@ esac
- fi
- GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
- if test -n "$GTKDOC_CHECK"; then
-- { echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5
--echo "${ECHO_T}$GTKDOC_CHECK" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5
-+$as_echo "$GTKDOC_CHECK" >&6; }
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
-
-
-@@ -25496,11 +26021,12 @@ _ACEOF
+ # Check whether --enable-gtk-doc-html was given.
+ if test "${enable_gtk_doc_html+set}" = set; then
+@@ -25715,11 +26243,12 @@ _ACEOF
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -15504,7 +15646,7 @@
*) $as_unset $ac_var ;;
esac ;;
esac
-@@ -25533,12 +26059,12 @@ echo "$as_me: WARNING: Cache variable $a
+@@ -25752,12 +26281,12 @@ echo "$as_me: WARNING: Cache variable $a
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
@@ -15521,7 +15663,7 @@
fi
fi
rm -f confcache
-@@ -25554,7 +26080,7 @@ ac_ltlibobjs=
+@@ -25773,7 +26302,7 @@ ac_ltlibobjs=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -15530,7 +15672,7 @@
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-@@ -25566,51 +26092,51 @@ LTLIBOBJS=$ac_ltlibobjs
+@@ -25785,51 +26314,51 @@ LTLIBOBJS=$ac_ltlibobjs
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -15596,7 +15738,7 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-@@ -25619,180 +26145,181 @@ fi
+@@ -25838,201 +26367,202 @@ fi
if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
@@ -15806,12 +15948,39 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+ if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then
+- { { echo "$as_me:$LINENO: error: conditional \"GTK_DOC_BUILD_HTML\" was never defined.
++ { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_BUILD_HTML\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-echo "$as_me: error: conditional \"GTK_DOC_BUILD_HTML\" was never defined.
++$as_echo "$as_me: error: conditional \"GTK_DOC_BUILD_HTML\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then
+- { { echo "$as_me:$LINENO: error: conditional \"GTK_DOC_BUILD_PDF\" was never defined.
++ { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_BUILD_PDF\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-echo "$as_me: error: conditional \"GTK_DOC_BUILD_PDF\" was never defined.
++$as_echo "$as_me: error: conditional \"GTK_DOC_BUILD_PDF\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
+$as_echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then
+- { { echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_REBASE\" was never defined.
++ { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_REBASE\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-echo "$as_me: error: conditional \"GTK_DOC_USE_REBASE\" was never defined.
++$as_echo "$as_me: error: conditional \"GTK_DOC_USE_REBASE\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -15829,7 +15998,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -25805,7 +26332,7 @@ ac_cs_silent=false
+@@ -26045,7 +26575,7 @@ ac_cs_silent=false
SHELL=\${CONFIG_SHELL-$SHELL}
_ACEOF
@@ -15838,7 +16007,7 @@
## --------------------- ##
## M4sh Initialization. ##
## --------------------- ##
-@@ -25815,7 +26342,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
+@@ -26055,7 +26585,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
@@ -15847,7 +16016,7 @@
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
-@@ -25837,17 +26364,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
+@@ -26077,17 +26607,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
@@ -15902,7 +16071,7 @@
fi
# Support unset when possible.
-@@ -25863,8 +26418,6 @@ fi
+@@ -26103,8 +26661,6 @@ fi
# there to prevent editors from complaining about space-tab.
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
# splitting by setting IFS to empty value.)
@@ -15911,7 +16080,7 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-@@ -25887,7 +26440,7 @@ if test "x$as_myself" = x; then
+@@ -26127,7 +26683,7 @@ if test "x$as_myself" = x; then
as_myself=$0
fi
if test ! -f "$as_myself"; then
@@ -15920,7 +16089,7 @@
{ (exit 1); exit 1; }
fi
-@@ -25900,17 +26453,10 @@ PS2='> '
+@@ -26140,17 +26696,10 @@ PS2='> '
PS4='+ '
# NLS nuisances.
@@ -15942,7 +16111,7 @@
# Required to use basename.
if expr a : '\(a\)' >/dev/null 2>&1 &&
-@@ -25932,7 +26478,7 @@ as_me=`$as_basename -- "$0" ||
+@@ -26172,7 +26721,7 @@ as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
@@ -15951,7 +16120,7 @@
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
-@@ -25983,7 +26529,7 @@ $as_unset CDPATH
+@@ -26223,7 +26772,7 @@ $as_unset CDPATH
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
@@ -15960,7 +16129,7 @@
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
-@@ -26011,7 +26557,6 @@ case `echo -n x` in
+@@ -26251,7 +26800,6 @@ case `echo -n x` in
*)
ECHO_N='-n';;
esac
@@ -15968,7 +16137,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -26024,19 +26569,22 @@ if test -d conf$$.dir; then
+@@ -26264,19 +26812,22 @@ if test -d conf$$.dir; then
rm -f conf$$.dir/conf$$.file
else
rm -f conf$$.dir
@@ -16002,7 +16171,7 @@
else
as_ln_s='cp -p'
fi
-@@ -26061,10 +26609,10 @@ else
+@@ -26301,10 +26852,10 @@ else
as_test_x='
eval sh -c '\''
if test -d "$1"; then
@@ -16015,16 +16184,16 @@
esac;
case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
???[sx]*):;;*)false;;esac;fi
-@@ -26087,7 +26635,7 @@ exec 6>&1
+@@ -26327,7 +26878,7 @@ exec 6>&1
# values after options handling.
ac_log="
- This file was extended by GNOME Web Browser $as_me 2.26.1, which was
+ This file was extended by GNOME Web Browser $as_me 2.26.3, which was
-generated by GNU Autoconf 2.61. Invocation command line was
+generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -26100,7 +26648,16 @@ on `(hostname || uname -n) 2>/dev/null |
+@@ -26340,7 +26891,16 @@ on `(hostname || uname -n) 2>/dev/null |
_ACEOF
@@ -16042,7 +16211,7 @@
# Files that config.status was made for.
config_files="$ac_config_files"
config_headers="$ac_config_headers"
-@@ -26108,22 +26665,23 @@ config_commands="$ac_config_commands"
+@@ -26348,22 +26908,23 @@ config_commands="$ac_config_commands"
_ACEOF
@@ -16073,14 +16242,14 @@
Configuration files:
$config_files
-@@ -26137,13 +26695,13 @@ $config_commands
+@@ -26377,13 +26938,13 @@ $config_commands
Report bugs to <bug-autoconf at gnu.org>."
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
- GNOME Web Browser config.status 2.26.1
+ GNOME Web Browser config.status 2.26.3
-configured by $0, generated by GNU Autoconf 2.61,
- with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.63,
@@ -16091,7 +16260,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -26151,11 +26709,12 @@ ac_pwd='$ac_pwd'
+@@ -26391,11 +26952,12 @@ ac_pwd='$ac_pwd'
srcdir='$srcdir'
INSTALL='$INSTALL'
MKDIR_P='$MKDIR_P'
@@ -16107,7 +16276,7 @@
ac_need_defaults=:
while test $# != 0
do
-@@ -26177,30 +26736,36 @@ do
+@@ -26417,30 +26979,36 @@ do
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
@@ -16150,7 +16319,7 @@
Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; } ;;
-@@ -26219,27 +26784,29 @@ if $ac_cs_silent; then
+@@ -26459,27 +27027,29 @@ if $ac_cs_silent; then
fi
_ACEOF
@@ -16187,7 +16356,7 @@
#
# INIT-COMMANDS
#
-@@ -26281,6 +26848,7 @@ lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e
+@@ -26521,6 +27091,7 @@ lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e
lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
@@ -16195,7 +16364,7 @@
deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
-@@ -26439,6 +27007,7 @@ LN_S \
+@@ -26679,6 +27250,7 @@ LN_S \
lt_SP2NL \
lt_NL2SP \
reload_flag \
@@ -16203,7 +16372,7 @@
deplibs_check_method \
file_magic_cmd \
AR \
-@@ -26598,7 +27167,7 @@ EPIPHANY_API_VERSION=$EPIPHANY_API_VERSI
+@@ -26838,7 +27410,7 @@ EPIPHANY_API_VERSION=$EPIPHANY_API_VERSI
_ACEOF
@@ -16212,7 +16381,7 @@
# Handling of arguments.
for ac_config_target in $ac_config_targets
-@@ -26637,8 +27206,8 @@ do
+@@ -26877,8 +27449,8 @@ do
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -16223,7 +16392,7 @@
{ (exit 1); exit 1; }; };;
esac
done
-@@ -26679,417 +27248,144 @@ $debug ||
+@@ -26919,425 +27491,144 @@ $debug ||
(umask 077 && mkdir "$tmp")
} ||
{
@@ -16690,18 +16859,26 @@
-DISTCHECK_CONFIGURE_FLAGS!$DISTCHECK_CONFIGURE_FLAGS$ac_delim
-HAVE_GNOME_DOC_UTILS_TRUE!$HAVE_GNOME_DOC_UTILS_TRUE$ac_delim
-HAVE_GNOME_DOC_UTILS_FALSE!$HAVE_GNOME_DOC_UTILS_FALSE$ac_delim
+-GTKDOC_CHECK!$GTKDOC_CHECK$ac_delim
+-GTKDOC_REBASE!$GTKDOC_REBASE$ac_delim
+-GTKDOC_MKPDF!$GTKDOC_MKPDF$ac_delim
-HTML_DIR!$HTML_DIR$ac_delim
--GTKDOC_CHECK!$GTKDOC_CHECK$ac_delim
-ENABLE_GTK_DOC_TRUE!$ENABLE_GTK_DOC_TRUE$ac_delim
-ENABLE_GTK_DOC_FALSE!$ENABLE_GTK_DOC_FALSE$ac_delim
+-GTK_DOC_BUILD_HTML_TRUE!$GTK_DOC_BUILD_HTML_TRUE$ac_delim
+-GTK_DOC_BUILD_HTML_FALSE!$GTK_DOC_BUILD_HTML_FALSE$ac_delim
+-GTK_DOC_BUILD_PDF_TRUE!$GTK_DOC_BUILD_PDF_TRUE$ac_delim
+-GTK_DOC_BUILD_PDF_FALSE!$GTK_DOC_BUILD_PDF_FALSE$ac_delim
-GTK_DOC_USE_LIBTOOL_TRUE!$GTK_DOC_USE_LIBTOOL_TRUE$ac_delim
-GTK_DOC_USE_LIBTOOL_FALSE!$GTK_DOC_USE_LIBTOOL_FALSE$ac_delim
+-GTK_DOC_USE_REBASE_TRUE!$GTK_DOC_USE_REBASE_TRUE$ac_delim
+-GTK_DOC_USE_REBASE_FALSE!$GTK_DOC_USE_REBASE_FALSE$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
+_ACAWK
_ACEOF
-
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 84; then
- break
- elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -16750,7 +16927,7 @@
# VPATH may cause trouble with some makes, so we remove $(srcdir),
# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
-@@ -27105,19 +27401,133 @@ s/^[^=]*=[ ]*$//
+@@ -27353,19 +27644,133 @@ s/^[^=]*=[ ]*$//
}'
fi
@@ -16888,7 +17065,7 @@
{ (exit 1); exit 1; }; };;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-@@ -27146,26 +27556,38 @@ echo "$as_me: error: Invalid tag $ac_tag
+@@ -27394,26 +27799,38 @@ echo "$as_me: error: Invalid tag $ac_tag
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -16935,7 +17112,7 @@
esac
;;
esac
-@@ -27175,7 +27597,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^
+@@ -27423,7 +27840,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^
X"$ac_file" : 'X\(//\)[^/]' \| \
X"$ac_file" : 'X\(//\)$' \| \
X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
@@ -16944,7 +17121,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -27201,7 +27623,7 @@ echo X"$ac_file" |
+@@ -27449,7 +27866,7 @@ echo X"$ac_file" |
as_dirs=
while :; do
case $as_dir in #(
@@ -16953,7 +17130,7 @@
*) as_qdir=$as_dir;;
esac
as_dirs="'$as_qdir' $as_dirs"
-@@ -27210,7 +27632,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/
+@@ -27458,7 +27875,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
@@ -16962,7 +17139,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -27231,17 +27653,17 @@ echo X"$as_dir" |
+@@ -27479,17 +27896,17 @@ echo X"$as_dir" |
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
@@ -16984,7 +17161,7 @@
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-@@ -27286,12 +27708,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
+@@ -27534,12 +27951,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
esac
_ACEOF
@@ -17000,7 +17177,7 @@
p
q
}
-@@ -27300,13 +27723,14 @@ case `sed -n '/datarootdir/ {
+@@ -27548,13 +27966,14 @@ case `sed -n '/datarootdir/ {
/@infodir@/p
/@localedir@/p
/@mandir@/p
@@ -17019,7 +17196,7 @@
ac_datarootdir_hack='
s&@datadir@&$datadir&g
s&@docdir@&$docdir&g
-@@ -27320,15 +27744,16 @@ _ACEOF
+@@ -27568,15 +27987,16 @@ _ACEOF
# Neutralize VPATH when `$srcdir' = `.'.
# Shell code in configure.ac might set extrasub.
# FIXME: do we really want to maintain this feature?
@@ -17040,7 +17217,7 @@
s&@srcdir@&$ac_srcdir&;t t
s&@abs_srcdir@&$ac_abs_srcdir&;t t
s&@top_srcdir@&$ac_top_srcdir&;t t
-@@ -27339,121 +27764,60 @@ s&@abs_top_builddir@&$ac_abs_top_builddi
+@@ -27587,121 +28007,60 @@ s&@abs_top_builddir@&$ac_abs_top_builddi
s&@INSTALL@&$ac_INSTALL&;t t
s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
@@ -17197,7 +17374,7 @@
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
-@@ -27468,7 +27832,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^
+@@ -27716,7 +28075,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^
X"$_am_arg" : 'X\(//\)[^/]' \| \
X"$_am_arg" : 'X\(//\)$' \| \
X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
@@ -17206,7 +17383,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -27488,14 +27852,23 @@ echo X"$_am_arg" |
+@@ -27736,14 +28095,23 @@ echo X"$_am_arg" |
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -17233,7 +17410,7 @@
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
-@@ -27511,7 +27884,7 @@ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/
+@@ -27759,7 +28127,7 @@ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/
X"$mf" : 'X\(//\)[^/]' \| \
X"$mf" : 'X\(//\)$' \| \
X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
@@ -17242,7 +17419,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -27555,7 +27928,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][
+@@ -27803,7 +28171,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][
X"$file" : 'X\(//\)[^/]' \| \
X"$file" : 'X\(//\)$' \| \
X"$file" : 'X\(/\)' \| . 2>/dev/null ||
@@ -17251,7 +17428,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -27581,7 +27954,7 @@ echo X"$file" |
+@@ -27829,7 +28197,7 @@ echo X"$file" |
as_dirs=
while :; do
case $as_dir in #(
@@ -17260,7 +17437,7 @@
*) as_qdir=$as_dir;;
esac
as_dirs="'$as_qdir' $as_dirs"
-@@ -27590,7 +27963,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/
+@@ -27838,7 +28206,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
@@ -17269,7 +17446,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -27611,8 +27984,8 @@ echo X"$as_dir" |
+@@ -27859,8 +28227,8 @@ echo X"$as_dir" |
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
@@ -17280,7 +17457,7 @@
{ (exit 1); exit 1; }; }; }
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
-@@ -27741,6 +28114,9 @@ NL2SP=$lt_lt_NL2SP
+@@ -27989,6 +28357,9 @@ NL2SP=$lt_lt_NL2SP
reload_flag=$lt_reload_flag
reload_cmds=$lt_reload_cmds
@@ -17290,7 +17467,7 @@
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
-@@ -28423,8 +28799,8 @@ _LT_EOF
+@@ -28671,8 +29042,8 @@ _LT_EOF
esac ;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
@@ -17301,7 +17478,7 @@
{ (exit 1); exit 1; }; }
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
-@@ -28453,6 +28829,11 @@ _ACEOF
+@@ -28701,6 +29072,11 @@ _ACEOF
chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
@@ -17313,7 +17490,7 @@
# configure is writing to config.log, and then calls config.status.
# config.status does its own redirection, appending to config.log.
-@@ -28474,6 +28855,10 @@ if test "$no_create" != yes; then
+@@ -28722,6 +29098,10 @@ if test "$no_create" != yes; then
# would make configure fail if this is the last instruction.
$ac_cs_success || { (exit 1); exit 1; }
fi
@@ -17324,17 +17501,17 @@
# *************************************
-Index: epiphany-2.26.1/embed/mozilla/Makefile.in
+Index: epiphany-2.26.3/embed/mozilla/Makefile.in
===================================================================
---- epiphany-2.26.1.orig/embed/mozilla/Makefile.in 2009-04-12 17:49:53.000000000 +0200
-+++ epiphany-2.26.1/embed/mozilla/Makefile.in 2009-05-06 13:24:21.201838401 +0200
+--- epiphany-2.26.3.orig/embed/mozilla/Makefile.in 2009-06-29 14:22:35.000000000 +0200
++++ epiphany-2.26.3/embed/mozilla/Makefile.in 2009-08-10 16:24:12.930135766 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -333,6 +333,7 @@ MSGMERGE = @MSGMERGE@
+@@ -316,6 +316,7 @@ MSGMERGE = @MSGMERGE@
NM = @NM@
NMEDIT = @NMEDIT@
NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
@@ -17342,7 +17519,7 @@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
OTOOL = @OTOOL@
-@@ -431,6 +432,7 @@ sharedstatedir = @sharedstatedir@
+@@ -414,6 +415,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -17350,7 +17527,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
noinst_LTLIBRARIES = libephymozillaembed.la
-@@ -507,7 +509,7 @@ libephymozillaembed_la_CPPFLAGS = -I$(to
+@@ -490,7 +492,7 @@ libephymozillaembed_la_CPPFLAGS = -I$(to
-I$(top_srcdir)/embed -I$(top_srcdir) $(addprefix \
-I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) \
-DSHARE_DIR=\"$(pkgdatadir)\" \
@@ -17359,7 +17536,7 @@
-DMOZILLA_HOME=\"$(GECKO_HOME)\" \
-DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \
-DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \
-@@ -529,8 +531,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+@@ -512,8 +514,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -17370,7 +17547,7 @@
exit 1;; \
esac; \
done; \
-@@ -942,7 +944,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+@@ -925,7 +927,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -17379,17 +17556,17 @@
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-Index: epiphany-2.26.1/lib/Makefile.in
+Index: epiphany-2.26.3/lib/Makefile.in
===================================================================
---- epiphany-2.26.1.orig/lib/Makefile.in 2009-04-12 17:49:54.000000000 +0200
-+++ epiphany-2.26.1/lib/Makefile.in 2009-05-06 13:24:21.565837740 +0200
+--- epiphany-2.26.3.orig/lib/Makefile.in 2009-06-29 14:22:36.000000000 +0200
++++ epiphany-2.26.3/lib/Makefile.in 2009-08-10 16:24:13.294136075 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -268,6 +268,7 @@ MSGMERGE = @MSGMERGE@
+@@ -251,6 +251,7 @@ MSGMERGE = @MSGMERGE@
NM = @NM@
NMEDIT = @NMEDIT@
NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
@@ -17397,7 +17574,7 @@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
OTOOL = @OTOOL@
-@@ -366,6 +367,7 @@ sharedstatedir = @sharedstatedir@
+@@ -349,6 +350,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -17405,7 +17582,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = widgets egg
-@@ -427,7 +429,7 @@ libephymisc_la_CPPFLAGS = \
+@@ -410,7 +412,7 @@ libephymisc_la_CPPFLAGS = \
-I$(top_builddir)/lib/egg \
-I$(top_srcdir)/lib/egg \
-DSHARE_DIR=\"$(pkgdatadir)\" \
@@ -17414,7 +17591,7 @@
$(AM_CPPFLAGS)
libephymisc_la_CFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CFLAGS) \
-@@ -460,8 +462,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+@@ -443,8 +445,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -17425,7 +17602,7 @@
exit 1;; \
esac; \
done; \
-@@ -831,7 +833,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+@@ -814,7 +816,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -17434,10 +17611,10 @@
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-Index: epiphany-2.26.1/ltmain.sh
+Index: epiphany-2.26.3/ltmain.sh
===================================================================
---- epiphany-2.26.1.orig/ltmain.sh 2009-01-02 22:41:01.000000000 +0100
-+++ epiphany-2.26.1/ltmain.sh 2009-05-06 13:24:10.101339515 +0200
+--- epiphany-2.26.3.orig/ltmain.sh 2009-05-18 18:51:38.000000000 +0200
++++ epiphany-2.26.3/ltmain.sh 2009-08-10 16:23:59.206144853 +0200
@@ -1,6 +1,6 @@
# Generated from ltmain.m4sh.
@@ -18597,17 +18774,17 @@
esac
$ECHO > $output "\
# $outputname - a libtool library file
-Index: epiphany-2.26.1/plugins/desktop-file/Makefile.in
+Index: epiphany-2.26.3/plugins/desktop-file/Makefile.in
===================================================================
---- epiphany-2.26.1.orig/plugins/desktop-file/Makefile.in 2009-04-12 17:49:55.000000000 +0200
-+++ epiphany-2.26.1/plugins/desktop-file/Makefile.in 2009-05-06 13:24:22.057837493 +0200
+--- epiphany-2.26.3.orig/plugins/desktop-file/Makefile.in 2009-06-29 14:22:37.000000000 +0200
++++ epiphany-2.26.3/plugins/desktop-file/Makefile.in 2009-08-10 16:24:13.790134937 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -207,6 +207,7 @@ MSGMERGE = @MSGMERGE@
+@@ -190,6 +190,7 @@ MSGMERGE = @MSGMERGE@
NM = @NM@
NMEDIT = @NMEDIT@
NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
@@ -18615,7 +18792,7 @@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
OTOOL = @OTOOL@
-@@ -305,9 +306,10 @@ sharedstatedir = @sharedstatedir@
+@@ -288,9 +289,10 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -18627,7 +18804,7 @@
plugin_LTLIBRARIES = libdesktopfileplugin.la
libdesktopfileplugin_la_SOURCES = \
plugin.cpp
-@@ -346,8 +348,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+@@ -329,8 +331,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -18638,7 +18815,7 @@
exit 1;; \
esac; \
done; \
-@@ -448,7 +450,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+@@ -431,7 +433,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -18647,17 +18824,17 @@
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-Index: epiphany-2.26.1/src/Makefile.in
+Index: epiphany-2.26.3/src/Makefile.in
===================================================================
---- epiphany-2.26.1.orig/src/Makefile.in 2009-04-12 17:49:55.000000000 +0200
-+++ epiphany-2.26.1/src/Makefile.in 2009-05-06 13:24:22.409839010 +0200
+--- epiphany-2.26.3.orig/src/Makefile.in 2009-06-29 14:22:37.000000000 +0200
++++ epiphany-2.26.3/src/Makefile.in 2009-08-10 16:24:14.134137259 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -360,6 +360,7 @@ MSGMERGE = @MSGMERGE@
+@@ -343,6 +343,7 @@ MSGMERGE = @MSGMERGE@
NM = @NM@
NMEDIT = @NMEDIT@
NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
@@ -18665,7 +18842,7 @@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
OTOOL = @OTOOL@
-@@ -458,6 +459,7 @@ sharedstatedir = @sharedstatedir@
+@@ -441,6 +442,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -18673,7 +18850,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = bookmarks
-@@ -516,8 +518,8 @@ libephymain_la_CPPFLAGS = \
+@@ -499,8 +501,8 @@ libephymain_la_CPPFLAGS = \
-I$(top_srcdir)/lib/egg \
-I$(top_srcdir)/lib/widgets \
-I$(top_srcdir)/src/bookmarks \
@@ -18684,7 +18861,7 @@
-DDATADIR=\""$(pkgdatadir)"\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
$(AM_CPPFLAGS)
-@@ -555,8 +557,8 @@ libephymain_la_CFLAGS = \
+@@ -538,8 +540,8 @@ libephymain_la_CFLAGS = \
@ENABLE_PYTHON_TRUE@ -I$(top_builddir)/src \
@ENABLE_PYTHON_TRUE@ -I$(top_builddir)/src/bookmarks \
@ENABLE_PYTHON_TRUE@ $(PYTHON_INCLUDES) \
@@ -18695,7 +18872,7 @@
@ENABLE_PYTHON_TRUE@ -DDATADIR=\""$(datadir)"\" \
@ENABLE_PYTHON_TRUE@ $(AM_CPPFLAGS)
-@@ -793,8 +795,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+@@ -776,8 +778,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -18706,7 +18883,7 @@
exit 1;; \
esac; \
done; \
-@@ -1363,7 +1365,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+@@ -1346,7 +1348,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -18715,17 +18892,17 @@
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-Index: epiphany-2.26.1/Makefile.in
+Index: epiphany-2.26.3/Makefile.in
===================================================================
---- epiphany-2.26.1.orig/Makefile.in 2009-05-06 13:23:05.829840569 +0200
-+++ epiphany-2.26.1/Makefile.in 2009-05-06 13:24:22.717837085 +0200
+--- epiphany-2.26.3.orig/Makefile.in 2009-06-29 14:22:38.000000000 +0200
++++ epiphany-2.26.3/Makefile.in 2009-08-10 16:24:14.442137782 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -208,6 +208,7 @@ MSGMERGE = @MSGMERGE@
+@@ -191,6 +191,7 @@ MSGMERGE = @MSGMERGE@
NM = @NM@
NMEDIT = @NMEDIT@
NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
@@ -18733,7 +18910,7 @@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
OTOOL = @OTOOL@
-@@ -306,6 +307,7 @@ sharedstatedir = @sharedstatedir@
+@@ -289,6 +290,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -18741,7 +18918,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = lib embed src plugins data po help doc
-@@ -395,7 +397,7 @@ clean-libtool:
+@@ -378,7 +380,7 @@ clean-libtool:
-rm -rf .libs _libs
distclean-libtool:
@@ -18750,7 +18927,7 @@
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
-@@ -472,7 +474,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+@@ -455,7 +457,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -18759,10 +18936,10 @@
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-Index: epiphany-2.26.1/m4/libtool.m4
+Index: epiphany-2.26.3/m4/libtool.m4
===================================================================
---- epiphany-2.26.1.orig/m4/libtool.m4 2009-05-06 13:22:50.073345168 +0200
-+++ epiphany-2.26.1/m4/libtool.m4 2009-05-06 13:24:10.237343538 +0200
+--- epiphany-2.26.3.orig/m4/libtool.m4 2009-05-18 18:51:38.000000000 +0200
++++ epiphany-2.26.3/m4/libtool.m4 2009-08-10 16:23:59.362143455 +0200
@@ -380,12 +380,12 @@ m4_define([lt_decl_dquote_varnames],
# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
# ---------------------------------------------------
@@ -19143,10 +19320,10 @@
# _LT_DECL_SED
# ------------
# Check for a fully-functional sed program, that truncates
-Index: epiphany-2.26.1/m4/ltoptions.m4
+Index: epiphany-2.26.3/m4/ltoptions.m4
===================================================================
---- epiphany-2.26.1.orig/m4/ltoptions.m4 2009-05-06 13:22:50.193345899 +0200
-+++ epiphany-2.26.1/m4/ltoptions.m4 2009-05-06 13:24:10.381347255 +0200
+--- epiphany-2.26.3.orig/m4/ltoptions.m4 2009-05-18 18:51:39.000000000 +0200
++++ epiphany-2.26.3/m4/ltoptions.m4 2009-08-10 16:23:59.514141486 +0200
@@ -125,7 +125,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll],
[enable_win32_dll=yes
@@ -19156,10 +19333,10 @@
AC_CHECK_TOOL(AS, as, false)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
AC_CHECK_TOOL(OBJDUMP, objdump, false)
-Index: epiphany-2.26.1/m4/ltsugar.m4
+Index: epiphany-2.26.3/m4/ltsugar.m4
===================================================================
---- epiphany-2.26.1.orig/m4/ltsugar.m4 2009-05-06 13:22:50.257346355 +0200
-+++ epiphany-2.26.1/m4/ltsugar.m4 2009-05-06 13:24:10.533345762 +0200
+--- epiphany-2.26.3.orig/m4/ltsugar.m4 2009-05-18 18:51:39.000000000 +0200
++++ epiphany-2.26.3/m4/ltsugar.m4 2009-08-10 16:23:59.678137815 +0200
@@ -1,13 +1,13 @@
# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
#
@@ -19199,10 +19376,10 @@
# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
-Index: epiphany-2.26.1/m4/ltversion.m4
+Index: epiphany-2.26.3/m4/ltversion.m4
===================================================================
---- epiphany-2.26.1.orig/m4/ltversion.m4 2009-05-06 13:22:50.321344366 +0200
-+++ epiphany-2.26.1/m4/ltversion.m4 2009-05-06 13:24:10.677348487 +0200
+--- epiphany-2.26.3.orig/m4/ltversion.m4 2009-05-18 18:51:39.000000000 +0200
++++ epiphany-2.26.3/m4/ltversion.m4 2009-08-10 16:23:59.846143035 +0200
@@ -9,15 +9,15 @@
# Generated from ltversion.in.
More information about the pkg-gnome-commits
mailing list