r21530 - /desktop/experimental/epiphany-webkit/debian/patches/
kov at users.alioth.debian.org
kov at users.alioth.debian.org
Thu Sep 24 21:23:49 UTC 2009
Author: kov
Date: Thu Sep 24 21:23:33 2009
New Revision: 21530
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21530
Log:
Refreshed all patches after rebranding/takeover
Modified:
desktop/experimental/epiphany-webkit/debian/patches/00_browser_wrapper_path.patch
desktop/experimental/epiphany-webkit/debian/patches/01_bookmarks_menu.patch
desktop/experimental/epiphany-webkit/debian/patches/02_ac_init.patch
desktop/experimental/epiphany-webkit/debian/patches/03_dbus.patch
desktop/experimental/epiphany-webkit/debian/patches/05_libexecdir.patch
desktop/experimental/epiphany-webkit/debian/patches/07_bookmarks.patch
desktop/experimental/epiphany-webkit/debian/patches/10_smart_bookmarks.patch
desktop/experimental/epiphany-webkit/debian/patches/12_safetypes.patch
desktop/experimental/epiphany-webkit/debian/patches/99_autoreconf.patch
desktop/experimental/epiphany-webkit/debian/patches/99_ltmain_as-needed.patch
Modified: desktop/experimental/epiphany-webkit/debian/patches/00_browser_wrapper_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/patches/00_browser_wrapper_path.patch?rev=21530&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/patches/00_browser_wrapper_path.patch [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/patches/00_browser_wrapper_path.patch [utf-8] Thu Sep 24 21:23:33 2009
@@ -1,7 +1,7 @@
-Index: epiphany-webkit-2.27.92/data/bme.desktop.in.in
+Index: epiphany-browser-2.28.0/data/bme.desktop.in.in
===================================================================
---- epiphany-webkit-2.27.92.orig/data/bme.desktop.in.in 2009-04-17 03:06:40.000000000 -0300
-+++ epiphany-webkit-2.27.92/data/bme.desktop.in.in 2009-09-09 18:56:59.222409973 -0300
+--- epiphany-browser-2.28.0.orig/data/bme.desktop.in.in 2009-09-24 18:15:08.164439853 -0300
++++ epiphany-browser-2.28.0/data/bme.desktop.in.in 2009-09-24 18:18:17.524940227 -0300
@@ -2,7 +2,7 @@
_Name=Epiphany Web Bookmarks
_GenericName=Web Bookmarks
@@ -11,24 +11,16 @@
StartupNotify=true
Terminal=false
Type=Application
-Index: epiphany-webkit-2.27.92/data/epiphany.desktop.in.in
+Index: epiphany-browser-2.28.0/data/epiphany.desktop.in.in
===================================================================
---- epiphany-webkit-2.27.92.orig/data/epiphany.desktop.in.in 2009-09-04 11:09:21.000000000 -0300
-+++ epiphany-webkit-2.27.92/data/epiphany.desktop.in.in 2009-09-09 18:58:17.565912976 -0300
-@@ -1,13 +1,13 @@
- [Desktop Entry]
- _Name=Epiphany
+--- epiphany-browser-2.28.0.orig/data/epiphany.desktop.in.in 2009-09-24 18:15:08.152447132 -0300
++++ epiphany-browser-2.28.0/data/epiphany.desktop.in.in 2009-09-24 18:18:17.524940227 -0300
+@@ -3,7 +3,7 @@
_GenericName=Web Browser
--_X-GNOME-FullName=Epiphany Web Browser
-+_X-GNOME-FullName=Epiphany Web Browser
+ _X-GNOME-FullName=Epiphany Web Browser
_Comment=Browse the web
-Exec=epiphany %U
+Exec=epiphany-browser %U
StartupNotify=true
Terminal=false
Type=Application
--Icon=gnome-web-browser
-+Icon=gnome-web-browser
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=epiphany
- X-GNOME-Bugzilla-Component=BugBuddyBugs
Modified: desktop/experimental/epiphany-webkit/debian/patches/01_bookmarks_menu.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/patches/01_bookmarks_menu.patch?rev=21530&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/patches/01_bookmarks_menu.patch [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/patches/01_bookmarks_menu.patch [utf-8] Thu Sep 24 21:23:33 2009
@@ -1,8 +1,8 @@
-Index: epiphany-2.24.3/data/bme.desktop.in.in
+Index: epiphany-browser-2.28.0/data/bme.desktop.in.in
===================================================================
---- epiphany-2.24.3.orig/data/bme.desktop.in.in 2009-02-15 00:05:18.501903358 +0100
-+++ epiphany-2.24.3/data/bme.desktop.in.in 2009-02-15 00:05:55.741902575 +0100
-@@ -7,6 +7,7 @@ StartupNotify=true
+--- epiphany-browser-2.28.0.orig/data/bme.desktop.in.in 2009-09-24 18:18:17.524940227 -0300
++++ epiphany-browser-2.28.0/data/bme.desktop.in.in 2009-09-24 18:18:28.388938924 -0300
+@@ -7,6 +7,7 @@
Terminal=false
Type=Application
Icon=epiphany-bookmarks
Modified: desktop/experimental/epiphany-webkit/debian/patches/02_ac_init.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/patches/02_ac_init.patch?rev=21530&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/patches/02_ac_init.patch [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/patches/02_ac_init.patch [utf-8] Thu Sep 24 21:23:33 2009
@@ -1,13 +1,13 @@
-Index: epiphany-2.24.1/configure.ac
+Index: epiphany-browser-2.28.0/configure.ac
===================================================================
---- epiphany-2.24.1.orig/configure.ac 2008-10-19 14:52:49.000000000 +0200
-+++ epiphany-2.24.1/configure.ac 2008-11-14 00:28:34.598987162 +0100
-@@ -25,7 +25,7 @@ m4_define([epiphany_build_id],[20080528]
+--- epiphany-browser-2.28.0.orig/configure.ac 2009-09-24 18:15:07.988439871 -0300
++++ epiphany-browser-2.28.0/configure.ac 2009-09-24 18:18:34.084440183 -0300
+@@ -23,7 +23,7 @@
# This can be either "trunk" or "branches/gnome-x-y"
- m4_define([epiphany_branch],["branches/gnome-2-24"])
+ m4_define([epiphany_branch],["trunk"])
-AC_INIT([GNOME Web Browser],[epiphany_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
+AC_INIT([GNOME Web Browser],[epiphany_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany-browser])
- AC_PREREQ([2.59])
+ GNOME_COMMON_INIT
Modified: desktop/experimental/epiphany-webkit/debian/patches/03_dbus.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/patches/03_dbus.patch?rev=21530&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/patches/03_dbus.patch [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/patches/03_dbus.patch [utf-8] Thu Sep 24 21:23:33 2009
@@ -1,8 +1,8 @@
-Index: epiphany-2.24.3/src/ephy-main.c
+Index: epiphany-browser-2.28.0/src/ephy-main.c
===================================================================
---- epiphany-2.24.3.orig/src/ephy-main.c 2008-08-04 19:36:22.000000000 +0200
-+++ epiphany-2.24.3/src/ephy-main.c 2009-02-15 00:06:09.989406029 +0100
-@@ -645,11 +645,13 @@ main (int argc,
+--- epiphany-browser-2.28.0.orig/src/ephy-main.c 2009-09-24 18:15:07.912464628 -0300
++++ epiphany-browser-2.28.0/src/ephy-main.c 2009-09-24 18:18:45.428939915 -0300
+@@ -690,11 +690,13 @@
if (!_ephy_dbus_startup (!private_instance, &error))
{
Modified: desktop/experimental/epiphany-webkit/debian/patches/05_libexecdir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/patches/05_libexecdir.patch?rev=21530&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/patches/05_libexecdir.patch [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/patches/05_libexecdir.patch [utf-8] Thu Sep 24 21:23:33 2009
@@ -1,7 +1,7 @@
-Index: epiphany-webkit-2.27.3/data/epiphany.pc.in
+Index: epiphany-browser-2.28.0/data/epiphany.pc.in
===================================================================
---- epiphany-webkit-2.27.3.orig/data/epiphany.pc.in 2009-04-17 03:06:40.000000000 -0300
-+++ epiphany-webkit-2.27.3/data/epiphany.pc.in 2009-06-24 17:15:34.000000000 -0300
+--- epiphany-browser-2.28.0.orig/data/epiphany.pc.in 2009-09-24 18:15:07.808465337 -0300
++++ epiphany-browser-2.28.0/data/epiphany.pc.in 2009-09-24 18:19:01.164440294 -0300
@@ -2,8 +2,8 @@
exec_prefix=@exec_prefix@
libdir=@libdir@
@@ -13,11 +13,11 @@
datarootdir=@datarootdir@
datadir=@datadir@
icondir=@datadir@/@PACKAGE@/icons
-Index: epiphany-webkit-2.27.3/lib/Makefile.am
+Index: epiphany-browser-2.28.0/lib/Makefile.am
===================================================================
---- epiphany-webkit-2.27.3.orig/lib/Makefile.am 2009-04-17 03:06:40.000000000 -0300
-+++ epiphany-webkit-2.27.3/lib/Makefile.am 2009-06-24 17:15:34.000000000 -0300
-@@ -78,7 +78,7 @@
+--- epiphany-browser-2.28.0.orig/lib/Makefile.am 2009-09-24 18:15:07.832440578 -0300
++++ epiphany-browser-2.28.0/lib/Makefile.am 2009-09-24 18:19:01.164440294 -0300
+@@ -77,7 +77,7 @@
-I$(top_srcdir)/lib/egg \
-DDATADIR="\"$(datadir)\"" \
-DSHARE_DIR=\"$(pkgdatadir)\" \
@@ -26,11 +26,11 @@
$(AM_CPPFLAGS)
libephymisc_la_CFLAGS = \
-Index: epiphany-webkit-2.27.3/src/Makefile.am
+Index: epiphany-browser-2.28.0/src/Makefile.am
===================================================================
---- epiphany-webkit-2.27.3.orig/src/Makefile.am 2009-06-05 18:34:17.000000000 -0300
-+++ epiphany-webkit-2.27.3/src/Makefile.am 2009-06-24 17:15:34.000000000 -0300
-@@ -104,8 +104,8 @@
+--- epiphany-browser-2.28.0.orig/src/Makefile.am 2009-09-24 18:15:07.820440106 -0300
++++ epiphany-browser-2.28.0/src/Makefile.am 2009-09-24 18:19:01.164440294 -0300
+@@ -106,8 +106,8 @@
-I$(top_srcdir)/lib/egg \
-I$(top_srcdir)/lib/widgets \
-I$(top_srcdir)/src/bookmarks \
Modified: desktop/experimental/epiphany-webkit/debian/patches/07_bookmarks.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/patches/07_bookmarks.patch?rev=21530&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/patches/07_bookmarks.patch [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/patches/07_bookmarks.patch [utf-8] Thu Sep 24 21:23:33 2009
@@ -1,7 +1,7 @@
-Index: epiphany-webkit-2.27.91/data/default-bookmarks.rdf.in
+Index: epiphany-browser-2.28.0/data/default-bookmarks.rdf.in
===================================================================
---- epiphany-webkit-2.27.91.orig/data/default-bookmarks.rdf.in 2009-08-25 11:39:48.574884228 -0300
-+++ epiphany-webkit-2.27.91/data/default-bookmarks.rdf.in 2009-08-25 11:42:33.758850683 -0300
+--- epiphany-browser-2.28.0.orig/data/default-bookmarks.rdf.in 2009-09-24 18:15:07.712439907 -0300
++++ epiphany-browser-2.28.0/data/default-bookmarks.rdf.in 2009-09-24 18:19:14.532439942 -0300
@@ -20,4 +20,21 @@
"http://www.google.nl" and "http://www.google.nl/search?q=%s" -->
<_ephy:smartlink>http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8</_ephy:smartlink>
Modified: desktop/experimental/epiphany-webkit/debian/patches/10_smart_bookmarks.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/patches/10_smart_bookmarks.patch?rev=21530&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/patches/10_smart_bookmarks.patch [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/patches/10_smart_bookmarks.patch [utf-8] Thu Sep 24 21:23:33 2009
@@ -1,10 +1,10 @@
GNOME #571794
-Index: epiphany-2.26.3/src/bookmarks/ephy-bookmark-action.c
+Index: epiphany-browser-2.28.0/src/bookmarks/ephy-bookmark-action.c
===================================================================
---- 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,
+--- epiphany-browser-2.28.0.orig/src/bookmarks/ephy-bookmark-action.c 2009-09-24 18:15:07.588438388 -0300
++++ epiphany-browser-2.28.0/src/bookmarks/ephy-bookmark-action.c 2009-09-24 18:19:26.440440234 -0300
+@@ -399,6 +399,18 @@
gdk_event_free (event);
}
Modified: desktop/experimental/epiphany-webkit/debian/patches/12_safetypes.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/patches/12_safetypes.patch?rev=21530&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/patches/12_safetypes.patch [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/patches/12_safetypes.patch [utf-8] Thu Sep 24 21:23:33 2009
@@ -1,7 +1,7 @@
-Index: epiphany-2.24.3/data/mime-types-permissions.xml
+Index: epiphany-browser-2.28.0/data/mime-types-permissions.xml
===================================================================
---- epiphany-2.24.3.orig/data/mime-types-permissions.xml 2007-09-28 16:36:06.000000000 +0200
-+++ epiphany-2.24.3/data/mime-types-permissions.xml 2009-04-25 20:05:33.172045478 +0200
+--- epiphany-browser-2.28.0.orig/data/mime-types-permissions.xml 2009-09-24 18:15:07.472440427 -0300
++++ epiphany-browser-2.28.0/data/mime-types-permissions.xml 2009-09-24 18:19:30.692440593 -0300
@@ -19,6 +19,7 @@
<mime-type type="application/postscript"/>
<mime-type type="application/ram"/>
@@ -10,7 +10,7 @@
<mime-type type="application/rtf"/>
<mime-type type="application/sdp"/>
<mime-type type="application/smil"/>
-@@ -88,7 +89,6 @@
+@@ -89,7 +90,6 @@
<mime-type type="application/x-dbase"/>
<mime-type type="application/x-dbm"/>
<mime-type type="application/x-designer"/>
@@ -18,7 +18,7 @@
<mime-type type="application/x-dia-diagram"/>
<mime-type type="application/x-dvi"/>
<mime-type type="application/x-e-theme"/>
-@@ -206,6 +206,7 @@
+@@ -215,6 +215,7 @@
<mime-type type="application/x-zip-compressed"/>
<mime-type type="application/x-zoo"/>
<mime-type type="application/xhtml+xml"/>
@@ -26,7 +26,7 @@
<mime-type type="application/zip"/>
<mime-type type="audio/ac3"/>
<mime-type type="audio/AMR"/>
-@@ -438,6 +439,7 @@
+@@ -447,6 +448,7 @@
<mime-type type="application/x-csh"/>
<mime-type type="application/x-dc-rom"/>
<mime-type type="application/x-deb"/>
Modified: desktop/experimental/epiphany-webkit/debian/patches/99_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/patches/99_autoreconf.patch?rev=21530&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/patches/99_autoreconf.patch [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/patches/99_autoreconf.patch [utf-8] Thu Sep 24 21:23:33 2009
@@ -2,10 +2,10 @@
aclocal-1.10 -I m4
automake-1.10
autoconf
-Index: epiphany-webkit-2.28.0/configure
+Index: epiphany-browser-2.28.0/configure
===================================================================
---- epiphany-webkit-2.28.0.orig/configure 2009-09-21 15:04:17.000000000 -0300
-+++ epiphany-webkit-2.28.0/configure 2009-09-24 16:40:08.540440223 -0300
+--- epiphany-browser-2.28.0.orig/configure 2009-09-24 18:15:07.340447944 -0300
++++ epiphany-browser-2.28.0/configure 2009-09-24 18:20:03.584440260 -0300
@@ -1,20 +1,22 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -804,7 +804,7 @@
# Identity of this package.
PACKAGE_NAME='GNOME Web Browser'
-PACKAGE_TARNAME='epiphany'
-+PACKAGE_TARNAME='epiphany-webkit'
++PACKAGE_TARNAME='epiphany-browser'
PACKAGE_VERSION='2.28.0'
PACKAGE_STRING='GNOME Web Browser 2.28.0'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany'
@@ -942,16 +942,17 @@
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1689,7 +1634,7 @@
+@@ -1689,7 +1634,8 @@
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
- --docdir=DIR documentation root [DATAROOTDIR/doc/epiphany]
-+ --docdir=DIR documentation root [DATAROOTDIR/doc/epiphany-webkit]
++ --docdir=DIR documentation root
++ [DATAROOTDIR/doc/epiphany-browser]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
-@@ -1736,7 +1681,8 @@
+@@ -1736,7 +1682,8 @@
Turn on compiler warnings
--enable-iso-c Try to warn if code is not ISO C
--enable-tests Wheter to build tests (default: yes)
@@ -961,7 +962,7 @@
--enable-introspection Enable GObject introspection (default: disabled)
--enable-seed Enable Seed support (default: disabled)
--enable-nss Enable NSS support (default: enabled)
-@@ -1867,21 +1813,432 @@
+@@ -1867,21 +1814,432 @@
if $ac_init_version; then
cat <<\_ACEOF
GNOME Web Browser configure 2.28.0
@@ -1398,7 +1399,7 @@
$ $0 $@
-@@ -1917,8 +2274,8 @@
+@@ -1917,8 +2275,8 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1409,7 +1410,7 @@
IFS=$as_save_IFS
} >&5
-@@ -1955,9 +2312,9 @@
+@@ -1955,9 +2313,9 @@
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -1421,7 +1422,7 @@
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
-@@ -1973,13 +2330,13 @@
+@@ -1973,13 +2331,13 @@
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -1438,7 +1439,7 @@
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
-@@ -2004,13 +2361,13 @@
+@@ -2004,13 +2362,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -1454,7 +1455,7 @@
esac ;;
esac
done
-@@ -2082,39 +2439,41 @@
+@@ -2082,39 +2440,41 @@
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -1501,7 +1502,7 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
-@@ -2133,7 +2492,7 @@
+@@ -2133,7 +2493,7 @@
do
test "x$ac_site_file" = xNONE && continue
if test -r "$ac_site_file"; then
@@ -1510,7 +1511,7 @@
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
-@@ -2144,7 +2503,7 @@
+@@ -2144,7 +2504,7 @@
# Some versions of bash will fail to source /dev/null (special
# files actually), so we avoid doing that.
if test -f "$cache_file"; then
@@ -1519,7 +1520,7 @@
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2152,14 +2511,14 @@
+@@ -2152,14 +2512,14 @@
esac
fi
else
@@ -1538,7 +1539,7 @@
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
-@@ -2170,11 +2529,11 @@
+@@ -2170,11 +2530,11 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
@@ -1552,7 +1553,7 @@
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -2184,17 +2543,17 @@
+@@ -2184,17 +2544,17 @@
ac_old_val_w=`echo x $ac_old_val`
ac_new_val_w=`echo x $ac_new_val`
if test "$ac_old_val_w" != "$ac_new_val_w"; then
@@ -1574,7 +1575,7 @@
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -2206,43 +2565,20 @@
+@@ -2206,43 +2566,20 @@
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -1625,7 +1626,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -2296,24 +2632,16 @@
+@@ -2296,24 +2633,16 @@
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -1658,7 +1659,7 @@
fi
# These three variables are undocumented and unsupported,
-@@ -2339,10 +2667,10 @@
+@@ -2339,10 +2668,10 @@
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
# Reject install programs that cannot install multiple files.
@@ -1671,7 +1672,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2350,11 +2678,11 @@
+@@ -2350,11 +2679,11 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1687,7 +1688,7 @@
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2391,7 +2719,7 @@
+@@ -2391,7 +2720,7 @@
;;
esac
@@ -1696,7 +1697,7 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -2407,7 +2735,7 @@
+@@ -2407,7 +2736,7 @@
INSTALL=$ac_install_sh
fi
fi
@@ -1705,7 +1706,7 @@
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2418,7 +2746,7 @@
+@@ -2418,7 +2747,7 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -1714,7 +1715,7 @@
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -2429,15 +2757,11 @@
+@@ -2429,15 +2758,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -1732,7 +1733,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2459,11 +2783,8 @@
+@@ -2459,11 +2784,8 @@
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
@@ -1746,7 +1747,7 @@
fi
test "$2" = conftest.file
-@@ -2472,13 +2793,10 @@
+@@ -2472,13 +2794,10 @@
# Ok.
:
else
@@ -1763,7 +1764,7 @@
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2506,7 +2824,7 @@
+@@ -2506,7 +2825,7 @@
am_missing_run="$MISSING --run "
else
am_missing_run=
@@ -1772,7 +1773,7 @@
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-@@ -2527,9 +2845,9 @@
+@@ -2527,9 +2846,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -1784,7 +1785,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -2540,24 +2858,24 @@
+@@ -2540,24 +2859,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1814,7 +1815,7 @@
$as_echo "no" >&6; }
fi
-@@ -2567,9 +2885,9 @@
+@@ -2567,9 +2886,9 @@
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -1826,7 +1827,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -2580,24 +2898,24 @@
+@@ -2580,24 +2899,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1856,7 +1857,7 @@
$as_echo "no" >&6; }
fi
-@@ -2606,7 +2924,7 @@
+@@ -2606,7 +2925,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -1865,7 +1866,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2619,10 +2937,10 @@
+@@ -2619,10 +2938,10 @@
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
@@ -1878,7 +1879,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2630,7 +2948,7 @@
+@@ -2630,7 +2949,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1887,7 +1888,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-@@ -2642,7 +2960,7 @@
+@@ -2642,7 +2961,7 @@
esac
done
done
@@ -1896,7 +1897,7 @@
IFS=$as_save_IFS
fi
-@@ -2658,7 +2976,7 @@
+@@ -2658,7 +2977,7 @@
MKDIR_P="$ac_install_sh -d"
fi
fi
@@ -1905,7 +1906,7 @@
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
-@@ -2671,9 +2989,9 @@
+@@ -2671,9 +2990,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -1917,7 +1918,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2684,24 +3002,24 @@
+@@ -2684,24 +3003,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1947,7 +1948,7 @@
$as_echo "no" >&6; }
fi
-@@ -2709,11 +3027,11 @@
+@@ -2709,11 +3028,11 @@
test -n "$AWK" && break
done
@@ -1961,7 +1962,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2731,11 +3049,11 @@
+@@ -2731,11 +3050,11 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -1975,7 +1976,7 @@
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2755,9 +3073,7 @@
+@@ -2755,9 +3074,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
@@ -1986,16 +1987,16 @@
fi
fi
-@@ -2772,7 +3088,7 @@
+@@ -2772,7 +3089,7 @@
# Define the identity of the package.
- PACKAGE='epiphany'
-+ PACKAGE='epiphany-webkit'
++ PACKAGE='epiphany-browser'
VERSION='2.28.0'
-@@ -2808,7 +3124,7 @@
+@@ -2808,7 +3125,7 @@
AMTAR=${AMTAR-"${am_missing_run}tar"}
@@ -2004,7 +2005,7 @@
$as_echo_n "checking how to create a ustar tar archive... " >&6; }
# Loop over all known methods to create a tar archive until one works.
_am_tools='gnutar plaintar pax cpio none'
-@@ -2881,13 +3197,13 @@
+@@ -2881,13 +3198,13 @@
done
rm -rf conftest.dir
@@ -2020,7 +2021,7 @@
$as_echo "$am_cv_prog_tar_ustar" >&6; }
-@@ -2897,7 +3213,7 @@
+@@ -2897,7 +3214,7 @@
# Use AM_SILENT_RULES if present
# Check whether --enable-silent-rules was given.
@@ -2029,7 +2030,7 @@
enableval=$enable_silent_rules;
fi
-@@ -2913,16 +3229,16 @@
+@@ -2913,16 +3230,16 @@
enable_maintainer_mode=yes
fi
@@ -2049,7 +2050,7 @@
$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
-@@ -2937,7 +3253,7 @@
+@@ -2937,7 +3254,7 @@
# Check whether --enable-shared was given.
@@ -2058,7 +2059,7 @@
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -2968,7 +3284,7 @@
+@@ -2968,7 +3285,7 @@
# Check whether --enable-static was given.
@@ -2067,7 +2068,7 @@
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -3005,7 +3321,7 @@
+@@ -3005,7 +3322,7 @@
case `pwd` in
*\ * | *\ *)
@@ -2076,7 +2077,7 @@
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
esac
-@@ -3030,35 +3346,27 @@
+@@ -3030,35 +3347,27 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -2119,7 +2120,7 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -3074,28 +3382,24 @@
+@@ -3074,28 +3383,24 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -2153,7 +2154,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -3123,7 +3427,7 @@
+@@ -3123,7 +3428,7 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -2162,7 +2163,7 @@
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-@@ -3151,12 +3455,12 @@
+@@ -3151,12 +3456,12 @@
fi
@@ -2177,7 +2178,7 @@
enableval=$enable_dependency_tracking;
fi
-@@ -3181,9 +3485,9 @@
+@@ -3181,9 +3486,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -2189,7 +2190,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3194,24 +3498,24 @@
+@@ -3194,24 +3499,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2219,7 +2220,7 @@
$as_echo "no" >&6; }
fi
-@@ -3221,9 +3525,9 @@
+@@ -3221,9 +3526,9 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -2231,7 +2232,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3234,24 +3538,24 @@
+@@ -3234,24 +3539,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2261,7 +2262,7 @@
$as_echo "no" >&6; }
fi
-@@ -3260,7 +3564,7 @@
+@@ -3260,7 +3565,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2270,7 +2271,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3274,9 +3578,9 @@
+@@ -3274,9 +3579,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -2282,7 +2283,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3287,24 +3591,24 @@
+@@ -3287,24 +3592,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2312,7 +2313,7 @@
$as_echo "no" >&6; }
fi
-@@ -3314,9 +3618,9 @@
+@@ -3314,9 +3619,9 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -2324,7 +2325,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3328,18 +3632,18 @@
+@@ -3328,18 +3633,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2346,7 +2347,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -3358,10 +3662,10 @@
+@@ -3358,10 +3663,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -2359,7 +2360,7 @@
$as_echo "no" >&6; }
fi
-@@ -3373,9 +3677,9 @@
+@@ -3373,9 +3678,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -2371,7 +2372,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3386,24 +3690,24 @@
+@@ -3386,24 +3691,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2401,7 +2402,7 @@
$as_echo "no" >&6; }
fi
-@@ -3417,9 +3721,9 @@
+@@ -3417,9 +3722,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -2413,7 +2414,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3430,24 +3734,24 @@
+@@ -3430,24 +3735,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2443,7 +2444,7 @@
$as_echo "no" >&6; }
fi
-@@ -3460,7 +3764,7 @@
+@@ -3460,7 +3765,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2452,7 +2453,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3471,73 +3775,55 @@
+@@ -3471,73 +3776,55 @@
fi
@@ -2551,7 +2552,7 @@
$as_echo_n "checking for C compiler default output file name... " >&6; }
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-@@ -3554,17 +3840,17 @@
+@@ -3554,17 +3841,17 @@
done
rm -f $ac_rmfiles
@@ -2574,7 +2575,7 @@
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
# in a Makefile. We should not override ac_cv_exeext if it was cached,
-@@ -3581,7 +3867,7 @@
+@@ -3581,7 +3868,7 @@
# certainly right.
break;;
*.* )
@@ -2583,7 +2584,7 @@
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -3600,84 +3886,75 @@
+@@ -3600,84 +3887,75 @@
else
ac_file=''
fi
@@ -2693,7 +2694,7 @@
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -3692,32 +3969,24 @@
+@@ -3692,32 +3970,24 @@
esac
done
else
@@ -2733,7 +2734,7 @@
/* end confdefs.h. */
int
-@@ -3729,17 +3998,17 @@
+@@ -3729,17 +3999,17 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -2756,7 +2757,7 @@
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
-@@ -3752,31 +4021,23 @@
+@@ -3752,31 +4022,23 @@
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -2795,7 +2796,7 @@
/* end confdefs.h. */
int
-@@ -3790,37 +4051,16 @@
+@@ -3790,37 +4052,16 @@
return 0;
}
_ACEOF
@@ -2836,7 +2837,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -3829,20 +4069,16 @@
+@@ -3829,20 +4070,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -2860,7 +2861,7 @@
/* end confdefs.h. */
int
-@@ -3853,35 +4089,11 @@
+@@ -3853,35 +4090,11 @@
return 0;
}
_ACEOF
@@ -2899,7 +2900,7 @@
/* end confdefs.h. */
int
-@@ -3892,36 +4104,12 @@
+@@ -3892,36 +4105,12 @@
return 0;
}
_ACEOF
@@ -2940,7 +2941,7 @@
/* end confdefs.h. */
int
-@@ -3932,42 +4120,17 @@
+@@ -3932,42 +4121,17 @@
return 0;
}
_ACEOF
@@ -2985,7 +2986,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -3984,18 +4147,14 @@
+@@ -3984,18 +4148,14 @@
CFLAGS=
fi
fi
@@ -3007,7 +3008,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -4052,32 +4211,9 @@
+@@ -4052,32 +4212,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -3041,7 +3042,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -4088,17 +4224,19 @@
+@@ -4088,17 +4225,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -3064,7 +3065,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -4108,9 +4246,9 @@
+@@ -4108,9 +4247,9 @@
depcc="$CC" am_compiler_list=
@@ -3076,7 +3077,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -4218,7 +4356,7 @@
+@@ -4218,7 +4357,7 @@
fi
fi
@@ -3085,7 +3086,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -4233,9 +4371,9 @@
+@@ -4233,9 +4372,9 @@
fi
@@ -3097,7 +3098,7 @@
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -4243,7 +4381,7 @@
+@@ -4243,7 +4382,7 @@
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -3106,7 +3107,7 @@
if test -z "$SED"; then
ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
-@@ -4252,7 +4390,7 @@
+@@ -4252,7 +4391,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3115,7 +3116,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-@@ -4272,7 +4410,7 @@
+@@ -4272,7 +4411,7 @@
$as_echo '' >> "conftest.nl"
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -3124,7 +3125,7 @@
if test $ac_count -gt ${ac_path_SED_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_SED="$ac_path_SED"
-@@ -4287,19 +4425,17 @@
+@@ -4287,19 +4426,17 @@
$ac_path_SED_found && break 3
done
done
@@ -3147,7 +3148,7 @@
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -4317,9 +4453,9 @@
+@@ -4317,9 +4454,9 @@
@@ -3159,7 +3160,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -4330,7 +4466,7 @@
+@@ -4330,7 +4467,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3168,7 +3169,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-@@ -4350,7 +4486,7 @@
+@@ -4350,7 +4487,7 @@
$as_echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -3177,7 +3178,7 @@
if test $ac_count -gt ${ac_path_GREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_GREP="$ac_path_GREP"
-@@ -4365,26 +4501,24 @@
+@@ -4365,26 +4502,24 @@
$ac_path_GREP_found && break 3
done
done
@@ -3209,7 +3210,7 @@
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4398,7 +4532,7 @@
+@@ -4398,7 +4533,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3218,7 +3219,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-@@ -4418,7 +4552,7 @@
+@@ -4418,7 +4553,7 @@
$as_echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -3227,7 +3228,7 @@
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_EGREP="$ac_path_EGREP"
-@@ -4433,12 +4567,10 @@
+@@ -4433,12 +4568,10 @@
$ac_path_EGREP_found && break 3
done
done
@@ -3242,7 +3243,7 @@
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -4446,14 +4578,14 @@
+@@ -4446,14 +4579,14 @@
fi
fi
@@ -3260,7 +3261,7 @@
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -4467,7 +4599,7 @@
+@@ -4467,7 +4600,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3269,7 +3270,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-@@ -4487,7 +4619,7 @@
+@@ -4487,7 +4620,7 @@
$as_echo 'FGREP' >> "conftest.nl"
"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -3278,7 +3279,7 @@
if test $ac_count -gt ${ac_path_FGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_FGREP="$ac_path_FGREP"
-@@ -4502,12 +4634,10 @@
+@@ -4502,12 +4635,10 @@
$ac_path_FGREP_found && break 3
done
done
@@ -3293,7 +3294,7 @@
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -4515,7 +4645,7 @@
+@@ -4515,7 +4646,7 @@
fi
fi
@@ -3302,7 +3303,7 @@
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
-@@ -4541,7 +4671,7 @@
+@@ -4541,7 +4672,7 @@
# Check whether --with-gnu-ld was given.
@@ -3311,7 +3312,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -4550,7 +4680,7 @@
+@@ -4550,7 +4681,7 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -3320,7 +3321,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -4580,13 +4710,13 @@
+@@ -4580,13 +4711,13 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -3337,7 +3338,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -4617,18 +4747,16 @@
+@@ -4617,18 +4748,16 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -3361,7 +3362,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -4641,7 +4769,7 @@
+@@ -4641,7 +4770,7 @@
;;
esac
fi
@@ -3370,7 +3371,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -4653,9 +4781,9 @@
+@@ -4653,9 +4782,9 @@
@@ -3382,7 +3383,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -4702,7 +4830,7 @@
+@@ -4702,7 +4831,7 @@
: ${lt_cv_path_NM=no}
fi
fi
@@ -3391,7 +3392,7 @@
$as_echo "$lt_cv_path_NM" >&6; }
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
-@@ -4713,9 +4841,9 @@
+@@ -4713,9 +4842,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -3403,7 +3404,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -4726,24 +4854,24 @@
+@@ -4726,24 +4855,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3433,7 +3434,7 @@
$as_echo "no" >&6; }
fi
-@@ -4757,9 +4885,9 @@
+@@ -4757,9 +4886,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -3445,7 +3446,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -4770,24 +4898,24 @@
+@@ -4770,24 +4899,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3475,7 +3476,7 @@
$as_echo "no" >&6; }
fi
-@@ -4800,7 +4928,7 @@
+@@ -4800,7 +4929,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3484,7 +3485,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -4820,44 +4948,44 @@
+@@ -4820,44 +4949,44 @@
@@ -3498,15 +3499,15 @@
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:4830: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:4958: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:4959: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4833: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:4961: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:4962: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4836: output\"" >&5)
-+ (eval echo "\"\$as_me:4964: output\"" >&5)
++ (eval echo "\"\$as_me:4965: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -3540,7 +3541,7 @@
$as_echo_n "(cached) " >&6
else
i=0
-@@ -4975,10 +5103,10 @@
+@@ -4975,10 +5104,10 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -3553,7 +3554,7 @@
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -4992,7 +5120,7 @@
+@@ -4992,7 +5121,7 @@
: ${MV="mv -f"}
: ${RM="rm -f"}
@@ -3562,7 +3563,7 @@
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
-@@ -5002,17 +5130,17 @@
+@@ -5002,17 +5131,17 @@
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -3583,7 +3584,7 @@
$as_echo "$lt_shell_append" >&6; }
-@@ -5047,14 +5175,14 @@
+@@ -5047,14 +5176,14 @@
@@ -3601,7 +3602,7 @@
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
-@@ -5083,9 +5211,9 @@
+@@ -5083,9 +5212,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -3613,7 +3614,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -5096,24 +5224,24 @@
+@@ -5096,24 +5225,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3643,7 +3644,7 @@
$as_echo "no" >&6; }
fi
-@@ -5123,9 +5251,9 @@
+@@ -5123,9 +5252,9 @@
ac_ct_OBJDUMP=$OBJDUMP
# Extract the first word of "objdump", so it can be a program name with args.
set dummy objdump; ac_word=$2
@@ -3655,7 +3656,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -5136,24 +5264,24 @@
+@@ -5136,24 +5265,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3685,7 +3686,7 @@
$as_echo "no" >&6; }
fi
-@@ -5162,7 +5290,7 @@
+@@ -5162,7 +5291,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3694,7 +3695,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5182,9 +5310,9 @@
+@@ -5182,9 +5311,9 @@
@@ -3706,7 +3707,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -5378,7 +5506,7 @@
+@@ -5378,7 +5507,7 @@
esac
fi
@@ -3715,7 +3716,7 @@
$as_echo "$lt_cv_deplibs_check_method" >&6; }
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
-@@ -5398,9 +5526,9 @@
+@@ -5398,9 +5527,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -3727,7 +3728,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
-@@ -5411,24 +5539,24 @@
+@@ -5411,24 +5540,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3757,7 +3758,7 @@
$as_echo "no" >&6; }
fi
-@@ -5438,9 +5566,9 @@
+@@ -5438,9 +5567,9 @@
ac_ct_AR=$AR
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
@@ -3769,7 +3770,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
-@@ -5451,24 +5579,24 @@
+@@ -5451,24 +5580,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3799,7 +3800,7 @@
$as_echo "no" >&6; }
fi
-@@ -5477,7 +5605,7 @@
+@@ -5477,7 +5606,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3808,7 +3809,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5503,9 +5631,9 @@
+@@ -5503,9 +5632,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -3820,7 +3821,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -5516,24 +5644,24 @@
+@@ -5516,24 +5645,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3850,7 +3851,7 @@
$as_echo "no" >&6; }
fi
-@@ -5543,9 +5671,9 @@
+@@ -5543,9 +5672,9 @@
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -3862,7 +3863,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -5556,24 +5684,24 @@
+@@ -5556,24 +5685,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3892,7 +3893,7 @@
$as_echo "no" >&6; }
fi
-@@ -5582,7 +5710,7 @@
+@@ -5582,7 +5711,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3901,7 +3902,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5602,9 +5730,9 @@
+@@ -5602,9 +5731,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -3913,7 +3914,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -5615,24 +5743,24 @@
+@@ -5615,24 +5744,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3943,7 +3944,7 @@
$as_echo "no" >&6; }
fi
-@@ -5642,9 +5770,9 @@
+@@ -5642,9 +5771,9 @@
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
@@ -3955,7 +3956,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -5655,24 +5783,24 @@
+@@ -5655,24 +5784,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3985,7 +3986,7 @@
$as_echo "no" >&6; }
fi
-@@ -5681,7 +5809,7 @@
+@@ -5681,7 +5810,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3994,7 +3995,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5759,9 +5887,9 @@
+@@ -5759,9 +5888,9 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -4006,7 +4007,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -5877,18 +6005,18 @@
+@@ -5877,18 +6006,18 @@
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
@@ -4031,7 +4032,7 @@
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -5941,11 +6069,11 @@
+@@ -5941,11 +6070,11 @@
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -4046,7 +4047,7 @@
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
-@@ -5979,10 +6107,10 @@
+@@ -5979,10 +6108,10 @@
lt_cv_sys_global_symbol_to_cdecl=
fi
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -4059,7 +4060,7 @@
$as_echo "ok" >&6; }
fi
-@@ -6009,7 +6137,7 @@
+@@ -6009,7 +6138,7 @@
# Check whether --enable-libtool-lock was given.
@@ -4068,7 +4069,7 @@
enableval=$enable_libtool_lock;
fi
-@@ -6021,11 +6149,11 @@
+@@ -6021,11 +6150,11 @@
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -4083,13 +4084,13 @@
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
-@@ -6039,12 +6167,12 @@
+@@ -6039,12 +6168,12 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6042 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ echo '#line 6170 "configure"' > conftest.$ac_ext
++ echo '#line 6171 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -4100,7 +4101,7 @@
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
-@@ -6078,11 +6206,11 @@
+@@ -6078,11 +6207,11 @@
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -4115,7 +4116,7 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
-@@ -6131,9 +6259,9 @@
+@@ -6131,9 +6260,9 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -4127,7 +4128,7 @@
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -6142,11 +6270,7 @@
+@@ -6142,11 +6271,7 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -4140,7 +4141,7 @@
/* end confdefs.h. */
int
-@@ -6157,38 +6281,13 @@
+@@ -6157,38 +6282,13 @@
return 0;
}
_ACEOF
@@ -4183,7 +4184,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -6196,7 +6295,7 @@
+@@ -6196,7 +6296,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -4192,7 +4193,7 @@
$as_echo "$lt_cv_cc_needs_belf" >&6; }
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-@@ -6206,11 +6305,11 @@
+@@ -6206,11 +6306,11 @@
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -4207,7 +4208,7 @@
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
-@@ -6236,9 +6335,9 @@
+@@ -6236,9 +6336,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
@@ -4219,7 +4220,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -6249,24 +6348,24 @@
+@@ -6249,24 +6349,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4249,7 +4250,7 @@
$as_echo "no" >&6; }
fi
-@@ -6276,9 +6375,9 @@
+@@ -6276,9 +6376,9 @@
ac_ct_DSYMUTIL=$DSYMUTIL
# Extract the first word of "dsymutil", so it can be a program name with args.
set dummy dsymutil; ac_word=$2
@@ -4261,7 +4262,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -6289,24 +6388,24 @@
+@@ -6289,24 +6389,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4291,7 +4292,7 @@
$as_echo "no" >&6; }
fi
-@@ -6315,7 +6414,7 @@
+@@ -6315,7 +6415,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4300,7 +4301,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6328,9 +6427,9 @@
+@@ -6328,9 +6428,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
@@ -4312,7 +4313,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -6341,24 +6440,24 @@
+@@ -6341,24 +6441,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4342,7 +4343,7 @@
$as_echo "no" >&6; }
fi
-@@ -6368,9 +6467,9 @@
+@@ -6368,9 +6468,9 @@
ac_ct_NMEDIT=$NMEDIT
# Extract the first word of "nmedit", so it can be a program name with args.
set dummy nmedit; ac_word=$2
@@ -4354,7 +4355,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -6381,24 +6480,24 @@
+@@ -6381,24 +6481,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4384,7 +4385,7 @@
$as_echo "no" >&6; }
fi
-@@ -6407,7 +6506,7 @@
+@@ -6407,7 +6507,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4393,7 +4394,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6420,9 +6519,9 @@
+@@ -6420,9 +6520,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
set dummy ${ac_tool_prefix}lipo; ac_word=$2
@@ -4405,7 +4406,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -6433,24 +6532,24 @@
+@@ -6433,24 +6533,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4435,7 +4436,7 @@
$as_echo "no" >&6; }
fi
-@@ -6460,9 +6559,9 @@
+@@ -6460,9 +6560,9 @@
ac_ct_LIPO=$LIPO
# Extract the first word of "lipo", so it can be a program name with args.
set dummy lipo; ac_word=$2
@@ -4447,7 +4448,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -6473,24 +6572,24 @@
+@@ -6473,24 +6573,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4477,7 +4478,7 @@
$as_echo "no" >&6; }
fi
-@@ -6499,7 +6598,7 @@
+@@ -6499,7 +6599,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4486,7 +4487,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6512,9 +6611,9 @@
+@@ -6512,9 +6612,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool; ac_word=$2
@@ -4498,7 +4499,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -6525,24 +6624,24 @@
+@@ -6525,24 +6625,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4528,7 +4529,7 @@
$as_echo "no" >&6; }
fi
-@@ -6552,9 +6651,9 @@
+@@ -6552,9 +6652,9 @@
ac_ct_OTOOL=$OTOOL
# Extract the first word of "otool", so it can be a program name with args.
set dummy otool; ac_word=$2
@@ -4540,7 +4541,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -6565,24 +6664,24 @@
+@@ -6565,24 +6665,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4570,7 +4571,7 @@
$as_echo "no" >&6; }
fi
-@@ -6591,7 +6690,7 @@
+@@ -6591,7 +6691,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4579,7 +4580,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6604,9 +6703,9 @@
+@@ -6604,9 +6704,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool64; ac_word=$2
@@ -4591,7 +4592,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -6617,24 +6716,24 @@
+@@ -6617,24 +6717,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4621,7 +4622,7 @@
$as_echo "no" >&6; }
fi
-@@ -6644,9 +6743,9 @@
+@@ -6644,9 +6744,9 @@
ac_ct_OTOOL64=$OTOOL64
# Extract the first word of "otool64", so it can be a program name with args.
set dummy otool64; ac_word=$2
@@ -4633,7 +4634,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -6657,24 +6756,24 @@
+@@ -6657,24 +6757,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4663,7 +4664,7 @@
$as_echo "no" >&6; }
fi
-@@ -6683,7 +6782,7 @@
+@@ -6683,7 +6783,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4672,7 +4673,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6719,9 +6818,9 @@
+@@ -6719,9 +6819,9 @@
@@ -4684,7 +4685,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -6746,22 +6845,18 @@
+@@ -6746,22 +6846,18 @@
rm -f conftest.*
fi
fi
@@ -4711,7 +4712,7 @@
/* end confdefs.h. */
int
-@@ -6772,42 +6867,17 @@
+@@ -6772,42 +6868,17 @@
return 0;
}
_ACEOF
@@ -4759,7 +4760,7 @@
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
-@@ -6849,14 +6919,14 @@
+@@ -6849,14 +6920,14 @@
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -4776,7 +4777,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -6871,11 +6941,7 @@
+@@ -6871,11 +6942,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -4789,7 +4790,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -6884,78 +6950,34 @@
+@@ -6884,78 +6951,34 @@
#endif
Syntax error
_ACEOF
@@ -4873,7 +4874,7 @@
break
fi
-@@ -6967,7 +6989,7 @@
+@@ -6967,7 +6990,7 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -4882,7 +4883,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -6978,11 +7000,7 @@
+@@ -6978,11 +7001,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -4895,7 +4896,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -6991,87 +7009,40 @@
+@@ -6991,87 +7010,40 @@
#endif
Syntax error
_ACEOF
@@ -4992,7 +4993,7 @@
fi
ac_ext=c
-@@ -7081,16 +7052,12 @@
+@@ -7081,16 +7053,12 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -5012,7 +5013,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -7105,48 +7072,23 @@
+@@ -7105,48 +7073,23 @@
return 0;
}
_ACEOF
@@ -5066,7 +5067,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -7156,18 +7098,14 @@
+@@ -7156,18 +7099,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -5088,7 +5089,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -7177,14 +7115,10 @@
+@@ -7177,14 +7116,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -5105,7 +5106,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -7211,118 +7145,34 @@
+@@ -7211,118 +7146,34 @@
return 0;
}
_ACEOF
@@ -5237,7 +5238,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -7332,62 +7182,13 @@
+@@ -7332,62 +7183,13 @@
done
@@ -5305,7 +5306,7 @@
_ACEOF
fi
-@@ -7408,7 +7209,7 @@
+@@ -7408,7 +7210,7 @@
# Check whether --with-pic was given.
@@ -5314,7 +5315,7 @@
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
-@@ -7424,7 +7225,7 @@
+@@ -7424,7 +7226,7 @@
# Check whether --enable-fast-install was given.
@@ -5323,7 +5324,7 @@
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
-@@ -7505,9 +7306,9 @@
+@@ -7505,9 +7307,9 @@
setopt NO_GLOB_SUBST
fi
@@ -5335,7 +5336,7 @@
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -7520,7 +7321,7 @@
+@@ -7520,7 +7322,7 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -5344,7 +5345,7 @@
$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
-@@ -7613,9 +7414,9 @@
+@@ -7613,9 +7415,9 @@
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -5356,7 +5357,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -7666,10 +7467,10 @@
+@@ -7666,10 +7468,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -5369,7 +5370,7 @@
$as_echo "no" >&6; }
fi
-@@ -7679,9 +7480,9 @@
+@@ -7679,9 +7481,9 @@
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
@@ -5381,7 +5382,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -7732,10 +7533,10 @@
+@@ -7732,10 +7534,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -5394,7 +5395,7 @@
$as_echo "no" >&6; }
fi
-@@ -7816,9 +7617,9 @@
+@@ -7816,9 +7618,9 @@
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -5406,21 +5407,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -7834,11 +7635,11 @@
+@@ -7834,11 +7636,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7837: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7638: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7639: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7841: \$? = $ac_status" >&5
-+ echo "$as_me:7642: \$? = $ac_status" >&5
++ echo "$as_me:7643: \$? = $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.
-@@ -7851,7 +7652,7 @@
+@@ -7851,7 +7653,7 @@
$RM conftest*
fi
@@ -5429,7 +5430,7 @@
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -7871,7 +7672,7 @@
+@@ -7871,7 +7673,7 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -5438,7 +5439,7 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
-@@ -8143,7 +7944,7 @@
+@@ -8143,7 +7945,7 @@
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -5447,7 +5448,7 @@
$as_echo "$lt_prog_compiler_pic" >&6; }
-@@ -8155,9 +7956,9 @@
+@@ -8155,9 +7957,9 @@
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
@@ -5459,21 +5460,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -8173,11 +7974,11 @@
+@@ -8173,11 +7975,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8176: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7977: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7978: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8180: \$? = $ac_status" >&5
-+ echo "$as_me:7981: \$? = $ac_status" >&5
++ echo "$as_me:7982: \$? = $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.
-@@ -8190,7 +7991,7 @@
+@@ -8190,7 +7992,7 @@
$RM conftest*
fi
@@ -5482,7 +5483,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -8214,9 +8015,9 @@
+@@ -8214,9 +8016,9 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -5494,7 +5495,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -8242,7 +8043,7 @@
+@@ -8242,7 +8044,7 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -5503,7 +5504,7 @@
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -8257,9 +8058,9 @@
+@@ -8257,9 +8059,9 @@
@@ -5515,21 +5516,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -8278,11 +8079,11 @@
+@@ -8278,11 +8080,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8281: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8082: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8083: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8285: \$? = $ac_status" >&5
-+ echo "$as_me:8086: \$? = $ac_status" >&5
++ echo "$as_me:8087: \$? = $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
-@@ -8304,7 +8105,7 @@
+@@ -8304,7 +8106,7 @@
$RM conftest*
fi
@@ -5538,7 +5539,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -8312,9 +8113,9 @@
+@@ -8312,9 +8114,9 @@
@@ -5550,21 +5551,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -8333,11 +8134,11 @@
+@@ -8333,11 +8135,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8336: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8137: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8138: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8340: \$? = $ac_status" >&5
-+ echo "$as_me:8141: \$? = $ac_status" >&5
++ echo "$as_me:8142: \$? = $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
-@@ -8359,7 +8160,7 @@
+@@ -8359,7 +8161,7 @@
$RM conftest*
fi
@@ -5573,7 +5574,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -8368,7 +8169,7 @@
+@@ -8368,7 +8170,7 @@
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
@@ -5582,7 +5583,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -8376,10 +8177,10 @@
+@@ -8376,10 +8178,10 @@
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -5595,7 +5596,7 @@
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -8392,7 +8193,7 @@
+@@ -8392,7 +8194,7 @@
@@ -5604,7 +5605,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
-@@ -8834,11 +8635,7 @@
+@@ -8834,11 +8636,7 @@
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -5617,7 +5618,7 @@
/* end confdefs.h. */
int
-@@ -8849,27 +8646,7 @@
+@@ -8849,27 +8647,7 @@
return 0;
}
_ACEOF
@@ -5646,7 +5647,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -8883,16 +8660,9 @@
+@@ -8883,16 +8661,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -5665,7 +5666,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -8905,11 +8675,7 @@
+@@ -8905,11 +8676,7 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -5678,7 +5679,7 @@
/* end confdefs.h. */
int
-@@ -8920,27 +8686,7 @@
+@@ -8920,27 +8687,7 @@
return 0;
}
_ACEOF
@@ -5707,7 +5708,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -8954,16 +8700,9 @@
+@@ -8954,16 +8701,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -5726,7 +5727,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -9175,42 +8914,16 @@
+@@ -9175,42 +8915,16 @@
# implicitly export all symbols.
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
@@ -5774,7 +5775,7 @@
LDFLAGS="$save_LDFLAGS"
else
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -9466,7 +9179,7 @@
+@@ -9466,7 +9180,7 @@
fi
fi
@@ -5783,7 +5784,7 @@
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-@@ -9503,16 +9216,16 @@
+@@ -9503,16 +9217,16 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -5804,7 +5805,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -9526,11 +9239,11 @@
+@@ -9526,11 +9240,11 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
@@ -5819,7 +5820,7 @@
then
archive_cmds_need_lc=no
else
-@@ -9541,7 +9254,7 @@
+@@ -9541,7 +9255,7 @@
cat conftest.err 1>&5
fi
$RM conftest*
@@ -5828,7 +5829,7 @@
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
-@@ -9705,7 +9418,7 @@
+@@ -9705,7 +9419,7 @@
@@ -5837,7 +5838,7 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
-@@ -10127,11 +9840,7 @@
+@@ -10127,11 +9841,7 @@
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -5850,7 +5851,7 @@
/* end confdefs.h. */
int
-@@ -10142,41 +9851,13 @@
+@@ -10142,41 +9852,13 @@
return 0;
}
_ACEOF
@@ -5896,7 +5897,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -10391,7 +10072,7 @@
+@@ -10391,7 +10073,7 @@
dynamic_linker=no
;;
esac
@@ -5905,7 +5906,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -10493,7 +10174,7 @@
+@@ -10493,7 +10175,7 @@
@@ -5914,7 +5915,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
-@@ -10518,7 +10199,7 @@
+@@ -10518,7 +10200,7 @@
# directories.
hardcode_action=unsupported
fi
@@ -5923,7 +5924,7 @@
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
-@@ -10563,18 +10244,14 @@
+@@ -10563,18 +10245,14 @@
darwin*)
# if libdl is installed we need to link against it
@@ -5945,7 +5946,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -10592,43 +10269,18 @@
+@@ -10592,43 +10270,18 @@
return 0;
}
_ACEOF
@@ -5995,7 +5996,7 @@
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -10641,33 +10293,19 @@
+@@ -10641,33 +10294,19 @@
;;
*)
@@ -6039,7 +6040,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -10676,13 +10314,6 @@
+@@ -10676,13 +10315,6 @@
extern "C"
#endif
char shl_load ();
@@ -6053,7 +6054,7 @@
int
main ()
{
-@@ -10691,212 +10322,32 @@
+@@ -10691,212 +10323,32 @@
return 0;
}
_ACEOF
@@ -6279,7 +6280,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -10914,57 +10365,28 @@
+@@ -10914,57 +10366,28 @@
return 0;
}
_ACEOF
@@ -6346,7 +6347,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -10982,57 +10404,28 @@
+@@ -10982,57 +10405,28 @@
return 0;
}
_ACEOF
@@ -6413,7 +6414,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11050,43 +10443,18 @@
+@@ -11050,43 +10444,18 @@
return 0;
}
_ACEOF
@@ -6463,7 +6464,7 @@
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -11125,9 +10493,9 @@
+@@ -11125,9 +10494,9 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -6475,16 +6476,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -11136,7 +10504,7 @@
+@@ -11136,7 +10505,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11139 "configure"
-+#line 10507 "configure"
++#line 10508 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11195,11 +10563,11 @@
+@@ -11195,11 +10564,11 @@
return status;
}
_LT_EOF
@@ -6499,7 +6500,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -11216,14 +10584,14 @@
+@@ -11216,14 +10585,14 @@
fi
@@ -6517,16 +6518,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -11232,7 +10600,7 @@
+@@ -11232,7 +10601,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11235 "configure"
-+#line 10603 "configure"
++#line 10604 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11291,11 +10659,11 @@
+@@ -11291,11 +10660,11 @@
return status;
}
_LT_EOF
@@ -6541,7 +6542,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -11312,7 +10680,7 @@
+@@ -11312,7 +10681,7 @@
fi
@@ -6550,7 +6551,7 @@
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
-@@ -11351,12 +10719,12 @@
+@@ -11351,12 +10720,12 @@
striplib=
old_striplib=
@@ -6565,7 +6566,7 @@
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
-@@ -11365,15 +10733,15 @@
+@@ -11365,15 +10734,15 @@
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -6584,7 +6585,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -11391,12 +10759,12 @@
+@@ -11391,12 +10760,12 @@
# Report which library types will actually be built
@@ -6600,7 +6601,7 @@
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
-@@ -11417,14 +10785,14 @@
+@@ -11417,14 +10786,14 @@
fi
;;
esac
@@ -6618,7 +6619,7 @@
$as_echo "$enable_static" >&6; }
-@@ -11465,9 +10833,9 @@
+@@ -11465,9 +10834,9 @@
# Josh Triplett <josh at freedesktop.org>
# Extract the first word of "bash", so it can be a program name with args.
set dummy bash; ac_word=$2
@@ -6630,7 +6631,7 @@
$as_echo_n "(cached) " >&6
else
case $DOLT_BASH in
-@@ -11480,14 +10848,14 @@
+@@ -11480,14 +10849,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6648,7 +6649,7 @@
IFS=$as_save_IFS
;;
-@@ -11495,15 +10863,15 @@
+@@ -11495,15 +10864,15 @@
fi
DOLT_BASH=$ac_cv_path_DOLT_BASH
if test -n "$DOLT_BASH"; then
@@ -6667,7 +6668,7 @@
$as_echo_n "checking if dolt supports this host... " >&6; }
dolt_supported=yes
if test x$DOLT_BASH = x; then
-@@ -11525,12 +10893,12 @@
+@@ -11525,12 +10894,12 @@
;;
esac
if test x$dolt_supported = xno ; then
@@ -6682,7 +6683,7 @@
$as_echo "yes, replacing libtool" >&6; }
cat <<__DOLTCOMPILE__EOF__ >doltcompile
-@@ -11658,17 +11026,13 @@
+@@ -11658,17 +11027,13 @@
# end dolt
@@ -6703,7 +6704,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11693,54 +11057,27 @@
+@@ -11693,54 +11058,27 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -6766,7 +6767,7 @@
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
-@@ -11753,9 +11090,9 @@
+@@ -11753,9 +11091,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -6778,7 +6779,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11766,24 +11103,24 @@
+@@ -11766,24 +11104,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6808,7 +6809,7 @@
$as_echo "no" >&6; }
fi
-@@ -11793,9 +11130,9 @@
+@@ -11793,9 +11131,9 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -6820,7 +6821,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -11806,24 +11143,24 @@
+@@ -11806,24 +11144,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6850,7 +6851,7 @@
$as_echo "no" >&6; }
fi
-@@ -11832,7 +11169,7 @@
+@@ -11832,7 +11170,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6859,7 +6860,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -11846,9 +11183,9 @@
+@@ -11846,9 +11184,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -6871,7 +6872,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11859,24 +11196,24 @@
+@@ -11859,24 +11197,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6901,7 +6902,7 @@
$as_echo "no" >&6; }
fi
-@@ -11886,9 +11223,9 @@
+@@ -11886,9 +11224,9 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -6913,7 +6914,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11900,18 +11237,18 @@
+@@ -11900,18 +11238,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6935,7 +6936,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -11930,10 +11267,10 @@
+@@ -11930,10 +11268,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -6948,7 +6949,7 @@
$as_echo "no" >&6; }
fi
-@@ -11945,9 +11282,9 @@
+@@ -11945,9 +11283,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -6960,7 +6961,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11958,24 +11295,24 @@
+@@ -11958,24 +11296,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6990,7 +6991,7 @@
$as_echo "no" >&6; }
fi
-@@ -11989,9 +11326,9 @@
+@@ -11989,9 +11327,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -7002,7 +7003,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -12002,24 +11339,24 @@
+@@ -12002,24 +11340,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7032,7 +7033,7 @@
$as_echo "no" >&6; }
fi
-@@ -12032,7 +11369,7 @@
+@@ -12032,7 +11370,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7041,7 +7042,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -12043,62 +11380,42 @@
+@@ -12043,62 +11381,42 @@
fi
@@ -7126,7 +7127,7 @@
/* end confdefs.h. */
int
-@@ -12112,37 +11429,16 @@
+@@ -12112,37 +11430,16 @@
return 0;
}
_ACEOF
@@ -7167,7 +7168,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -12151,20 +11447,16 @@
+@@ -12151,20 +11448,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -7191,7 +7192,7 @@
/* end confdefs.h. */
int
-@@ -12175,35 +11467,11 @@
+@@ -12175,35 +11468,11 @@
return 0;
}
_ACEOF
@@ -7230,7 +7231,7 @@
/* end confdefs.h. */
int
-@@ -12214,36 +11482,12 @@
+@@ -12214,36 +11483,12 @@
return 0;
}
_ACEOF
@@ -7271,7 +7272,7 @@
/* end confdefs.h. */
int
-@@ -12254,42 +11498,17 @@
+@@ -12254,42 +11499,17 @@
return 0;
}
_ACEOF
@@ -7316,7 +7317,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -12306,18 +11525,14 @@
+@@ -12306,18 +11526,14 @@
CFLAGS=
fi
fi
@@ -7338,7 +7339,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -12374,32 +11589,9 @@
+@@ -12374,32 +11590,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -7372,7 +7373,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -12410,17 +11602,19 @@
+@@ -12410,17 +11603,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -7395,7 +7396,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -12430,9 +11624,9 @@
+@@ -12430,9 +11625,9 @@
depcc="$CC" am_compiler_list=
@@ -7407,7 +7408,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -12540,7 +11734,7 @@
+@@ -12540,7 +11735,7 @@
fi
fi
@@ -7416,7 +7417,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -12563,9 +11757,9 @@
+@@ -12563,9 +11758,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -7428,7 +7429,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -12576,24 +11770,24 @@
+@@ -12576,24 +11771,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7458,7 +7459,7 @@
$as_echo "no" >&6; }
fi
-@@ -12603,9 +11797,9 @@
+@@ -12603,9 +11798,9 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -7470,7 +7471,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -12616,24 +11810,24 @@
+@@ -12616,24 +11811,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7500,7 +7501,7 @@
$as_echo "no" >&6; }
fi
-@@ -12642,7 +11836,7 @@
+@@ -12642,7 +11837,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7509,7 +7510,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -12656,9 +11850,9 @@
+@@ -12656,9 +11851,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -7521,7 +7522,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -12669,24 +11863,24 @@
+@@ -12669,24 +11864,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7551,7 +7552,7 @@
$as_echo "no" >&6; }
fi
-@@ -12696,9 +11890,9 @@
+@@ -12696,9 +11891,9 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -7563,7 +7564,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -12710,18 +11904,18 @@
+@@ -12710,18 +11905,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7585,7 +7586,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -12740,10 +11934,10 @@
+@@ -12740,10 +11935,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7598,7 +7599,7 @@
$as_echo "no" >&6; }
fi
-@@ -12755,9 +11949,9 @@
+@@ -12755,9 +11950,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -7610,7 +7611,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -12768,24 +11962,24 @@
+@@ -12768,24 +11963,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7640,7 +7641,7 @@
$as_echo "no" >&6; }
fi
-@@ -12799,9 +11993,9 @@
+@@ -12799,9 +11994,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -7652,7 +7653,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -12812,24 +12006,24 @@
+@@ -12812,24 +12007,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7682,7 +7683,7 @@
$as_echo "no" >&6; }
fi
-@@ -12842,7 +12036,7 @@
+@@ -12842,7 +12037,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7691,7 +7692,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -12853,62 +12047,42 @@
+@@ -12853,62 +12048,42 @@
fi
@@ -7776,7 +7777,7 @@
/* end confdefs.h. */
int
-@@ -12922,37 +12096,16 @@
+@@ -12922,37 +12097,16 @@
return 0;
}
_ACEOF
@@ -7817,7 +7818,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -12961,20 +12114,16 @@
+@@ -12961,20 +12115,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -7841,7 +7842,7 @@
/* end confdefs.h. */
int
-@@ -12985,35 +12134,11 @@
+@@ -12985,35 +12135,11 @@
return 0;
}
_ACEOF
@@ -7880,7 +7881,7 @@
/* end confdefs.h. */
int
-@@ -13024,36 +12149,12 @@
+@@ -13024,36 +12150,12 @@
return 0;
}
_ACEOF
@@ -7921,7 +7922,7 @@
/* end confdefs.h. */
int
-@@ -13064,42 +12165,17 @@
+@@ -13064,42 +12166,17 @@
return 0;
}
_ACEOF
@@ -7966,7 +7967,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -13116,18 +12192,14 @@
+@@ -13116,18 +12193,14 @@
CFLAGS=
fi
fi
@@ -7988,7 +7989,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -13184,32 +12256,9 @@
+@@ -13184,32 +12257,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -8022,7 +8023,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -13220,17 +12269,19 @@
+@@ -13220,17 +12270,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -8045,7 +8046,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -13240,9 +12291,9 @@
+@@ -13240,9 +12292,9 @@
depcc="$CC" am_compiler_list=
@@ -8057,7 +8058,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -13350,7 +12401,7 @@
+@@ -13350,7 +12402,7 @@
fi
fi
@@ -8066,7 +8067,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -13368,16 +12419,12 @@
+@@ -13368,16 +12420,12 @@
am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
@@ -8086,7 +8087,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -13392,48 +12439,23 @@
+@@ -13392,48 +12440,23 @@
return 0;
}
_ACEOF
@@ -8140,7 +8141,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -13443,18 +12465,14 @@
+@@ -13443,18 +12466,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -8162,7 +8163,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -13464,14 +12482,10 @@
+@@ -13464,14 +12483,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -8179,7 +8180,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -13498,60 +12512,31 @@
+@@ -13498,60 +12513,31 @@
return 0;
}
_ACEOF
@@ -8249,7 +8250,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_GENMARSHAL in
-@@ -13564,14 +12549,14 @@
+@@ -13564,14 +12550,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8267,7 +8268,7 @@
IFS=$as_save_IFS
;;
-@@ -13579,19 +12564,19 @@
+@@ -13579,19 +12565,19 @@
fi
GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
if test -n "$GLIB_GENMARSHAL"; then
@@ -8291,7 +8292,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_MKENUMS in
-@@ -13604,14 +12589,14 @@
+@@ -13604,14 +12590,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8309,7 +8310,7 @@
IFS=$as_save_IFS
;;
-@@ -13619,26 +12604,26 @@
+@@ -13619,26 +12605,26 @@
fi
GLIB_MKENUMS=$ac_cv_path_GLIB_MKENUMS
if test -n "$GLIB_MKENUMS"; then
@@ -8341,7 +8342,7 @@
$as_echo "$USE_NLS" >&6; }
-@@ -13646,35 +12631,31 @@
+@@ -13646,35 +12632,31 @@
case "$am__api_version" in
1.01234)
@@ -8383,7 +8384,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_UPDATE in
-@@ -13687,14 +12668,14 @@
+@@ -13687,14 +12669,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8401,7 +8402,7 @@
IFS=$as_save_IFS
;;
-@@ -13702,19 +12683,19 @@
+@@ -13702,19 +12684,19 @@
fi
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
if test -n "$INTLTOOL_UPDATE"; then
@@ -8425,7 +8426,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_MERGE in
-@@ -13727,14 +12708,14 @@
+@@ -13727,14 +12709,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8443,7 +8444,7 @@
IFS=$as_save_IFS
;;
-@@ -13742,19 +12723,19 @@
+@@ -13742,19 +12724,19 @@
fi
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
if test -n "$INTLTOOL_MERGE"; then
@@ -8467,7 +8468,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_EXTRACT in
-@@ -13767,14 +12748,14 @@
+@@ -13767,14 +12749,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8485,7 +8486,7 @@
IFS=$as_save_IFS
;;
-@@ -13782,18 +12763,16 @@
+@@ -13782,18 +12764,16 @@
fi
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
if test -n "$INTLTOOL_EXTRACT"; then
@@ -8507,7 +8508,7 @@
fi
INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-@@ -13839,9 +12818,9 @@
+@@ -13839,9 +12819,9 @@
# Check the gettext tools to make sure they are GNU
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -8519,7 +8520,7 @@
$as_echo_n "(cached) " >&6
else
case $XGETTEXT in
-@@ -13854,14 +12833,14 @@
+@@ -13854,14 +12834,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8537,7 +8538,7 @@
IFS=$as_save_IFS
;;
-@@ -13869,19 +12848,19 @@
+@@ -13869,19 +12849,19 @@
fi
XGETTEXT=$ac_cv_path_XGETTEXT
if test -n "$XGETTEXT"; then
@@ -8561,7 +8562,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGMERGE in
-@@ -13894,14 +12873,14 @@
+@@ -13894,14 +12874,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8579,7 +8580,7 @@
IFS=$as_save_IFS
;;
-@@ -13909,19 +12888,19 @@
+@@ -13909,19 +12889,19 @@
fi
MSGMERGE=$ac_cv_path_MSGMERGE
if test -n "$MSGMERGE"; then
@@ -8603,7 +8604,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGFMT in
-@@ -13934,14 +12913,14 @@
+@@ -13934,14 +12914,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8621,7 +8622,7 @@
IFS=$as_save_IFS
;;
-@@ -13949,19 +12928,19 @@
+@@ -13949,19 +12929,19 @@
fi
MSGFMT=$ac_cv_path_MSGFMT
if test -n "$MSGFMT"; then
@@ -8645,7 +8646,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -13974,14 +12953,14 @@
+@@ -13974,14 +12954,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8663,7 +8664,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -13990,33 +12969,29 @@
+@@ -13990,33 +12970,29 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -8703,7 +8704,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_PERL in
-@@ -14029,14 +13004,14 @@
+@@ -14029,14 +13005,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8721,7 +8722,7 @@
IFS=$as_save_IFS
;;
-@@ -14044,34 +13019,28 @@
+@@ -14044,34 +13020,28 @@
fi
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
if test -n "$INTLTOOL_PERL"; then
@@ -8763,7 +8764,7 @@
fi
fi
-@@ -14081,11 +13050,7 @@
+@@ -14081,11 +13051,7 @@
# Set DATADIRNAME correctly if it is not set yet
# (copied from glib-gettext.m4)
if test -z "$DATADIRNAME"; then
@@ -8776,7 +8777,7 @@
/* end confdefs.h. */
int
-@@ -14097,136 +13062,27 @@
+@@ -14097,136 +13063,27 @@
return 0;
}
_ACEOF
@@ -8929,7 +8930,7 @@
-@@ -14239,9 +13095,9 @@
+@@ -14239,9 +13096,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
@@ -8941,7 +8942,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -14254,14 +13110,14 @@
+@@ -14254,14 +13111,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8959,7 +8960,7 @@
IFS=$as_save_IFS
;;
-@@ -14269,10 +13125,10 @@
+@@ -14269,10 +13126,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -8972,7 +8973,7 @@
$as_echo "no" >&6; }
fi
-@@ -14282,9 +13138,9 @@
+@@ -14282,9 +13139,9 @@
ac_pt_PKG_CONFIG=$PKG_CONFIG
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -8984,7 +8985,7 @@
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -14297,14 +13153,14 @@
+@@ -14297,14 +13154,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9002,7 +9003,7 @@
IFS=$as_save_IFS
;;
-@@ -14312,10 +13168,10 @@
+@@ -14312,10 +13169,10 @@
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -9015,7 +9016,7 @@
$as_echo "no" >&6; }
fi
-@@ -14324,7 +13180,7 @@
+@@ -14324,7 +13181,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9024,7 +9025,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -14337,13 +13193,13 @@
+@@ -14337,13 +13194,13 @@
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -9041,7 +9042,7 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -14352,7 +13208,7 @@
+@@ -14352,7 +13209,7 @@
# Check whether --enable-debug was given.
@@ -9050,7 +9051,7 @@
enableval=$enable_debug;
else
enable_debug=no
-@@ -14361,16 +13217,14 @@
+@@ -14361,16 +13218,14 @@
if test x$enable_debug = xyes ; then
@@ -9069,7 +9070,7 @@
enableval=$enable_compile_warnings;
else
enable_compile_warnings="maximum"
-@@ -14401,13 +13255,9 @@
+@@ -14401,13 +13256,9 @@
for option in -Wno-sign-compare; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
@@ -9085,7 +9086,7 @@
/* end confdefs.h. */
int
-@@ -14418,35 +13268,14 @@
+@@ -14418,35 +13269,14 @@
return 0;
}
_ACEOF
@@ -9124,7 +9125,7 @@
$as_echo "$has_option" >&6; }
if test $has_option = yes; then
warning_flags="$warning_flags $option"
-@@ -14460,26 +13289,24 @@
+@@ -14460,26 +13290,24 @@
fi
;;
*)
@@ -9156,7 +9157,7 @@
$as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; }
complCFLAGS=
if test "x$enable_iso_c" != "xno"; then
-@@ -14494,7 +13321,7 @@
+@@ -14494,7 +13322,7 @@
esac
fi
fi
@@ -9165,7 +9166,7 @@
$as_echo "$complCFLAGS" >&6; }
WARN_CFLAGS="$warning_flags $complCFLAGS"
-@@ -14516,9 +13343,7 @@
+@@ -14516,9 +13344,7 @@
if test "$enable_maintainer_mode" = "yes"; then
@@ -9176,7 +9177,7 @@
enable_debug=yes
DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
-@@ -14536,11 +13361,11 @@
+@@ -14536,11 +13362,11 @@
GNOME_KEYRING_REQUIRED=2.26.0
if test -n "$PKG_CONFIG" && \
@@ -9191,7 +9192,7 @@
have_libnotify=yes
else
have_libnotify=no
-@@ -14550,24 +13375,22 @@
+@@ -14550,24 +13376,22 @@
if test "$have_libnotify" = "yes"; then
LIBNOTIFY_PACKAGE="libnotify >= $LIBNOTIFY_REQUIRED"
@@ -9220,7 +9221,7 @@
$as_echo "$enable_tests" >&6; }
if test "$enable_tests" = "yes"; then
-@@ -14581,14 +13404,15 @@
+@@ -14581,14 +13405,15 @@
pkg_failed=no
@@ -9242,7 +9243,7 @@
glib-2.0 >= \$GLIB_REQUIRED
gmodule-2.0
gthread-2.0
-@@ -14606,7 +13430,7 @@
+@@ -14606,7 +13431,7 @@
webkit-1.0 >= \$WEBKIT_GTK_REQUIRED
libsoup-gnome-2.4 >= \$LIBSOUP_GNOME_REQUIRED
gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED
@@ -9251,7 +9252,7 @@
($PKG_CONFIG --exists --print-errors "
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
-@@ -14627,8 +13451,8 @@
+@@ -14627,8 +13452,8 @@
gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
") 2>&5
ac_status=$?
@@ -9262,7 +9263,7 @@
pkg_cv_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
-@@ -14651,14 +13475,16 @@
+@@ -14651,14 +13476,16 @@
else
pkg_failed=yes
fi
@@ -9286,7 +9287,7 @@
glib-2.0 >= \$GLIB_REQUIRED
gmodule-2.0
gthread-2.0
-@@ -14676,7 +13502,7 @@
+@@ -14676,7 +13503,7 @@
webkit-1.0 >= \$WEBKIT_GTK_REQUIRED
libsoup-gnome-2.4 >= \$LIBSOUP_GNOME_REQUIRED
gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED
@@ -9295,7 +9296,7 @@
($PKG_CONFIG --exists --print-errors "
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
-@@ -14697,8 +13523,8 @@
+@@ -14697,8 +13524,8 @@
gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
") 2>&5
ac_status=$?
@@ -9306,7 +9307,7 @@
pkg_cv_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
-@@ -14721,8 +13547,9 @@
+@@ -14721,8 +13548,9 @@
else
pkg_failed=yes
fi
@@ -9318,7 +9319,7 @@
fi
-@@ -14735,7 +13562,7 @@
+@@ -14735,7 +13563,7 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -9327,7 +9328,7 @@
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
gthread-2.0
-@@ -14753,9 +13580,9 @@
+@@ -14753,9 +13581,9 @@
webkit-1.0 >= $WEBKIT_GTK_REQUIRED
libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
@@ -9339,7 +9340,7 @@
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
gthread-2.0
-@@ -14773,41 +13600,12 @@
+@@ -14773,41 +13601,12 @@
webkit-1.0 >= $WEBKIT_GTK_REQUIRED
libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
@@ -9383,7 +9384,7 @@
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
gthread-2.0
-@@ -14835,22 +13633,11 @@
+@@ -14835,22 +13634,11 @@
Alternatively, you may set the environment variables DEPENDENCIES_CFLAGS
and DEPENDENCIES_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9409,7 +9410,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14859,12 +13646,11 @@
+@@ -14859,12 +13647,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -9424,7 +9425,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -14875,40 +13661,44 @@
+@@ -14875,40 +13662,44 @@
pkg_failed=no
@@ -9488,7 +9489,7 @@
fi
-@@ -14921,25 +13711,14 @@
+@@ -14921,25 +13712,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -9517,7 +9518,7 @@
$DBUS_PKG_ERRORS
-@@ -14949,22 +13728,11 @@
+@@ -14949,22 +13729,11 @@
Alternatively, you may set the environment variables DBUS_CFLAGS
and DBUS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9543,7 +9544,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14973,21 +13741,20 @@
+@@ -14973,21 +13742,20 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -9569,7 +9570,7 @@
$as_echo_n "(cached) " >&6
else
case $DBUS_BINDING_TOOL in
-@@ -15000,14 +13767,14 @@
+@@ -15000,14 +13768,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9587,7 +9588,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_DBUS_BINDING_TOOL" && ac_cv_path_DBUS_BINDING_TOOL="no"
-@@ -15016,19 +13783,17 @@
+@@ -15016,19 +13784,17 @@
fi
DBUS_BINDING_TOOL=$ac_cv_path_DBUS_BINDING_TOOL
if test -n "$DBUS_BINDING_TOOL"; then
@@ -9610,7 +9611,7 @@
fi
# *****
-@@ -15044,13 +13809,13 @@
+@@ -15044,13 +13810,13 @@
# Check whether --with-gconf-source was given.
@@ -9626,7 +9627,7 @@
$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-@@ -15059,22 +13824,20 @@
+@@ -15059,22 +13825,20 @@
# Check whether --with-gconf-schema-file-dir was given.
@@ -9653,7 +9654,7 @@
esac
fi
-@@ -15090,9 +13853,9 @@
+@@ -15090,9 +13854,9 @@
# Extract the first word of "gconftool-2", so it can be a program name with args.
set dummy gconftool-2; ac_word=$2
@@ -9665,7 +9666,7 @@
$as_echo_n "(cached) " >&6
else
case $GCONFTOOL in
-@@ -15105,14 +13868,14 @@
+@@ -15105,14 +13869,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9683,7 +9684,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
-@@ -15121,134 +13884,160 @@
+@@ -15121,134 +13885,160 @@
fi
GCONFTOOL=$ac_cv_path_GCONFTOOL
if test -n "$GCONFTOOL"; then
@@ -9932,7 +9933,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -15257,582 +14046,18 @@
+@@ -15257,582 +14047,18 @@
done
@@ -10519,7 +10520,7 @@
/* end confdefs.h. */
/* Test program from Paul Eggert and Tony Leneis. */
#ifdef TIME_WITH_SYS_TIME
-@@ -16029,44 +14254,17 @@
+@@ -16029,44 +14255,17 @@
return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
}
_ACEOF
@@ -10569,7 +10570,7 @@
$as_echo "$ac_cv_func_working_mktime" >&6; }
if test $ac_cv_func_working_mktime = no; then
case " $LIBOBJS " in
-@@ -16077,19 +14275,15 @@
+@@ -16077,19 +14276,15 @@
fi
@@ -10593,7 +10594,7 @@
/* end confdefs.h. */
$ac_includes_default
-@@ -16122,44 +14316,17 @@
+@@ -16122,44 +14317,17 @@
}
_ACEOF
@@ -10643,7 +10644,7 @@
$as_echo "$ac_cv_func_strtod" >&6; }
if test $ac_cv_func_strtod = no; then
case " $LIBOBJS " in
-@@ -16168,105 +14335,20 @@
+@@ -16168,105 +14336,20 @@
;;
esac
@@ -10754,7 +10755,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16284,149 +14366,31 @@
+@@ -16284,149 +14367,31 @@
return 0;
}
_ACEOF
@@ -10919,7 +10920,7 @@
else
cat >>confdefs.h <<_ACEOF
-@@ -16450,48 +14414,23 @@
+@@ -16450,48 +14415,23 @@
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $_FLAGS"
@@ -10974,7 +10975,7 @@
$as_echo "$ac_cv_have_declaration_after_statement" >&6; }
if test "$ac_cv_have_declaration_after_statement" = "yes"; then
-@@ -16510,151 +14449,12 @@
+@@ -16510,151 +14450,12 @@
# Multimedia keys
# ***************
@@ -11130,7 +11131,7 @@
_ACEOF
fi
-@@ -16668,16 +14468,16 @@
+@@ -16668,16 +14469,16 @@
# GObject Introspection
# *********************
@@ -11150,7 +11151,7 @@
$as_echo "$enable_introspection" >&6; }
G_IR_SCANNER=
-@@ -16692,40 +14492,44 @@
+@@ -16692,40 +14493,44 @@
GOBJECT_INTROSPECTION_REQUIRED=0.6.2
pkg_failed=no
@@ -11214,7 +11215,7 @@
fi
-@@ -16738,25 +14542,14 @@
+@@ -16738,25 +14543,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -11243,7 +11244,7 @@
$INTROSPECTION_PKG_ERRORS
-@@ -16766,22 +14559,11 @@
+@@ -16766,22 +14560,11 @@
Alternatively, you may set the environment variables INTROSPECTION_CFLAGS
and INTROSPECTION_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -11269,7 +11270,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -16790,12 +14572,11 @@
+@@ -16790,12 +14573,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -11284,7 +11285,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -16807,9 +14588,7 @@
+@@ -16807,9 +14589,7 @@
GIRTYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
@@ -11295,7 +11296,7 @@
fi
-@@ -16832,22 +14611,20 @@
+@@ -16832,22 +14612,20 @@
# Seed
# ****
@@ -11322,7 +11323,7 @@
fi
if test "$enable_seed" = "yes"; then
-@@ -16856,40 +14633,44 @@
+@@ -16856,40 +14634,44 @@
SEED_REQUIRED=2.27.91
pkg_failed=no
@@ -11386,7 +11387,7 @@
fi
-@@ -16902,25 +14683,14 @@
+@@ -16902,25 +14684,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -11415,7 +11416,7 @@
$SEED_PKG_ERRORS
-@@ -16930,22 +14700,11 @@
+@@ -16930,22 +14701,11 @@
Alternatively, you may set the environment variables SEED_CFLAGS
and SEED_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -11441,7 +11442,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -16954,20 +14713,17 @@
+@@ -16954,20 +14714,17 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -11465,7 +11466,7 @@
fi
-@@ -16986,56 +14742,60 @@
+@@ -16986,56 +14743,60 @@
# NSS
# ***
@@ -11548,7 +11549,7 @@
fi
-@@ -17048,25 +14808,14 @@
+@@ -17048,25 +14809,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -11577,7 +11578,7 @@
$NSS_PKG_ERRORS
-@@ -17076,22 +14825,11 @@
+@@ -17076,22 +14826,11 @@
Alternatively, you may set the environment variables NSS_CFLAGS
and NSS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -11603,7 +11604,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -17100,20 +14838,17 @@
+@@ -17100,20 +14839,17 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -11627,7 +11628,7 @@
fi
-@@ -17133,16 +14868,16 @@
+@@ -17133,16 +14869,16 @@
# Zeroconf bookmarks sites
@@ -11647,7 +11648,7 @@
$as_echo "$enable_zeroconf" >&6; }
if test "$enable_zeroconf" != "no"; then
-@@ -17150,52 +14885,56 @@
+@@ -17150,52 +14886,56 @@
pkg_failed=no
@@ -11725,7 +11726,7 @@
fi
-@@ -17208,18 +14947,18 @@
+@@ -17208,18 +14948,18 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -11749,7 +11750,7 @@
$as_echo "no" >&6; }
have_avahi=no
elif test $pkg_failed = untried; then
-@@ -17227,15 +14966,13 @@
+@@ -17227,15 +14967,13 @@
else
AVAHI_CFLAGS=$pkg_cv_AVAHI_CFLAGS
AVAHI_LIBS=$pkg_cv_AVAHI_LIBS
@@ -11767,7 +11768,7 @@
elif test "$have_avahi" = "yes"; then
enable_zeroconf=yes
else
-@@ -17245,9 +14982,7 @@
+@@ -17245,9 +14983,7 @@
if test "$enable_zeroconf" = "yes"; then
@@ -11778,7 +11779,7 @@
fi
-@@ -17262,55 +14997,59 @@
+@@ -17262,55 +14998,59 @@
# NetworkManager
@@ -11860,7 +11861,7 @@
fi
-@@ -17323,14 +15062,14 @@
+@@ -17323,14 +15063,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -11878,7 +11879,7 @@
$as_echo "no" >&6; }
have_network_manager=no
elif test $pkg_failed = untried; then
-@@ -17338,26 +15077,22 @@
+@@ -17338,26 +15078,22 @@
else
NETWORK_MANAGER_CFLAGS=$pkg_cv_NETWORK_MANAGER_CFLAGS
NETWORK_MANAGER_LIBS=$pkg_cv_NETWORK_MANAGER_LIBS
@@ -11909,11 +11910,10 @@
fi
-@@ -17397,201 +15132,58 @@
-
+@@ -17398,200 +15134,57 @@
ISO_CODES_REQUIRED=0.35
--if test -n "$PKG_CONFIG" && \
+ if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"iso-codes >= \$ISO_CODES_REQUIRED\"") >&5
- ($PKG_CONFIG --exists --print-errors "iso-codes >= $ISO_CODES_REQUIRED") 2>&5
- ac_status=$?
@@ -12009,7 +12009,6 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-+if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"iso-codes >= \$ISO_CODES_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "iso-codes >= $ISO_CODES_REQUIRED") 2>&5
+ ac_status=$?
@@ -12132,7 +12131,7 @@
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+GETTEXT_PACKAGE=epiphany-webkit
++GETTEXT_PACKAGE=epiphany
+
+
+cat >>confdefs.h <<_ACEOF
@@ -12150,7 +12149,7 @@
_ACEOF
fi
-@@ -17599,16 +15191,12 @@
+@@ -17599,16 +15192,12 @@
done
if test $ac_cv_header_locale_h = yes; then
@@ -12170,7 +12169,7 @@
/* end confdefs.h. */
#include <locale.h>
int
-@@ -17619,46 +15207,19 @@
+@@ -17619,46 +15208,19 @@
return 0;
}
_ACEOF
@@ -12223,7 +12222,7 @@
fi
fi
-@@ -17671,155 +15232,20 @@
+@@ -17671,155 +15233,20 @@
XGETTEXT=:
INTLLIBS=
@@ -12384,7 +12383,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -17832,54 +15258,25 @@
+@@ -17832,54 +15259,25 @@
return 0;
}
_ACEOF
@@ -12447,7 +12446,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -17892,141 +15289,26 @@
+@@ -17892,141 +15290,26 @@
return 0;
}
_ACEOF
@@ -12599,7 +12598,7 @@
_ACEOF
fi
-@@ -18041,18 +15323,14 @@
+@@ -18041,18 +15324,14 @@
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
@@ -12621,7 +12620,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18064,61 +15342,32 @@
+@@ -18064,61 +15343,32 @@
char bindtextdomain ();
int
main ()
@@ -12698,7 +12697,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18136,55 +15385,26 @@
+@@ -18136,55 +15386,26 @@
return 0;
}
_ACEOF
@@ -12763,7 +12762,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18202,43 +15422,18 @@
+@@ -18202,43 +15423,18 @@
return 0;
}
_ACEOF
@@ -12813,7 +12812,7 @@
gt_cv_func_dgettext_libintl=yes
fi
-@@ -18248,22 +15443,18 @@
+@@ -18248,22 +15444,18 @@
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -12841,7 +12840,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18281,55 +15472,26 @@
+@@ -18281,55 +15473,26 @@
return 0;
}
_ACEOF
@@ -12906,7 +12905,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18347,43 +15509,18 @@
+@@ -18347,43 +15510,18 @@
return 0;
}
_ACEOF
@@ -12956,7 +12955,7 @@
gt_cv_func_dgettext_libintl=yes
libintl_extra_libs=-liconv
else
-@@ -18405,102 +15542,12 @@
+@@ -18405,102 +15543,12 @@
glib_save_LIBS="$LIBS"
LIBS="$LIBS -lintl $libintl_extra_libs"
unset ac_cv_func_bind_textdomain_codeset
@@ -13064,7 +13063,7 @@
_ACEOF
fi
-@@ -18530,15 +15577,13 @@
+@@ -18530,15 +15578,13 @@
if test "$gt_cv_have_gettext" = "yes"; then
@@ -13083,7 +13082,7 @@
$as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
-@@ -18563,118 +15608,28 @@
+@@ -18563,118 +15609,28 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
@@ -13210,7 +13209,7 @@
$as_echo_n "checking if msgfmt accepts -c... " >&6; }
cat >conftest.foo <<_ACEOF
-@@ -18689,14 +15644,14 @@
+@@ -18689,14 +15645,14 @@
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -13230,7 +13229,7 @@
$as_echo "no" >&6; }
echo "$as_me: failed input was:" >&5
sed 's/^/| /' conftest.foo >&5
-@@ -18704,9 +15659,9 @@
+@@ -18704,9 +15660,9 @@
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
@@ -13242,7 +13241,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -18719,14 +15674,14 @@
+@@ -18719,14 +15675,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13260,7 +13259,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -18735,19 +15690,19 @@
+@@ -18735,19 +15691,19 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -13284,7 +13283,7 @@
$as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
-@@ -18772,144 +15727,33 @@
+@@ -18772,144 +15728,33 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
@@ -13445,7 +13444,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -18924,10 +15768,8 @@
+@@ -18924,10 +15769,8 @@
;;
esac
fi
@@ -13458,7 +13457,7 @@
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
else
-@@ -18941,9 +15783,7 @@
+@@ -18941,9 +15784,7 @@
if test "$gt_cv_have_gettext" = "yes" ; then
@@ -13469,7 +13468,7 @@
fi
-@@ -18951,7 +15791,7 @@
+@@ -18951,7 +15792,7 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -13478,7 +13477,7 @@
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
-@@ -18984,7 +15824,7 @@
+@@ -18984,7 +15825,7 @@
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -13487,7 +13486,7 @@
$as_echo_n "checking for catalogs to be installed... " >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
-@@ -19009,7 +15849,7 @@
+@@ -19009,7 +15850,7 @@
fi
done
LINGUAS=$NEW_LINGUAS
@@ -13496,7 +13495,7 @@
$as_echo "$LINGUAS" >&6; }
fi
-@@ -19057,7 +15897,7 @@
+@@ -19057,7 +15898,7 @@
# Check whether --with-distributor-name was given.
@@ -13505,7 +13504,7 @@
withval=$with_distributor_name; LSB_DISTRIBUTOR="$withval"
fi
-@@ -19067,9 +15907,9 @@
+@@ -19067,9 +15908,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -13517,7 +13516,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LSB_RELEASE"; then
-@@ -19080,24 +15920,24 @@
+@@ -19080,24 +15921,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13547,7 +13546,7 @@
$as_echo "no" >&6; }
fi
-@@ -19128,11 +15968,11 @@
+@@ -19128,11 +15969,11 @@
gdu_cv_version_required=0.3.2
if test -n "$PKG_CONFIG" && \
@@ -13562,7 +13561,7 @@
gdu_cv_have_gdu=yes
else
gdu_cv_have_gdu=no
-@@ -19141,15 +15981,13 @@
+@@ -19141,15 +15982,13 @@
if test "$gdu_cv_have_gdu" = "yes"; then
:
else
@@ -13580,7 +13579,7 @@
withval=$with_help_dir;
else
with_help_dir='${datadir}/gnome/help'
-@@ -19160,7 +15998,7 @@
+@@ -19160,7 +15999,7 @@
# Check whether --with-omf-dir was given.
@@ -13589,7 +13588,7 @@
withval=$with_omf_dir;
else
with_omf_dir='${datadir}/omf'
-@@ -19171,7 +16009,7 @@
+@@ -19171,7 +16010,7 @@
# Check whether --with-help-formats was given.
@@ -13598,7 +13597,7 @@
withval=$with_help_formats;
else
with_help_formats=''
-@@ -19181,7 +16019,7 @@
+@@ -19181,7 +16020,7 @@
# Check whether --enable-scrollkeeper was given.
@@ -13607,7 +13606,7 @@
enableval=$enable_scrollkeeper;
else
enable_scrollkeeper=yes
-@@ -19213,9 +16051,9 @@
+@@ -19213,9 +16052,9 @@
# Extract the first word of "gtkdoc-check", so it can be a program name with args.
set dummy gtkdoc-check; ac_word=$2
@@ -13619,7 +13618,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_CHECK in
-@@ -19228,14 +16066,14 @@
+@@ -19228,14 +16067,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13637,7 +13636,7 @@
IFS=$as_save_IFS
;;
-@@ -19243,10 +16081,10 @@
+@@ -19243,10 +16082,10 @@
fi
GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
if test -n "$GTKDOC_CHECK"; then
@@ -13650,7 +13649,7 @@
$as_echo "no" >&6; }
fi
-@@ -19255,9 +16093,9 @@
+@@ -19255,9 +16094,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -13662,7 +13661,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_REBASE in
-@@ -19270,14 +16108,14 @@
+@@ -19270,14 +16109,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13680,7 +13679,7 @@
IFS=$as_save_IFS
;;
-@@ -19285,10 +16123,10 @@
+@@ -19285,10 +16124,10 @@
fi
GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
if test -n "$GTKDOC_REBASE"; then
@@ -13693,7 +13692,7 @@
$as_echo "no" >&6; }
fi
-@@ -19299,9 +16137,9 @@
+@@ -19299,9 +16138,9 @@
# Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
set dummy gtkdoc-mkpdf; ac_word=$2
@@ -13705,7 +13704,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_MKPDF in
-@@ -19314,14 +16152,14 @@
+@@ -19314,14 +16153,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13723,7 +13722,7 @@
IFS=$as_save_IFS
;;
-@@ -19329,10 +16167,10 @@
+@@ -19329,10 +16168,10 @@
fi
GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
if test -n "$GTKDOC_MKPDF"; then
@@ -13736,7 +13735,7 @@
$as_echo "no" >&6; }
fi
-@@ -19340,7 +16178,7 @@
+@@ -19340,7 +16179,7 @@
# Check whether --with-html-dir was given.
@@ -13745,7 +13744,7 @@
withval=$with_html_dir;
else
with_html_dir='${datadir}/gtk-doc/html'
-@@ -19350,7 +16188,7 @@
+@@ -19350,7 +16189,7 @@
# Check whether --enable-gtk-doc was given.
@@ -13754,7 +13753,7 @@
enableval=$enable_gtk_doc;
else
enable_gtk_doc=no
-@@ -19359,33 +16197,31 @@
+@@ -19359,33 +16198,31 @@
if test x$enable_gtk_doc = xyes; then
if test -n "$PKG_CONFIG" && \
@@ -13796,7 +13795,7 @@
enableval=$enable_gtk_doc_pdf;
else
enable_gtk_doc_pdf=no
-@@ -19456,9 +16292,9 @@
+@@ -19456,9 +16293,9 @@
# Extract the first word of "gtk-builder-convert", so it can be a program name with args.
set dummy gtk-builder-convert; ac_word=$2
@@ -13808,7 +13807,7 @@
$as_echo_n "(cached) " >&6
else
case $GTK_BUILDER_CONVERT in
-@@ -19471,14 +16307,14 @@
+@@ -19471,14 +16308,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13826,7 +13825,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GTK_BUILDER_CONVERT" && ac_cv_path_GTK_BUILDER_CONVERT="false"
-@@ -19487,18 +16323,16 @@
+@@ -19487,18 +16324,16 @@
fi
GTK_BUILDER_CONVERT=$ac_cv_path_GTK_BUILDER_CONVERT
if test -n "$GTK_BUILDER_CONVERT"; then
@@ -13848,7 +13847,7 @@
fi
# ************
-@@ -19506,9 +16340,7 @@
+@@ -19506,9 +16341,7 @@
# ************
@@ -13859,7 +13858,7 @@
ac_config_files="$ac_config_files Makefile data/Makefile data/epiphany-${EPIPHANY_API_VERSION}.pc:data/epiphany.pc.in data/epiphany.desktop.in data/bme.desktop.in data/glade/Makefile data/icons/Makefile data/art/Makefile data/ui/Makefile doc/Makefile doc/reference/Makefile lib/Makefile lib/egg/Makefile lib/widgets/Makefile embed/Makefile src/Makefile src/bookmarks/Makefile src/epiphany.h help/Makefile po/Makefile.in tests/Makefile"
-@@ -19541,13 +16373,13 @@
+@@ -19541,13 +16374,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -13875,7 +13874,7 @@
esac ;;
esac
done
-@@ -19555,8 +16387,8 @@
+@@ -19555,8 +16388,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -13886,7 +13885,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -19579,11 +16411,11 @@
+@@ -19579,11 +16412,11 @@
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
@@ -13900,7 +13899,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -19603,8 +16435,8 @@
+@@ -19603,8 +16436,8 @@
ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
@@ -13911,7 +13910,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -19620,157 +16452,98 @@
+@@ -19620,157 +16453,98 @@
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -14112,7 +14111,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -19780,17 +16553,18 @@
+@@ -19780,17 +16554,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -14138,7 +14137,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -19798,23 +16572,15 @@
+@@ -19798,23 +16573,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -14167,7 +14166,7 @@
as_nl='
'
export as_nl
-@@ -19822,7 +16588,13 @@
+@@ -19822,7 +16589,13 @@
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -14182,7 +14181,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -19833,7 +16605,7 @@
+@@ -19833,7 +16606,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -14191,7 +14190,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -19856,13 +16628,6 @@
+@@ -19856,13 +16629,6 @@
}
fi
@@ -14205,7 +14204,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -19872,15 +16637,15 @@
+@@ -19872,15 +16638,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -14224,7 +14223,7 @@
IFS=$as_save_IFS
;;
-@@ -19892,12 +16657,16 @@
+@@ -19892,12 +16658,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -14245,7 +14244,7 @@
done
PS1='$ '
PS2='> '
-@@ -19909,7 +16678,89 @@
+@@ -19909,7 +16679,89 @@
LANGUAGE=C
export LANGUAGE
@@ -14336,7 +14335,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -19923,8 +16774,12 @@
+@@ -19923,8 +16775,12 @@
as_basename=false
fi
@@ -14350,7 +14349,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -19944,76 +16799,25 @@
+@@ -19944,76 +16800,25 @@
}
s/.*/./; q'`
@@ -14438,7 +14437,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -20042,8 +16846,56 @@
+@@ -20042,8 +16847,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -14496,7 +14495,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -20062,10 +16914,10 @@
+@@ -20062,10 +16915,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -14509,7 +14508,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -20080,13 +16932,19 @@
+@@ -20080,13 +16933,19 @@
exec 6>&1
@@ -14531,7 +14530,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -20118,10 +16976,11 @@
+@@ -20118,10 +16977,11 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -14546,7 +14545,7 @@
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
-@@ -20143,16 +17002,16 @@
+@@ -20143,16 +17003,16 @@
Configuration commands:
$config_commands
@@ -14566,7 +14565,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -20195,20 +17054,19 @@
+@@ -20195,20 +17055,19 @@
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -14591,7 +14590,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -20216,11 +17074,10 @@
+@@ -20216,11 +17075,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -14606,7 +14605,7 @@
ac_need_defaults=false ;;
esac
-@@ -20555,9 +17412,7 @@
+@@ -20555,9 +17413,7 @@
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -14617,7 +14616,7 @@
esac
done
-@@ -20584,7 +17439,7 @@
+@@ -20584,7 +17440,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -14626,7 +14625,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -20595,11 +17450,7 @@
+@@ -20595,11 +17451,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -14639,7 +14638,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -20607,10 +17458,16 @@
+@@ -20607,10 +17459,16 @@
if test -n "$CONFIG_FILES"; then
@@ -14658,7 +14657,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -20624,24 +17481,18 @@
+@@ -20624,24 +17482,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -14686,7 +14685,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -20730,9 +17581,7 @@
+@@ -20730,9 +17582,7 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -14697,7 +14696,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -20773,9 +17622,7 @@
+@@ -20773,9 +17623,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -14708,7 +14707,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -20860,9 +17707,7 @@
+@@ -20860,9 +17708,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -14719,7 +14718,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -20875,9 +17720,7 @@
+@@ -20875,9 +17721,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -14730,7 +14729,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -20905,12 +17748,10 @@
+@@ -20905,12 +17749,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -14745,7 +14744,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -20921,7 +17762,7 @@
+@@ -20921,7 +17763,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -14754,7 +14753,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -20934,9 +17775,7 @@
+@@ -20934,9 +17776,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -14765,7 +14764,7 @@
esac
;;
esac
-@@ -20964,47 +17803,7 @@
+@@ -20964,47 +17804,7 @@
q
}
s/.*/./; q'`
@@ -14814,7 +14813,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -21061,7 +17860,6 @@
+@@ -21061,7 +17861,6 @@
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -14822,7 +14821,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -21071,12 +17869,11 @@
+@@ -21071,12 +17870,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -14837,7 +14836,7 @@
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -21086,7 +17883,7 @@
+@@ -21086,7 +17884,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -14846,7 +14845,7 @@
esac
_ACEOF
-@@ -21115,14 +17912,12 @@
+@@ -21115,14 +17913,12 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -14863,7 +14862,7 @@
which seems to be undefined. Please make sure it is defined." >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&2;}
-@@ -21132,9 +17927,7 @@
+@@ -21132,9 +17928,7 @@
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -14874,7 +14873,7 @@
;;
:H)
#
-@@ -21145,25 +17938,19 @@
+@@ -21145,25 +17939,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -14904,7 +14903,7 @@
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -21201,7 +17988,7 @@
+@@ -21201,7 +17989,7 @@
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -14913,7 +14912,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -21296,47 +18083,7 @@
+@@ -21296,47 +18084,7 @@
q
}
s/.*/./; q'`
@@ -14962,7 +14961,7 @@
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
-@@ -21983,9 +18730,7 @@
+@@ -21983,9 +18731,7 @@
esac ;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" ; then
@@ -14973,7 +14972,7 @@
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
-@@ -22008,15 +18753,12 @@
+@@ -22008,15 +18754,12 @@
done # for ac_tag
@@ -14991,7 +14990,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -22037,10 +18779,10 @@
+@@ -22037,10 +18780,10 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
@@ -15004,10 +15003,10 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-Index: epiphany-webkit-2.28.0/lib/Makefile.in
+Index: epiphany-browser-2.28.0/lib/Makefile.in
===================================================================
---- epiphany-webkit-2.28.0.orig/lib/Makefile.in 2009-09-21 15:04:14.000000000 -0300
-+++ epiphany-webkit-2.28.0/lib/Makefile.in 2009-09-24 16:40:10.680940203 -0300
+--- epiphany-browser-2.28.0.orig/lib/Makefile.in 2009-09-24 18:15:07.380440552 -0300
++++ epiphany-browser-2.28.0/lib/Makefile.in 2009-09-24 18:20:09.016939583 -0300
@@ -336,6 +336,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
@@ -15025,10 +15024,10 @@
$(AM_CPPFLAGS)
libephymisc_la_CFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CFLAGS) \
-Index: epiphany-webkit-2.28.0/ltmain.sh
+Index: epiphany-browser-2.28.0/ltmain.sh
===================================================================
---- epiphany-webkit-2.28.0.orig/ltmain.sh 2009-09-19 16:43:29.000000000 -0300
-+++ epiphany-webkit-2.28.0/ltmain.sh 2009-09-24 16:39:58.724439329 -0300
+--- epiphany-browser-2.28.0.orig/ltmain.sh 2009-09-24 18:15:07.332439994 -0300
++++ epiphany-browser-2.28.0/ltmain.sh 2009-09-24 18:19:47.344440568 -0300
@@ -4202,6 +4202,11 @@
prev=
continue
@@ -15041,10 +15040,10 @@
esac
;;
expsyms)
-Index: epiphany-webkit-2.28.0/src/Makefile.in
+Index: epiphany-browser-2.28.0/src/Makefile.in
===================================================================
---- epiphany-webkit-2.28.0.orig/src/Makefile.in 2009-09-21 15:04:15.000000000 -0300
-+++ epiphany-webkit-2.28.0/src/Makefile.in 2009-09-24 16:40:11.308939979 -0300
+--- epiphany-browser-2.28.0.orig/src/Makefile.in 2009-09-24 18:15:07.368448392 -0300
++++ epiphany-browser-2.28.0/src/Makefile.in 2009-09-24 18:20:09.744940497 -0300
@@ -418,6 +418,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
Modified: desktop/experimental/epiphany-webkit/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/patches/99_ltmain_as-needed.patch?rev=21530&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/patches/99_ltmain_as-needed.patch [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/patches/99_ltmain_as-needed.patch [utf-8] Thu Sep 24 21:23:33 2009
@@ -1,8 +1,8 @@
-Index: epiphany-webkit-2.27.1/ltmain.sh
+Index: epiphany-browser-2.28.0/ltmain.sh
===================================================================
---- epiphany-webkit-2.27.1.orig/ltmain.sh 2009-04-02 15:27:12.000000000 -0300
-+++ epiphany-webkit-2.27.1/ltmain.sh 2009-04-02 15:31:59.000000000 -0300
-@@ -4194,6 +4194,11 @@
+--- epiphany-browser-2.28.0.orig/ltmain.sh 2009-09-24 18:19:47.344440568 -0300
++++ epiphany-browser-2.28.0/ltmain.sh 2009-09-24 18:20:20.648939697 -0300
+@@ -4721,6 +4721,11 @@
arg=$func_stripname_result
;;
@@ -14,7 +14,7 @@
-Wl,*)
func_stripname '-Wl,' '' "$arg"
args=$func_stripname_result
-@@ -4548,6 +4553,15 @@
+@@ -5072,6 +5077,15 @@
lib=
found=no
case $deplib in
More information about the pkg-gnome-commits
mailing list