r14137 - in /desktop/unstable/epiphany-browser/debian: changelog control control.in patches/02_ac_init.patch patches/05_libexecdir.patch patches/06_ssl_weak_ciphers.patch patches/13_powered-by.patch patches/99_autoreconf.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sat Jan 12 02:12:21 UTC 2008
Author: joss
Date: Sat Jan 12 02:12:20 2008
New Revision: 14137
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14137
Log:
* New upstream translation and bugfix release.
* Update and refresh patches.
* Use the Homepage field.
* Standards version is 3.7.3.
Modified:
desktop/unstable/epiphany-browser/debian/changelog
desktop/unstable/epiphany-browser/debian/control
desktop/unstable/epiphany-browser/debian/control.in
desktop/unstable/epiphany-browser/debian/patches/02_ac_init.patch
desktop/unstable/epiphany-browser/debian/patches/05_libexecdir.patch
desktop/unstable/epiphany-browser/debian/patches/06_ssl_weak_ciphers.patch
desktop/unstable/epiphany-browser/debian/patches/13_powered-by.patch
desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch
Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=14137&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog (original)
+++ desktop/unstable/epiphany-browser/debian/changelog Sat Jan 12 02:12:20 2008
@@ -1,3 +1,12 @@
+epiphany-browser (2.20.3-1) unstable; urgency=low
+
+ * New upstream translation and bugfix release.
+ * Update and refresh patches.
+ * Use the Homepage field.
+ * Standards version is 3.7.3.
+
+ -- Josselin Mouette <joss at debian.org> Sat, 12 Jan 2008 02:30:01 +0100
+
epiphany-browser (2.20.2-1) unstable; urgency=low
[ Josselin Mouette ]
Modified: desktop/unstable/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control?rev=14137&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control (original)
+++ desktop/unstable/epiphany-browser/debian/control Sat Jan 12 02:12:20 2008
@@ -2,7 +2,7 @@
Section: gnome
Priority: optional
Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: debhelper (>= 5),
pkg-config,
libglib2.0-dev (>= 2.13.4),
@@ -33,7 +33,7 @@
libenchant-dev (>= 1.0),
libwebkitgtk-dev (>= 0~svn24770),
gtk-doc-tools (>= 1.0)
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
Package: epiphany-browser
Architecture: all
@@ -71,8 +71,7 @@
Guidelines (HIG) and by close integration with the GNOME desktop.
.
This version uses the Gecko backend to render web pages.
- .
- Homepage: http://www.gnome.org/projects/epiphany/
+Homepage: http://www.gnome.org/projects/epiphany/
Package: epiphany-webkit
Architecture: any
@@ -99,8 +98,7 @@
Guidelines (HIG) and by close integration with the GNOME desktop.
.
This version uses the Webkit backend to render web pages.
- .
- Homepage: http://www.gnome.org/projects/epiphany/
+Homepage: http://www.gnome.org/projects/epiphany/
Package: epiphany-browser-data
Architecture: all
Modified: desktop/unstable/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control.in?rev=14137&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control.in (original)
+++ desktop/unstable/epiphany-browser/debian/control.in Sat Jan 12 02:12:20 2008
@@ -33,7 +33,7 @@
libenchant-dev (>= 1.0),
libwebkitgtk-dev (>= 0~svn24770),
gtk-doc-tools (>= 1.0)
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
Package: epiphany-browser
Architecture: all
@@ -71,8 +71,7 @@
Guidelines (HIG) and by close integration with the GNOME desktop.
.
This version uses the Gecko backend to render web pages.
- .
- Homepage: http://www.gnome.org/projects/epiphany/
+Homepage: http://www.gnome.org/projects/epiphany/
Package: epiphany-webkit
Architecture: any
@@ -99,8 +98,7 @@
Guidelines (HIG) and by close integration with the GNOME desktop.
.
This version uses the Webkit backend to render web pages.
- .
- Homepage: http://www.gnome.org/projects/epiphany/
+Homepage: http://www.gnome.org/projects/epiphany/
Package: epiphany-browser-data
Architecture: all
Modified: desktop/unstable/epiphany-browser/debian/patches/02_ac_init.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/02_ac_init.patch?rev=14137&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/02_ac_init.patch (original)
+++ desktop/unstable/epiphany-browser/debian/patches/02_ac_init.patch Sat Jan 12 02:12:20 2008
@@ -6,8 +6,8 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
--AC_INIT([GNOME Web Browser],[2.20.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
-+AC_INIT([GNOME Web Browser],[2.20.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany-browser])
+-AC_INIT([GNOME Web Browser],[2.20.3],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
++AC_INIT([GNOME Web Browser],[2.20.3],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany-browser])
GNOME_COMMON_INIT
Modified: desktop/unstable/epiphany-browser/debian/patches/05_libexecdir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/05_libexecdir.patch?rev=14137&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/05_libexecdir.patch (original)
+++ desktop/unstable/epiphany-browser/debian/patches/05_libexecdir.patch Sat Jan 12 02:12:20 2008
@@ -1,8 +1,8 @@
-Index: epiphany-2.20.0/data/epiphany.pc.in
+Index: epiphany-2.20.3/data/epiphany.pc.in
===================================================================
---- epiphany-2.20.0.orig/data/epiphany.pc.in 2007-09-21 14:41:49.966965277 +0200
-+++ epiphany-2.20.0/data/epiphany.pc.in 2007-09-21 14:45:51.976756629 +0200
-@@ -2,8 +2,8 @@
+--- epiphany-2.20.3.orig/data/epiphany.pc.in 2007-08-27 22:19:01.000000000 +0200
++++ epiphany-2.20.3/data/epiphany.pc.in 2008-01-12 02:25:29.815203666 +0100
+@@ -2,8 +2,8 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@/epiphany/@EPIPHANY_MAJOR@
@@ -13,11 +13,11 @@
datarootdir=@datarootdir@
datadir=@datadir@
icondir=@datadir@/@PACKAGE@/icons
-Index: epiphany-2.20.0/embed/mozilla/Makefile.am
+Index: epiphany-2.20.3/embed/mozilla/Makefile.am
===================================================================
---- epiphany-2.20.0.orig/embed/mozilla/Makefile.am 2007-09-21 14:41:35.286128664 +0200
-+++ epiphany-2.20.0/embed/mozilla/Makefile.am 2007-09-21 14:44:45.804985715 +0200
-@@ -141,7 +141,7 @@
+--- epiphany-2.20.3.orig/embed/mozilla/Makefile.am 2007-08-27 22:19:02.000000000 +0200
++++ epiphany-2.20.3/embed/mozilla/Makefile.am 2008-01-12 02:25:29.815203666 +0100
+@@ -141,7 +141,7 @@ libephymozillaembed_la_CPPFLAGS = \
-I$(top_srcdir) \
$(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) \
-DSHARE_DIR=\"$(pkgdatadir)\" \
@@ -26,11 +26,11 @@
-DMOZILLA_HOME=\"$(GECKO_HOME)\" \
-DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \
-DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \
-Index: epiphany-2.20.0/embed/mozilla/Makefile.in
+Index: epiphany-2.20.3/embed/mozilla/Makefile.in
===================================================================
---- epiphany-2.20.0.orig/embed/mozilla/Makefile.in 2007-09-21 14:41:35.326130943 +0200
-+++ epiphany-2.20.0/embed/mozilla/Makefile.in 2007-09-21 14:44:45.816986398 +0200
-@@ -461,7 +461,7 @@
+--- epiphany-2.20.3.orig/embed/mozilla/Makefile.in 2008-01-07 23:48:14.000000000 +0100
++++ epiphany-2.20.3/embed/mozilla/Makefile.in 2008-01-12 02:25:29.815203666 +0100
+@@ -458,7 +458,7 @@ libephymozillaembed_la_CPPFLAGS = \
-I$(top_srcdir) \
$(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) \
-DSHARE_DIR=\"$(pkgdatadir)\" \
@@ -39,11 +39,11 @@
-DMOZILLA_HOME=\"$(GECKO_HOME)\" \
-DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \
-DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \
-Index: epiphany-2.20.0/lib/Makefile.am
+Index: epiphany-2.20.3/lib/Makefile.am
===================================================================
---- epiphany-2.20.0.orig/lib/Makefile.am 2007-09-21 14:41:42.814557684 +0200
-+++ epiphany-2.20.0/lib/Makefile.am 2007-09-21 14:44:45.816986398 +0200
-@@ -76,7 +76,7 @@
+--- epiphany-2.20.3.orig/lib/Makefile.am 2007-08-27 22:19:00.000000000 +0200
++++ epiphany-2.20.3/lib/Makefile.am 2008-01-12 02:25:29.815203666 +0100
+@@ -76,7 +76,7 @@ nodist_libephymisc_la_SOURCES = \
libephymisc_la_CPPFLAGS = \
-I$(top_builddir)/lib \
-DSHARE_DIR=\"$(pkgdatadir)\" \
@@ -52,11 +52,11 @@
$(AM_CPPFLAGS)
libephymisc_la_CFLAGS = \
-Index: epiphany-2.20.0/lib/Makefile.in
+Index: epiphany-2.20.3/lib/Makefile.in
===================================================================
---- epiphany-2.20.0.orig/lib/Makefile.in 2007-09-21 14:41:42.854559964 +0200
-+++ epiphany-2.20.0/lib/Makefile.in 2007-09-21 14:44:45.828987082 +0200
-@@ -409,7 +409,7 @@
+--- epiphany-2.20.3.orig/lib/Makefile.in 2008-01-07 23:48:15.000000000 +0100
++++ epiphany-2.20.3/lib/Makefile.in 2008-01-12 02:25:29.815203666 +0100
+@@ -406,7 +406,7 @@ nodist_libephymisc_la_SOURCES = \
libephymisc_la_CPPFLAGS = \
-I$(top_builddir)/lib \
-DSHARE_DIR=\"$(pkgdatadir)\" \
@@ -65,21 +65,21 @@
$(AM_CPPFLAGS)
libephymisc_la_CFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CFLAGS) \
-Index: epiphany-2.20.0/plugins/desktop-file/Makefile.am
+Index: epiphany-2.20.3/plugins/desktop-file/Makefile.am
===================================================================
---- epiphany-2.20.0.orig/plugins/desktop-file/Makefile.am 2007-09-21 14:41:24.741527761 +0200
-+++ epiphany-2.20.0/plugins/desktop-file/Makefile.am 2007-09-21 14:44:45.800985487 +0200
+--- epiphany-2.20.3.orig/plugins/desktop-file/Makefile.am 2007-08-27 22:18:53.000000000 +0200
++++ epiphany-2.20.3/plugins/desktop-file/Makefile.am 2008-01-12 02:25:29.819203893 +0100
@@ -1,4 +1,4 @@
-plugindir = $(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins
+plugindir = $(libexecdir)/$(EPIPHANY_MAJOR)/plugins
plugin_LTLIBRARIES = libdesktopfileplugin.la
libdesktopfileplugin_la_SOURCES = \
-Index: epiphany-2.20.0/plugins/desktop-file/Makefile.in
+Index: epiphany-2.20.3/plugins/desktop-file/Makefile.in
===================================================================
---- epiphany-2.20.0.orig/plugins/desktop-file/Makefile.in 2007-09-21 14:41:24.781530041 +0200
-+++ epiphany-2.20.0/plugins/desktop-file/Makefile.in 2007-09-21 14:44:45.804985715 +0200
-@@ -295,7 +295,7 @@
+--- epiphany-2.20.3.orig/plugins/desktop-file/Makefile.in 2008-01-07 23:48:16.000000000 +0100
++++ epiphany-2.20.3/plugins/desktop-file/Makefile.in 2008-01-12 02:25:29.819203893 +0100
+@@ -292,7 +292,7 @@ target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
with_engine = @with_engine@
@@ -88,11 +88,11 @@
plugin_LTLIBRARIES = libdesktopfileplugin.la
libdesktopfileplugin_la_SOURCES = \
plugin.cpp
-Index: epiphany-2.20.0/src/Makefile.am
+Index: epiphany-2.20.3/src/Makefile.am
===================================================================
---- epiphany-2.20.0.orig/src/Makefile.am 2007-09-21 14:41:15.096978150 +0200
-+++ epiphany-2.20.0/src/Makefile.am 2007-09-21 14:44:45.784984575 +0200
-@@ -112,8 +112,8 @@
+--- epiphany-2.20.3.orig/src/Makefile.am 2007-08-27 22:18:55.000000000 +0200
++++ epiphany-2.20.3/src/Makefile.am 2008-01-12 02:25:29.819203893 +0100
+@@ -112,8 +112,8 @@ libephymain_la_CPPFLAGS = \
-I$(top_srcdir)/lib/egg \
-I$(top_srcdir)/lib/widgets \
-I$(top_srcdir)/src/bookmarks \
@@ -103,7 +103,7 @@
-DDATADIR=\""$(pkgdatadir)"\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
$(AM_CPPFLAGS)
-@@ -164,8 +164,8 @@
+@@ -164,8 +164,8 @@ libpyphany_la_CPPFLAGS = \
-I$(top_builddir)/src \
-I$(top_builddir)/src/bookmarks \
$(PYTHON_INCLUDES) \
@@ -114,11 +114,11 @@
-DDATADIR=\""$(datadir)"\" \
$(AM_CPPFLAGS)
-Index: epiphany-2.20.0/src/Makefile.in
+Index: epiphany-2.20.3/src/Makefile.in
===================================================================
---- epiphany-2.20.0.orig/src/Makefile.in 2007-09-21 14:41:15.132980201 +0200
-+++ epiphany-2.20.0/src/Makefile.in 2007-09-21 14:44:45.800985487 +0200
-@@ -521,8 +521,8 @@
+--- epiphany-2.20.3.orig/src/Makefile.in 2008-01-07 23:48:17.000000000 +0100
++++ epiphany-2.20.3/src/Makefile.in 2008-01-12 02:25:29.819203893 +0100
+@@ -518,8 +518,8 @@ libephymain_la_CPPFLAGS = \
-I$(top_srcdir)/lib/egg \
-I$(top_srcdir)/lib/widgets \
-I$(top_srcdir)/src/bookmarks \
@@ -129,7 +129,7 @@
-DDATADIR=\""$(pkgdatadir)"\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
$(AM_CPPFLAGS)
-@@ -560,8 +560,8 @@
+@@ -557,8 +557,8 @@ libephymain_la_CFLAGS = \
@ENABLE_PYTHON_TRUE@ -I$(top_builddir)/src \
@ENABLE_PYTHON_TRUE@ -I$(top_builddir)/src/bookmarks \
@ENABLE_PYTHON_TRUE@ $(PYTHON_INCLUDES) \
Modified: desktop/unstable/epiphany-browser/debian/patches/06_ssl_weak_ciphers.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/06_ssl_weak_ciphers.patch?rev=14137&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/06_ssl_weak_ciphers.patch (original)
+++ desktop/unstable/epiphany-browser/debian/patches/06_ssl_weak_ciphers.patch Sat Jan 12 02:12:20 2008
@@ -1,8 +1,8 @@
-Index: epiphany-2.20.0/data/default-prefs-common.js
+Index: epiphany-2.20.3/data/default-prefs-common.js
===================================================================
---- epiphany-2.20.0.orig/data/default-prefs-common.js 2007-08-27 22:19:01.000000000 +0200
-+++ epiphany-2.20.0/data/default-prefs-common.js 2007-09-21 14:29:58.022393868 +0200
-@@ -163,3 +163,6 @@
+--- epiphany-2.20.3.orig/data/default-prefs-common.js 2008-01-07 23:47:27.000000000 +0100
++++ epiphany-2.20.3/data/default-prefs-common.js 2008-01-12 02:25:48.144248178 +0100
+@@ -170,3 +170,6 @@ pref("dom.disable_window_flip", true);
// set to true for parity with gtk entries
pref("bidi.edit.delete_immediately", true);
Modified: desktop/unstable/epiphany-browser/debian/patches/13_powered-by.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/13_powered-by.patch?rev=14137&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/13_powered-by.patch (original)
+++ desktop/unstable/epiphany-browser/debian/patches/13_powered-by.patch Sat Jan 12 02:12:20 2008
@@ -1,8 +1,8 @@
-Index: epiphany-2.20.0/src/window-commands.c
-===================================================================
---- epiphany-2.20.0.orig/src/window-commands.c 2007-08-27 22:18:55.000000000 +0200
-+++ epiphany-2.20.0/src/window-commands.c 2007-10-02 14:52:31.508502320 +0200
-@@ -824,8 +824,8 @@
+Index: epiphany-2.20.3/src/window-commands.c
+===================================================================
+--- epiphany-2.20.3.orig/src/window-commands.c 2007-10-11 12:46:51.000000000 +0200
++++ epiphany-2.20.3/src/window-commands.c 2008-01-12 02:25:58.148818306 +0100
+@@ -824,8 +824,8 @@ window_cmd_help_about (GtkAction *action
single = EPHY_EMBED_SINGLE (ephy_embed_shell_get_embed_single (shell));
comments = g_strdup_printf (_("Lets you view web pages and find information on the internet.\n"
@@ -13,11 +13,11 @@
licence = g_strjoin ("\n\n",
_(licence_part[0]),
_(licence_part[1]),
-Index: epiphany-2.20.0/po/ar.po
-===================================================================
---- epiphany-2.20.0.orig/po/ar.po 2007-10-02 14:58:47.869949937 +0200
-+++ epiphany-2.20.0/po/ar.po 2007-10-02 14:59:56.649869481 +0200
-@@ -4078,10 +4078,10 @@
+Index: epiphany-2.20.3/po/ar.po
+===================================================================
+--- epiphany-2.20.3.orig/po/ar.po 2008-01-07 23:47:27.000000000 +0100
++++ epiphany-2.20.3/po/ar.po 2008-01-12 02:25:58.152818534 +0100
+@@ -4097,10 +4097,10 @@ msgstr "الÙ
طورون السابقوÙ
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -30,11 +30,11 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/be.po
-===================================================================
---- epiphany-2.20.0.orig/po/be.po 2007-10-02 14:58:47.945954268 +0200
-+++ epiphany-2.20.0/po/be.po 2007-10-02 14:59:56.701872444 +0200
-@@ -4063,10 +4063,10 @@
+Index: epiphany-2.20.3/po/be.po
+===================================================================
+--- epiphany-2.20.3.orig/po/be.po 2007-08-27 22:19:08.000000000 +0200
++++ epiphany-2.20.3/po/be.po 2008-01-12 02:25:58.152818534 +0100
+@@ -4063,10 +4063,10 @@ msgstr ""
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -47,11 +47,11 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/bg.po
-===================================================================
---- epiphany-2.20.0.orig/po/bg.po 2007-10-02 14:58:47.985956547 +0200
-+++ epiphany-2.20.0/po/bg.po 2007-10-02 14:59:56.729874040 +0200
-@@ -4337,10 +4337,10 @@
+Index: epiphany-2.20.3/po/bg.po
+===================================================================
+--- epiphany-2.20.3.orig/po/bg.po 2007-09-17 19:37:05.000000000 +0200
++++ epiphany-2.20.3/po/bg.po 2008-01-12 02:25:58.160818990 +0100
+@@ -4337,10 +4337,10 @@ msgstr "Предишни разрабоÑ
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -64,24 +64,24 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/bn_IN.po
-===================================================================
---- epiphany-2.20.0.orig/po/bn_IN.po 2007-10-02 14:58:48.025958827 +0200
-+++ epiphany-2.20.0/po/bn_IN.po 2007-10-02 14:59:56.761875864 +0200
-@@ -4247,7 +4247,7 @@
- #, c-format
- msgid ""
- "Lets you view web pages and find information on the internet.\n"
--"Powered by Gecko %s"
-+"Powered by %s"
- msgstr ""
-
- #. Translators: This is a special message that shouldn't be translated
-Index: epiphany-2.20.0/po/ca.po
-===================================================================
---- epiphany-2.20.0.orig/po/ca.po 2007-10-02 14:58:48.145965666 +0200
-+++ epiphany-2.20.0/po/ca.po 2007-10-02 14:59:56.845880651 +0200
-@@ -4337,10 +4337,10 @@
+Index: epiphany-2.20.3/po/bn_IN.po
+===================================================================
+--- epiphany-2.20.3.orig/po/bn_IN.po 2007-08-27 22:19:08.000000000 +0200
++++ epiphany-2.20.3/po/bn_IN.po 2008-01-12 02:25:58.160818990 +0100
+@@ -4247,7 +4247,7 @@ msgstr ""
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+
+ #. Translators: This is a special message that shouldn't be translated
+Index: epiphany-2.20.3/po/ca.po
+===================================================================
+--- epiphany-2.20.3.orig/po/ca.po 2008-01-07 23:47:27.000000000 +0100
++++ epiphany-2.20.3/po/ca.po 2008-01-12 02:25:58.164819218 +0100
+@@ -4337,10 +4337,10 @@ msgstr "Antics desenvolupadors:"
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -94,11 +94,11 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/cs.po
-===================================================================
---- epiphany-2.20.0.orig/po/cs.po 2007-10-02 14:58:48.181967717 +0200
-+++ epiphany-2.20.0/po/cs.po 2007-10-02 14:59:56.869882019 +0200
-@@ -4265,10 +4265,10 @@
+Index: epiphany-2.20.3/po/cs.po
+===================================================================
+--- epiphany-2.20.3.orig/po/cs.po 2007-08-27 22:19:08.000000000 +0200
++++ epiphany-2.20.3/po/cs.po 2008-01-12 02:25:58.168819446 +0100
+@@ -4265,10 +4265,10 @@ msgstr "DÅ™ÃvÄ›jÅ¡Ã vývojáři"
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -111,11 +111,11 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/da.po
-===================================================================
---- epiphany-2.20.0.orig/po/da.po 2007-10-02 14:58:48.261972277 +0200
-+++ epiphany-2.20.0/po/da.po 2007-10-02 14:59:56.925885210 +0200
-@@ -4342,11 +4342,11 @@
+Index: epiphany-2.20.3/po/da.po
+===================================================================
+--- epiphany-2.20.3.orig/po/da.po 2007-09-17 19:37:04.000000000 +0200
++++ epiphany-2.20.3/po/da.po 2008-01-12 02:25:58.168819446 +0100
+@@ -4342,11 +4342,11 @@ msgstr "Tidligere udviklere:"
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -129,11 +129,11 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/de.po
-===================================================================
---- epiphany-2.20.0.orig/po/de.po 2007-10-02 14:58:48.301974556 +0200
-+++ epiphany-2.20.0/po/de.po 2007-10-02 14:59:56.961887262 +0200
-@@ -4376,10 +4376,10 @@
+Index: epiphany-2.20.3/po/de.po
+===================================================================
+--- epiphany-2.20.3.orig/po/de.po 2008-01-07 23:47:27.000000000 +0100
++++ epiphany-2.20.3/po/de.po 2008-01-12 02:25:58.172819674 +0100
+@@ -4376,10 +4376,10 @@ msgstr "Vorherige Entwickler"
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -146,11 +146,11 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/dz.po
-===================================================================
---- epiphany-2.20.0.orig/po/dz.po 2007-10-02 14:58:48.341976836 +0200
-+++ epiphany-2.20.0/po/dz.po 2007-10-02 14:59:57.001889541 +0200
-@@ -4050,7 +4050,7 @@
+Index: epiphany-2.20.3/po/dz.po
+===================================================================
+--- epiphany-2.20.3.orig/po/dz.po 2007-08-27 22:19:08.000000000 +0200
++++ epiphany-2.20.3/po/dz.po 2008-01-12 02:25:58.176819902 +0100
+@@ -4050,7 +4050,7 @@ msgstr "འདས་པའི་་བà½
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -159,11 +159,11 @@
msgstr ""
"à½à¾±à½¼à½‘་ལུ་à½à½ºà½–་ཤོག་ལེབ་བལྟ་ནི་དི་ ཨིན་ཊར་ནེཊི་ནང་ བརྡ་དོན་འཚོལ་བà½
ུགཔ་ཨིན༠\n"
"གེཀ་ཀོ་%sགིས་ནུས་ཤུགས་བྱིནམ་ཨིནà¼"
-Index: epiphany-2.20.0/po/el.po
-===================================================================
---- epiphany-2.20.0.orig/po/el.po 2007-10-02 14:58:48.381979115 +0200
-+++ epiphany-2.20.0/po/el.po 2007-10-02 14:59:57.033891365 +0200
-@@ -4289,10 +4289,10 @@
+Index: epiphany-2.20.3/po/el.po
+===================================================================
+--- epiphany-2.20.3.orig/po/el.po 2007-09-28 22:30:48.000000000 +0200
++++ epiphany-2.20.3/po/el.po 2008-01-12 02:25:58.180820130 +0100
+@@ -4088,10 +4088,10 @@ msgstr "Παλιοί σÏ
ντελεστÎ
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -176,45 +176,45 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/en_CA.po
-===================================================================
---- epiphany-2.20.0.orig/po/en_CA.po 2007-10-02 14:58:48.421981395 +0200
-+++ epiphany-2.20.0/po/en_CA.po 2007-10-02 14:59:57.061892961 +0200
-@@ -4280,10 +4280,10 @@
- #, c-format
- msgid ""
- "Lets you view web pages and find information on the internet.\n"
--"Powered by Gecko %s"
-+"Powered by %s"
- msgstr ""
- "Lets you view web pages and find information on the internet.\n"
--"Powered by Gecko %s"
-+"Powered by %s"
-
- #. Translators: This is a special message that shouldn't be translated
- #. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/en_GB.po
-===================================================================
---- epiphany-2.20.0.orig/po/en_GB.po 2007-10-02 14:58:48.461983675 +0200
-+++ epiphany-2.20.0/po/en_GB.po 2007-10-02 14:59:57.093894784 +0200
-@@ -4048,10 +4048,10 @@
- #, c-format
- msgid ""
- "Lets you view web pages and find information on the internet.\n"
--"Powered by Gecko %s"
-+"Powered by %s"
- msgstr ""
- "Lets you view web pages and find information on the internet.\n"
--"Powered by Gecko %s"
-+"Powered by %s"
-
- #. Translators: This is a special message that shouldn't be translated
- #. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/es.po
-===================================================================
---- epiphany-2.20.0.orig/po/es.po 2007-10-02 14:58:48.501985954 +0200
-+++ epiphany-2.20.0/po/es.po 2007-10-02 14:59:57.125896608 +0200
-@@ -4315,10 +4315,10 @@
+Index: epiphany-2.20.3/po/en_CA.po
+===================================================================
+--- epiphany-2.20.3.orig/po/en_CA.po 2007-08-27 22:19:08.000000000 +0200
++++ epiphany-2.20.3/po/en_CA.po 2008-01-12 02:25:58.180820130 +0100
+@@ -4280,10 +4280,10 @@ msgstr "Past developers:"
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.3/po/en_GB.po
+===================================================================
+--- epiphany-2.20.3.orig/po/en_GB.po 2007-08-27 22:19:08.000000000 +0200
++++ epiphany-2.20.3/po/en_GB.po 2008-01-12 02:25:58.184820358 +0100
+@@ -4048,10 +4048,10 @@ msgstr "Past developers:"
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.3/po/es.po
+===================================================================
+--- epiphany-2.20.3.orig/po/es.po 2007-09-10 21:45:21.000000000 +0200
++++ epiphany-2.20.3/po/es.po 2008-01-12 02:25:58.184820358 +0100
+@@ -4315,10 +4315,10 @@ msgstr "Desarrolladores anteriores:"
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -227,11 +227,11 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/et.po
-===================================================================
---- epiphany-2.20.0.orig/po/et.po 2007-10-02 14:58:48.537988006 +0200
-+++ epiphany-2.20.0/po/et.po 2007-10-02 14:59:57.153898204 +0200
-@@ -4325,10 +4325,10 @@
+Index: epiphany-2.20.3/po/et.po
+===================================================================
+--- epiphany-2.20.3.orig/po/et.po 2008-01-07 23:47:27.000000000 +0100
++++ epiphany-2.20.3/po/et.po 2008-01-12 02:25:58.188820586 +0100
+@@ -4325,10 +4325,10 @@ msgstr "Eelmised arendajad:"
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -244,11 +244,11 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/eu.po
-===================================================================
---- epiphany-2.20.0.orig/po/eu.po 2007-10-02 14:58:48.577990285 +0200
-+++ epiphany-2.20.0/po/eu.po 2007-10-02 14:59:57.185900027 +0200
-@@ -4296,10 +4296,10 @@
+Index: epiphany-2.20.3/po/eu.po
+===================================================================
+--- epiphany-2.20.3.orig/po/eu.po 2007-09-17 19:37:05.000000000 +0200
++++ epiphany-2.20.3/po/eu.po 2008-01-12 02:25:58.188820586 +0100
+@@ -4296,10 +4296,10 @@ msgstr "Iraganeko garatzaileak:"
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -261,24 +261,24 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/fa.po
-===================================================================
---- epiphany-2.20.0.orig/po/fa.po 2007-10-02 14:58:48.617992565 +0200
-+++ epiphany-2.20.0/po/fa.po 2007-10-02 14:59:57.217901851 +0200
-@@ -4196,7 +4196,7 @@
- #, c-format
- msgid ""
- "Lets you view web pages and find information on the internet.\n"
--"Powered by Gecko %s"
-+"Powered by %s"
- msgstr ""
-
- #. Translators: This is a special message that shouldn't be translated
-Index: epiphany-2.20.0/po/fi.po
-===================================================================
---- epiphany-2.20.0.orig/po/fi.po 2007-10-02 14:58:48.657994845 +0200
-+++ epiphany-2.20.0/po/fi.po 2007-10-02 14:59:57.249903675 +0200
-@@ -4319,7 +4319,7 @@
+Index: epiphany-2.20.3/po/fa.po
+===================================================================
+--- epiphany-2.20.3.orig/po/fa.po 2007-08-27 22:19:08.000000000 +0200
++++ epiphany-2.20.3/po/fa.po 2008-01-12 02:25:58.192820814 +0100
+@@ -4196,7 +4196,7 @@ msgstr ""
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+
+ #. Translators: This is a special message that shouldn't be translated
+Index: epiphany-2.20.3/po/fi.po
+===================================================================
+--- epiphany-2.20.3.orig/po/fi.po 2007-09-28 22:30:48.000000000 +0200
++++ epiphany-2.20.3/po/fi.po 2008-01-12 02:25:58.196821042 +0100
+@@ -4319,7 +4319,7 @@ msgstr "Aikaisemmat kehittäjät:"
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -287,11 +287,11 @@
msgstr ""
"Mahdollistaa www-sivujen katselun ja tiedon etsimisen Internetistä.\n"
"Käyttää Gecko-moottoria %s"
-Index: epiphany-2.20.0/po/fr.po
-===================================================================
---- epiphany-2.20.0.orig/po/fr.po 2007-10-02 14:58:48.697997124 +0200
-+++ epiphany-2.20.0/po/fr.po 2007-10-02 14:59:57.277905270 +0200
-@@ -4375,11 +4375,11 @@
+Index: epiphany-2.20.3/po/fr.po
+===================================================================
+--- epiphany-2.20.3.orig/po/fr.po 2007-10-15 22:43:43.000000000 +0200
++++ epiphany-2.20.3/po/fr.po 2008-01-12 02:25:58.196821042 +0100
+@@ -4375,11 +4375,11 @@ msgstr "Anciens développeurs :"
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -305,11 +305,11 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/gl.po
-===================================================================
---- epiphany-2.20.0.orig/po/gl.po 2007-10-02 14:58:48.778001683 +0200
-+++ epiphany-2.20.0/po/gl.po 2007-10-02 14:59:57.329908234 +0200
-@@ -4272,10 +4272,10 @@
+Index: epiphany-2.20.3/po/gl.po
+===================================================================
+--- epiphany-2.20.3.orig/po/gl.po 2007-08-27 22:19:08.000000000 +0200
++++ epiphany-2.20.3/po/gl.po 2008-01-12 02:25:58.200821270 +0100
+@@ -4272,10 +4272,10 @@ msgstr "Desenvolvedores anteriores:"
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -322,11 +322,11 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/gu.po
-===================================================================
---- epiphany-2.20.0.orig/po/gu.po 2007-10-02 14:58:48.818003963 +0200
-+++ epiphany-2.20.0/po/gu.po 2007-10-02 14:59:57.365910286 +0200
-@@ -4306,10 +4306,10 @@
+Index: epiphany-2.20.3/po/gu.po
+===================================================================
+--- epiphany-2.20.3.orig/po/gu.po 2007-09-10 21:45:21.000000000 +0200
++++ epiphany-2.20.3/po/gu.po 2008-01-12 02:25:58.204821498 +0100
+@@ -4306,10 +4306,10 @@ msgstr "જૂના વિકાસકà
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -339,11 +339,11 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/he.po
-===================================================================
---- epiphany-2.20.0.orig/po/he.po 2007-10-02 14:58:48.854006015 +0200
-+++ epiphany-2.20.0/po/he.po 2007-10-02 14:59:57.397912109 +0200
-@@ -4232,10 +4232,10 @@
+Index: epiphany-2.20.3/po/he.po
+===================================================================
+--- epiphany-2.20.3.orig/po/he.po 2007-08-27 22:19:08.000000000 +0200
++++ epiphany-2.20.3/po/he.po 2008-01-12 02:25:58.204821498 +0100
+@@ -4232,10 +4232,10 @@ msgstr "×ž×¤×ª×—×™× ×‘×¢×‘×¨:"
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -356,11 +356,11 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/hi.po
-===================================================================
---- epiphany-2.20.0.orig/po/hi.po 2007-10-02 14:58:48.894008294 +0200
-+++ epiphany-2.20.0/po/hi.po 2007-10-02 14:59:57.433914161 +0200
-@@ -4248,7 +4248,7 @@
+Index: epiphany-2.20.3/po/hi.po
+===================================================================
+--- epiphany-2.20.3.orig/po/hi.po 2007-08-27 22:19:08.000000000 +0200
++++ epiphany-2.20.3/po/hi.po 2008-01-12 02:25:58.208821726 +0100
+@@ -4248,7 +4248,7 @@ msgstr ""
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -369,11 +369,11 @@
msgstr ""
# Translator credits
-Index: epiphany-2.20.0/po/hu.po
-===================================================================
---- epiphany-2.20.0.orig/po/hu.po 2007-10-02 14:58:48.974012853 +0200
-+++ epiphany-2.20.0/po/hu.po 2007-10-02 14:59:57.485917124 +0200
-@@ -4312,11 +4312,11 @@
+Index: epiphany-2.20.3/po/hu.po
+===================================================================
+--- epiphany-2.20.3.orig/po/hu.po 2007-09-17 19:37:05.000000000 +0200
++++ epiphany-2.20.3/po/hu.po 2008-01-12 02:25:58.212821954 +0100
+@@ -4312,11 +4312,11 @@ msgstr "Korábbi fejlesztők:"
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -387,11 +387,11 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/id.po
-===================================================================
---- epiphany-2.20.0.orig/po/id.po 2007-10-02 14:58:49.014015133 +0200
-+++ epiphany-2.20.0/po/id.po 2007-10-02 14:59:57.517918948 +0200
-@@ -4232,11 +4232,11 @@
+Index: epiphany-2.20.3/po/id.po
+===================================================================
+--- epiphany-2.20.3.orig/po/id.po 2007-08-27 22:19:08.000000000 +0200
++++ epiphany-2.20.3/po/id.po 2008-01-12 02:25:58.212821954 +0100
+@@ -4232,11 +4232,11 @@ msgstr ""
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -405,11 +405,11 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/it.po
-===================================================================
---- epiphany-2.20.0.orig/po/it.po 2007-10-02 14:58:49.094019692 +0200
-+++ epiphany-2.20.0/po/it.po 2007-10-02 14:59:57.569921912 +0200
-@@ -4380,11 +4380,11 @@
+Index: epiphany-2.20.3/po/it.po
+===================================================================
+--- epiphany-2.20.3.orig/po/it.po 2007-09-28 22:30:48.000000000 +0200
++++ epiphany-2.20.3/po/it.po 2008-01-12 02:25:58.216822182 +0100
+@@ -4436,11 +4436,11 @@ msgstr "Sviluppatori precedenti:"
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -423,11 +423,11 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/ja.po
-===================================================================
---- epiphany-2.20.0.orig/po/ja.po 2007-10-02 14:58:49.134021972 +0200
-+++ epiphany-2.20.0/po/ja.po 2007-10-02 14:59:57.597923507 +0200
-@@ -4316,7 +4316,7 @@
+Index: epiphany-2.20.3/po/ja.po
+===================================================================
+--- epiphany-2.20.3.orig/po/ja.po 2008-01-07 23:47:27.000000000 +0100
++++ epiphany-2.20.3/po/ja.po 2008-01-12 02:25:58.220822409 +0100
+@@ -4316,7 +4316,7 @@ msgstr "å‰ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®é–‹ç™ºè€
:"
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -436,11 +436,11 @@
msgstr ""
"ウェブページを表示ã—ã¦ã€ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆä¸Šã®æƒ
å ±ã‚’è¦‹ã¤ã‘出ã—ã¾ã™ã€‚\n"
"使用ã—ã¦ã„ã‚‹ Gecko エンジン: %s"
-Index: epiphany-2.20.0/po/ko.po
-===================================================================
---- epiphany-2.20.0.orig/po/ko.po 2007-10-02 14:58:49.214026531 +0200
-+++ epiphany-2.20.0/po/ko.po 2007-10-02 14:59:57.661927155 +0200
-@@ -4251,7 +4251,7 @@
+Index: epiphany-2.20.3/po/ko.po
+===================================================================
+--- epiphany-2.20.3.orig/po/ko.po 2007-09-28 22:30:48.000000000 +0200
++++ epiphany-2.20.3/po/ko.po 2008-01-12 02:25:58.220822409 +0100
+@@ -4267,7 +4267,7 @@ msgstr "ì´ì „ 개발ìž:"
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -449,24 +449,24 @@
msgstr ""
"ì¸í„°ë„·ì—ì„œ 웹페ì´ì§€ë¥¼ ë³´ê³ ì •ë³´ë¥¼ 찾습니다.\n"
"게코 %s ì—”ì§„ì„ ì‚¬ìš©í•©ë‹ˆë‹¤"
-Index: epiphany-2.20.0/po/ku.po
-===================================================================
---- epiphany-2.20.0.orig/po/ku.po 2007-10-02 14:58:49.250028583 +0200
-+++ epiphany-2.20.0/po/ku.po 2007-10-02 14:59:57.685928522 +0200
-@@ -3982,7 +3982,7 @@
- #, c-format
- msgid ""
- "Lets you view web pages and find information on the internet.\n"
--"Powered by Gecko %s"
-+"Powered by %s"
- msgstr ""
-
- #. Translators: This is a special message that shouldn't be translated
-Index: epiphany-2.20.0/po/lt.po
-===================================================================
---- epiphany-2.20.0.orig/po/lt.po 2007-10-02 14:58:49.330033142 +0200
-+++ epiphany-2.20.0/po/lt.po 2007-10-02 14:59:57.745931942 +0200
-@@ -4299,10 +4299,10 @@
+Index: epiphany-2.20.3/po/ku.po
+===================================================================
+--- epiphany-2.20.3.orig/po/ku.po 2007-08-27 22:19:08.000000000 +0200
++++ epiphany-2.20.3/po/ku.po 2008-01-12 02:25:58.224822637 +0100
+@@ -3982,7 +3982,7 @@ msgstr ""
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+
+ #. Translators: This is a special message that shouldn't be translated
+Index: epiphany-2.20.3/po/lt.po
+===================================================================
+--- epiphany-2.20.3.orig/po/lt.po 2007-08-27 22:19:08.000000000 +0200
++++ epiphany-2.20.3/po/lt.po 2008-01-12 02:25:58.224822637 +0100
+@@ -4299,10 +4299,10 @@ msgstr "Ankstesnieji kūrėjai:"
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -479,11 +479,11 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/lv.po
-===================================================================
---- epiphany-2.20.0.orig/po/lv.po 2007-10-02 14:58:49.370035422 +0200
-+++ epiphany-2.20.0/po/lv.po 2007-10-02 14:59:57.777933765 +0200
-@@ -4224,10 +4224,10 @@
+Index: epiphany-2.20.3/po/lv.po
+===================================================================
+--- epiphany-2.20.3.orig/po/lv.po 2007-08-27 22:19:08.000000000 +0200
++++ epiphany-2.20.3/po/lv.po 2008-01-12 02:25:58.228822865 +0100
+@@ -4224,10 +4224,10 @@ msgstr ""
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -496,24 +496,24 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/mg.po
-===================================================================
---- epiphany-2.20.0.orig/po/mg.po 2007-10-02 14:58:49.410037701 +0200
-+++ epiphany-2.20.0/po/mg.po 2007-10-02 14:59:57.805935361 +0200
-@@ -4117,7 +4117,7 @@
- #, c-format
- msgid ""
- "Lets you view web pages and find information on the internet.\n"
--"Powered by Gecko %s"
-+"Powered by %s"
- msgstr ""
-
- #. Translators: This is a special message that shouldn't be translated
-Index: epiphany-2.20.0/po/mk.po
-===================================================================
---- epiphany-2.20.0.orig/po/mk.po 2007-10-02 14:58:49.482041804 +0200
-+++ epiphany-2.20.0/po/mk.po 2007-10-02 14:59:57.857938325 +0200
-@@ -4313,10 +4313,10 @@
+Index: epiphany-2.20.3/po/mg.po
+===================================================================
+--- epiphany-2.20.3.orig/po/mg.po 2007-08-27 22:19:08.000000000 +0200
++++ epiphany-2.20.3/po/mg.po 2008-01-12 02:25:58.232823093 +0100
+@@ -4117,7 +4117,7 @@ msgstr ""
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+
+ #. Translators: This is a special message that shouldn't be translated
+Index: epiphany-2.20.3/po/mk.po
+===================================================================
+--- epiphany-2.20.3.orig/po/mk.po 2007-09-10 21:45:21.000000000 +0200
++++ epiphany-2.20.3/po/mk.po 2008-01-12 02:25:58.232823093 +0100
+@@ -4313,10 +4313,10 @@ msgstr "ПретÑ
одни развивÐ
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -526,11 +526,11 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/ml.po
-===================================================================
---- epiphany-2.20.0.orig/po/ml.po 2007-10-02 14:58:49.506043172 +0200
-+++ epiphany-2.20.0/po/ml.po 2007-10-02 14:59:57.893940376 +0200
-@@ -4190,7 +4190,7 @@
+Index: epiphany-2.20.3/po/ml.po
+===================================================================
+--- epiphany-2.20.3.orig/po/ml.po 2007-09-10 21:45:21.000000000 +0200
++++ epiphany-2.20.3/po/ml.po 2008-01-12 02:25:58.236823321 +0100
+@@ -4190,7 +4190,7 @@ msgstr "à´®àµà´¨àµâ€à´•à´¾à´²à´¤àµà´
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -539,50 +539,50 @@
msgstr "നിങàµà´™à´³àµ† വെബൠതാളàµà´•à´³àµâ€ കാണàµà´¨àµà´¨à´¤à´¿à´¨àµà´‚ ഇനàµà´±à´°àµâ€à´¨àµ†à´±àµà´±à´¿à´²àµâ€ വിവരങàµà´™à´³àµâ€ à´•à´£àµà´Ÿàµà´ªà´¿à´Ÿà´¿à´¯àµà´•àµà´•àµà´¨àµà´¨à´¤à´¿à´¨àµà´‚ à´•à´´à´¿à´µàµà´³àµà´³à´¤à´¾à´•àµà´•àµà´¨àµà´¨àµ.\n"
"ഗെകàµà´•àµ‹ %s à´¨àµà´±àµ† ശകàµà´¤à´¿"
-Index: epiphany-2.20.0/po/mn.po
-===================================================================
---- epiphany-2.20.0.orig/po/mn.po 2007-10-02 14:58:49.526044312 +0200
-+++ epiphany-2.20.0/po/mn.po 2007-10-02 14:59:57.925942200 +0200
-@@ -4192,7 +4192,7 @@
- #, c-format
- msgid ""
- "Lets you view web pages and find information on the internet.\n"
--"Powered by Gecko %s"
-+"Powered by %s"
- msgstr ""
-
- #. Translators: This is a special message that shouldn't be translated
-Index: epiphany-2.20.0/po/mr.po
-===================================================================
---- epiphany-2.20.0.orig/po/mr.po 2007-10-02 14:58:49.550045680 +0200
-+++ epiphany-2.20.0/po/mr.po 2007-10-02 14:59:57.953943796 +0200
-@@ -4163,7 +4163,7 @@
- #, c-format
- msgid ""
- "Lets you view web pages and find information on the internet.\n"
--"Powered by Gecko %s"
-+"Powered by %s"
- msgstr ""
-
- #. Translators: This is a special message that shouldn't be translated
-Index: epiphany-2.20.0/po/ms.po
-===================================================================
---- epiphany-2.20.0.orig/po/ms.po 2007-10-02 14:58:49.574047047 +0200
-+++ epiphany-2.20.0/po/ms.po 2007-10-02 14:59:57.985945619 +0200
-@@ -4353,7 +4353,7 @@
- #, c-format
- msgid ""
- "Lets you view web pages and find information on the internet.\n"
--"Powered by Gecko %s"
-+"Powered by %s"
- msgstr ""
-
- #. Translators: This is a special message that shouldn't be translated
-Index: epiphany-2.20.0/po/nb.po
-===================================================================
---- epiphany-2.20.0.orig/po/nb.po 2007-10-02 14:58:49.594048187 +0200
-+++ epiphany-2.20.0/po/nb.po 2007-10-02 14:59:58.013947215 +0200
-@@ -4076,10 +4076,10 @@
+Index: epiphany-2.20.3/po/mn.po
+===================================================================
+--- epiphany-2.20.3.orig/po/mn.po 2007-08-27 22:19:08.000000000 +0200
++++ epiphany-2.20.3/po/mn.po 2008-01-12 02:25:58.236823321 +0100
+@@ -4192,7 +4192,7 @@ msgstr ""
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+
+ #. Translators: This is a special message that shouldn't be translated
+Index: epiphany-2.20.3/po/mr.po
+===================================================================
+--- epiphany-2.20.3.orig/po/mr.po 2007-08-27 22:19:08.000000000 +0200
++++ epiphany-2.20.3/po/mr.po 2008-01-12 02:25:58.240823549 +0100
+@@ -4163,7 +4163,7 @@ msgstr "a चाा सामानà¥à¤
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+
+ #. Translators: This is a special message that shouldn't be translated
+Index: epiphany-2.20.3/po/ms.po
+===================================================================
+--- epiphany-2.20.3.orig/po/ms.po 2007-08-27 22:19:08.000000000 +0200
++++ epiphany-2.20.3/po/ms.po 2008-01-12 02:25:58.244823777 +0100
+@@ -4353,7 +4353,7 @@ msgstr "Pembangun _Perisian"
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+
+ #. Translators: This is a special message that shouldn't be translated
+Index: epiphany-2.20.3/po/nb.po
+===================================================================
+--- epiphany-2.20.3.orig/po/nb.po 2007-09-17 19:37:04.000000000 +0200
++++ epiphany-2.20.3/po/nb.po 2008-01-12 02:25:58.244823777 +0100
+@@ -4076,10 +4076,10 @@ msgstr "Tidligere utviklere:"
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -595,11 +595,11 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/nl.po
-===================================================================
---- epiphany-2.20.0.orig/po/nl.po 2007-10-02 14:58:49.642050923 +0200
-+++ epiphany-2.20.0/po/nl.po 2007-10-02 14:59:58.085951318 +0200
-@@ -4972,10 +4972,10 @@
+Index: epiphany-2.20.3/po/nl.po
+===================================================================
+--- epiphany-2.20.3.orig/po/nl.po 2007-09-10 23:20:59.000000000 +0200
++++ epiphany-2.20.3/po/nl.po 2008-01-12 02:25:58.248824005 +0100
+@@ -4972,10 +4972,10 @@ msgstr "Ex-ontwikkelaars:"
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -612,11 +612,11 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/nn.po
-===================================================================
---- epiphany-2.20.0.orig/po/nn.po 2007-10-02 14:58:49.662052063 +0200
-+++ epiphany-2.20.0/po/nn.po 2007-10-02 14:59:58.113952914 +0200
-@@ -4223,10 +4223,10 @@
+Index: epiphany-2.20.3/po/nn.po
+===================================================================
+--- epiphany-2.20.3.orig/po/nn.po 2007-08-27 22:19:08.000000000 +0200
++++ epiphany-2.20.3/po/nn.po 2008-01-12 02:25:58.252824233 +0100
+@@ -4223,10 +4223,10 @@ msgstr ""
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -629,37 +629,37 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/oc.po
-===================================================================
---- epiphany-2.20.0.orig/po/oc.po 2007-10-02 14:58:49.686053430 +0200
-+++ epiphany-2.20.0/po/oc.po 2007-10-02 14:59:58.137954282 +0200
-@@ -4106,7 +4106,7 @@
- #, c-format
- msgid ""
- "Lets you view web pages and find information on the internet.\n"
--"Powered by Gecko %s"
-+"Powered by %s"
- msgstr ""
-
- #. Translators: This is a special message that shouldn't be translated
-Index: epiphany-2.20.0/po/or.po
-===================================================================
---- epiphany-2.20.0.orig/po/or.po 2007-10-02 14:58:49.710054798 +0200
-+++ epiphany-2.20.0/po/or.po 2007-10-02 14:59:58.161955650 +0200
-@@ -4062,7 +4062,7 @@
- #, c-format
- msgid ""
- "Lets you view web pages and find information on the internet.\n"
--"Powered by Gecko %s"
-+"Powered by %s"
- msgstr ""
-
- #. Translators: This is a special message that shouldn't be translated
-Index: epiphany-2.20.0/po/pa.po
-===================================================================
---- epiphany-2.20.0.orig/po/pa.po 2007-10-02 14:58:49.734056166 +0200
-+++ epiphany-2.20.0/po/pa.po 2007-10-02 14:59:58.197957701 +0200
-@@ -4281,7 +4281,7 @@
+Index: epiphany-2.20.3/po/oc.po
+===================================================================
+--- epiphany-2.20.3.orig/po/oc.po 2007-08-27 22:19:08.000000000 +0200
++++ epiphany-2.20.3/po/oc.po 2008-01-12 02:25:58.252824233 +0100
+@@ -4106,7 +4106,7 @@ msgstr ""
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+
+ #. Translators: This is a special message that shouldn't be translated
+Index: epiphany-2.20.3/po/or.po
+===================================================================
+--- epiphany-2.20.3.orig/po/or.po 2007-08-27 22:19:08.000000000 +0200
++++ epiphany-2.20.3/po/or.po 2008-01-12 02:25:58.252824233 +0100
+@@ -4062,7 +4062,7 @@ msgstr ""
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+
+ #. Translators: This is a special message that shouldn't be translated
+Index: epiphany-2.20.3/po/pa.po
+===================================================================
+--- epiphany-2.20.3.orig/po/pa.po 2007-09-10 21:45:21.000000000 +0200
++++ epiphany-2.20.3/po/pa.po 2008-01-12 02:25:58.256824461 +0100
+@@ -4281,7 +4281,7 @@ msgstr "ਪà©à¨°à¨¾à¨£à©‡ ਖੋਜੀ:
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -668,11 +668,11 @@
msgstr ""
"ਇੰਟਰਨੈੱਟ ਉੱਤੇ ਵੈੱਬ ਸਫ਼ੇ ਵੇਖਣ à¨
ਤੇ ਜਾਣਕਾਰੀ ਲੱà¨à¨£ ਦਿੰਦਾ ਹੈ।\n"
"ਗੀਕੋ %s ਉੱਤੇ à¨
ਧਾਰਿਤ ਹੈ।"
-Index: epiphany-2.20.0/po/pl.po
-===================================================================
---- epiphany-2.20.0.orig/po/pl.po 2007-10-02 14:58:49.754057306 +0200
-+++ epiphany-2.20.0/po/pl.po 2007-10-02 14:59:58.225959297 +0200
-@@ -4347,10 +4347,10 @@
+Index: epiphany-2.20.3/po/pl.po
+===================================================================
+--- epiphany-2.20.3.orig/po/pl.po 2007-09-17 19:37:05.000000000 +0200
++++ epiphany-2.20.3/po/pl.po 2008-01-12 02:25:58.260824689 +0100
+@@ -4347,10 +4347,10 @@ msgstr "Poprzedni programiści:"
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -685,11 +685,11 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/pt.po
-===================================================================
---- epiphany-2.20.0.orig/po/pt.po 2007-10-02 14:58:49.802060041 +0200
-+++ epiphany-2.20.0/po/pt.po 2007-10-02 14:59:58.293963172 +0200
-@@ -4333,10 +4333,10 @@
+Index: epiphany-2.20.3/po/pt.po
+===================================================================
+--- epiphany-2.20.3.orig/po/pt.po 2007-09-17 19:37:05.000000000 +0200
++++ epiphany-2.20.3/po/pt.po 2008-01-12 02:25:58.260824689 +0100
+@@ -4333,10 +4333,10 @@ msgstr "Programadores anteriores:"
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -702,11 +702,11 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/pt_BR.po
-===================================================================
---- epiphany-2.20.0.orig/po/pt_BR.po 2007-10-02 14:58:49.778058673 +0200
-+++ epiphany-2.20.0/po/pt_BR.po 2007-10-02 14:59:58.257961121 +0200
-@@ -4332,10 +4332,10 @@
+Index: epiphany-2.20.3/po/pt_BR.po
+===================================================================
+--- epiphany-2.20.3.orig/po/pt_BR.po 2008-01-07 23:47:27.000000000 +0100
++++ epiphany-2.20.3/po/pt_BR.po 2008-01-12 02:25:58.264824917 +0100
+@@ -4333,10 +4333,10 @@ msgstr "Desenvolvedores no passado:"
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -719,11 +719,11 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/ru.po
-===================================================================
---- epiphany-2.20.0.orig/po/ru.po 2007-10-02 14:58:49.846062549 +0200
-+++ epiphany-2.20.0/po/ru.po 2007-10-02 14:59:58.353966592 +0200
-@@ -4326,10 +4326,10 @@
+Index: epiphany-2.20.3/po/ru.po
+===================================================================
+--- epiphany-2.20.3.orig/po/ru.po 2007-09-17 19:37:05.000000000 +0200
++++ epiphany-2.20.3/po/ru.po 2008-01-12 02:25:58.268825145 +0100
+@@ -4326,10 +4326,10 @@ msgstr "Предыдущие разраÐ
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -736,24 +736,24 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/si.po
-===================================================================
---- epiphany-2.20.0.orig/po/si.po 2007-10-02 14:58:49.894065284 +0200
-+++ epiphany-2.20.0/po/si.po 2007-10-02 14:59:58.409969783 +0200
-@@ -4238,7 +4238,7 @@
- #, c-format
- msgid ""
- "Lets you view web pages and find information on the internet.\n"
--"Powered by Gecko %s"
-+"Powered by %s"
- msgstr ""
-
- #. Translators: This is a special message that shouldn't be translated
-Index: epiphany-2.20.0/po/sl.po
-===================================================================
---- epiphany-2.20.0.orig/po/sl.po 2007-10-02 14:58:49.938067792 +0200
-+++ epiphany-2.20.0/po/sl.po 2007-10-02 14:59:58.465972975 +0200
-@@ -4322,10 +4322,10 @@
+Index: epiphany-2.20.3/po/si.po
+===================================================================
+--- epiphany-2.20.3.orig/po/si.po 2007-08-27 22:19:08.000000000 +0200
++++ epiphany-2.20.3/po/si.po 2008-01-12 02:25:58.268825145 +0100
+@@ -4238,7 +4238,7 @@ msgstr ""
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+
+ #. Translators: This is a special message that shouldn't be translated
+Index: epiphany-2.20.3/po/sl.po
+===================================================================
+--- epiphany-2.20.3.orig/po/sl.po 2007-08-27 22:19:08.000000000 +0200
++++ epiphany-2.20.3/po/sl.po 2008-01-12 02:25:58.272825373 +0100
+@@ -4322,10 +4322,10 @@ msgstr "Pretekli razvijalci:"
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -766,11 +766,11 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/sq.po
-===================================================================
---- epiphany-2.20.0.orig/po/sq.po 2007-10-02 14:58:49.962069160 +0200
-+++ epiphany-2.20.0/po/sq.po 2007-10-02 14:59:58.493974570 +0200
-@@ -4321,11 +4321,11 @@
+Index: epiphany-2.20.3/po/sq.po
+===================================================================
+--- epiphany-2.20.3.orig/po/sq.po 2007-09-17 19:37:05.000000000 +0200
++++ epiphany-2.20.3/po/sq.po 2008-01-12 02:25:58.272825373 +0100
+@@ -4321,11 +4321,11 @@ msgstr "Zhvillues të tjerë:"
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -784,11 +784,11 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/sr.po
-===================================================================
---- epiphany-2.20.0.orig/po/sr.po 2007-10-02 14:58:50.006071667 +0200
-+++ epiphany-2.20.0/po/sr.po 2007-10-02 14:59:58.573979130 +0200
-@@ -4332,10 +4332,10 @@
+Index: epiphany-2.20.3/po/sr.po
+===================================================================
+--- epiphany-2.20.3.orig/po/sr.po 2007-09-17 19:37:04.000000000 +0200
++++ epiphany-2.20.3/po/sr.po 2008-01-12 02:25:58.276825601 +0100
+@@ -4332,10 +4332,10 @@ msgstr "Ранији програмерÐ
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -801,11 +801,11 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/sr at Latn.po
-===================================================================
---- epiphany-2.20.0.orig/po/sr at Latn.po 2007-10-02 14:58:49.982070299 +0200
-+++ epiphany-2.20.0/po/sr at Latn.po 2007-10-02 14:59:58.533976850 +0200
-@@ -4332,10 +4332,10 @@
+Index: epiphany-2.20.3/po/sr at Latn.po
+===================================================================
+--- epiphany-2.20.3.orig/po/sr at Latn.po 2007-09-17 19:37:04.000000000 +0200
++++ epiphany-2.20.3/po/sr at Latn.po 2008-01-12 02:25:58.280825829 +0100
+@@ -4332,10 +4332,10 @@ msgstr "Raniji programeri:"
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -818,11 +818,11 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/sv.po
-===================================================================
---- epiphany-2.20.0.orig/po/sv.po 2007-10-02 14:58:50.030073035 +0200
-+++ epiphany-2.20.0/po/sv.po 2007-10-02 14:59:58.605980953 +0200
-@@ -4082,10 +4082,10 @@
+Index: epiphany-2.20.3/po/sv.po
+===================================================================
+--- epiphany-2.20.3.orig/po/sv.po 2007-09-10 21:45:21.000000000 +0200
++++ epiphany-2.20.3/po/sv.po 2008-01-12 02:25:58.280825829 +0100
+@@ -4082,10 +4082,10 @@ msgstr "Tidigare utvecklare:"
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -835,11 +835,11 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/ta.po
-===================================================================
---- epiphany-2.20.0.orig/po/ta.po 2007-10-02 14:58:50.054074403 +0200
-+++ epiphany-2.20.0/po/ta.po 2007-10-02 14:59:58.641983005 +0200
-@@ -4259,7 +4259,7 @@
+Index: epiphany-2.20.3/po/ta.po
+===================================================================
+--- epiphany-2.20.3.orig/po/ta.po 2007-09-28 22:30:48.000000000 +0200
++++ epiphany-2.20.3/po/ta.po 2008-01-12 02:25:58.284826057 +0100
+@@ -4282,7 +4282,7 @@ msgstr "கடநà¯à®¤ கால மெ
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -848,24 +848,24 @@
msgstr ""
"இணைய பகà¯à®•à®™à¯à®•à®³à¯ˆ காணவà¯à®®à¯ உலகவலையில௠தகவல௠சேகரிகà¯à®•à®µà¯à®®à¯ பயனà¯à®ªà®Ÿà¯à®®à¯.\n"
" கெகà¯à®•à¯‹ ஆல௠இயகà¯à®•à®ªà¯à®ªà®Ÿà¯à®•à®¿à®±à®¤à¯ %s "
-Index: epiphany-2.20.0/po/te.po
-===================================================================
---- epiphany-2.20.0.orig/po/te.po 2007-10-02 14:58:50.074075542 +0200
-+++ epiphany-2.20.0/po/te.po 2007-10-02 14:59:58.677985056 +0200
-@@ -4143,7 +4143,7 @@
- #, c-format
- msgid ""
- "Lets you view web pages and find information on the internet.\n"
--"Powered by Gecko %s"
-+"Powered by %s"
- msgstr ""
-
- #. Translators: This is a special message that shouldn't be translated
-Index: epiphany-2.20.0/po/th.po
-===================================================================
---- epiphany-2.20.0.orig/po/th.po 2007-10-02 14:58:50.098076910 +0200
-+++ epiphany-2.20.0/po/th.po 2007-10-02 14:59:58.717987336 +0200
-@@ -4241,10 +4241,10 @@
+Index: epiphany-2.20.3/po/te.po
+===================================================================
+--- epiphany-2.20.3.orig/po/te.po 2007-08-27 22:19:08.000000000 +0200
++++ epiphany-2.20.3/po/te.po 2008-01-12 02:25:58.284826057 +0100
+@@ -4143,7 +4143,7 @@ msgstr "గతంలో విసà±à°¤à
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+
+ #. Translators: This is a special message that shouldn't be translated
+Index: epiphany-2.20.3/po/th.po
+===================================================================
+--- epiphany-2.20.3.orig/po/th.po 2007-09-17 19:37:05.000000000 +0200
++++ epiphany-2.20.3/po/th.po 2008-01-12 02:25:58.288826285 +0100
+@@ -4241,10 +4241,10 @@ msgstr "ผู้พัฒนาในà¸
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -878,11 +878,11 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/tr.po
-===================================================================
---- epiphany-2.20.0.orig/po/tr.po 2007-10-02 14:58:50.146079646 +0200
-+++ epiphany-2.20.0/po/tr.po 2007-10-02 14:59:58.765990072 +0200
-@@ -4232,11 +4232,11 @@
+Index: epiphany-2.20.3/po/tr.po
+===================================================================
+--- epiphany-2.20.3.orig/po/tr.po 2007-08-27 22:19:08.000000000 +0200
++++ epiphany-2.20.3/po/tr.po 2008-01-12 02:25:58.292826513 +0100
+@@ -4232,11 +4232,11 @@ msgstr ""
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -896,11 +896,11 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/uk.po
-===================================================================
---- epiphany-2.20.0.orig/po/uk.po 2007-10-02 14:58:50.166080786 +0200
-+++ epiphany-2.20.0/po/uk.po 2007-10-02 14:59:58.801992123 +0200
-@@ -4320,10 +4320,10 @@
+Index: epiphany-2.20.3/po/uk.po
+===================================================================
+--- epiphany-2.20.3.orig/po/uk.po 2007-09-17 19:37:04.000000000 +0200
++++ epiphany-2.20.3/po/uk.po 2008-01-12 02:25:58.292826513 +0100
+@@ -4320,10 +4320,10 @@ msgstr "Колишні розробниÐ
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -913,11 +913,11 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/vi.po
-===================================================================
---- epiphany-2.20.0.orig/po/vi.po 2007-10-02 14:58:50.190082153 +0200
-+++ epiphany-2.20.0/po/vi.po 2007-10-02 14:59:58.829993719 +0200
-@@ -4327,10 +4327,10 @@
+Index: epiphany-2.20.3/po/vi.po
+===================================================================
+--- epiphany-2.20.3.orig/po/vi.po 2007-09-10 21:45:21.000000000 +0200
++++ epiphany-2.20.3/po/vi.po 2008-01-12 02:25:58.296826741 +0100
+@@ -4327,10 +4327,10 @@ msgstr "Láºp trình viên trÆ°á»›c:"
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -930,11 +930,11 @@
#: ../src/window-commands.c:852
#. Translators: This is a special message that shouldn't be translated
-Index: epiphany-2.20.0/po/zh_CN.po
-===================================================================
---- epiphany-2.20.0.orig/po/zh_CN.po 2007-10-02 14:58:50.238084889 +0200
-+++ epiphany-2.20.0/po/zh_CN.po 2007-10-02 14:59:58.877996454 +0200
-@@ -4211,10 +4211,10 @@
+Index: epiphany-2.20.3/po/zh_CN.po
+===================================================================
+--- epiphany-2.20.3.orig/po/zh_CN.po 2007-09-17 19:37:05.000000000 +0200
++++ epiphany-2.20.3/po/zh_CN.po 2008-01-12 02:25:58.300826969 +0100
+@@ -4211,10 +4211,10 @@ msgstr "å
ˆå‰çš„å¼€å‘è€
："
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -947,11 +947,11 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/zh_HK.po
-===================================================================
---- epiphany-2.20.0.orig/po/zh_HK.po 2007-10-02 14:58:50.262086257 +0200
-+++ epiphany-2.20.0/po/zh_HK.po 2007-10-02 14:59:58.909998278 +0200
-@@ -4107,10 +4107,10 @@
+Index: epiphany-2.20.3/po/zh_HK.po
+===================================================================
+--- epiphany-2.20.3.orig/po/zh_HK.po 2007-08-27 22:19:08.000000000 +0200
++++ epiphany-2.20.3/po/zh_HK.po 2008-01-12 02:25:58.300826969 +0100
+@@ -4107,10 +4107,10 @@ msgstr "å‰åº¦é–‹ç™¼äººå“¡ï¼š"
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
@@ -964,11 +964,11 @@
#. Translators: This is a special message that shouldn't be translated
#. * literally. It is used in the about box to give credits to
-Index: epiphany-2.20.0/po/zh_TW.po
-===================================================================
---- epiphany-2.20.0.orig/po/zh_TW.po 2007-10-02 14:58:50.282087396 +0200
-+++ epiphany-2.20.0/po/zh_TW.po 2007-10-02 14:59:58.937999874 +0200
-@@ -4165,10 +4165,10 @@
+Index: epiphany-2.20.3/po/zh_TW.po
+===================================================================
+--- epiphany-2.20.3.orig/po/zh_TW.po 2007-08-27 22:19:08.000000000 +0200
++++ epiphany-2.20.3/po/zh_TW.po 2008-01-12 02:25:58.304827197 +0100
+@@ -4165,10 +4165,10 @@ msgstr "å‰åº¦é–‹ç™¼äººå“¡ï¼š"
#, c-format
msgid ""
"Lets you view web pages and find information on the internet.\n"
Modified: desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch?rev=14137&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch (original)
+++ desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch Sat Jan 12 02:12:20 2008
@@ -1,1092 +1,34 @@
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.20.2.old/aclocal.m4 epiphany-browser-2.20.2/aclocal.m4
---- epiphany-browser-2.20.2.old/aclocal.m4 2007-11-27 00:37:29.000000000 +0100
-+++ epiphany-browser-2.20.2/aclocal.m4 2007-12-01 17:48:56.000000000 +0100
-@@ -682,7 +682,7 @@
+libtoolize --force --copy
+aclocal-1.10 -I m4
+automake-1.10
+autoconf
+Index: epiphany-2.20.3/aclocal.m4
+===================================================================
+--- epiphany-2.20.3.orig/aclocal.m4 2008-01-07 23:48:06.000000000 +0100
++++ epiphany-2.20.3/aclocal.m4 2008-01-12 02:27:56.227547229 +0100
+@@ -682,7 +682,7 @@ AC_DEFUN([GNOME_CXX_WARNINGS],[
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
--# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
-+# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL
+-# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL
++# serial 51 Debian 1.5.24-2 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -845,7 +845,7 @@
- test -z "$ac_objext" && ac_objext=o
-
- # Determine commands to create old-style static archives.
--old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
- old_postinstall_cmds='chmod 644 $oldlib'
- old_postuninstall_cmds=
-
-@@ -932,8 +932,9 @@
- # Check for compiler boilerplate output or warnings with
- # the simple compiler test code.
- AC_DEFUN([_LT_COMPILER_BOILERPLATE],
--[ac_outfile=conftest.$ac_objext
--printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+ac_outfile=conftest.$ac_objext
-+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
- eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_compiler_boilerplate=`cat conftest.err`
- $rm conftest*
-@@ -945,8 +946,9 @@
- # Check for linker boilerplate output or warnings with
- # the simple link test code.
- AC_DEFUN([_LT_LINKER_BOILERPLATE],
--[ac_outfile=conftest.$ac_objext
--printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+ac_outfile=conftest.$ac_objext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
- $rm conftest*
-@@ -962,12 +964,20 @@
- # If we don't find anything, use the default library path according
- # to the aix ld manual.
- AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
--[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi],[])
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi],[])
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- ])# _LT_AC_SYS_LIBPATH_AIX
-
-@@ -1198,13 +1208,17 @@
- rm -rf conftest*
- ;;
-
--x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
-+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+s390*-*linux*|sparc*-*linux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- case `/usr/bin/file conftest.o` in
- *32-bit*)
- case $host in
-+ x86_64-*kfreebsd*-gnu)
-+ LD="${LD-ld} -m elf_i386_fbsd"
-+ ;;
- x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
- ;;
-@@ -1221,6 +1235,9 @@
- ;;
- *64-bit*)
- case $host in
-+ x86_64-*kfreebsd*-gnu)
-+ LD="${LD-ld} -m elf_x86_64_fbsd"
-+ ;;
- x86_64-*linux*)
- LD="${LD-ld} -m elf_x86_64"
- ;;
-@@ -1292,7 +1309,7 @@
- AC_CACHE_CHECK([$1], [$2],
- [$2=no
- ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$3"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
-@@ -1333,11 +1350,12 @@
- # ------------------------------------------------------------
- # Check whether the given compiler option works
- AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
--[AC_CACHE_CHECK([$1], [$2],
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+AC_CACHE_CHECK([$1], [$2],
- [$2=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $3"
-- printf "$lt_simple_link_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
- # The linker can only warn and ignore the option if not recognized
- # So say no if there are warnings
-@@ -1451,24 +1469,27 @@
- fi
- ;;
- *)
-- # If test is not a shell built-in, we'll probably end up computing a
-- # maximum length that is only half of the actual maximum length, but
-- # we can't tell.
-- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-- while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
-+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-+ if test -n "$lt_cv_sys_max_cmd_len"; then
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-+ else
-+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
- = "XX$teststring") >/dev/null 2>&1 &&
-- new_result=`expr "X$teststring" : ".*" 2>&1` &&
-- lt_cv_sys_max_cmd_len=$new_result &&
-- test $i != 17 # 1/2 MB should be enough
-- do
-- i=`expr $i + 1`
-- teststring=$teststring$teststring
-- done
-- teststring=
-- # Add a significant safety factor because C++ compilers can tack on massive
-- # amounts of additional arguments before passing them to the linker.
-- # It appears as though 1/2 is a usable value.
-- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-+ new_result=`expr "X$teststring" : ".*" 2>&1` &&
-+ lt_cv_sys_max_cmd_len=$new_result &&
-+ test $i != 17 # 1/2 MB should be enough
-+ do
-+ i=`expr $i + 1`
-+ teststring=$teststring$teststring
-+ done
-+ teststring=
-+ # Add a significant safety factor because C++ compilers can tack on massive
-+ # amounts of additional arguments before passing them to the linker.
-+ # It appears as though 1/2 is a usable value.
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-+ fi
- ;;
- esac
- ])
-@@ -1695,7 +1716,8 @@
- # ---------------------------------
- # Check to see if options -c and -o are simultaneously supported by compiler
- AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
--[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
- AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-@@ -1703,7 +1725,7 @@
- mkdir conftest
- cd conftest
- mkdir out
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
-@@ -1843,6 +1865,7 @@
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
-+ old_striplib="$STRIP -S"
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
-@@ -1860,7 +1883,8 @@
- # -----------------------------
- # PORTME Fill in your ld.so characteristics
- AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
--[AC_MSG_CHECKING([dynamic linker characteristics])
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+AC_MSG_CHECKING([dynamic linker characteristics])
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
-@@ -1874,20 +1898,58 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+m4_if($1,[],[
- if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-+ case $host_os in
-+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-+ *) lt_awk_arg="/^libraries:/" ;;
-+ esac
-+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
- # if the path contains ";" then we assume it to be the separator
- # otherwise default to the standard path separator (i.e. ":") - it is
- # assumed that no part of a normal pathname contains ";" but that should
- # okay in the real world where ";" in dirpaths is itself problematic.
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
- else
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
-+ # Ok, now we have the path, separated by spaces, we can step through it
-+ # and add multilib dir if necessary.
-+ lt_tmp_lt_search_path_spec=
-+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-+ for lt_sys_path in $lt_search_path_spec; do
-+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-+ else
-+ test -d "$lt_sys_path" && \
-+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-+ fi
-+ done
-+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
-+BEGIN {RS=" "; FS="/|\n";} {
-+ lt_foo="";
-+ lt_count=0;
-+ for (lt_i = NF; lt_i > 0; lt_i--) {
-+ if ($lt_i != "" && $lt_i != ".") {
-+ if ($lt_i == "..") {
-+ lt_count++;
-+ } else {
-+ if (lt_count == 0) {
-+ lt_foo="/" $lt_i lt_foo;
-+ } else {
-+ lt_count--;
-+ }
-+ }
-+ }
-+ }
-+ if (lt_foo != "") { lt_freq[[lt_foo]]++; }
-+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-+}'`
-+ sys_lib_search_path_spec=`echo $lt_search_path_spec`
- else
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
--fi
-+fi])
- need_lib_prefix=unknown
- hardcode_into_libs=no
-
-@@ -2044,12 +2106,8 @@
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-- if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-- else
-- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-- fi
-+ m4_if([$1], [],[
-+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
- ;;
-
-@@ -2103,7 +2161,7 @@
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-- freebsd*) # from 4.6 on
-+ *) # from 4.6 on, and DragonFly
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-@@ -2166,7 +2224,7 @@
- postinstall_cmds='chmod 555 $lib'
- ;;
-
--interix3*)
-+interix[[3-9]]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -2237,7 +2295,7 @@
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
-- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
-@@ -2343,6 +2401,10 @@
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
-+rdos*)
-+ dynamic_linker=no
-+ ;;
-+
- solaris*)
- version_type=linux
- need_lib_prefix=no
-@@ -2448,7 +2510,8 @@
- # _LT_AC_TAGCONFIG
- # ----------------
- AC_DEFUN([_LT_AC_TAGCONFIG],
--[AC_ARG_WITH([tags],
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+AC_ARG_WITH([tags],
- [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
- [include additional configurations @<:@automatic@:>@])],
- [tagnames="$withval"])
-@@ -2709,7 +2772,7 @@
-
- # AC_PATH_TOOL_PREFIX
- # -------------------
--# find a file program which can recognise shared library
-+# find a file program which can recognize shared library
- AC_DEFUN([AC_PATH_TOOL_PREFIX],
- [AC_REQUIRE([AC_PROG_EGREP])dnl
- AC_MSG_CHECKING([for $1])
-@@ -2772,7 +2835,7 @@
-
- # AC_PATH_MAGIC
- # -------------
--# find a file program which can recognise a shared library
-+# find a file program which can recognize a shared library
- AC_DEFUN([AC_PATH_MAGIC],
- [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
- if test -z "$lt_cv_path_MAGIC_CMD"; then
-@@ -2919,7 +2982,7 @@
- # how to check for library dependencies
- # -- PORTME fill in with the dynamic library characteristics
- AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
--[AC_CACHE_CHECK([how to recognise dependent libraries],
-+[AC_CACHE_CHECK([how to recognize dependent libraries],
- lt_cv_deplibs_check_method,
- [lt_cv_file_magic_cmd='$MAGIC_CMD'
- lt_cv_file_magic_test_file=
-@@ -2958,9 +3021,15 @@
-
- mingw* | pw32*)
- # Base MSYS/MinGW do not provide the 'file' command needed by
-- # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-- lt_cv_file_magic_cmd='$OBJDUMP -f'
-+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
-+ # unless we find 'file', for example because we are cross-compiling.
-+ if ( file / ) >/dev/null 2>&1; then
-+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+ lt_cv_file_magic_cmd='func_win32_libid'
-+ else
-+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+ lt_cv_file_magic_cmd='$OBJDUMP -f'
-+ fi
- ;;
-
- darwin* | rhapsody*)
-@@ -3005,7 +3074,7 @@
- esac
- ;;
-
--interix3*)
-+interix[[3-9]]*)
- # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
- ;;
-@@ -3055,6 +3124,10 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-+rdos*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
- solaris*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-@@ -3107,7 +3180,7 @@
- lt_cv_path_NM="$NM"
- else
- lt_nm_to_check="${ac_tool_prefix}nm"
-- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
- lt_nm_to_check="$lt_nm_to_check nm"
- fi
- for lt_tmp_nm in $lt_nm_to_check; do
-@@ -3323,10 +3396,10 @@
- _LT_AC_TAGVAR(objext, $1)=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;\n"
-+lt_simple_compile_test_code="int some_variable = 0;"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code='int main(){return(0);}\n'
-+lt_simple_link_test_code='int main(){return(0);}'
-
- _LT_AC_SYS_COMPILER
-
-@@ -3428,10 +3501,10 @@
- _LT_AC_TAGVAR(objext, $1)=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;\n"
-+lt_simple_compile_test_code="int some_variable = 0;"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
-+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_AC_SYS_COMPILER
-@@ -3577,7 +3650,7 @@
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ :
- else
- # We have old collect2
- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -3736,10 +3809,10 @@
- case $cc_basename in
- xlc*)
- output_verbose_link_cmd='echo'
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
- *)
-@@ -3822,9 +3895,7 @@
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- case $host_cpu in
-- hppa*64*|ia64*)
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-- ;;
-+ hppa*64*|ia64*) ;;
- *)
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- ;;
-@@ -3892,7 +3963,7 @@
- ;;
- esac
- ;;
-- interix3*)
-+ interix[[3-9]]*)
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-@@ -4012,6 +4083,29 @@
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- ;;
-+ *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C++ 5.9
-+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+
-+ # Not sure whether something based on
-+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-+ # would be better.
-+ output_verbose_link_cmd='echo'
-+
-+ # Archives containing C++ object files must be created using
-+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
-+ # necessary to make sure instantiated templates are included
-+ # in the archive.
-+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-+ ;;
-+ esac
-+ ;;
- esac
- ;;
- lynxos*)
-@@ -4050,16 +4144,20 @@
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- openbsd*)
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ if test -f /usr/libexec/ld.so; then
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ fi
-+ output_verbose_link_cmd='echo'
-+ else
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
-- output_verbose_link_cmd='echo'
- ;;
- osf3*)
- case $cc_basename in
-@@ -4221,15 +4319,10 @@
- case $host_os in
- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
- *)
-- # The C++ compiler is used as linker so we must use $wl
-- # flag to pass the commands to the underlying system
-- # linker. We must also pass each convience library through
-- # to the system linker between allextract/defaultextract.
-- # The C++ compiler will combine linker options so we
-- # cannot just pass the convience library names through
-- # without $wl.
-+ # The compiler driver will combine and reorder linker options,
-+ # but understands `-z linker_flag'.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
- ;;
- esac
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -4276,6 +4369,12 @@
- fi
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-+ case $host_os in
-+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+ *)
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ ;;
-+ esac
- fi
- ;;
- esac
-@@ -4519,7 +4618,7 @@
- # PORTME: override above test on systems where it is broken
- ifelse([$1],[CXX],
- [case $host_os in
--interix3*)
-+interix[[3-9]]*)
- # Interix 3.5 installs completely hosed .la files for C++, so rather than
- # hack all around it, let's just trust "g++" to DTRT.
- _LT_AC_TAGVAR(predep_objects,$1)=
-@@ -4527,13 +4626,46 @@
- _LT_AC_TAGVAR(postdeps,$1)=
- ;;
-
-+linux*)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C++ 5.9
-+ #
-+ # The more standards-conforming stlport4 library is
-+ # incompatible with the Cstd library. Avoid specifying
-+ # it if it's in CXXFLAGS. Ignore libCrun as
-+ # -library=stlport4 depends on it.
-+ case " $CXX $CXXFLAGS " in
-+ *" -library=stlport4 "*)
-+ solaris_use_stlport4=yes
-+ ;;
-+ esac
-+ if test "$solaris_use_stlport4" != yes; then
-+ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-+ fi
-+ ;;
-+ esac
-+ ;;
-+
- solaris*)
- case $cc_basename in
- CC*)
-+ # The more standards-conforming stlport4 library is
-+ # incompatible with the Cstd library. Avoid specifying
-+ # it if it's in CXXFLAGS. Ignore libCrun as
-+ # -library=stlport4 depends on it.
-+ case " $CXX $CXXFLAGS " in
-+ *" -library=stlport4 "*)
-+ solaris_use_stlport4=yes
-+ ;;
-+ esac
-+
- # Adding this requires a known-good setup of shared libraries for
- # Sun compiler versions before 5.6, else PIC objects from an old
- # archive will be linked into the output, leading to subtle bugs.
-- _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
-+ if test "$solaris_use_stlport4" != yes; then
-+ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-+ fi
- ;;
- esac
- ;;
-@@ -4582,10 +4714,17 @@
- _LT_AC_TAGVAR(objext, $1)=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code=" subroutine t\n return\n end\n"
-+lt_simple_compile_test_code="\
-+ subroutine t
-+ return
-+ end
-+"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code=" program t\n end\n"
-+lt_simple_link_test_code="\
-+ program t
-+ end
-+"
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_AC_SYS_COMPILER
-@@ -4664,10 +4803,10 @@
- _LT_AC_TAGVAR(objext, $1)=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code="class foo {}\n"
-+lt_simple_compile_test_code="class foo {}"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
-+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_AC_SYS_COMPILER
-@@ -4720,7 +4859,7 @@
- _LT_AC_TAGVAR(objext, $1)=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
- # Code to be used in simple link tests
- lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -4809,6 +4948,7 @@
- _LT_AC_TAGVAR(module_cmds, $1) \
- _LT_AC_TAGVAR(module_expsym_cmds, $1) \
- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
-+ _LT_AC_TAGVAR(fix_srcfile_path, $1) \
- _LT_AC_TAGVAR(exclude_expsyms, $1) \
- _LT_AC_TAGVAR(include_expsyms, $1); do
-
-@@ -4855,7 +4995,7 @@
- # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
- #
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
- # Free Software Foundation, Inc.
- #
- # This file is part of GNU Libtool:
-@@ -5180,7 +5320,7 @@
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
- # Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
-+fix_srcfile_path=$lt_fix_srcfile_path
-
- # Set to yes if exported symbols are required.
- always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-@@ -5263,6 +5403,7 @@
- # ---------------------------------
- AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
- [AC_REQUIRE([AC_CANONICAL_HOST])
-+AC_REQUIRE([LT_AC_PROG_SED])
- AC_REQUIRE([AC_PROG_NM])
- AC_REQUIRE([AC_OBJEXT])
- # Check for command to grab the raw symbol name followed by C symbol from nm.
-@@ -5489,12 +5630,14 @@
- # like `-m68040'.
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
- ;;
-- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-- mingw* | os2* | pw32*)
-+ mingw* | cygwin* | os2* | pw32*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
-+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+ # (--disable-auto-import) libraries
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
- ;;
- darwin* | rhapsody*)
-@@ -5506,7 +5649,7 @@
- # DJGPP does not support shared libraries at all
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
- ;;
-- interix3*)
-+ interix[[3-9]]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
-@@ -5642,6 +5785,14 @@
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
- *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C++ 5.9
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-+ ;;
-+ esac
- ;;
- esac
- ;;
-@@ -5762,13 +5913,15 @@
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
- ;;
-
-- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-
-- mingw* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
-+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+ # (--disable-auto-import) libraries
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
- ;;
-
-@@ -5778,7 +5931,7 @@
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
- ;;
-
-- interix3*)
-+ interix[[3-9]]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
-@@ -5836,7 +5989,7 @@
- esac
- ;;
-
-- mingw* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-@@ -5888,6 +6041,22 @@
- # All Alpha code is PIC.
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-+ *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C 5.9
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ ;;
-+ *Sun\ F*)
-+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
-+ ;;
-+ esac
-+ ;;
- esac
- ;;
-
-@@ -5897,6 +6066,10 @@
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-
-+ rdos*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+ ;;
-+
- solaris*)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -5991,7 +6164,8 @@
- # ------------------------------------
- # See if the linker supports building shared libraries.
- AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
--[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
- ifelse([$1],[CXX],[
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- case $host_os in
-@@ -6008,7 +6182,7 @@
- _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
- ;;
- cygwin* | mingw*)
-- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
- ;;
- linux* | k*bsd*-gnu)
- _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-@@ -6150,7 +6324,7 @@
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_AC_TAGVAR(always_export_symbols, $1)=no
- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -6168,7 +6342,7 @@
- fi
- ;;
-
-- interix3*)
-+ interix[[3-9]]*)
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-@@ -6183,7 +6357,7 @@
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
-- linux* | k*bsd*-gnu)
-+ gnu* | linux* | k*bsd*-gnu)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_addflag=
- case $cc_basename,$host_cpu in
-@@ -6201,13 +6375,22 @@
- ifc* | ifort*) # Intel Fortran compiler
- tmp_addflag=' -nofor_main' ;;
- esac
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*) # Sun C 5.9
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+ tmp_sharedflag='-G' ;;
-+ *Sun\ F*) # Sun Fortran 8.3
-+ tmp_sharedflag='-G' ;;
-+ *)
-+ tmp_sharedflag='-shared' ;;
-+ esac
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
- if test $supports_anon_versioning = yes; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- $echo "local: *; };" >> $output_objdir/$libname.ver~
-- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
- _LT_AC_TAGVAR(link_all_deplibs, $1)=no
- else
-@@ -6248,7 +6431,7 @@
-
- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
- case `$LD -v 2>&1` in
-- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- cat <<_LT_EOF 1>&2
-
-@@ -6367,7 +6550,7 @@
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ :
- else
- # We have old collect2
- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -6460,7 +6643,7 @@
- # The linker will automatically build a .lib file if we build a DLL.
- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
- # FIXME: Should let the user specify the lib program.
-- _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
- _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- ;;
-@@ -6502,10 +6685,10 @@
- case $cc_basename in
- xlc*)
- output_verbose_link_cmd='echo'
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
- *)
-@@ -6667,24 +6850,28 @@
- ;;
-
- openbsd*)
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ if test -f /usr/libexec/ld.so; then
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ else
-+ case $host_os in
-+ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ ;;
-+ esac
-+ fi
- else
-- case $host_os in
-- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-- ;;
-- *)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-- ;;
-- esac
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
-@@ -6743,17 +6930,16 @@
- case $host_os in
- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
- *)
-- # The compiler driver will combine linker options so we
-- # cannot just pass the convience library names through
-- # without $wl, iff we do not link with $LD.
-- # Luckily, gcc supports the same syntax we need for Sun Studio.
-+ # The compiler driver will combine and reorder linker options,
-+ # but understands `-z linker_flag'. GCC discards it without `$wl',
-+ # but is careful enough not to reorder.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
-- case $wlarc in
-- '')
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
-- *)
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-- esac ;;
-+ if test "$GCC" = yes; then
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ else
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-+ fi
-+ ;;
- esac
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-@@ -6810,7 +6996,7 @@
- fi
- ;;
-
-- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
-+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -6885,7 +7071,7 @@
- # to ld, don't add -lc before -lgcc.
- AC_MSG_CHECKING([whether -lc should be explicitly linked in])
- $rm conftest*
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
- soname=conftest
-@@ -6988,6 +7174,30 @@
- [AC_CHECK_TOOL(RC, windres, no)
- ])
-
-+
-+# Cheap backport of AS_EXECUTABLE_P and required macros
-+# from Autoconf 2.59; we should not use $as_executable_p directly.
-+
-+# _AS_TEST_PREPARE
-+# ----------------
-+m4_ifndef([_AS_TEST_PREPARE],
-+[m4_defun([_AS_TEST_PREPARE],
-+[if test -x / >/dev/null 2>&1; then
-+ as_executable_p='test -x'
-+else
-+ as_executable_p='test -f'
-+fi
-+])])# _AS_TEST_PREPARE
-+
-+# AS_EXECUTABLE_P
-+# ---------------
-+# Check whether a file is executable.
-+m4_ifndef([AS_EXECUTABLE_P],
-+[m4_defun([AS_EXECUTABLE_P],
-+[AS_REQUIRE([_AS_TEST_PREPARE])dnl
-+$as_executable_p $1[]dnl
-+])])# AS_EXECUTABLE_P
-+
- # NOTE: This macro has been submitted for inclusion into #
- # GNU Autoconf as AC_PROG_SED. When it is available in #
- # a released version of Autoconf we should remove this #
-@@ -7008,12 +7218,13 @@
- test -z "$as_dir" && as_dir=.
- for lt_ac_prog in sed gsed; do
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-+ if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
- fi
- done
- done
- done
-+IFS=$as_save_IFS
- lt_ac_max=0
- lt_ac_count=0
- # Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -7046,6 +7257,7 @@
- done
- ])
- SED=$lt_cv_path_SED
-+AC_SUBST([SED])
- AC_MSG_RESULT([$SED])
- ])
-
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.20.2.old/configure epiphany-browser-2.20.2/configure
---- epiphany-browser-2.20.2.old/configure 2007-11-27 00:37:35.000000000 +0100
-+++ epiphany-browser-2.20.2/configure 2007-12-01 17:49:01.000000000 +0100
-@@ -727,7 +727,7 @@
+Index: epiphany-2.20.3/configure
+===================================================================
+--- epiphany-2.20.3.orig/configure 2008-01-07 23:48:19.000000000 +0100
++++ epiphany-2.20.3/configure 2008-01-12 02:28:22.049018711 +0100
+@@ -727,7 +727,7 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='GNOME Web Browser'
-PACKAGE_TARNAME='epiphany'
+PACKAGE_TARNAME='epiphany-browser'
- PACKAGE_VERSION='2.20.2'
- PACKAGE_STRING='GNOME Web Browser 2.20.2'
+ PACKAGE_VERSION='2.20.3'
+ PACKAGE_STRING='GNOME Web Browser 2.20.3'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany'
-@@ -859,6 +859,7 @@
- CCDEPMODE
- am__fastdepCC_TRUE
- am__fastdepCC_FALSE
-+SED
- GREP
- EGREP
- LN_S
-@@ -1606,7 +1607,7 @@
+@@ -1606,7 +1606,7 @@ Fine tuning of the installation director
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
@@ -1095,2225 +37,16 @@
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
-@@ -2527,7 +2528,7 @@
+@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
- PACKAGE='epiphany'
+ PACKAGE='epiphany-browser'
- VERSION='2.20.2'
-
-
-@@ -4040,12 +4041,13 @@
- test -z "$as_dir" && as_dir=.
- for lt_ac_prog in sed gsed; do
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-+ if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
- fi
- done
- done
- done
-+IFS=$as_save_IFS
- lt_ac_max=0
- lt_ac_count=0
- # Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -4080,6 +4082,7 @@
- fi
-
- SED=$lt_cv_path_SED
-+
- { echo "$as_me:$LINENO: result: $SED" >&5
- echo "${ECHO_T}$SED" >&6; }
-
-@@ -4441,8 +4444,8 @@
- echo "${ECHO_T}no, using $LN_S" >&6; }
- fi
-
--{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
--echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
-+echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
- if test "${lt_cv_deplibs_check_method+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4483,9 +4486,15 @@
-
- mingw* | pw32*)
- # Base MSYS/MinGW do not provide the 'file' command needed by
-- # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-- lt_cv_file_magic_cmd='$OBJDUMP -f'
-+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
-+ # unless we find 'file', for example because we are cross-compiling.
-+ if ( file / ) >/dev/null 2>&1; then
-+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+ lt_cv_file_magic_cmd='func_win32_libid'
-+ else
-+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+ lt_cv_file_magic_cmd='$OBJDUMP -f'
-+ fi
- ;;
-
- darwin* | rhapsody*)
-@@ -4530,7 +4539,7 @@
- esac
- ;;
-
--interix3*)
-+interix[3-9]*)
- # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
- ;;
-@@ -4580,6 +4589,10 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-+rdos*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
- solaris*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-@@ -4667,7 +4680,7 @@
- ;;
- *-*-irix6*)
- # Find out which ABI we are using.
-- echo '#line 4670 "configure"' > conftest.$ac_ext
-+ echo '#line 4683 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-@@ -4702,7 +4715,8 @@
- rm -rf conftest*
- ;;
-
--x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
-+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+s390*-*linux*|sparc*-*linux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -4713,6 +4727,9 @@
- case `/usr/bin/file conftest.o` in
- *32-bit*)
- case $host in
-+ x86_64-*kfreebsd*-gnu)
-+ LD="${LD-ld} -m elf_i386_fbsd"
-+ ;;
- x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
- ;;
-@@ -4729,6 +4746,9 @@
- ;;
- *64-bit*)
- case $host in
-+ x86_64-*kfreebsd*-gnu)
-+ LD="${LD-ld} -m elf_x86_64_fbsd"
-+ ;;
- x86_64-*linux*)
- LD="${LD-ld} -m elf_x86_64"
- ;;
-@@ -6521,24 +6541,27 @@
- fi
- ;;
- *)
-- # If test is not a shell built-in, we'll probably end up computing a
-- # maximum length that is only half of the actual maximum length, but
-- # we can't tell.
-- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-- while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
-+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-+ if test -n "$lt_cv_sys_max_cmd_len"; then
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-+ else
-+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+ while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
- = "XX$teststring") >/dev/null 2>&1 &&
-- new_result=`expr "X$teststring" : ".*" 2>&1` &&
-- lt_cv_sys_max_cmd_len=$new_result &&
-- test $i != 17 # 1/2 MB should be enough
-- do
-- i=`expr $i + 1`
-- teststring=$teststring$teststring
-- done
-- teststring=
-- # Add a significant safety factor because C++ compilers can tack on massive
-- # amounts of additional arguments before passing them to the linker.
-- # It appears as though 1/2 is a usable value.
-- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-+ new_result=`expr "X$teststring" : ".*" 2>&1` &&
-+ lt_cv_sys_max_cmd_len=$new_result &&
-+ test $i != 17 # 1/2 MB should be enough
-+ do
-+ i=`expr $i + 1`
-+ teststring=$teststring$teststring
-+ done
-+ teststring=
-+ # Add a significant safety factor because C++ compilers can tack on massive
-+ # amounts of additional arguments before passing them to the linker.
-+ # It appears as though 1/2 is a usable value.
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-+ fi
- ;;
- esac
-
-@@ -6555,6 +6578,7 @@
-
-
-
-+
- # Check for command to grab the raw symbol name followed by C symbol from nm.
- { echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
- echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
-@@ -7143,7 +7167,7 @@
- test -z "$ac_objext" && ac_objext=o
-
- # Determine commands to create old-style static archives.
--old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
- old_postinstall_cmds='chmod 644 $oldlib'
- old_postuninstall_cmds=
-
-@@ -7343,10 +7367,10 @@
- objext=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;\n"
-+lt_simple_compile_test_code="int some_variable = 0;"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code='int main(){return(0);}\n'
-+lt_simple_link_test_code='int main(){return(0);}'
-
-
- # If no C compiler was specified, use CC.
-@@ -7361,13 +7385,13 @@
-
- # save warnings/boilerplate of simple test code
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
- eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_compiler_boilerplate=`cat conftest.err`
- $rm conftest*
-
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
- $rm conftest*
-@@ -7387,7 +7411,7 @@
- else
- lt_cv_prog_compiler_rtti_exceptions=no
- ac_outfile=conftest.$ac_objext
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="-fno-rtti -fno-exceptions"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
-@@ -7398,11 +7422,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:7401: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7425: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:7405: \$? = $ac_status" >&5
-+ echo "$as_me:7429: \$? = $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.
-@@ -7453,13 +7477,15 @@
- lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
- ;;
-
-- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-
-- mingw* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
-+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+ # (--disable-auto-import) libraries
- lt_prog_compiler_pic='-DDLL_EXPORT'
- ;;
-
-@@ -7469,7 +7495,7 @@
- lt_prog_compiler_pic='-fno-common'
- ;;
-
-- interix3*)
-+ interix[3-9]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
-@@ -7527,7 +7553,7 @@
- esac
- ;;
-
-- mingw* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- lt_prog_compiler_pic='-DDLL_EXPORT'
-@@ -7579,6 +7605,22 @@
- # All Alpha code is PIC.
- lt_prog_compiler_static='-non_shared'
- ;;
-+ *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C 5.9
-+ lt_prog_compiler_pic='-KPIC'
-+ lt_prog_compiler_static='-Bstatic'
-+ lt_prog_compiler_wl='-Wl,'
-+ ;;
-+ *Sun\ F*)
-+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
-+ lt_prog_compiler_pic='-KPIC'
-+ lt_prog_compiler_static='-Bstatic'
-+ lt_prog_compiler_wl=''
-+ ;;
-+ esac
-+ ;;
- esac
- ;;
-
-@@ -7588,6 +7630,10 @@
- lt_prog_compiler_static='-non_shared'
- ;;
-
-+ rdos*)
-+ lt_prog_compiler_static='-non_shared'
-+ ;;
-+
- solaris*)
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-Bstatic'
-@@ -7655,7 +7701,7 @@
- else
- lt_prog_compiler_pic_works=no
- ac_outfile=conftest.$ac_objext
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
-@@ -7666,11 +7712,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:7669: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7715: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:7673: \$? = $ac_status" >&5
-+ echo "$as_me:7719: \$? = $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.
-@@ -7719,7 +7765,7 @@
- lt_prog_compiler_static_works=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-- printf "$lt_simple_link_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
- # The linker can only warn and ignore the option if not recognized
- # So say no if there are warnings
-@@ -7759,7 +7805,7 @@
- mkdir conftest
- cd conftest
- mkdir out
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
-@@ -7770,11 +7816,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:7773: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7819: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:7777: \$? = $ac_status" >&5
-+ echo "$as_me:7823: \$? = $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
-@@ -7966,7 +8012,7 @@
- allow_undefined_flag=unsupported
- always_export_symbols=no
- enable_shared_with_static_runtimes=yes
-- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -7984,7 +8030,7 @@
- fi
- ;;
-
-- interix3*)
-+ interix[3-9]*)
- hardcode_direct=no
- hardcode_shlibpath_var=no
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-@@ -7999,7 +8045,7 @@
- archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
-- linux* | k*bsd*-gnu)
-+ gnu* | linux* | k*bsd*-gnu)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_addflag=
- case $cc_basename,$host_cpu in
-@@ -8017,13 +8063,22 @@
- ifc* | ifort*) # Intel Fortran compiler
- tmp_addflag=' -nofor_main' ;;
- esac
-- archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*) # Sun C 5.9
-+ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+ tmp_sharedflag='-G' ;;
-+ *Sun\ F*) # Sun Fortran 8.3
-+ tmp_sharedflag='-G' ;;
-+ *)
-+ tmp_sharedflag='-shared' ;;
-+ esac
-+ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
- if test $supports_anon_versioning = yes; then
- archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- $echo "local: *; };" >> $output_objdir/$libname.ver~
-- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
- link_all_deplibs=no
- else
-@@ -8183,7 +8238,7 @@
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
-- hardcode_direct=yes
-+ :
- else
- # We have old collect2
- hardcode_direct=unsupported
-@@ -8257,11 +8312,18 @@
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -8316,11 +8378,18 @@
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -8374,7 +8443,7 @@
- # The linker will automatically build a .lib file if we build a DLL.
- old_archive_From_new_cmds='true'
- # FIXME: Should let the user specify the lib program.
-- old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
- fix_srcfile_path='`cygpath -w "$srcfile"`'
- enable_shared_with_static_runtimes=yes
- ;;
-@@ -8416,10 +8485,10 @@
- case $cc_basename in
- xlc*)
- output_verbose_link_cmd='echo'
-- archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
- *)
-@@ -8581,24 +8650,28 @@
- ;;
-
- openbsd*)
-- hardcode_direct=yes
-- hardcode_shlibpath_var=no
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-- export_dynamic_flag_spec='${wl}-E'
-+ if test -f /usr/libexec/ld.so; then
-+ hardcode_direct=yes
-+ hardcode_shlibpath_var=no
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+ export_dynamic_flag_spec='${wl}-E'
-+ else
-+ case $host_os in
-+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_libdir_flag_spec='-R$libdir'
-+ ;;
-+ *)
-+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+ ;;
-+ esac
-+ fi
- else
-- case $host_os in
-- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_libdir_flag_spec='-R$libdir'
-- ;;
-- *)
-- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-- ;;
-- esac
-+ ld_shlibs=no
- fi
- ;;
-
-@@ -8657,17 +8730,16 @@
- case $host_os in
- solaris2.[0-5] | solaris2.[0-5].*) ;;
- *)
-- # The compiler driver will combine linker options so we
-- # cannot just pass the convience library names through
-- # without $wl, iff we do not link with $LD.
-- # Luckily, gcc supports the same syntax we need for Sun Studio.
-+ # The compiler driver will combine and reorder linker options,
-+ # but understands `-z linker_flag'. GCC discards it without `$wl',
-+ # but is careful enough not to reorder.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
-- case $wlarc in
-- '')
-- whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
-- *)
-- whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-- esac ;;
-+ if test "$GCC" = yes; then
-+ whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ else
-+ whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
-+ fi
-+ ;;
- esac
- link_all_deplibs=yes
- ;;
-@@ -8724,7 +8796,7 @@
- fi
- ;;
-
-- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
-+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
- no_undefined_flag='${wl}-z,text'
- archive_cmds_need_lc=no
- hardcode_shlibpath_var=no
-@@ -8801,7 +8873,7 @@
- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
- echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
- $rm conftest*
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
-@@ -8859,17 +8931,55 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+
- if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-+ case $host_os in
-+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-+ *) lt_awk_arg="/^libraries:/" ;;
-+ esac
-+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
- # if the path contains ";" then we assume it to be the separator
- # otherwise default to the standard path separator (i.e. ":") - it is
- # assumed that no part of a normal pathname contains ";" but that should
- # okay in the real world where ";" in dirpaths is itself problematic.
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
- else
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
-+ # Ok, now we have the path, separated by spaces, we can step through it
-+ # and add multilib dir if necessary.
-+ lt_tmp_lt_search_path_spec=
-+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-+ for lt_sys_path in $lt_search_path_spec; do
-+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-+ else
-+ test -d "$lt_sys_path" && \
-+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-+ fi
-+ done
-+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
-+BEGIN {RS=" "; FS="/|\n";} {
-+ lt_foo="";
-+ lt_count=0;
-+ for (lt_i = NF; lt_i > 0; lt_i--) {
-+ if ($lt_i != "" && $lt_i != ".") {
-+ if ($lt_i == "..") {
-+ lt_count++;
-+ } else {
-+ if (lt_count == 0) {
-+ lt_foo="/" $lt_i lt_foo;
-+ } else {
-+ lt_count--;
-+ }
-+ }
-+ }
-+ }
-+ if (lt_foo != "") { lt_freq[lt_foo]++; }
-+ if (lt_freq[lt_foo] == 1) { print lt_foo; }
-+}'`
-+ sys_lib_search_path_spec=`echo $lt_search_path_spec`
- else
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
- fi
-@@ -9029,12 +9139,8 @@
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-- if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-- else
-- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-- fi
-+
-+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
- ;;
-
-@@ -9088,7 +9194,7 @@
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-- freebsd*) # from 4.6 on
-+ *) # from 4.6 on, and DragonFly
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-@@ -9151,7 +9257,7 @@
- postinstall_cmds='chmod 555 $lib'
- ;;
-
--interix3*)
-+interix[3-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -9222,7 +9328,7 @@
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
-- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
-@@ -9328,6 +9434,10 @@
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
-+rdos*)
-+ dynamic_linker=no
-+ ;;
-+
- solaris*)
- version_type=linux
- need_lib_prefix=no
-@@ -9481,6 +9591,7 @@
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
-+ old_striplib="$STRIP -S"
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
- else
-@@ -10067,7 +10178,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 10070 "configure"
-+#line 10181 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -10167,7 +10278,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 10170 "configure"
-+#line 10281 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -10365,6 +10476,7 @@
- module_cmds \
- module_expsym_cmds \
- lt_cv_prog_compiler_c_o \
-+ fix_srcfile_path \
- exclude_expsyms \
- include_expsyms; do
-
-@@ -10409,7 +10521,7 @@
- # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
- #
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
- # Free Software Foundation, Inc.
- #
- # This file is part of GNU Libtool:
-@@ -10733,7 +10845,7 @@
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
- # Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path"
-+fix_srcfile_path=$lt_fix_srcfile_path
-
- # Set to yes if exported symbols are required.
- always_export_symbols=$always_export_symbols
-@@ -10902,10 +11014,10 @@
- objext_CXX=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;\n"
-+lt_simple_compile_test_code="int some_variable = 0;"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
-+lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-@@ -10921,13 +11033,13 @@
-
- # save warnings/boilerplate of simple test code
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
- eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_compiler_boilerplate=`cat conftest.err`
- $rm conftest*
-
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
- $rm conftest*
-@@ -11186,7 +11298,7 @@
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
-- hardcode_direct_CXX=yes
-+ :
- else
- # We have old collect2
- hardcode_direct_CXX=unsupported
-@@ -11260,11 +11372,18 @@
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -11320,11 +11439,18 @@
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -11443,10 +11569,10 @@
- case $cc_basename in
- xlc*)
- output_verbose_link_cmd='echo'
-- archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
- module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
- *)
-@@ -11529,9 +11655,7 @@
- hardcode_libdir_separator_CXX=:
-
- case $host_cpu in
-- hppa*64*|ia64*)
-- hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-- ;;
-+ hppa*64*|ia64*) ;;
- *)
- export_dynamic_flag_spec_CXX='${wl}-E'
- ;;
-@@ -11599,7 +11723,7 @@
- ;;
- esac
- ;;
-- interix3*)
-+ interix[3-9]*)
- hardcode_direct_CXX=no
- hardcode_shlibpath_var_CXX=no
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-@@ -11719,6 +11843,29 @@
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- ;;
-+ *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C++ 5.9
-+ no_undefined_flag_CXX=' -zdefs'
-+ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-+ hardcode_libdir_flag_spec_CXX='-R$libdir'
-+ whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+
-+ # Not sure whether something based on
-+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-+ # would be better.
-+ output_verbose_link_cmd='echo'
-+
-+ # Archives containing C++ object files must be created using
-+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
-+ # necessary to make sure instantiated templates are included
-+ # in the archive.
-+ old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
-+ ;;
-+ esac
-+ ;;
- esac
- ;;
- lynxos*)
-@@ -11757,16 +11904,20 @@
- ld_shlibs_CXX=no
- ;;
- openbsd*)
-- hardcode_direct_CXX=yes
-- hardcode_shlibpath_var_CXX=no
-- archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-- export_dynamic_flag_spec_CXX='${wl}-E'
-- whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ if test -f /usr/libexec/ld.so; then
-+ hardcode_direct_CXX=yes
-+ hardcode_shlibpath_var_CXX=no
-+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+ export_dynamic_flag_spec_CXX='${wl}-E'
-+ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ fi
-+ output_verbose_link_cmd='echo'
-+ else
-+ ld_shlibs_CXX=no
- fi
-- output_verbose_link_cmd='echo'
- ;;
- osf3*)
- case $cc_basename in
-@@ -11928,15 +12079,10 @@
- case $host_os in
- solaris2.[0-5] | solaris2.[0-5].*) ;;
- *)
-- # The C++ compiler is used as linker so we must use $wl
-- # flag to pass the commands to the underlying system
-- # linker. We must also pass each convience library through
-- # to the system linker between allextract/defaultextract.
-- # The C++ compiler will combine linker options so we
-- # cannot just pass the convience library names through
-- # without $wl.
-+ # The compiler driver will combine and reorder linker options,
-+ # but understands `-z linker_flag'.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
-- whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
-+ whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
- ;;
- esac
- link_all_deplibs_CXX=yes
-@@ -11983,6 +12129,12 @@
- fi
-
- hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
-+ case $host_os in
-+ solaris2.[0-5] | solaris2.[0-5].*) ;;
-+ *)
-+ whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ ;;
-+ esac
- fi
- ;;
- esac
-@@ -12174,7 +12326,7 @@
-
- # PORTME: override above test on systems where it is broken
- case $host_os in
--interix3*)
-+interix[3-9]*)
- # Interix 3.5 installs completely hosed .la files for C++, so rather than
- # hack all around it, let's just trust "g++" to DTRT.
- predep_objects_CXX=
-@@ -12182,13 +12334,46 @@
- postdeps_CXX=
- ;;
-
-+linux*)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C++ 5.9
-+ #
-+ # The more standards-conforming stlport4 library is
-+ # incompatible with the Cstd library. Avoid specifying
-+ # it if it's in CXXFLAGS. Ignore libCrun as
-+ # -library=stlport4 depends on it.
-+ case " $CXX $CXXFLAGS " in
-+ *" -library=stlport4 "*)
-+ solaris_use_stlport4=yes
-+ ;;
-+ esac
-+ if test "$solaris_use_stlport4" != yes; then
-+ postdeps_CXX='-library=Cstd -library=Crun'
-+ fi
-+ ;;
-+ esac
-+ ;;
-+
- solaris*)
- case $cc_basename in
- CC*)
-+ # The more standards-conforming stlport4 library is
-+ # incompatible with the Cstd library. Avoid specifying
-+ # it if it's in CXXFLAGS. Ignore libCrun as
-+ # -library=stlport4 depends on it.
-+ case " $CXX $CXXFLAGS " in
-+ *" -library=stlport4 "*)
-+ solaris_use_stlport4=yes
-+ ;;
-+ esac
-+
- # Adding this requires a known-good setup of shared libraries for
- # Sun compiler versions before 5.6, else PIC objects from an old
- # archive will be linked into the output, leading to subtle bugs.
-- postdeps_CXX='-lCstd -lCrun'
-+ if test "$solaris_use_stlport4" != yes; then
-+ postdeps_CXX='-library=Cstd -library=Crun'
-+ fi
- ;;
- esac
- ;;
-@@ -12225,12 +12410,14 @@
- # like `-m68040'.
- lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
- ;;
-- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-- mingw* | os2* | pw32*)
-+ mingw* | cygwin* | os2* | pw32*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
-+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+ # (--disable-auto-import) libraries
- lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
- ;;
- darwin* | rhapsody*)
-@@ -12242,7 +12429,7 @@
- # DJGPP does not support shared libraries at all
- lt_prog_compiler_pic_CXX=
- ;;
-- interix3*)
-+ interix[3-9]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
-@@ -12378,6 +12565,14 @@
- lt_prog_compiler_static_CXX='-non_shared'
- ;;
- *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C++ 5.9
-+ lt_prog_compiler_pic_CXX='-KPIC'
-+ lt_prog_compiler_static_CXX='-Bstatic'
-+ lt_prog_compiler_wl_CXX='-Qoption ld '
-+ ;;
-+ esac
- ;;
- esac
- ;;
-@@ -12492,7 +12687,7 @@
- else
- lt_prog_compiler_pic_works_CXX=no
- ac_outfile=conftest.$ac_objext
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
-@@ -12503,11 +12698,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:12506: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:12701: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:12510: \$? = $ac_status" >&5
-+ echo "$as_me:12705: \$? = $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.
-@@ -12556,7 +12751,7 @@
- lt_prog_compiler_static_works_CXX=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-- printf "$lt_simple_link_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
- # The linker can only warn and ignore the option if not recognized
- # So say no if there are warnings
-@@ -12596,7 +12791,7 @@
- mkdir conftest
- cd conftest
- mkdir out
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
-@@ -12607,11 +12802,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:12610: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:12805: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:12614: \$? = $ac_status" >&5
-+ echo "$as_me:12809: \$? = $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
-@@ -12677,7 +12872,7 @@
- export_symbols_cmds_CXX="$ltdll_cmds"
- ;;
- cygwin* | mingw*)
-- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
- ;;
- linux* | k*bsd*-gnu)
- link_all_deplibs_CXX=no
-@@ -12711,7 +12906,7 @@
- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
- echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
- $rm conftest*
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
-@@ -12769,20 +12964,7 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
--if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-- # if the path contains ";" then we assume it to be the separator
-- # otherwise default to the standard path separator (i.e. ":") - it is
-- # assumed that no part of a normal pathname contains ";" but that should
-- # okay in the real world where ";" in dirpaths is itself problematic.
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-- else
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-- fi
--else
-- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
--fi
-+
- need_lib_prefix=unknown
- hardcode_into_libs=no
-
-@@ -12939,12 +13121,7 @@
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-- if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-- else
-- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-- fi
-+
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
- ;;
-
-@@ -12998,7 +13175,7 @@
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-- freebsd*) # from 4.6 on
-+ *) # from 4.6 on, and DragonFly
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-@@ -13061,7 +13238,7 @@
- postinstall_cmds='chmod 555 $lib'
- ;;
-
--interix3*)
-+interix[3-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -13132,7 +13309,7 @@
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
-- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
-@@ -13238,6 +13415,10 @@
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
-+rdos*)
-+ dynamic_linker=no
-+ ;;
-+
- solaris*)
- version_type=linux
- need_lib_prefix=no
-@@ -13432,6 +13613,7 @@
- module_cmds_CXX \
- module_expsym_cmds_CXX \
- lt_cv_prog_compiler_c_o_CXX \
-+ fix_srcfile_path_CXX \
- exclude_expsyms_CXX \
- include_expsyms_CXX; do
-
-@@ -13752,7 +13934,7 @@
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
- # Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path_CXX"
-+fix_srcfile_path=$lt_fix_srcfile_path
-
- # Set to yes if exported symbols are required.
- always_export_symbols=$always_export_symbols_CXX
-@@ -13843,10 +14025,17 @@
- objext_F77=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code=" subroutine t\n return\n end\n"
-+lt_simple_compile_test_code="\
-+ subroutine t
-+ return
-+ end
-+"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code=" program t\n end\n"
-+lt_simple_link_test_code="\
-+ program t
-+ end
-+"
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-@@ -13862,13 +14051,13 @@
-
- # save warnings/boilerplate of simple test code
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
- eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_compiler_boilerplate=`cat conftest.err`
- $rm conftest*
-
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
- $rm conftest*
-@@ -13955,13 +14144,15 @@
- lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
- ;;
-
-- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-
-- mingw* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
-+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+ # (--disable-auto-import) libraries
- lt_prog_compiler_pic_F77='-DDLL_EXPORT'
- ;;
-
-@@ -13971,7 +14162,7 @@
- lt_prog_compiler_pic_F77='-fno-common'
- ;;
-
-- interix3*)
-+ interix[3-9]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
-@@ -14029,7 +14220,7 @@
- esac
- ;;
-
-- mingw* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-@@ -14081,6 +14272,22 @@
- # All Alpha code is PIC.
- lt_prog_compiler_static_F77='-non_shared'
- ;;
-+ *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C 5.9
-+ lt_prog_compiler_pic_F77='-KPIC'
-+ lt_prog_compiler_static_F77='-Bstatic'
-+ lt_prog_compiler_wl_F77='-Wl,'
-+ ;;
-+ *Sun\ F*)
-+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
-+ lt_prog_compiler_pic_F77='-KPIC'
-+ lt_prog_compiler_static_F77='-Bstatic'
-+ lt_prog_compiler_wl_F77=''
-+ ;;
-+ esac
-+ ;;
- esac
- ;;
-
-@@ -14090,6 +14297,10 @@
- lt_prog_compiler_static_F77='-non_shared'
- ;;
-
-+ rdos*)
-+ lt_prog_compiler_static_F77='-non_shared'
-+ ;;
-+
- solaris*)
- lt_prog_compiler_pic_F77='-KPIC'
- lt_prog_compiler_static_F77='-Bstatic'
-@@ -14157,7 +14368,7 @@
- else
- lt_prog_compiler_pic_works_F77=no
- ac_outfile=conftest.$ac_objext
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic_F77"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
-@@ -14168,11 +14379,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:14171: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14382: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:14175: \$? = $ac_status" >&5
-+ echo "$as_me:14386: \$? = $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.
-@@ -14221,7 +14432,7 @@
- lt_prog_compiler_static_works_F77=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-- printf "$lt_simple_link_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
- # The linker can only warn and ignore the option if not recognized
- # So say no if there are warnings
-@@ -14261,7 +14472,7 @@
- mkdir conftest
- cd conftest
- mkdir out
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
-@@ -14272,11 +14483,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:14275: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14486: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:14279: \$? = $ac_status" >&5
-+ echo "$as_me:14490: \$? = $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
-@@ -14468,7 +14679,7 @@
- allow_undefined_flag_F77=unsupported
- always_export_symbols_F77=no
- enable_shared_with_static_runtimes_F77=yes
-- export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -14486,7 +14697,7 @@
- fi
- ;;
-
-- interix3*)
-+ interix[3-9]*)
- hardcode_direct_F77=no
- hardcode_shlibpath_var_F77=no
- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-@@ -14501,7 +14712,7 @@
- archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
-- linux* | k*bsd*-gnu)
-+ gnu* | linux* | k*bsd*-gnu)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_addflag=
- case $cc_basename,$host_cpu in
-@@ -14519,13 +14730,22 @@
- ifc* | ifort*) # Intel Fortran compiler
- tmp_addflag=' -nofor_main' ;;
- esac
-- archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*) # Sun C 5.9
-+ whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+ tmp_sharedflag='-G' ;;
-+ *Sun\ F*) # Sun Fortran 8.3
-+ tmp_sharedflag='-G' ;;
-+ *)
-+ tmp_sharedflag='-shared' ;;
-+ esac
-+ archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
- if test $supports_anon_versioning = yes; then
- archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- $echo "local: *; };" >> $output_objdir/$libname.ver~
-- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
- link_all_deplibs_F77=no
- else
-@@ -14685,7 +14905,7 @@
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
-- hardcode_direct_F77=yes
-+ :
- else
- # We have old collect2
- hardcode_direct_F77=unsupported
-@@ -14749,11 +14969,18 @@
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -14798,11 +15025,18 @@
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -14856,7 +15090,7 @@
- # The linker will automatically build a .lib file if we build a DLL.
- old_archive_From_new_cmds_F77='true'
- # FIXME: Should let the user specify the lib program.
-- old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+ old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs'
- fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
- enable_shared_with_static_runtimes_F77=yes
- ;;
-@@ -14898,10 +15132,10 @@
- case $cc_basename in
- xlc*)
- output_verbose_link_cmd='echo'
-- archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
- module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
- *)
-@@ -15063,24 +15297,28 @@
- ;;
-
- openbsd*)
-- hardcode_direct_F77=yes
-- hardcode_shlibpath_var_F77=no
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-- export_dynamic_flag_spec_F77='${wl}-E'
-+ if test -f /usr/libexec/ld.so; then
-+ hardcode_direct_F77=yes
-+ hardcode_shlibpath_var_F77=no
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-+ export_dynamic_flag_spec_F77='${wl}-E'
-+ else
-+ case $host_os in
-+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_libdir_flag_spec_F77='-R$libdir'
-+ ;;
-+ *)
-+ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-+ ;;
-+ esac
-+ fi
- else
-- case $host_os in
-- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_libdir_flag_spec_F77='-R$libdir'
-- ;;
-- *)
-- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-- ;;
-- esac
-+ ld_shlibs_F77=no
- fi
- ;;
-
-@@ -15139,17 +15377,16 @@
- case $host_os in
- solaris2.[0-5] | solaris2.[0-5].*) ;;
- *)
-- # The compiler driver will combine linker options so we
-- # cannot just pass the convience library names through
-- # without $wl, iff we do not link with $LD.
-- # Luckily, gcc supports the same syntax we need for Sun Studio.
-+ # The compiler driver will combine and reorder linker options,
-+ # but understands `-z linker_flag'. GCC discards it without `$wl',
-+ # but is careful enough not to reorder.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
-- case $wlarc in
-- '')
-- whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
-- *)
-- whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-- esac ;;
-+ if test "$GCC" = yes; then
-+ whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ else
-+ whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract'
-+ fi
-+ ;;
- esac
- link_all_deplibs_F77=yes
- ;;
-@@ -15206,7 +15443,7 @@
- fi
- ;;
-
-- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
-+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
- no_undefined_flag_F77='${wl}-z,text'
- archive_cmds_need_lc_F77=no
- hardcode_shlibpath_var_F77=no
-@@ -15283,7 +15520,7 @@
- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
- echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
- $rm conftest*
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
-@@ -15341,20 +15578,7 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
--if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-- # if the path contains ";" then we assume it to be the separator
-- # otherwise default to the standard path separator (i.e. ":") - it is
-- # assumed that no part of a normal pathname contains ";" but that should
-- # okay in the real world where ";" in dirpaths is itself problematic.
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-- else
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-- fi
--else
-- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
--fi
-+
- need_lib_prefix=unknown
- hardcode_into_libs=no
-
-@@ -15511,12 +15735,7 @@
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-- if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-- else
-- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-- fi
-+
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
- ;;
-
-@@ -15570,7 +15789,7 @@
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-- freebsd*) # from 4.6 on
-+ *) # from 4.6 on, and DragonFly
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-@@ -15633,7 +15852,7 @@
- postinstall_cmds='chmod 555 $lib'
- ;;
-
--interix3*)
-+interix[3-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -15704,7 +15923,7 @@
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
-- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
-@@ -15810,6 +16029,10 @@
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
-+rdos*)
-+ dynamic_linker=no
-+ ;;
-+
- solaris*)
- version_type=linux
- need_lib_prefix=no
-@@ -16004,6 +16227,7 @@
- module_cmds_F77 \
- module_expsym_cmds_F77 \
- lt_cv_prog_compiler_c_o_F77 \
-+ fix_srcfile_path_F77 \
- exclude_expsyms_F77 \
- include_expsyms_F77; do
-
-@@ -16324,7 +16548,7 @@
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
- # Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path_F77"
-+fix_srcfile_path=$lt_fix_srcfile_path
-
- # Set to yes if exported symbols are required.
- always_export_symbols=$always_export_symbols_F77
-@@ -16382,10 +16606,10 @@
- objext_GCJ=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code="class foo {}\n"
-+lt_simple_compile_test_code="class foo {}"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
-+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-@@ -16401,13 +16625,13 @@
-
- # save warnings/boilerplate of simple test code
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
- eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_compiler_boilerplate=`cat conftest.err`
- $rm conftest*
-
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
- $rm conftest*
-@@ -16448,7 +16672,7 @@
- else
- lt_cv_prog_compiler_rtti_exceptions=no
- ac_outfile=conftest.$ac_objext
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="-fno-rtti -fno-exceptions"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
-@@ -16459,11 +16683,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:16462: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16686: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:16466: \$? = $ac_status" >&5
-+ echo "$as_me:16690: \$? = $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.
-@@ -16514,13 +16738,15 @@
- lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
- ;;
-
-- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-
-- mingw* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
-+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+ # (--disable-auto-import) libraries
- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
- ;;
-
-@@ -16530,7 +16756,7 @@
- lt_prog_compiler_pic_GCJ='-fno-common'
- ;;
-
-- interix3*)
-+ interix[3-9]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
-@@ -16588,7 +16814,7 @@
- esac
- ;;
-
-- mingw* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-@@ -16640,6 +16866,22 @@
- # All Alpha code is PIC.
- lt_prog_compiler_static_GCJ='-non_shared'
- ;;
-+ *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C 5.9
-+ lt_prog_compiler_pic_GCJ='-KPIC'
-+ lt_prog_compiler_static_GCJ='-Bstatic'
-+ lt_prog_compiler_wl_GCJ='-Wl,'
-+ ;;
-+ *Sun\ F*)
-+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
-+ lt_prog_compiler_pic_GCJ='-KPIC'
-+ lt_prog_compiler_static_GCJ='-Bstatic'
-+ lt_prog_compiler_wl_GCJ=''
-+ ;;
-+ esac
-+ ;;
- esac
- ;;
-
-@@ -16649,6 +16891,10 @@
- lt_prog_compiler_static_GCJ='-non_shared'
- ;;
-
-+ rdos*)
-+ lt_prog_compiler_static_GCJ='-non_shared'
-+ ;;
-+
- solaris*)
- lt_prog_compiler_pic_GCJ='-KPIC'
- lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -16716,7 +16962,7 @@
- else
- lt_prog_compiler_pic_works_GCJ=no
- ac_outfile=conftest.$ac_objext
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
-@@ -16727,11 +16973,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:16730: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16976: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:16734: \$? = $ac_status" >&5
-+ echo "$as_me:16980: \$? = $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.
-@@ -16780,7 +17026,7 @@
- lt_prog_compiler_static_works_GCJ=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-- printf "$lt_simple_link_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
- # The linker can only warn and ignore the option if not recognized
- # So say no if there are warnings
-@@ -16820,7 +17066,7 @@
- mkdir conftest
- cd conftest
- mkdir out
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
-@@ -16831,11 +17077,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:16834: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17080: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:16838: \$? = $ac_status" >&5
-+ echo "$as_me:17084: \$? = $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
-@@ -17027,7 +17273,7 @@
- allow_undefined_flag_GCJ=unsupported
- always_export_symbols_GCJ=no
- enable_shared_with_static_runtimes_GCJ=yes
-- export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+ export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -17045,7 +17291,7 @@
- fi
- ;;
-
-- interix3*)
-+ interix[3-9]*)
- hardcode_direct_GCJ=no
- hardcode_shlibpath_var_GCJ=no
- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-@@ -17060,7 +17306,7 @@
- archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
-- linux* | k*bsd*-gnu)
-+ gnu* | linux* | k*bsd*-gnu)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_addflag=
- case $cc_basename,$host_cpu in
-@@ -17078,13 +17324,22 @@
- ifc* | ifort*) # Intel Fortran compiler
- tmp_addflag=' -nofor_main' ;;
- esac
-- archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*) # Sun C 5.9
-+ whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+ tmp_sharedflag='-G' ;;
-+ *Sun\ F*) # Sun Fortran 8.3
-+ tmp_sharedflag='-G' ;;
-+ *)
-+ tmp_sharedflag='-shared' ;;
-+ esac
-+ archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
- if test $supports_anon_versioning = yes; then
- archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- $echo "local: *; };" >> $output_objdir/$libname.ver~
-- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
- link_all_deplibs_GCJ=no
- else
-@@ -17244,7 +17499,7 @@
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
-- hardcode_direct_GCJ=yes
-+ :
- else
- # We have old collect2
- hardcode_direct_GCJ=unsupported
-@@ -17318,11 +17573,18 @@
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -17377,11 +17639,18 @@
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -17435,7 +17704,7 @@
- # The linker will automatically build a .lib file if we build a DLL.
- old_archive_From_new_cmds_GCJ='true'
- # FIXME: Should let the user specify the lib program.
-- old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+ old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs'
- fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
- enable_shared_with_static_runtimes_GCJ=yes
- ;;
-@@ -17477,10 +17746,10 @@
- case $cc_basename in
- xlc*)
- output_verbose_link_cmd='echo'
-- archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
- module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
- *)
-@@ -17642,24 +17911,28 @@
- ;;
-
- openbsd*)
-- hardcode_direct_GCJ=yes
-- hardcode_shlibpath_var_GCJ=no
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-- export_dynamic_flag_spec_GCJ='${wl}-E'
-+ if test -f /usr/libexec/ld.so; then
-+ hardcode_direct_GCJ=yes
-+ hardcode_shlibpath_var_GCJ=no
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-+ export_dynamic_flag_spec_GCJ='${wl}-E'
-+ else
-+ case $host_os in
-+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_libdir_flag_spec_GCJ='-R$libdir'
-+ ;;
-+ *)
-+ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-+ ;;
-+ esac
-+ fi
- else
-- case $host_os in
-- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_libdir_flag_spec_GCJ='-R$libdir'
-- ;;
-- *)
-- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-- ;;
-- esac
-+ ld_shlibs_GCJ=no
- fi
- ;;
-
-@@ -17718,17 +17991,16 @@
- case $host_os in
- solaris2.[0-5] | solaris2.[0-5].*) ;;
- *)
-- # The compiler driver will combine linker options so we
-- # cannot just pass the convience library names through
-- # without $wl, iff we do not link with $LD.
-- # Luckily, gcc supports the same syntax we need for Sun Studio.
-+ # The compiler driver will combine and reorder linker options,
-+ # but understands `-z linker_flag'. GCC discards it without `$wl',
-+ # but is careful enough not to reorder.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
-- case $wlarc in
-- '')
-- whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
-- *)
-- whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-- esac ;;
-+ if test "$GCC" = yes; then
-+ whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ else
-+ whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract'
-+ fi
-+ ;;
- esac
- link_all_deplibs_GCJ=yes
- ;;
-@@ -17785,7 +18057,7 @@
- fi
- ;;
-
-- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
-+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
- no_undefined_flag_GCJ='${wl}-z,text'
- archive_cmds_need_lc_GCJ=no
- hardcode_shlibpath_var_GCJ=no
-@@ -17862,7 +18134,7 @@
- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
- echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
- $rm conftest*
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
-@@ -17920,20 +18192,7 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
--if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-- # if the path contains ";" then we assume it to be the separator
-- # otherwise default to the standard path separator (i.e. ":") - it is
-- # assumed that no part of a normal pathname contains ";" but that should
-- # okay in the real world where ";" in dirpaths is itself problematic.
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-- else
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-- fi
--else
-- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
--fi
-+
- need_lib_prefix=unknown
- hardcode_into_libs=no
-
-@@ -18090,12 +18349,7 @@
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-- if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-- else
-- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-- fi
-+
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
- ;;
-
-@@ -18149,7 +18403,7 @@
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-- freebsd*) # from 4.6 on
-+ *) # from 4.6 on, and DragonFly
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-@@ -18212,7 +18466,7 @@
- postinstall_cmds='chmod 555 $lib'
- ;;
-
--interix3*)
-+interix[3-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -18283,7 +18537,7 @@
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
-- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
-@@ -18389,6 +18643,10 @@
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
-+rdos*)
-+ dynamic_linker=no
-+ ;;
-+
- solaris*)
- version_type=linux
- need_lib_prefix=no
-@@ -18583,6 +18841,7 @@
- module_cmds_GCJ \
- module_expsym_cmds_GCJ \
- lt_cv_prog_compiler_c_o_GCJ \
-+ fix_srcfile_path_GCJ \
- exclude_expsyms_GCJ \
- include_expsyms_GCJ; do
-
-@@ -18903,7 +19162,7 @@
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
- # Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path_GCJ"
-+fix_srcfile_path=$lt_fix_srcfile_path
-
- # Set to yes if exported symbols are required.
- always_export_symbols=$always_export_symbols_GCJ
-@@ -18960,7 +19219,7 @@
- objext_RC=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
- # Code to be used in simple link tests
- lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -18979,13 +19238,13 @@
-
- # save warnings/boilerplate of simple test code
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
- eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_compiler_boilerplate=`cat conftest.err`
- $rm conftest*
-
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
- $rm conftest*
-@@ -19063,6 +19322,7 @@
- module_cmds_RC \
- module_expsym_cmds_RC \
- lt_cv_prog_compiler_c_o_RC \
-+ fix_srcfile_path_RC \
- exclude_expsyms_RC \
- include_expsyms_RC; do
-
-@@ -19383,7 +19643,7 @@
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
- # Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path_RC"
-+fix_srcfile_path=$lt_fix_srcfile_path
-
- # Set to yes if exported symbols are required.
- always_export_symbols=$always_export_symbols_RC
-@@ -26094,12 +26354,12 @@
+ VERSION='2.20.3'
+
+
+@@ -26353,12 +26353,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_WEBKIT_CFLAGS="$WEBKIT_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
@@ -3329,7 +62,7 @@
else
pkg_failed=yes
fi
-@@ -26112,12 +26372,12 @@
+@@ -26371,12 +26371,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_WEBKIT_LIBS="$WEBKIT_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -3345,7 +78,7 @@
else
pkg_failed=yes
fi
-@@ -26136,14 +26396,14 @@
+@@ -26395,14 +26395,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -3363,7 +96,7 @@
$WEBKIT_PKG_ERRORS
-@@ -26154,7 +26414,7 @@
+@@ -26413,7 +26413,7 @@ Alternatively, you may set the environme
and WEBKIT_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
@@ -3372,178 +105,10 @@
$WEBKIT_PKG_ERRORS
-@@ -30198,13 +30458,13 @@
- CCDEPMODE!$CCDEPMODE$ac_delim
- am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
- am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-+SED!$SED$ac_delim
- GREP!$GREP$ac_delim
- EGREP!$EGREP$ac_delim
- LN_S!$LN_S$ac_delim
- ECHO!$ECHO$ac_delim
- AR!$AR$ac_delim
- RANLIB!$RANLIB$ac_delim
--CPP!$CPP$ac_delim
- _ACEOF
-
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -30246,6 +30506,7 @@
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
-+CPP!$CPP$ac_delim
- CXX!$CXX$ac_delim
- CXXFLAGS!$CXXFLAGS$ac_delim
- ac_ct_CXX!$ac_ct_CXX$ac_delim
-@@ -30342,7 +30603,6 @@
- pkgpythondir!$pkgpythondir$ac_delim
- pyexecdir!$pyexecdir$ac_delim
- pkgpyexecdir!$pkgpyexecdir$ac_delim
--PYTHON_INCLUDES!$PYTHON_INCLUDES$ac_delim
- _ACEOF
-
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -30384,6 +30644,7 @@
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
-+PYTHON_INCLUDES!$PYTHON_INCLUDES$ac_delim
- PYTHON_LIBS!$PYTHON_LIBS$ac_delim
- PYTHON_LIB_LOC!$PYTHON_LIB_LOC$ac_delim
- PYTHON_CFLAGS!$PYTHON_CFLAGS$ac_delim
-@@ -30448,7 +30709,7 @@
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
-
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 62; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 63; then
- break
- elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.20.2.old/data/art/Makefile.in epiphany-browser-2.20.2/data/art/Makefile.in
---- epiphany-browser-2.20.2.old/data/art/Makefile.in 2007-11-27 00:37:37.000000000 +0100
-+++ epiphany-browser-2.20.2/data/art/Makefile.in 2007-12-01 17:49:02.000000000 +0100
-@@ -200,6 +200,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.20.2.old/data/chrome/Makefile.in epiphany-browser-2.20.2/data/chrome/Makefile.in
---- epiphany-browser-2.20.2.old/data/chrome/Makefile.in 2007-11-27 00:37:38.000000000 +0100
-+++ epiphany-browser-2.20.2/data/chrome/Makefile.in 2007-12-01 17:49:02.000000000 +0100
-@@ -203,6 +203,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.20.2.old/data/glade/Makefile.in epiphany-browser-2.20.2/data/glade/Makefile.in
---- epiphany-browser-2.20.2.old/data/glade/Makefile.in 2007-11-27 00:37:38.000000000 +0100
-+++ epiphany-browser-2.20.2/data/glade/Makefile.in 2007-12-01 17:49:03.000000000 +0100
-@@ -202,6 +202,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.20.2.old/data/icons/Makefile.in epiphany-browser-2.20.2/data/icons/Makefile.in
---- epiphany-browser-2.20.2.old/data/icons/Makefile.in 2007-11-27 00:37:38.000000000 +0100
-+++ epiphany-browser-2.20.2/data/icons/Makefile.in 2007-12-01 17:49:03.000000000 +0100
-@@ -191,6 +191,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.20.2.old/data/Makefile.in epiphany-browser-2.20.2/data/Makefile.in
---- epiphany-browser-2.20.2.old/data/Makefile.in 2007-11-27 00:37:37.000000000 +0100
-+++ epiphany-browser-2.20.2/data/Makefile.in 2007-12-01 17:49:02.000000000 +0100
-@@ -231,6 +231,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.20.2.old/data/ui/Makefile.in epiphany-browser-2.20.2/data/ui/Makefile.in
---- epiphany-browser-2.20.2.old/data/ui/Makefile.in 2007-11-27 00:37:38.000000000 +0100
-+++ epiphany-browser-2.20.2/data/ui/Makefile.in 2007-12-01 17:49:03.000000000 +0100
-@@ -199,6 +199,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.20.2.old/doc/Makefile.in epiphany-browser-2.20.2/doc/Makefile.in
---- epiphany-browser-2.20.2.old/doc/Makefile.in 2007-11-27 00:37:38.000000000 +0100
-+++ epiphany-browser-2.20.2/doc/Makefile.in 2007-12-01 17:49:03.000000000 +0100
-@@ -205,6 +205,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.20.2.old/doc/reference/Makefile.in epiphany-browser-2.20.2/doc/reference/Makefile.in
---- epiphany-browser-2.20.2.old/doc/reference/Makefile.in 2007-11-27 00:37:38.000000000 +0100
-+++ epiphany-browser-2.20.2/doc/reference/Makefile.in 2007-12-01 17:49:03.000000000 +0100
-@@ -205,6 +205,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.20.2.old/embed/Makefile.in epiphany-browser-2.20.2/embed/Makefile.in
---- epiphany-browser-2.20.2.old/embed/Makefile.in 2007-11-27 00:37:39.000000000 +0100
-+++ epiphany-browser-2.20.2/embed/Makefile.in 2007-12-01 17:49:03.000000000 +0100
-@@ -290,6 +290,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.20.2.old/embed/mozilla/Makefile.in epiphany-browser-2.20.2/embed/mozilla/Makefile.in
---- epiphany-browser-2.20.2.old/embed/mozilla/Makefile.in 2007-12-01 17:47:23.000000000 +0100
-+++ epiphany-browser-2.20.2/embed/mozilla/Makefile.in 2007-12-01 17:49:04.000000000 +0100
-@@ -315,6 +315,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.20.2.old/embed/webkit/Makefile.in epiphany-browser-2.20.2/embed/webkit/Makefile.in
---- epiphany-browser-2.20.2.old/embed/webkit/Makefile.in 2007-11-27 00:37:40.000000000 +0100
-+++ epiphany-browser-2.20.2/embed/webkit/Makefile.in 2007-12-01 17:49:04.000000000 +0100
-@@ -221,6 +221,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.20.2.old/gtk-doc.make epiphany-browser-2.20.2/gtk-doc.make
---- epiphany-browser-2.20.2.old/gtk-doc.make 1970-01-01 01:00:00.000000000 +0100
-+++ epiphany-browser-2.20.2/gtk-doc.make 2007-12-01 17:48:49.000000000 +0100
+Index: epiphany-2.20.3/gtk-doc.make
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ epiphany-2.20.3/gtk-doc.make 2008-01-12 02:27:03.808560042 +0100
@@ -0,0 +1,174 @@
+# -*- mode: makefile -*-
+
@@ -3719,641 +284,16 @@
+ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+
+.PHONY : dist-hook-local docs
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.20.2.old/help/Makefile.in epiphany-browser-2.20.2/help/Makefile.in
---- epiphany-browser-2.20.2.old/help/Makefile.in 2007-11-27 00:37:40.000000000 +0100
-+++ epiphany-browser-2.20.2/help/Makefile.in 2007-12-01 17:49:04.000000000 +0100
-@@ -214,6 +214,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.20.2.old/lib/egg/Makefile.in epiphany-browser-2.20.2/lib/egg/Makefile.in
---- epiphany-browser-2.20.2.old/lib/egg/Makefile.in 2007-11-27 00:37:41.000000000 +0100
-+++ epiphany-browser-2.20.2/lib/egg/Makefile.in 2007-12-01 17:49:05.000000000 +0100
-@@ -223,6 +223,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.20.2.old/lib/Makefile.in epiphany-browser-2.20.2/lib/Makefile.in
---- epiphany-browser-2.20.2.old/lib/Makefile.in 2007-12-01 17:47:23.000000000 +0100
-+++ epiphany-browser-2.20.2/lib/Makefile.in 2007-12-01 17:49:05.000000000 +0100
-@@ -281,6 +281,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.20.2.old/lib/widgets/Makefile.in epiphany-browser-2.20.2/lib/widgets/Makefile.in
---- epiphany-browser-2.20.2.old/lib/widgets/Makefile.in 2007-11-27 00:37:41.000000000 +0100
-+++ epiphany-browser-2.20.2/lib/widgets/Makefile.in 2007-12-01 17:49:05.000000000 +0100
-@@ -221,6 +221,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.20.2.old/ltmain.sh epiphany-browser-2.20.2/ltmain.sh
---- epiphany-browser-2.20.2.old/ltmain.sh 2006-03-11 19:49:04.000000000 +0100
-+++ epiphany-browser-2.20.2/ltmain.sh 2007-08-14 19:43:36.000000000 +0200
-@@ -1,8 +1,8 @@
- # ltmain.sh - Provide generalized library-building support services.
- # NOTE: Changing this file will not affect anything until you rerun configure.
- #
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
--# Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-+# 2007 Free Software Foundation, Inc.
- # Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
- #
- # This program is free software; you can redistribute it and/or modify
-@@ -43,14 +43,22 @@
+Index: epiphany-2.20.3/ltmain.sh
+===================================================================
+--- epiphany-2.20.3.orig/ltmain.sh 2007-08-01 16:12:57.000000000 +0200
++++ epiphany-2.20.3/ltmain.sh 2007-11-27 21:09:41.000000000 +0100
+@@ -43,7 +43,7 @@ EXIT_FAILURE=1
PROGRAM=ltmain.sh
PACKAGE=libtool
--VERSION="1.5.22 Debian 1.5.22-4"
--TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-+VERSION="1.5.24 Debian 1.5.24-1ubuntu1"
-+TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
-
--# See if we are running on zsh, and set the options which allow our
--# commands through without removal of \ escapes.
--if test -n "${ZSH_VERSION+set}" ; then
-+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+ # is contrary to our usage. Disable this feature.
-+ alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-+else
-+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
- fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
-
- # Check that we have a working $echo.
- if test "X$1" = X--no-reexec; then
-@@ -105,12 +113,14 @@
- # These must not be set unconditionally because not all systems understand
- # e.g. LANG=C (notably SCO).
- # We save the old values to restore during execute mode.
--if test "${LC_ALL+set}" = set; then
-- save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
--fi
--if test "${LANG+set}" = set; then
-- save_LANG="$LANG"; LANG=C; export LANG
--fi
-+for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-+do
-+ eval "if test \"\${$lt_var+set}\" = set; then
-+ save_$lt_var=\$$lt_var
-+ $lt_var=C
-+ export $lt_var
-+ fi"
-+done
-
- # Make sure IFS has a sensible default
- lt_nl='
-@@ -136,6 +146,8 @@
- preserve_args=
- lo2o="s/\\.lo\$/.${objext}/"
- o2lo="s/\\.${objext}\$/.lo/"
-+extracted_archives=
-+extracted_serial=0
-
- #####################################
- # Shell function definitions:
-@@ -196,7 +208,13 @@
- if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
- $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
- win32_nmres=`eval $NM -f posix -A $1 | \
-- $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
-+ $SED -n -e '1,100{
-+ / I /{
-+ s,.*,import,
-+ p
-+ q
-+ }
-+ }'`
- case $win32_nmres in
- import*) win32_libid_type="x86 archive import";;
- *) win32_libid_type="x86 archive static";;
-@@ -327,7 +345,17 @@
- *) my_xabs=`pwd`"/$my_xlib" ;;
- esac
- my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-- my_xdir="$my_gentop/$my_xlib"
-+ my_xlib_u=$my_xlib
-+ while :; do
-+ case " $extracted_archives " in
-+ *" $my_xlib_u "*)
-+ extracted_serial=`expr $extracted_serial + 1`
-+ my_xlib_u=lt$extracted_serial-$my_xlib ;;
-+ *) break ;;
-+ esac
-+ done
-+ extracted_archives="$extracted_archives $my_xlib_u"
-+ my_xdir="$my_gentop/$my_xlib_u"
-
- $show "${rm}r $my_xdir"
- $run ${rm}r "$my_xdir"
-@@ -454,11 +482,12 @@
- ;;
-
- --version)
-- $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-- $echo
-- $echo "Copyright (C) 2005 Free Software Foundation, Inc."
-- $echo "This is free software; see the source for copying conditions. There is NO"
-- $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-+ echo "\
-+$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
-+
-+Copyright (C) 2007 Free Software Foundation, Inc.
-+This is free software; see the source for copying conditions. There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
- exit $?
- ;;
-
-@@ -755,9 +784,10 @@
- *.class) xform=class ;;
- *.cpp) xform=cpp ;;
- *.cxx) xform=cxx ;;
-- *.f90) xform=f90 ;;
-+ *.[fF][09]?) xform=[fF][09]. ;;
- *.for) xform=for ;;
- *.java) xform=java ;;
-+ *.obj) xform=obj ;;
- esac
-
- libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-@@ -1138,8 +1168,9 @@
- for arg
- do
- case $arg in
-- -all-static | -static)
-- if test "X$arg" = "X-all-static"; then
-+ -all-static | -static | -static-libtool-libs)
-+ case $arg in
-+ -all-static)
- if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
- $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
- fi
-@@ -1147,12 +1178,20 @@
- dlopen_self=$dlopen_self_static
- fi
- prefer_static_libs=yes
-- else
-+ ;;
-+ -static)
- if test -z "$pic_flag" && test -n "$link_static_flag"; then
- dlopen_self=$dlopen_self_static
- fi
- prefer_static_libs=built
-- fi
-+ ;;
-+ -static-libtool-libs)
-+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
-+ dlopen_self=$dlopen_self_static
-+ fi
-+ prefer_static_libs=yes
-+ ;;
-+ esac
- build_libtool_libs=no
- build_old_libs=yes
- break
-@@ -1600,7 +1639,7 @@
- continue
- ;;
-
-- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- compiler_flags="$compiler_flags $arg"
- compile_command="$compile_command $arg"
- finalize_command="$finalize_command $arg"
-@@ -1620,10 +1659,11 @@
- # -m* pass through architecture-specific compiler args for GCC
- # -m*, -t[45]*, -txscale* pass through architecture-specific
- # compiler args for GCC
-- # -pg pass through profiling flag for GCC
-+ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-+ # -F/path gives path to uninstalled frameworks, gcc on darwin
- # @file GCC response files
-- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
-- -t[45]*|-txscale*|@*)
-+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-
- # Unknown arguments in both finalize_command and compile_command need
- # to be aesthetically quoted because they are evaled later.
-@@ -1651,9 +1691,9 @@
-
- -no-install)
- case $host in
-- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
- # The PATH hackery in wrapper scripts is required on Windows
-- # in order for the loader to find any dlls it needs.
-+ # and Darwin in order for the loader to find any dlls it needs.
- $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
- $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
- fast_install=no
-@@ -1712,7 +1752,7 @@
- continue
- ;;
-
-- -static)
-+ -static | -static-libtool-libs)
- # The effects of -static are defined in a previous loop.
- # We used to do the same as -all-static on platforms that
- # didn't have a PIC flag, but the assumption that the effects
-@@ -2097,7 +2137,7 @@
- lib=
- found=no
- case $deplib in
-- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- if test "$linkmode,$pass" = "prog,link"; then
- compile_deplibs="$deplib $compile_deplibs"
- finalize_deplibs="$deplib $finalize_deplibs"
-@@ -2493,7 +2533,9 @@
-
- if test "$linkmode,$pass" = "prog,link"; then
- if test -n "$library_names" &&
-- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-+ { { test "$prefer_static_libs" = no ||
-+ test "$prefer_static_libs,$installed" = "built,yes"; } ||
-+ test -z "$old_library"; }; then
- # We need to hardcode the library path
- if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
- # Make sure the rpath contains only unique directories.
-@@ -3189,7 +3231,7 @@
- # which has an extra 1 added just for fun
- #
- case $version_type in
-- darwin|linux|osf|windows)
-+ darwin|linux|osf|windows|none)
- current=`expr $number_major + $number_minor`
- age="$number_minor"
- revision="$number_revision"
-@@ -3200,9 +3242,10 @@
- age="0"
- ;;
- irix|nonstopux)
-- current=`expr $number_major + $number_minor - 1`
-+ current=`expr $number_major + $number_minor`
- age="$number_minor"
- revision="$number_minor"
-+ lt_irix_increment=no
- ;;
- *)
- $echo "$modename: unknown library version type \`$version_type'" 1>&2
-@@ -3266,7 +3309,8 @@
- versuffix="$major.$age.$revision"
- # Darwin ld doesn't like 0 for these options...
- minor_current=`expr $current + 1`
-- verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-+ xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
- ;;
-
- freebsd-aout)
-@@ -3280,8 +3324,11 @@
- ;;
-
- irix | nonstopux)
-- major=`expr $current - $age + 1`
--
-+ if test "X$lt_irix_increment" = "Xno"; then
-+ major=`expr $current - $age`
-+ else
-+ major=`expr $current - $age + 1`
-+ fi
- case $version_type in
- nonstopux) verstring_prefix=nonstopux ;;
- *) verstring_prefix=sgi ;;
-@@ -3418,11 +3465,11 @@
- fi
-
- # Eliminate all temporary directories.
-- for path in $notinst_path; do
-- lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-- deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-- dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-- done
-+ #for path in $notinst_path; do
-+ # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-+ # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-+ # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-+ #done
-
- if test -n "$xrpath"; then
- # If the user specified any rpath flags, then add them.
-@@ -3523,13 +3570,12 @@
- int main() { return 0; }
- EOF
- $rm conftest
-- $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
-- if test "$?" -eq 0 ; then
-+ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
- ldd_output=`ldd conftest`
- for i in $deplibs; do
- name=`expr $i : '-l\(.*\)'`
- # If $name is empty we are operating on a -L argument.
-- if test "$name" != "" && test "$name" -ne "0"; then
-+ if test "$name" != "" && test "$name" != "0"; then
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- case " $predeps $postdeps " in
- *" $i "*)
-@@ -3568,9 +3614,7 @@
- # If $name is empty we are operating on a -L argument.
- if test "$name" != "" && test "$name" != "0"; then
- $rm conftest
-- $LTCC $LTCFLAGS -o conftest conftest.c $i
-- # Did it work?
-- if test "$?" -eq 0 ; then
-+ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
- ldd_output=`ldd conftest`
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- case " $predeps $postdeps " in
-@@ -3602,7 +3646,7 @@
- droppeddeps=yes
- $echo
- $echo "*** Warning! Library $i is needed by this library but I was not able to"
-- $echo "*** make it link in! You will probably need to install it or some"
-+ $echo "*** make it link in! You will probably need to install it or some"
- $echo "*** library that it depends on before this library will be fully"
- $echo "*** functional. Installing it before continuing would be even better."
- fi
-@@ -3888,7 +3932,10 @@
- test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
- if test -n "$hardcode_libdir_flag_spec_ld"; then
-- eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-+ case $archive_cmds in
-+ *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
-+ *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
-+ esac
- else
- eval dep_rpath=\"$hardcode_libdir_flag_spec\"
- fi
-@@ -4247,12 +4294,14 @@
- reload_conv_objs=
- gentop=
- # reload_cmds runs $LD directly, so let us get rid of
-- # -Wl from whole_archive_flag_spec
-+ # -Wl from whole_archive_flag_spec and hope we can get by with
-+ # turning comma into space..
- wl=
-
- if test -n "$convenience"; then
- if test -n "$whole_archive_flag_spec"; then
-- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
-+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-+ reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
- else
- gentop="$output_objdir/${obj}x"
- generated="$generated $gentop"
-@@ -4700,16 +4749,16 @@
- case $host in
- *cygwin* | *mingw* )
- if test -f "$output_objdir/${outputname}.def" ; then
-- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
-+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
- else
-- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
- fi
- ;;
- * )
-- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
- ;;
- esac
- ;;
-@@ -4724,13 +4773,13 @@
- # really was required.
-
- # Nullify the symbol file.
-- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
-+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
- fi
-
- if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
- # Replace the output file specification.
-- compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
- link_command="$compile_command$compile_rpath"
-
- # We have no uninstalled library dependencies, so finalize right now.
-@@ -4817,7 +4866,7 @@
- if test "$fast_install" != no; then
- link_command="$finalize_var$compile_command$finalize_rpath"
- if test "$fast_install" = yes; then
-- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-+ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
- else
- # fast_install is set to needless
- relink_command=
-@@ -4854,7 +4903,7 @@
- fi
- done
- relink_command="(cd `pwd`; $relink_command)"
-- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
- fi
-
- # Quote $echo for shipping.
-@@ -5261,6 +5310,20 @@
- Xsed='${SED} -e 1s/^X//'
- sed_quote_subst='$sed_quote_subst'
-
-+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
-+ # is contrary to our usage. Disable this feature.
-+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
-+ setopt NO_GLOB_SUBST
-+else
-+ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
-+fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
-+
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
- (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-@@ -5403,7 +5466,7 @@
- ;;
- esac
- $echo >> $output "\
-- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
-+ \$echo \"\$0: cannot exec \$program \$*\"
- exit $EXIT_FAILURE
- fi
- else
-@@ -5589,7 +5652,7 @@
- done
- # Quote the link command for shipping.
- relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
- if test "$hardcode_automatic" = yes ; then
- relink_command=
- fi
-@@ -5934,9 +5997,9 @@
-
- if test -n "$inst_prefix_dir"; then
- # Stick the inst_prefix_dir data into the link command.
-- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
- else
-- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
-+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
- fi
-
- $echo "$modename: warning: relinking \`$file'" 1>&2
-@@ -6145,7 +6208,7 @@
- file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
- outputname="$tmpdir/$file"
- # Replace the output file specification.
-- relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
-
- $show "$relink_command"
- if $run eval "$relink_command"; then :
-@@ -6356,8 +6419,10 @@
- if test -f "$dir/$objdir/$dlname"; then
- dir="$dir/$objdir"
- else
-- $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-- exit $EXIT_FAILURE
-+ if test ! -f "$dir/$dlname"; then
-+ $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
- fi
- ;;
-
-@@ -6421,12 +6486,12 @@
- fi
-
- # Restore saved environment variables
-- if test "${save_LC_ALL+set}" = set; then
-- LC_ALL="$save_LC_ALL"; export LC_ALL
-- fi
-- if test "${save_LANG+set}" = set; then
-- LANG="$save_LANG"; export LANG
-- fi
-+ for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-+ do
-+ eval "if test \"\${save_$lt_var+set}\" = set; then
-+ $lt_var=\$save_$lt_var; export $lt_var
-+ fi"
-+ done
-
- # Now prepare to actually exec the command.
- exec_cmd="\$cmd$args"
-@@ -6783,9 +6848,9 @@
- -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
- -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
- -export-symbols SYMFILE
-- try to export only the symbols listed in SYMFILE
-+ try to export only the symbols listed in SYMFILE
- -export-symbols-regex REGEX
-- try to export only the symbols matching REGEX
-+ try to export only the symbols matching REGEX
- -LLIBDIR search LIBDIR for required installed libraries
- -lNAME OUTPUT-FILE requires the installed library libNAME
- -module build a library that can dlopened
-@@ -6799,9 +6864,11 @@
- -release RELEASE specify package release information
- -rpath LIBDIR the created library will eventually be installed in LIBDIR
- -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
-- -static do not do any dynamic linking of libtool libraries
-+ -static do not do any dynamic linking of uninstalled libtool libraries
-+ -static-libtool-libs
-+ do not do any dynamic linking of libtool libraries
- -version-info CURRENT[:REVISION[:AGE]]
-- specify library version info [each variable defaults to 0]
-+ specify library version info [each variable defaults to 0]
-
- All other options (arguments beginning with \`-') are ignored.
-
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.20.2.old/Makefile.in epiphany-browser-2.20.2/Makefile.in
---- epiphany-browser-2.20.2.old/Makefile.in 2007-11-27 00:37:43.000000000 +0100
-+++ epiphany-browser-2.20.2/Makefile.in 2007-12-01 17:49:06.000000000 +0100
-@@ -216,6 +216,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.20.2.old/plugins/desktop-file/Makefile.in epiphany-browser-2.20.2/plugins/desktop-file/Makefile.in
---- epiphany-browser-2.20.2.old/plugins/desktop-file/Makefile.in 2007-12-01 17:47:23.000000000 +0100
-+++ epiphany-browser-2.20.2/plugins/desktop-file/Makefile.in 2007-12-01 17:49:05.000000000 +0100
-@@ -223,6 +223,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.20.2.old/plugins/Makefile.in epiphany-browser-2.20.2/plugins/Makefile.in
---- epiphany-browser-2.20.2.old/plugins/Makefile.in 2007-11-27 00:37:41.000000000 +0100
-+++ epiphany-browser-2.20.2/plugins/Makefile.in 2007-12-01 17:49:05.000000000 +0100
-@@ -201,6 +201,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.20.2.old/src/bookmarks/Makefile.in epiphany-browser-2.20.2/src/bookmarks/Makefile.in
---- epiphany-browser-2.20.2.old/src/bookmarks/Makefile.in 2007-11-27 00:37:43.000000000 +0100
-+++ epiphany-browser-2.20.2/src/bookmarks/Makefile.in 2007-12-01 17:49:06.000000000 +0100
-@@ -247,6 +247,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.20.2.old/src/Makefile.in epiphany-browser-2.20.2/src/Makefile.in
---- epiphany-browser-2.20.2.old/src/Makefile.in 2007-12-01 17:47:23.000000000 +0100
-+++ epiphany-browser-2.20.2/src/Makefile.in 2007-12-01 17:49:06.000000000 +0100
-@@ -393,6 +393,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
+-VERSION="1.5.24 Debian 1.5.24-1"
++VERSION="1.5.24 Debian 1.5.24-2"
+ TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
+
+ # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
More information about the pkg-gnome-commits
mailing list