r14918 - in /desktop/experimental/epiphany-browser/debian: changelog control control.in patches/02_ac_init.patch patches/05_libexecdir.patch patches/09_download_dialog.patch patches/10_url_double-click.patch patches/99_autoreconf.patch rules
samm-guest at users.alioth.debian.org
samm-guest at users.alioth.debian.org
Mon Mar 10 23:54:53 UTC 2008
Author: samm-guest
Date: Mon Mar 10 23:54:53 2008
New Revision: 14918
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14918
Log:
* New upstream release.
* Build-depend on libglib2.0-dev 2.15.6.
* Build-depend on lsb-release for distributor name.
* Refresh 02_ac_init.patch, 10_url_double-click.patch, 05_libexecdir.patch,
09_download_dialog.patch and 99_autoreconf.patch.
* Disable building epiphany-webkit until libwebkitgtk-dev is updated.
Modified:
desktop/experimental/epiphany-browser/debian/changelog
desktop/experimental/epiphany-browser/debian/control
desktop/experimental/epiphany-browser/debian/control.in
desktop/experimental/epiphany-browser/debian/patches/02_ac_init.patch
desktop/experimental/epiphany-browser/debian/patches/05_libexecdir.patch
desktop/experimental/epiphany-browser/debian/patches/09_download_dialog.patch
desktop/experimental/epiphany-browser/debian/patches/10_url_double-click.patch
desktop/experimental/epiphany-browser/debian/patches/99_autoreconf.patch
desktop/experimental/epiphany-browser/debian/rules
Modified: desktop/experimental/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/changelog?rev=14918&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/changelog (original)
+++ desktop/experimental/epiphany-browser/debian/changelog Mon Mar 10 23:54:53 2008
@@ -1,3 +1,14 @@
+epiphany-browser (2.22.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * Build-depend on libglib2.0-dev 2.15.6.
+ * Build-depend on lsb-release for distributor name.
+ * Refresh 02_ac_init.patch, 10_url_double-click.patch, 05_libexecdir.patch,
+ 09_download_dialog.patch and 99_autoreconf.patch.
+ * Disable building epiphany-webkit until libwebkitgtk-dev is updated.
+
+ -- Sam Morris <sam at robots.org.uk> Mon, 25 Feb 2008 22:30:44 +0000
+
epiphany-browser (2.21.90-2) UNRELEASED; urgency=low
* Fix installation of manual pages in the alternatives.
Modified: desktop/experimental/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control?rev=14918&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control (original)
+++ desktop/experimental/epiphany-browser/debian/control Mon Mar 10 23:54:53 2008
@@ -5,7 +5,7 @@
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.15.2),
+ libglib2.0-dev (>= 2.15.6),
libgtk2.0-dev (>= 2.12.0),
libxml2-dev (>= 2.6.12),
libxslt1-dev (>= 1.1.7),
@@ -33,7 +33,8 @@
libenchant-dev (>= 1.0),
libavahi-gobject-dev (>= 0.6.22),
libwebkitgtk-dev (>= 0~svn29752),
- gtk-doc-tools (>= 1.0)
+ gtk-doc-tools (>= 1.0),
+ lsb-release
Standards-Version: 3.7.3
Package: epiphany-browser
@@ -74,33 +75,33 @@
This version uses the Gecko backend to render web pages.
Homepage: http://www.gnome.org/projects/epiphany/
-Package: epiphany-webkit
-Architecture: any
-Depends: epiphany-browser-data (>= ${gnome:Version}),
- epiphany-browser-data (<< ${gnome:NextVersion}),
- ${shlibs:Depends},
- gnome-icon-theme (>= 2.9.90),
- dbus,
- iso-codes,
- ${misc:Depends}
-Conflicts: epiphany-browser (<< 2.20)
-Recommends: yelp
-Suggests: mozplugger
-Provides: www-browser, gnome-www-browser
-Description: Intuitive GNOME web browser - webkit version
- Epiphany is a simple yet powerful GNOME web browser targeted at
- non-technical users. Its principles are simplicity and standards
- compliance. Simplicity is achieved by a well designed user interface and
- reliance on external applications for performing external tasks (such as
- reading email). Simplicity should not mean less powerful. Standards
- compliance is achieved on the HTML side by using the Gecko
- rendering engine, as developed for the Mozilla and Iceweasel browsers; and
- on the user interface side by closely following the GNOME Human Interface
- 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/
-
+#Package: epiphany-webkit
+#Architecture: any
+#Depends: epiphany-browser-data (>= ${gnome:Version}),
+# epiphany-browser-data (<< ${gnome:NextVersion}),
+# ${shlibs:Depends},
+# gnome-icon-theme (>= 2.9.90),
+# dbus,
+# iso-codes,
+# ${misc:Depends}
+#Conflicts: epiphany-browser (<< 2.20)
+#Recommends: yelp
+#Suggests: mozplugger
+#Provides: www-browser, gnome-www-browser
+#Description: Intuitive GNOME web browser - webkit version
+# Epiphany is a simple yet powerful GNOME web browser targeted at
+# non-technical users. Its principles are simplicity and standards
+# compliance. Simplicity is achieved by a well designed user interface and
+# reliance on external applications for performing external tasks (such as
+# reading email). Simplicity should not mean less powerful. Standards
+# compliance is achieved on the HTML side by using the Gecko
+# rendering engine, as developed for the Mozilla and Iceweasel browsers; and
+# on the user interface side by closely following the GNOME Human Interface
+# 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/
+#
Package: epiphany-browser-data
Architecture: all
Depends: ${misc:Depends}
Modified: desktop/experimental/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control.in?rev=14918&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control.in (original)
+++ desktop/experimental/epiphany-browser/debian/control.in Mon Mar 10 23:54:53 2008
@@ -5,7 +5,7 @@
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>= 5),
pkg-config,
- libglib2.0-dev (>= 2.15.2),
+ libglib2.0-dev (>= 2.15.6),
libgtk2.0-dev (>= 2.12.0),
libxml2-dev (>= 2.6.12),
libxslt1-dev (>= 1.1.7),
@@ -33,7 +33,8 @@
libenchant-dev (>= 1.0),
libavahi-gobject-dev (>= 0.6.22),
libwebkitgtk-dev (>= 0~svn29752),
- gtk-doc-tools (>= 1.0)
+ gtk-doc-tools (>= 1.0),
+ lsb-release
Standards-Version: 3.7.3
Package: epiphany-browser
@@ -74,33 +75,33 @@
This version uses the Gecko backend to render web pages.
Homepage: http://www.gnome.org/projects/epiphany/
-Package: epiphany-webkit
-Architecture: any
-Depends: epiphany-browser-data (>= ${gnome:Version}),
- epiphany-browser-data (<< ${gnome:NextVersion}),
- ${shlibs:Depends},
- gnome-icon-theme (>= 2.9.90),
- dbus,
- iso-codes,
- ${misc:Depends}
-Conflicts: epiphany-browser (<< 2.20)
-Recommends: yelp
-Suggests: mozplugger
-Provides: www-browser, gnome-www-browser
-Description: Intuitive GNOME web browser - webkit version
- Epiphany is a simple yet powerful GNOME web browser targeted at
- non-technical users. Its principles are simplicity and standards
- compliance. Simplicity is achieved by a well designed user interface and
- reliance on external applications for performing external tasks (such as
- reading email). Simplicity should not mean less powerful. Standards
- compliance is achieved on the HTML side by using the Gecko
- rendering engine, as developed for the Mozilla and Iceweasel browsers; and
- on the user interface side by closely following the GNOME Human Interface
- 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/
-
+#Package: epiphany-webkit
+#Architecture: any
+#Depends: epiphany-browser-data (>= ${gnome:Version}),
+# epiphany-browser-data (<< ${gnome:NextVersion}),
+# ${shlibs:Depends},
+# gnome-icon-theme (>= 2.9.90),
+# dbus,
+# iso-codes,
+# ${misc:Depends}
+#Conflicts: epiphany-browser (<< 2.20)
+#Recommends: yelp
+#Suggests: mozplugger
+#Provides: www-browser, gnome-www-browser
+#Description: Intuitive GNOME web browser - webkit version
+# Epiphany is a simple yet powerful GNOME web browser targeted at
+# non-technical users. Its principles are simplicity and standards
+# compliance. Simplicity is achieved by a well designed user interface and
+# reliance on external applications for performing external tasks (such as
+# reading email). Simplicity should not mean less powerful. Standards
+# compliance is achieved on the HTML side by using the Gecko
+# rendering engine, as developed for the Mozilla and Iceweasel browsers; and
+# on the user interface side by closely following the GNOME Human Interface
+# 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/
+#
Package: epiphany-browser-data
Architecture: all
Depends: ${misc:Depends}
Modified: desktop/experimental/epiphany-browser/debian/patches/02_ac_init.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/02_ac_init.patch?rev=14918&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/02_ac_init.patch (original)
+++ desktop/experimental/epiphany-browser/debian/patches/02_ac_init.patch Mon Mar 10 23:54:53 2008
@@ -1,10 +1,10 @@
-Index: epiphany-2.21.90/configure.ac
+Index: epiphany-browser-2.22.0/configure.ac
===================================================================
---- epiphany-2.21.90.orig/configure.ac 2008-01-28 18:40:32.000000000 +0100
-+++ epiphany-2.21.90/configure.ac 2008-02-18 20:50:32.088885831 +0100
-@@ -23,7 +23,7 @@ m4_define([epiphany_version],[epiphany_v
+--- epiphany-browser-2.22.0.orig/configure.ac 2008-03-09 20:57:29.000000000 +0000
++++ epiphany-browser-2.22.0/configure.ac 2008-03-10 22:16:48.000000000 +0000
+@@ -23,7 +23,7 @@
# This can be either "trunk" or "branches/gnome-x-y"
- m4_define([epiphany_branch],["trunk"])
+ m4_define([epiphany_branch],["branches/gnome-2-22"])
-AC_INIT([GNOME Web Browser],[epiphany_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
+AC_INIT([GNOME Web Browser],[epiphany_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany-browser])
Modified: desktop/experimental/epiphany-browser/debian/patches/05_libexecdir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/05_libexecdir.patch?rev=14918&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/05_libexecdir.patch (original)
+++ desktop/experimental/epiphany-browser/debian/patches/05_libexecdir.patch Mon Mar 10 23:54:53 2008
@@ -1,8 +1,8 @@
-Index: epiphany-2.21.90/data/epiphany.pc.in
+Index: epiphany-browser-2.22.0/data/epiphany.pc.in
===================================================================
---- epiphany-2.21.90.orig/data/epiphany.pc.in 2007-11-05 00:44:58.000000000 +0100
-+++ epiphany-2.21.90/data/epiphany.pc.in 2008-02-18 20:50:54.264884396 +0100
-@@ -2,8 +2,8 @@ prefix=@prefix@
+--- epiphany-browser-2.22.0.orig/data/epiphany.pc.in 2008-03-09 20:56:33.000000000 +0000
++++ epiphany-browser-2.22.0/data/epiphany.pc.in 2008-03-10 22:27:43.000000000 +0000
+@@ -2,8 +2,8 @@
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.21.90/embed/mozilla/Makefile.am
+Index: epiphany-browser-2.22.0/embed/mozilla/Makefile.am
===================================================================
---- epiphany-2.21.90.orig/embed/mozilla/Makefile.am 2007-12-30 00:48:32.000000000 +0100
-+++ epiphany-2.21.90/embed/mozilla/Makefile.am 2008-02-18 20:50:54.264884396 +0100
-@@ -149,7 +149,7 @@ libephymozillaembed_la_CPPFLAGS = \
+--- epiphany-browser-2.22.0.orig/embed/mozilla/Makefile.am 2008-03-09 20:56:47.000000000 +0000
++++ epiphany-browser-2.22.0/embed/mozilla/Makefile.am 2008-03-10 22:27:43.000000000 +0000
+@@ -145,7 +145,7 @@
-I$(top_srcdir) \
$(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) \
-DSHARE_DIR=\"$(pkgdatadir)\" \
@@ -26,24 +26,11 @@
-DMOZILLA_HOME=\"$(GECKO_HOME)\" \
-DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \
-DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \
-Index: epiphany-2.21.90/embed/mozilla/Makefile.in
+Index: epiphany-browser-2.22.0/lib/Makefile.am
===================================================================
---- epiphany-2.21.90.orig/embed/mozilla/Makefile.in 2008-01-28 18:40:58.000000000 +0100
-+++ epiphany-2.21.90/embed/mozilla/Makefile.in 2008-02-18 20:50:54.264884396 +0100
-@@ -498,7 +498,7 @@ libephymozillaembed_la_CPPFLAGS = \
- -I$(top_srcdir) \
- $(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) \
- -DSHARE_DIR=\"$(pkgdatadir)\" \
-- -DPLUGINDIR=\"$(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins\" \
-+ -DPLUGINDIR=\"$(libexecdir)/$(EPIPHANY_MAJOR)/plugins\" \
- -DMOZILLA_HOME=\"$(GECKO_HOME)\" \
- -DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \
- -DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \
-Index: epiphany-2.21.90/lib/Makefile.am
-===================================================================
---- epiphany-2.21.90.orig/lib/Makefile.am 2008-01-24 16:33:00.000000000 +0100
-+++ epiphany-2.21.90/lib/Makefile.am 2008-02-18 20:50:54.264884396 +0100
-@@ -80,7 +80,7 @@ libephymisc_la_CPPFLAGS = \
+--- epiphany-browser-2.22.0.orig/lib/Makefile.am 2008-03-09 20:56:30.000000000 +0000
++++ epiphany-browser-2.22.0/lib/Makefile.am 2008-03-10 22:27:43.000000000 +0000
+@@ -80,7 +80,7 @@
-I$(top_builddir)/lib/egg \
-I$(top_srcdir)/lib/egg \
-DSHARE_DIR=\"$(pkgdatadir)\" \
@@ -52,47 +39,21 @@
$(AM_CPPFLAGS)
libephymisc_la_CFLAGS = \
-Index: epiphany-2.21.90/lib/Makefile.in
+Index: epiphany-browser-2.22.0/plugins/desktop-file/Makefile.am
===================================================================
---- epiphany-2.21.90.orig/lib/Makefile.in 2008-01-28 18:41:01.000000000 +0100
-+++ epiphany-2.21.90/lib/Makefile.in 2008-02-18 20:50:54.264884396 +0100
-@@ -442,7 +442,7 @@ libephymisc_la_CPPFLAGS = \
- -I$(top_builddir)/lib/egg \
- -I$(top_srcdir)/lib/egg \
- -DSHARE_DIR=\"$(pkgdatadir)\" \
-- -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \
-+ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \
- $(AM_CPPFLAGS)
-
- libephymisc_la_CFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CFLAGS) \
-Index: epiphany-2.21.90/plugins/desktop-file/Makefile.am
-===================================================================
---- epiphany-2.21.90.orig/plugins/desktop-file/Makefile.am 2007-07-16 22:02:37.000000000 +0200
-+++ epiphany-2.21.90/plugins/desktop-file/Makefile.am 2008-02-18 20:50:54.264884396 +0100
+--- epiphany-browser-2.22.0.orig/plugins/desktop-file/Makefile.am 2008-03-09 20:55:37.000000000 +0000
++++ epiphany-browser-2.22.0/plugins/desktop-file/Makefile.am 2008-03-10 22:27:43.000000000 +0000
@@ -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.21.90/plugins/desktop-file/Makefile.in
+Index: epiphany-browser-2.22.0/src/Makefile.am
===================================================================
---- epiphany-2.21.90.orig/plugins/desktop-file/Makefile.in 2008-01-28 18:41:02.000000000 +0100
-+++ epiphany-2.21.90/plugins/desktop-file/Makefile.in 2008-02-18 20:50:54.268884295 +0100
-@@ -322,7 +322,7 @@ target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- with_engine = @with_engine@
--plugindir = $(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins
-+plugindir = $(libexecdir)/$(EPIPHANY_MAJOR)/plugins
- plugin_LTLIBRARIES = libdesktopfileplugin.la
- libdesktopfileplugin_la_SOURCES = \
- plugin.cpp
-Index: epiphany-2.21.90/src/Makefile.am
-===================================================================
---- epiphany-2.21.90.orig/src/Makefile.am 2007-11-16 16:09:42.000000000 +0100
-+++ epiphany-2.21.90/src/Makefile.am 2008-02-18 20:50:54.268884295 +0100
-@@ -113,8 +113,8 @@ libephymain_la_CPPFLAGS = \
+--- epiphany-browser-2.22.0.orig/src/Makefile.am 2008-03-09 20:55:56.000000000 +0000
++++ epiphany-browser-2.22.0/src/Makefile.am 2008-03-10 22:27:43.000000000 +0000
+@@ -106,8 +106,8 @@
-I$(top_srcdir)/lib/egg \
-I$(top_srcdir)/lib/widgets \
-I$(top_srcdir)/src/bookmarks \
@@ -103,7 +64,7 @@
-DDATADIR=\""$(pkgdatadir)"\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
$(AM_CPPFLAGS)
-@@ -165,8 +165,8 @@ libpyphany_la_CPPFLAGS = \
+@@ -158,8 +158,8 @@
-I$(top_builddir)/src \
-I$(top_builddir)/src/bookmarks \
$(PYTHON_INCLUDES) \
@@ -114,29 +75,3 @@
-DDATADIR=\""$(datadir)"\" \
$(AM_CPPFLAGS)
-Index: epiphany-2.21.90/src/Makefile.in
-===================================================================
---- epiphany-2.21.90.orig/src/Makefile.in 2008-01-28 18:41:02.000000000 +0100
-+++ epiphany-2.21.90/src/Makefile.in 2008-02-18 20:50:54.268884295 +0100
-@@ -557,8 +557,8 @@ libephymain_la_CPPFLAGS = \
- -I$(top_srcdir)/lib/egg \
- -I$(top_srcdir)/lib/widgets \
- -I$(top_srcdir)/src/bookmarks \
-- -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \
-- -DLOADER_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/loaders"\" \
-+ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \
-+ -DLOADER_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/loaders"\" \
- -DDATADIR=\""$(pkgdatadir)"\" \
- -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
- $(AM_CPPFLAGS)
-@@ -596,8 +596,8 @@ libephymain_la_CFLAGS = \
- @ENABLE_PYTHON_TRUE@ -I$(top_builddir)/src \
- @ENABLE_PYTHON_TRUE@ -I$(top_builddir)/src/bookmarks \
- @ENABLE_PYTHON_TRUE@ $(PYTHON_INCLUDES) \
-- at ENABLE_PYTHON_TRUE@ -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \
-- at ENABLE_PYTHON_TRUE@ -DLOADER_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/loaders"\" \
-+ at ENABLE_PYTHON_TRUE@ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \
-+ at ENABLE_PYTHON_TRUE@ -DLOADER_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/loaders"\" \
- @ENABLE_PYTHON_TRUE@ -DDATADIR=\""$(datadir)"\" \
- @ENABLE_PYTHON_TRUE@ $(AM_CPPFLAGS)
-
Modified: desktop/experimental/epiphany-browser/debian/patches/09_download_dialog.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/09_download_dialog.patch?rev=14918&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/09_download_dialog.patch (original)
+++ desktop/experimental/epiphany-browser/debian/patches/09_download_dialog.patch Mon Mar 10 23:54:53 2008
@@ -1,8 +1,8 @@
Index: embed/mozilla/ContentHandler.cpp
===================================================================
---- embed/mozilla/ContentHandler.cpp.orig 2008-01-14 23:51:08.000000000 +0100
-+++ embed/mozilla/ContentHandler.cpp 2008-02-18 20:51:42.960884593 +0100
-@@ -337,8 +337,11 @@ NS_METHOD GContentHandler::MIMEConfirmAc
+--- embed/mozilla/ContentHandler.cpp.orig 2008-03-01 10:48:28.000000000 +0000
++++ embed/mozilla/ContentHandler.cpp 2008-03-01 10:48:46.000000000 +0000
+@@ -333,8 +333,11 @@
gtk_dialog_add_button (GTK_DIALOG (dialog),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
@@ -16,7 +16,7 @@
gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY);
-@@ -386,20 +389,16 @@ NS_METHOD GContentHandler::MIMEInitiateA
+@@ -382,20 +385,16 @@
}
if (auto_downloads)
@@ -45,8 +45,8 @@
}
Index: data/glade/prefs-dialog.glade
===================================================================
---- data/glade/prefs-dialog.glade.orig 2007-11-12 11:48:23.000000000 +0100
-+++ data/glade/prefs-dialog.glade 2008-02-18 20:51:42.960884593 +0100
+--- data/glade/prefs-dialog.glade.orig 2008-03-01 10:48:28.000000000 +0000
++++ data/glade/prefs-dialog.glade 2008-03-01 10:48:46.000000000 +0000
@@ -303,6 +303,25 @@
<property name="spacing">6</property>
@@ -101,9 +101,9 @@
</widget>
Index: src/prefs-dialog.c
===================================================================
---- src/prefs-dialog.c.orig 2008-01-14 23:51:06.000000000 +0100
-+++ src/prefs-dialog.c 2008-02-18 20:51:42.960884593 +0100
-@@ -392,6 +392,13 @@ prefs_dialog_show_help (EphyDialog *dial
+--- src/prefs-dialog.c.orig 2008-03-01 10:48:28.000000000 +0000
++++ src/prefs-dialog.c 2008-03-01 10:48:46.000000000 +0000
+@@ -362,6 +362,13 @@
}
static void
@@ -117,7 +117,7 @@
setup_font_combo (EphyDialog *dialog,
const char *type,
const char *code,
-@@ -1521,6 +1528,7 @@ prefs_dialog_init (PrefsDialog *pd)
+@@ -1491,6 +1498,7 @@
EphyDialog *dialog = EPHY_DIALOG (pd);
EphyEncodings *encodings;
GtkWidget *window, *curr_button, *blank_button;
@@ -125,7 +125,7 @@
GtkWidget *clear_cache_button, *font_prefs_button;
GtkWidget *css_checkbox, *css_edit_box, *css_edit_button, *css_container;
gboolean sensitive;
-@@ -1541,6 +1549,8 @@ prefs_dialog_init (PrefsDialog *pd)
+@@ -1511,6 +1519,8 @@
properties[WINDOW_PROP].id, &window,
properties[HOMEPAGE_CURRENT_PROP].id, &curr_button,
properties[HOMEPAGE_BLANK_PROP].id, &blank_button,
@@ -134,7 +134,7 @@
properties[FONT_PREFS_BUTTON_PROP].id, &font_prefs_button,
properties[CSS_CHECKBOX_PROP].id, &css_checkbox,
properties[CSS_EDIT_BOX_PROP].id, &css_edit_box,
-@@ -1564,6 +1574,10 @@ prefs_dialog_init (PrefsDialog *pd)
+@@ -1534,6 +1544,10 @@
gtk_widget_set_sensitive (curr_button, sensitive);
gtk_widget_set_sensitive (blank_button, sensitive);
Modified: desktop/experimental/epiphany-browser/debian/patches/10_url_double-click.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/10_url_double-click.patch?rev=14918&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/10_url_double-click.patch (original)
+++ desktop/experimental/epiphany-browser/debian/patches/10_url_double-click.patch Mon Mar 10 23:54:53 2008
@@ -1,8 +1,8 @@
-Index: epiphany-2.21.90/lib/widgets/ephy-location-entry.c
+Index: epiphany-browser-2.21.92/lib/widgets/ephy-location-entry.c
===================================================================
---- epiphany-2.21.90.orig/lib/widgets/ephy-location-entry.c 2007-12-30 00:48:31.000000000 +0100
-+++ epiphany-2.21.90/lib/widgets/ephy-location-entry.c 2008-02-18 20:51:53.032885539 +0100
-@@ -351,18 +351,6 @@ editable_changed_cb (GtkEditable *editab
+--- epiphany-browser-2.21.92.orig/lib/widgets/ephy-location-entry.c 2008-03-01 10:48:28.000000000 +0000
++++ epiphany-browser-2.21.92/lib/widgets/ephy-location-entry.c 2008-03-01 10:48:50.000000000 +0000
+@@ -362,18 +362,6 @@
}
static gboolean
@@ -21,7 +21,7 @@
entry_key_press_cb (GtkEntry *entry,
GdkEventKey *event,
EphyLocationEntry *lentry)
-@@ -839,8 +827,6 @@ ephy_location_entry_construct_contents (
+@@ -900,8 +888,6 @@
G_CALLBACK (entry_key_press_after_cb), entry);
g_signal_connect_after (priv->icon_entry->entry, "activate",
G_CALLBACK (entry_activate_after_cb), entry);
Modified: desktop/experimental/epiphany-browser/debian/patches/99_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/99_autoreconf.patch?rev=14918&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/99_autoreconf.patch (original)
+++ desktop/experimental/epiphany-browser/debian/patches/99_autoreconf.patch Mon Mar 10 23:54:53 2008
@@ -2,659 +2,31 @@
aclocal-1.10 -I m4
automake-1.10
autoconf
-Index: epiphany-2.21.90/aclocal.m4
-===================================================================
---- epiphany-2.21.90.orig/aclocal.m4 2008-01-28 18:40:51.000000000 +0100
-+++ epiphany-2.21.90/aclocal.m4 2008-02-18 20:53:08.888884126 +0100
-@@ -1,7 +1,7 @@
--# generated automatically by aclocal 1.10 -*- Autoconf -*-
-+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005, 2006 Free Software Foundation, Inc.
-+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -11,10 +11,13 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
-
--m4_if(m4_PACKAGE_VERSION, [2.61],,
--[m4_fatal([this file was generated for autoconf 2.61.
--You have another version of autoconf. If you want to use that,
--you should regenerate the build system entirely.], [63])])
-+m4_ifndef([AC_AUTOCONF_VERSION],
-+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+m4_if(AC_AUTOCONF_VERSION, [2.61],,
-+[m4_warning([this file was generated for autoconf 2.61.
-+You have another version of autoconf. It may work, but is not guaranteed to.
-+If you have problems, you may need to regenerate the build system entirely.
-+To do so, use the procedure documented by the package, typically `autoreconf'.])])
-
- dnl AM_GCONF_SOURCE_2
- dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
-@@ -159,8 +162,7 @@ AC_SUBST($1)dnl
- #-----------------
- glib_DEFUN([GLIB_WITH_NLS],
- dnl NLS is obligatory
-- [AC_REQUIRE([AC_CANONICAL_HOST])dnl
-- USE_NLS=yes
-+ [USE_NLS=yes
- AC_SUBST(USE_NLS)
-
- gt_cv_have_gettext=no
-@@ -682,7 +684,7 @@ AC_DEFUN([GNOME_CXX_WARNINGS],[
+diff -ruN epiphany-browser-2.22.0.orig/aclocal.m4 epiphany-browser-2.22.0/aclocal.m4
+--- epiphany-browser-2.22.0.orig/aclocal.m4 2008-03-10 22:36:55.000000000 +0000
++++ epiphany-browser-2.22.0/aclocal.m4 2008-03-10 22:37:26.000000000 +0000
+@@ -684,7 +684,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
--# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL
+-# serial 52 Debian 1.5.26-1ubuntu1 AC_PROG_LIBTOOL
+# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -770,7 +772,6 @@ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
- AC_REQUIRE([AC_OBJEXT])dnl
- AC_REQUIRE([AC_EXEEXT])dnl
- dnl
--
- AC_LIBTOOL_SYS_MAX_CMD_LEN
- AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
- AC_LIBTOOL_OBJDIR
-@@ -872,6 +873,8 @@ file_magic*)
- ;;
- esac
-
-+_LT_REQUIRED_DARWIN_CHECKS
-+
- AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
- AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
- enable_win32_dll=yes, enable_win32_dll=no)
-@@ -951,9 +954,80 @@ 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*
-+$rm -r conftest*
- ])# _LT_LINKER_BOILERPLATE
-
-+# _LT_REQUIRED_DARWIN_CHECKS
-+# --------------------------
-+# Check for some things on darwin
-+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
-+ case $host_os in
-+ rhapsody* | darwin*)
-+ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-+ AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-+
-+ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-+ [lt_cv_apple_cc_single_mod=no
-+ if test -z "${LT_MULTI_MODULE}"; then
-+ # By default we will add the -single_module flag. You can override
-+ # by either setting the environment variable LT_MULTI_MODULE
-+ # non-empty at configure time, or by adding -multi_module to the
-+ # link flags.
-+ echo "int foo(void){return 1;}" > conftest.c
-+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-+ -dynamiclib ${wl}-single_module conftest.c
-+ if test -f libconftest.dylib; then
-+ lt_cv_apple_cc_single_mod=yes
-+ rm -rf libconftest.dylib*
-+ fi
-+ rm conftest.c
-+ fi])
-+ AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-+ [lt_cv_ld_exported_symbols_list],
-+ [lt_cv_ld_exported_symbols_list=no
-+ save_LDFLAGS=$LDFLAGS
-+ echo "_main" > conftest.sym
-+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-+ [lt_cv_ld_exported_symbols_list=yes],
-+ [lt_cv_ld_exported_symbols_list=no])
-+ LDFLAGS="$save_LDFLAGS"
-+ ])
-+ case $host_os in
-+ rhapsody* | darwin1.[[0123]])
-+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-+ darwin1.*)
-+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+ darwin*)
-+ # if running on 10.5 or later, the deployment target defaults
-+ # to the OS version, if on x86, and 10.4, the deployment
-+ # target defaults to 10.4. Don't you love it?
-+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+ 10.[[012]]*)
-+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+ 10.*)
-+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+ esac
-+ ;;
-+ esac
-+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-+ _lt_dar_single_mod='$single_module'
-+ fi
-+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-+ else
-+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
-+ fi
-+ if test "$DSYMUTIL" != ":"; then
-+ _lt_dsymutil="~$DSYMUTIL \$lib || :"
-+ else
-+ _lt_dsymutil=
-+ fi
-+ ;;
-+ esac
-+])
-
- # _LT_AC_SYS_LIBPATH_AIX
- # ----------------------
-@@ -1278,7 +1352,11 @@ sparc*-*solaris*)
- *64-bit*)
- case $lt_cv_prog_gnu_ld in
- yes*) LD="${LD-ld} -m elf64_sparc" ;;
-- *) LD="${LD-ld} -64" ;;
-+ *)
-+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-+ LD="${LD-ld} -64"
-+ fi
-+ ;;
- esac
- ;;
- esac
-@@ -1371,7 +1449,7 @@ AC_CACHE_CHECK([$1], [$2],
- $2=yes
- fi
- fi
-- $rm conftest*
-+ $rm -r conftest*
- LDFLAGS="$save_LDFLAGS"
- ])
-
-@@ -1642,7 +1720,7 @@ else
- AC_CHECK_FUNC([shl_load],
- [lt_cv_dlopen="shl_load"],
- [AC_CHECK_LIB([dld], [shl_load],
-- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
-+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
- [AC_CHECK_FUNC([dlopen],
- [lt_cv_dlopen="dlopen"],
- [AC_CHECK_LIB([dl], [dlopen],
-@@ -1650,7 +1728,7 @@ else
- [AC_CHECK_LIB([svld], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
- [AC_CHECK_LIB([dld], [dld_link],
-- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
-+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
- ])
- ])
- ])
-@@ -1967,7 +2045,7 @@ aix3*)
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
-
--aix4* | aix5*)
-+aix[[4-9]]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -2500,6 +2578,13 @@ esac
- AC_MSG_RESULT([$dynamic_linker])
- test "$dynamic_linker" = no && can_build_shared=no
-
-+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
-+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
-+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
-+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
-+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-+
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
- if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -2999,7 +3084,7 @@ lt_cv_deplibs_check_method='unknown'
- # whether `pass_all' will *always* work, you probably want this one.
-
- case $host_os in
--aix4* | aix5*)
-+aix[[4-9]]*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-@@ -3435,7 +3520,7 @@ aix3*)
- fi
- ;;
-
--aix4* | aix5*)
-+aix[[4-9]]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
- fi
-@@ -3492,6 +3577,7 @@ _LT_AC_TAGVAR(postdep_objects, $1)=
- _LT_AC_TAGVAR(predeps, $1)=
- _LT_AC_TAGVAR(postdeps, $1)=
- _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
-+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
-
- # Source file extension for C++ test sources.
- ac_ext=cpp
-@@ -3601,7 +3687,7 @@ case $host_os in
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-- aix4* | aix5*)
-+ aix[[4-9]]*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
-@@ -3614,7 +3700,7 @@ case $host_os in
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
-- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
- for ld_flag in $LDFLAGS; do
- case $ld_flag in
- *-brtl*)
-@@ -3760,51 +3846,23 @@ case $host_os in
- fi
- ;;
- darwin* | rhapsody*)
-- case $host_os in
-- rhapsody* | darwin1.[[012]])
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-- ;;
-- *) # Darwin 1.3 on
-- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-- else
-- case ${MACOSX_DEPLOYMENT_TARGET} in
-- 10.[[012]])
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-- ;;
-- 10.*)
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-- ;;
-- esac
-- fi
-- ;;
-- esac
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--
-- if test "$GXX" = yes ; then
-- lt_int_apple_cc_single_mod=no
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-+ if test "$GXX" = yes ; then
- output_verbose_link_cmd='echo'
-- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-- lt_int_apple_cc_single_mod=yes
-+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
- fi
-- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- else
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- fi
-- _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
-- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- else
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- fi
-- _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}'
- else
- case $cc_basename in
- xlc*)
-@@ -4055,7 +4113,7 @@ case $host_os in
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
- ;;
-- pgCC*)
-+ pgCC* | pgcpp*)
- # Portland Group C++ compiler
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-@@ -4490,7 +4548,8 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
- # compiler output when linking a shared library.
- # Parse the compiler output and extract the necessary
- # objects, libraries and library flags.
--AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
-+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
- dnl we can't use the lt_simple_compile_test_code here,
- dnl because it contains code intended for an executable,
- dnl not a library. It's possible we should let each
-@@ -4615,6 +4674,11 @@ fi
-
- $rm -f confest.$objext
-
-+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
-+if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
-+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-+fi
-+
- # PORTME: override above test on systems where it is broken
- ifelse([$1],[CXX],
- [case $host_os in
-@@ -4671,7 +4735,6 @@ solaris*)
- ;;
- esac
- ])
--
- case " $_LT_AC_TAGVAR(postdeps, $1) " in
- *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
- esac
-@@ -4756,7 +4819,7 @@ aix3*)
- postinstall_cmds='$RANLIB $lib'
- fi
- ;;
--aix4* | aix5*)
-+aix[[4-9]]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
- fi
-@@ -4933,6 +4996,7 @@ if test -f "$ltmain"; then
- _LT_AC_TAGVAR(predeps, $1) \
- _LT_AC_TAGVAR(postdeps, $1) \
- _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
-+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
- _LT_AC_TAGVAR(archive_cmds, $1) \
- _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
- _LT_AC_TAGVAR(postinstall_cmds, $1) \
-@@ -4995,7 +5059,7 @@ ifelse([$1], [],
- # 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, 2002, 2003, 2004, 2005, 2006, 2007
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
- # Free Software Foundation, Inc.
- #
- # This file is part of GNU Libtool:
-@@ -5232,6 +5296,10 @@ predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
- # shared library.
- postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
-
-+# The directories searched by this compiler when creating a shared
-+# library
-+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
-+
- # The library search path used internally by the compiler when linking
- # a shared library.
- compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-@@ -5581,7 +5649,7 @@ EOF
- echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
- cat conftest.$ac_ext >&5
- fi
-- rm -f conftest* conftst*
-+ rm -rf conftest* conftst*
-
- # Do not use the global_symbol_pipe unless it works.
- if test "$pipe_works" = yes; then
-@@ -5638,7 +5706,8 @@ AC_MSG_CHECKING([for $compiler option to
- # 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'
-+ m4_if([$1], [GCJ], [],
-+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
- ;;
- darwin* | rhapsody*)
- # PIC is the default on this platform
-@@ -5675,7 +5744,7 @@ AC_MSG_CHECKING([for $compiler option to
- esac
- else
- case $host_os in
-- aix4* | aix5*)
-+ aix[[4-9]]*)
- # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
-@@ -5771,7 +5840,7 @@ AC_MSG_CHECKING([for $compiler option to
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
- ;;
-- pgCC*)
-+ pgCC* | pgcpp*)
- # Portland Group C++ compiler.
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-@@ -5922,7 +5991,8 @@ AC_MSG_CHECKING([for $compiler option to
- # 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'
-+ m4_if([$1], [GCJ], [],
-+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
- ;;
-
- darwin* | rhapsody*)
-@@ -5992,7 +6062,8 @@ AC_MSG_CHECKING([for $compiler option to
- 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'
-+ m4_if([$1], [GCJ], [],
-+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
- ;;
-
- hpux9* | hpux10* | hpux11*)
-@@ -6129,7 +6200,7 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_co
- #
- if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
- AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
-- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
-+ _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
- [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
- [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
- "" | " "*) ;;
-@@ -6153,7 +6224,7 @@ esac
- #
- wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
- AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
-+ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
- $lt_tmp_static_flag,
- [],
- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-@@ -6169,7 +6240,7 @@ AC_MSG_CHECKING([whether the $compiler l
- 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
-- aix4* | aix5*)
-+ aix[[4-9]]*)
- # If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-@@ -6191,6 +6262,7 @@ ifelse([$1],[CXX],[
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
- esac
-+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
- ],[
- runpath_var=
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -6221,12 +6293,14 @@ ifelse([$1],[CXX],[
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
-- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
-+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
- # platforms (ab)use it in PIC code, but their linkers get confused if
- # the symbol is explicitly referenced. Since portable code cannot
- # rely on this symbol name, it's probably fine to never include it in
- # preloaded symbol tables.
-+ # Exclude shared library initialization/finalization symbols.
-+dnl Note also adjust exclude_expsyms for C++ above.
- extract_expsyms_cmds=
- # Just being paranoid about ensuring that cc_basename is set.
- _LT_CC_BASENAME([$compiler])
-@@ -6276,7 +6350,7 @@ ifelse([$1],[CXX],[
-
- # See if GNU ld supports shared libraries.
- case $host_os in
-- aix3* | aix4* | aix5*)
-+ aix[[3-9]]*)
- # On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -6496,7 +6570,7 @@ _LT_EOF
- fi
- ;;
-
-- aix4* | aix5*)
-+ aix[[4-9]]*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
-@@ -6516,7 +6590,7 @@ _LT_EOF
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
-- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
- for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
- aix_use_runtimelinking=yes
-@@ -6676,11 +6750,10 @@ _LT_EOF
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- if test "$GCC" = yes ; then
- output_verbose_link_cmd='echo'
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- _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 -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~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}'
-+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
- else
- case $cc_basename in
- xlc*)
-@@ -7419,7 +7492,7 @@ else
- fi[]dnl
- ])# PKG_CHECK_MODULES
-
--# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
-+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -7434,7 +7507,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
- [am__api_version='1.10'
- dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
- dnl require some minimum version. Point them to the right macro.
--m4_if([$1], [1.10], [],
-+m4_if([$1], [1.10.1], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
-
-@@ -7450,8 +7523,10 @@ m4_define([_AM_AUTOCONF_VERSION], [])
- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.10])dnl
--_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
-+[AM_AUTOMAKE_VERSION([1.10.1])dnl
-+m4_ifndef([AC_AUTOCONF_VERSION],
-+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
-
- # AM_AUX_DIR_EXPAND -*- Autoconf -*-
-
-@@ -7746,7 +7821,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
-- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
-+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
-@@ -7794,13 +7869,13 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
- # Do all the work for Automake. -*- Autoconf -*-
-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005, 2006 Free Software Foundation, Inc.
-+# 2005, 2006, 2008 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
--# serial 12
-+# serial 13
-
- # This macro actually does too much. Some checks are only needed if
- # your package does certain things. But this isn't really a big deal.
-@@ -7905,16 +7980,17 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC],
- # our stamp files there.
- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
- [# Compute $1's index in $config_headers.
-+_am_arg=$1
- _am_stamp_count=1
- for _am_header in $config_headers :; do
- case $_am_header in
-- $1 | $1:* )
-+ $_am_arg | $_am_arg:* )
- break ;;
- * )
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
- esac
- done
--echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-
- # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
- #
-@@ -8396,7 +8472,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
- # _AM_SUBST_NOTMAKE(VARIABLE)
- # ---------------------------
--# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
-+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
- # This macro is traced by Automake.
- AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-Index: epiphany-2.21.90/configure
-===================================================================
---- epiphany-2.21.90.orig/configure 2008-01-28 18:41:04.000000000 +0100
-+++ epiphany-2.21.90/configure 2008-02-18 20:53:19.236879248 +0100
-@@ -727,7 +727,7 @@ SHELL=${CONFIG_SHELL-/bin/sh}
+diff -ruN epiphany-browser-2.22.0.orig/configure epiphany-browser-2.22.0/configure
+--- epiphany-browser-2.22.0.orig/configure 2008-03-10 22:36:55.000000000 +0000
++++ epiphany-browser-2.22.0/configure 2008-03-10 22:37:38.000000000 +0000
+@@ -727,7 +727,7 @@
# Identity of this package.
PACKAGE_NAME='GNOME Web Browser'
-PACKAGE_TARNAME='epiphany'
+PACKAGE_TARNAME='epiphany-browser'
- PACKAGE_VERSION='2.21.90'
- PACKAGE_STRING='GNOME Web Browser 2.21.90'
+ PACKAGE_VERSION='2.22.0'
+ PACKAGE_STRING='GNOME Web Browser 2.22.0'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany'
-@@ -867,6 +867,8 @@ LN_S
- ECHO
- AR
- RANLIB
-+DSYMUTIL
-+NMEDIT
- CPP
- CXX
- CXXFLAGS
-@@ -1653,7 +1655,7 @@ Fine tuning of the installation director
+@@ -1635,7 +1635,7 @@
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
@@ -663,1986 +35,85 @@
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
-@@ -2600,7 +2602,7 @@ fi
+@@ -2573,7 +2573,7 @@
# Define the identity of the package.
- PACKAGE='epiphany'
+ PACKAGE='epiphany-browser'
- VERSION='2.21.90'
+ VERSION='2.22.0'
-@@ -4536,7 +4538,7 @@ lt_cv_deplibs_check_method='unknown'
- # whether `pass_all' will *always* work, you probably want this one.
+diff -ruN epiphany-browser-2.22.0.orig/embed/mozilla/Makefile.in epiphany-browser-2.22.0/embed/mozilla/Makefile.in
+--- epiphany-browser-2.22.0.orig/embed/mozilla/Makefile.in 2008-03-10 22:36:55.000000000 +0000
++++ epiphany-browser-2.22.0/embed/mozilla/Makefile.in 2008-03-10 22:37:33.000000000 +0000
+@@ -487,7 +487,7 @@
+ -I$(top_srcdir) \
+ $(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) \
+ -DSHARE_DIR=\"$(pkgdatadir)\" \
+- -DPLUGINDIR=\"$(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins\" \
++ -DPLUGINDIR=\"$(libexecdir)/$(EPIPHANY_MAJOR)/plugins\" \
+ -DMOZILLA_HOME=\"$(GECKO_HOME)\" \
+ -DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \
+ -DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \
+diff -ruN epiphany-browser-2.22.0.orig/lib/Makefile.in epiphany-browser-2.22.0/lib/Makefile.in
+--- epiphany-browser-2.22.0.orig/lib/Makefile.in 2008-03-10 22:36:55.000000000 +0000
++++ epiphany-browser-2.22.0/lib/Makefile.in 2008-03-10 22:37:34.000000000 +0000
+@@ -436,7 +436,7 @@
+ -I$(top_builddir)/lib/egg \
+ -I$(top_srcdir)/lib/egg \
+ -DSHARE_DIR=\"$(pkgdatadir)\" \
+- -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \
++ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \
+ $(AM_CPPFLAGS)
- case $host_os in
--aix4* | aix5*)
-+aix[4-9]*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-@@ -4752,7 +4754,7 @@ ia64-*-hpux*)
- ;;
- *-*-irix6*)
- # Find out which ABI we are using.
-- echo '#line 4755 "configure"' > conftest.$ac_ext
-+ echo '#line 4757 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-@@ -4924,7 +4926,11 @@ sparc*-*solaris*)
- *64-bit*)
- case $lt_cv_prog_gnu_ld in
- yes*) LD="${LD-ld} -m elf64_sparc" ;;
-- *) LD="${LD-ld} -64" ;;
-+ *)
-+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-+ LD="${LD-ld} -64"
-+ fi
-+ ;;
- esac
- ;;
- esac
-@@ -6526,7 +6532,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
- # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
--
- # find the maximum length of command line arguments
- { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
- echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
-@@ -6841,7 +6846,7 @@ EOF
- echo "$progname: failed program was:" >&5
- cat conftest.$ac_ext >&5
- fi
-- rm -f conftest* conftst*
-+ rm -rf conftest* conftst*
-
- # Do not use the global_symbol_pipe unless it works.
- if test "$pipe_works" = yes; then
-@@ -7401,6 +7406,318 @@ fi
- ;;
- esac
-
-+
-+ case $host_os in
-+ rhapsody* | darwin*)
-+ if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$DSYMUTIL"; then
-+ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+DSYMUTIL=$ac_cv_prog_DSYMUTIL
-+if test -n "$DSYMUTIL"; then
-+ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
-+echo "${ECHO_T}$DSYMUTIL" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_DSYMUTIL"; then
-+ ac_ct_DSYMUTIL=$DSYMUTIL
-+ # Extract the first word of "dsymutil", so it can be a program name with args.
-+set dummy dsymutil; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$ac_ct_DSYMUTIL"; then
-+ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-+if test -n "$ac_ct_DSYMUTIL"; then
-+ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
-+echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+ if test "x$ac_ct_DSYMUTIL" = x; then
-+ DSYMUTIL=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ DSYMUTIL=$ac_ct_DSYMUTIL
-+ fi
-+else
-+ DSYMUTIL="$ac_cv_prog_DSYMUTIL"
-+fi
-+
-+ if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_NMEDIT+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$NMEDIT"; then
-+ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+NMEDIT=$ac_cv_prog_NMEDIT
-+if test -n "$NMEDIT"; then
-+ { echo "$as_me:$LINENO: result: $NMEDIT" >&5
-+echo "${ECHO_T}$NMEDIT" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_NMEDIT"; then
-+ ac_ct_NMEDIT=$NMEDIT
-+ # Extract the first word of "nmedit", so it can be a program name with args.
-+set dummy nmedit; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$ac_ct_NMEDIT"; then
-+ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_ac_ct_NMEDIT="nmedit"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-+if test -n "$ac_ct_NMEDIT"; then
-+ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
-+echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+ if test "x$ac_ct_NMEDIT" = x; then
-+ NMEDIT=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ NMEDIT=$ac_ct_NMEDIT
-+ fi
-+else
-+ NMEDIT="$ac_cv_prog_NMEDIT"
-+fi
-+
-+
-+ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
-+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
-+if test "${lt_cv_apple_cc_single_mod+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_apple_cc_single_mod=no
-+ if test -z "${LT_MULTI_MODULE}"; then
-+ # By default we will add the -single_module flag. You can override
-+ # by either setting the environment variable LT_MULTI_MODULE
-+ # non-empty at configure time, or by adding -multi_module to the
-+ # link flags.
-+ echo "int foo(void){return 1;}" > conftest.c
-+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-+ -dynamiclib ${wl}-single_module conftest.c
-+ if test -f libconftest.dylib; then
-+ lt_cv_apple_cc_single_mod=yes
-+ rm -rf libconftest.dylib*
-+ fi
-+ rm conftest.c
-+ fi
-+fi
-+{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
-+echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
-+ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
-+echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
-+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_ld_exported_symbols_list=no
-+ save_LDFLAGS=$LDFLAGS
-+ echo "_main" > conftest.sym
-+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ lt_cv_ld_exported_symbols_list=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ lt_cv_ld_exported_symbols_list=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
-+ LDFLAGS="$save_LDFLAGS"
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
-+echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
-+ case $host_os in
-+ rhapsody* | darwin1.[0123])
-+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-+ darwin1.*)
-+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+ darwin*)
-+ # if running on 10.5 or later, the deployment target defaults
-+ # to the OS version, if on x86, and 10.4, the deployment
-+ # target defaults to 10.4. Don't you love it?
-+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-+ 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
-+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+ 10.[012]*)
-+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+ 10.*)
-+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+ esac
-+ ;;
-+ esac
-+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-+ _lt_dar_single_mod='$single_module'
-+ fi
-+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-+ else
-+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
-+ fi
-+ if test "$DSYMUTIL" != ":"; then
-+ _lt_dsymutil="~$DSYMUTIL \$lib || :"
-+ else
-+ _lt_dsymutil=
-+ fi
-+ ;;
-+ esac
-+
-+
- enable_dlopen=yes
- enable_win32_dll=no
-
-@@ -7466,7 +7783,7 @@ 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*
-+$rm -r conftest*
-
-
-
-@@ -7494,11 +7811,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:7497: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7814: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:7501: \$? = $ac_status" >&5
-+ echo "$as_me:7818: \$? = $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.
-@@ -7768,10 +8085,10 @@ if test -n "$lt_prog_compiler_pic"; then
-
- { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
- echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_pic_works+set}" = set; then
-+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- lt_prog_compiler_pic_works=no
-+ lt_cv_prog_compiler_pic_works=no
- ac_outfile=conftest.$ac_objext
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-@@ -7784,27 +8101,27 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:7787: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8104: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:7791: \$? = $ac_status" >&5
-+ echo "$as_me:8108: \$? = $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.
- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-- lt_prog_compiler_pic_works=yes
-+ lt_cv_prog_compiler_pic_works=yes
- fi
- fi
- $rm conftest*
-
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
-
--if test x"$lt_prog_compiler_pic_works" = xyes; then
-+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
- case $lt_prog_compiler_pic in
- "" | " "*) ;;
- *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-@@ -7831,10 +8148,10 @@ esac
- wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
- { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
- echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_static_works+set}" = set; then
-+if test "${lt_cv_prog_compiler_static_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- lt_prog_compiler_static_works=no
-+ lt_cv_prog_compiler_static_works=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
- echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -7847,20 +8164,20 @@ else
- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if diff conftest.exp conftest.er2 >/dev/null; then
-- lt_prog_compiler_static_works=yes
-+ lt_cv_prog_compiler_static_works=yes
- fi
- else
-- lt_prog_compiler_static_works=yes
-+ lt_cv_prog_compiler_static_works=yes
- fi
- fi
-- $rm conftest*
-+ $rm -r conftest*
- LDFLAGS="$save_LDFLAGS"
-
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
--echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
-
--if test x"$lt_prog_compiler_static_works" = xyes; then
-+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
- :
- else
- lt_prog_compiler_static=
-@@ -7888,11 +8205,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:7891: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8208: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:7895: \$? = $ac_status" >&5
-+ echo "$as_me:8212: \$? = $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
-@@ -7972,12 +8289,13 @@ echo $ECHO_N "checking whether the $comp
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
-- exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
-+ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
- # platforms (ab)use it in PIC code, but their linkers get confused if
- # the symbol is explicitly referenced. Since portable code cannot
- # rely on this symbol name, it's probably fine to never include it in
- # preloaded symbol tables.
-+ # Exclude shared library initialization/finalization symbols.
- extract_expsyms_cmds=
- # Just being paranoid about ensuring that cc_basename is set.
- for cc_temp in $compiler""; do
-@@ -8036,7 +8354,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
-
- # See if GNU ld supports shared libraries.
- case $host_os in
-- aix3* | aix4* | aix5*)
-+ aix[3-9]*)
- # On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
- ld_shlibs=no
-@@ -8256,7 +8574,7 @@ _LT_EOF
- fi
- ;;
-
-- aix4* | aix5*)
-+ aix[4-9]*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
-@@ -8276,7 +8594,7 @@ _LT_EOF
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
-- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
- for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
- aix_use_runtimelinking=yes
-@@ -8548,11 +8866,10 @@ if test -z "$aix_libpath"; then aix_libp
- link_all_deplibs=yes
- if test "$GCC" = yes ; then
- output_verbose_link_cmd='echo'
-- archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- 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 -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~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}'
-+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
- else
- case $cc_basename in
- xlc*)
-@@ -9072,7 +9389,7 @@ aix3*)
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
-
--aix4* | aix5*)
-+aix[4-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -9606,6 +9923,21 @@ esac
- echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
-
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-+fi
-+
-+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
-+fi
-+
-+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-+
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
- if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -9925,7 +10257,7 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
- echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
- if test $ac_cv_lib_dld_shl_load = yes; then
-- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
- else
- { echo "$as_me:$LINENO: checking for dlopen" >&5
- echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-@@ -10201,7 +10533,7 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
- echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
- if test $ac_cv_lib_dld_dld_link = yes; then
-- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
- fi
-
-
-@@ -10250,7 +10582,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 10253 "configure"
-+#line 10585 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -10350,7 +10682,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 10353 "configure"
-+#line 10685 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -10477,7 +10809,7 @@ aix3*)
- fi
- ;;
-
--aix4* | aix5*)
-+aix[4-9]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
- fi
-@@ -10533,6 +10865,7 @@ if test -f "$ltmain"; then
- predeps \
- postdeps \
- compiler_lib_search_path \
-+ compiler_lib_search_dirs \
- archive_cmds \
- archive_expsym_cmds \
- postinstall_cmds \
-@@ -10593,7 +10926,7 @@ echo "$as_me: creating $ofile" >&6;}
- # 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, 2002, 2003, 2004, 2005, 2006, 2007
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
- # Free Software Foundation, Inc.
- #
- # This file is part of GNU Libtool:
-@@ -10829,6 +11162,10 @@ predeps=$lt_predeps
- # shared library.
- postdeps=$lt_postdeps
-
-+# The directories searched by this compiler when creating a shared
-+# library
-+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
-+
- # The library search path used internally by the compiler when linking
- # a shared library.
- compiler_lib_search_path=$lt_compiler_lib_search_path
-@@ -11077,6 +11414,7 @@ postdep_objects_CXX=
- predeps_CXX=
- postdeps_CXX=
- compiler_lib_search_path_CXX=
-+compiler_lib_search_dirs_CXX=
-
- # Source file extension for C++ test sources.
- ac_ext=cpp
-@@ -11114,7 +11452,7 @@ 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*
-+$rm -r conftest*
-
-
- # Allow CC to be a program name with arguments.
-@@ -11321,7 +11659,7 @@ case $host_os in
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
-- aix4* | aix5*)
-+ aix[4-9]*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
-@@ -11334,7 +11672,7 @@ case $host_os in
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
-- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
- for ld_flag in $LDFLAGS; do
- case $ld_flag in
- *-brtl*)
-@@ -11592,51 +11930,23 @@ if test -z "$aix_libpath"; then aix_libp
- fi
- ;;
- darwin* | rhapsody*)
-- case $host_os in
-- rhapsody* | darwin1.[012])
-- allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
-- ;;
-- *) # Darwin 1.3 on
-- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-- else
-- case ${MACOSX_DEPLOYMENT_TARGET} in
-- 10.[012])
-- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-- ;;
-- 10.*)
-- allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
-- ;;
-- esac
-- fi
-- ;;
-- esac
- archive_cmds_need_lc_CXX=no
- hardcode_direct_CXX=no
- hardcode_automatic_CXX=yes
- hardcode_shlibpath_var_CXX=unsupported
- whole_archive_flag_spec_CXX=''
- link_all_deplibs_CXX=yes
--
-- if test "$GXX" = yes ; then
-- lt_int_apple_cc_single_mod=no
-+ allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
-+ if test "$GXX" = yes ; then
- output_verbose_link_cmd='echo'
-- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-- lt_int_apple_cc_single_mod=yes
-+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
- fi
-- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-- archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- else
-- archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- fi
-- 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
-- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- else
-- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- fi
-- 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}'
- else
- case $cc_basename in
- xlc*)
-@@ -11887,7 +12197,7 @@ if test -z "$aix_libpath"; then aix_libp
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
- ;;
-- pgCC*)
-+ pgCC* | pgcpp*)
- # Portland Group C++ compiler
- archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-@@ -12294,7 +12604,6 @@ test "$ld_shlibs_CXX" = no && can_build_
- GCC_CXX="$GXX"
- LD_CXX="$LD"
-
--
- cat > conftest.$ac_ext <<EOF
- class Foo
- {
-@@ -12396,6 +12705,11 @@ fi
-
- $rm -f confest.$objext
-
-+compiler_lib_search_dirs_CXX=
-+if test -n "$compiler_lib_search_path_CXX"; then
-+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-+fi
-+
- # PORTME: override above test on systems where it is broken
- case $host_os in
- interix[3-9]*)
-@@ -12451,7 +12765,6 @@ solaris*)
- ;;
- esac
-
--
- case " $postdeps_CXX " in
- *" -lc "*) archive_cmds_need_lc_CXX=no ;;
- esac
-@@ -12527,7 +12840,7 @@ echo $ECHO_N "checking for $compiler opt
- esac
- else
- case $host_os in
-- aix4* | aix5*)
-+ aix[4-9]*)
- # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
-@@ -12623,7 +12936,7 @@ echo $ECHO_N "checking for $compiler opt
- lt_prog_compiler_pic_CXX='-KPIC'
- lt_prog_compiler_static_CXX='-static'
- ;;
-- pgCC*)
-+ pgCC* | pgcpp*)
- # Portland Group C++ compiler.
- lt_prog_compiler_wl_CXX='-Wl,'
- lt_prog_compiler_pic_CXX='-fpic'
-@@ -12754,10 +13067,10 @@ if test -n "$lt_prog_compiler_pic_CXX";
-
- { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
- echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
-+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- lt_prog_compiler_pic_works_CXX=no
-+ lt_cv_prog_compiler_pic_works_CXX=no
- ac_outfile=conftest.$ac_objext
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
-@@ -12770,27 +13083,27 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:12773: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13086: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:12777: \$? = $ac_status" >&5
-+ echo "$as_me:13090: \$? = $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.
- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-- lt_prog_compiler_pic_works_CXX=yes
-+ lt_cv_prog_compiler_pic_works_CXX=yes
- fi
- fi
- $rm conftest*
-
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
-
--if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
-+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
- case $lt_prog_compiler_pic_CXX in
- "" | " "*) ;;
- *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-@@ -12817,10 +13130,10 @@ esac
- wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
- { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
- echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
-+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- lt_prog_compiler_static_works_CXX=no
-+ lt_cv_prog_compiler_static_works_CXX=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
- echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -12833,20 +13146,20 @@ else
- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if diff conftest.exp conftest.er2 >/dev/null; then
-- lt_prog_compiler_static_works_CXX=yes
-+ lt_cv_prog_compiler_static_works_CXX=yes
- fi
- else
-- lt_prog_compiler_static_works_CXX=yes
-+ lt_cv_prog_compiler_static_works_CXX=yes
- fi
- fi
-- $rm conftest*
-+ $rm -r conftest*
- LDFLAGS="$save_LDFLAGS"
-
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
--echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
-
--if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
-+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
- :
- else
- lt_prog_compiler_static_CXX=
-@@ -12874,11 +13187,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:12877: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13190: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:12881: \$? = $ac_status" >&5
-+ echo "$as_me:13194: \$? = $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
-@@ -12931,7 +13244,7 @@ echo $ECHO_N "checking whether the $comp
-
- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- case $host_os in
-- aix4* | aix5*)
-+ aix[4-9]*)
- # If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-@@ -12953,6 +13266,7 @@ echo $ECHO_N "checking whether the $comp
- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
- esac
-+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-
- { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
- echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
-@@ -13054,7 +13368,7 @@ aix3*)
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
-
--aix4* | aix5*)
-+aix[4-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -13587,6 +13901,21 @@ esac
- echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
-
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-+fi
-+
-+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
-+fi
-+
-+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-+
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
- if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -13670,6 +13999,7 @@ if test -f "$ltmain"; then
- predeps_CXX \
- postdeps_CXX \
- compiler_lib_search_path_CXX \
-+ compiler_lib_search_dirs_CXX \
- archive_cmds_CXX \
- archive_expsym_cmds_CXX \
- postinstall_cmds_CXX \
-@@ -13918,6 +14248,10 @@ predeps=$lt_predeps_CXX
- # shared library.
- postdeps=$lt_postdeps_CXX
-
-+# The directories searched by this compiler when creating a shared
-+# library
-+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
-+
- # The library search path used internally by the compiler when linking
- # a shared library.
- compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-@@ -14132,7 +14466,7 @@ 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*
-+$rm -r conftest*
-
-
- # Allow CC to be a program name with arguments.
-@@ -14170,7 +14504,7 @@ aix3*)
- postinstall_cmds='$RANLIB $lib'
- fi
- ;;
--aix4* | aix5*)
-+aix[4-9]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
- fi
-@@ -14435,10 +14769,10 @@ if test -n "$lt_prog_compiler_pic_F77";
-
- { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
- echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
-+if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- lt_prog_compiler_pic_works_F77=no
-+ lt_cv_prog_compiler_pic_works_F77=no
- ac_outfile=conftest.$ac_objext
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic_F77"
-@@ -14451,27 +14785,27 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14454: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14788: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:14458: \$? = $ac_status" >&5
-+ echo "$as_me:14792: \$? = $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.
- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-- lt_prog_compiler_pic_works_F77=yes
-+ lt_cv_prog_compiler_pic_works_F77=yes
- fi
- fi
- $rm conftest*
-
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }
-
--if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
-+if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
- case $lt_prog_compiler_pic_F77 in
- "" | " "*) ;;
- *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
-@@ -14498,10 +14832,10 @@ esac
- wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
- { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
- echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_static_works_F77+set}" = set; then
-+if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- lt_prog_compiler_static_works_F77=no
-+ lt_cv_prog_compiler_static_works_F77=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
- echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -14514,20 +14848,20 @@ else
- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if diff conftest.exp conftest.er2 >/dev/null; then
-- lt_prog_compiler_static_works_F77=yes
-+ lt_cv_prog_compiler_static_works_F77=yes
- fi
- else
-- lt_prog_compiler_static_works_F77=yes
-+ lt_cv_prog_compiler_static_works_F77=yes
- fi
- fi
-- $rm conftest*
-+ $rm -r conftest*
- LDFLAGS="$save_LDFLAGS"
-
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
--echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }
-
--if test x"$lt_prog_compiler_static_works_F77" = xyes; then
-+if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
- :
- else
- lt_prog_compiler_static_F77=
-@@ -14555,11 +14889,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14558: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14892: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:14562: \$? = $ac_status" >&5
-+ echo "$as_me:14896: \$? = $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
-@@ -14639,12 +14973,13 @@ echo $ECHO_N "checking whether the $comp
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
-- exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
-+ exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
- # platforms (ab)use it in PIC code, but their linkers get confused if
- # the symbol is explicitly referenced. Since portable code cannot
- # rely on this symbol name, it's probably fine to never include it in
- # preloaded symbol tables.
-+ # Exclude shared library initialization/finalization symbols.
- extract_expsyms_cmds=
- # Just being paranoid about ensuring that cc_basename is set.
- for cc_temp in $compiler""; do
-@@ -14703,7 +15038,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
-
- # See if GNU ld supports shared libraries.
- case $host_os in
-- aix3* | aix4* | aix5*)
-+ aix[3-9]*)
- # On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
- ld_shlibs_F77=no
-@@ -14923,7 +15258,7 @@ _LT_EOF
- fi
- ;;
-
-- aix4* | aix5*)
-+ aix[4-9]*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
-@@ -14943,7 +15278,7 @@ _LT_EOF
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
-- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
- for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
- aix_use_runtimelinking=yes
-@@ -15195,11 +15530,10 @@ if test -z "$aix_libpath"; then aix_libp
- link_all_deplibs_F77=yes
- if test "$GCC" = yes ; then
- output_verbose_link_cmd='echo'
-- archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- 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 -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~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}'
-+ archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+ module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+ archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+ module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
- else
- case $cc_basename in
- xlc*)
-@@ -15668,7 +16002,7 @@ aix3*)
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
-
--aix4* | aix5*)
-+aix[4-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -16201,6 +16535,21 @@ esac
- echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
-
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-+fi
-+
-+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
-+fi
-+
-+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-+
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
- if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -16284,6 +16633,7 @@ if test -f "$ltmain"; then
- predeps_F77 \
- postdeps_F77 \
- compiler_lib_search_path_F77 \
-+ compiler_lib_search_dirs_F77 \
- archive_cmds_F77 \
- archive_expsym_cmds_F77 \
- postinstall_cmds_F77 \
-@@ -16532,6 +16882,10 @@ predeps=$lt_predeps_F77
- # shared library.
- postdeps=$lt_postdeps_F77
-
-+# The directories searched by this compiler when creating a shared
-+# library
-+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77
-+
- # The library search path used internally by the compiler when linking
- # a shared library.
- compiler_lib_search_path=$lt_compiler_lib_search_path_F77
-@@ -16706,7 +17060,7 @@ 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*
-+$rm -r conftest*
-
-
- # Allow CC to be a program name with arguments.
-@@ -16755,11 +17109,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16758: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17112: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:16762: \$? = $ac_status" >&5
-+ echo "$as_me:17116: \$? = $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.
-@@ -16819,7 +17173,7 @@ echo $ECHO_N "checking for $compiler opt
- # 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'
-+
- ;;
-
- darwin* | rhapsody*)
-@@ -16889,7 +17243,7 @@ echo $ECHO_N "checking for $compiler opt
- 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'
-+
- ;;
-
- hpux9* | hpux10* | hpux11*)
-@@ -17029,10 +17383,10 @@ if test -n "$lt_prog_compiler_pic_GCJ";
-
- { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
- echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
-+if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- lt_prog_compiler_pic_works_GCJ=no
-+ lt_cv_prog_compiler_pic_works_GCJ=no
- ac_outfile=conftest.$ac_objext
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
-@@ -17045,27 +17399,27 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17048: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17402: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:17052: \$? = $ac_status" >&5
-+ echo "$as_me:17406: \$? = $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.
- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-- lt_prog_compiler_pic_works_GCJ=yes
-+ lt_cv_prog_compiler_pic_works_GCJ=yes
- fi
- fi
- $rm conftest*
-
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
-
--if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
-+if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
- case $lt_prog_compiler_pic_GCJ in
- "" | " "*) ;;
- *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
-@@ -17092,10 +17446,10 @@ esac
- wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
- { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
- echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
-+if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- lt_prog_compiler_static_works_GCJ=no
-+ lt_cv_prog_compiler_static_works_GCJ=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
- echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -17108,20 +17462,20 @@ else
- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if diff conftest.exp conftest.er2 >/dev/null; then
-- lt_prog_compiler_static_works_GCJ=yes
-+ lt_cv_prog_compiler_static_works_GCJ=yes
- fi
- else
-- lt_prog_compiler_static_works_GCJ=yes
-+ lt_cv_prog_compiler_static_works_GCJ=yes
- fi
- fi
-- $rm conftest*
-+ $rm -r conftest*
- LDFLAGS="$save_LDFLAGS"
-
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
--echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }
-
--if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
-+if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
- :
- else
- lt_prog_compiler_static_GCJ=
-@@ -17149,11 +17503,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17152: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17506: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:17156: \$? = $ac_status" >&5
-+ echo "$as_me:17510: \$? = $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
-@@ -17233,12 +17587,13 @@ echo $ECHO_N "checking whether the $comp
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
-- exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
-+ exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
- # platforms (ab)use it in PIC code, but their linkers get confused if
- # the symbol is explicitly referenced. Since portable code cannot
- # rely on this symbol name, it's probably fine to never include it in
- # preloaded symbol tables.
-+ # Exclude shared library initialization/finalization symbols.
- extract_expsyms_cmds=
- # Just being paranoid about ensuring that cc_basename is set.
- for cc_temp in $compiler""; do
-@@ -17297,7 +17652,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
-
- # See if GNU ld supports shared libraries.
- case $host_os in
-- aix3* | aix4* | aix5*)
-+ aix[3-9]*)
- # On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
- ld_shlibs_GCJ=no
-@@ -17517,7 +17872,7 @@ _LT_EOF
- fi
- ;;
-
-- aix4* | aix5*)
-+ aix[4-9]*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
-@@ -17537,7 +17892,7 @@ _LT_EOF
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
-- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
- for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
- aix_use_runtimelinking=yes
-@@ -17809,11 +18164,10 @@ if test -z "$aix_libpath"; then aix_libp
- link_all_deplibs_GCJ=yes
- if test "$GCC" = yes ; then
- output_verbose_link_cmd='echo'
-- archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- 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 -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~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}'
-+ archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+ module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+ archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+ module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
- else
- case $cc_basename in
- xlc*)
-@@ -18282,7 +18636,7 @@ aix3*)
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
-
--aix4* | aix5*)
-+aix[4-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -18815,6 +19169,21 @@ esac
- echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
-
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-+fi
-+
-+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
-+fi
-+
-+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-+
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
- if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -18898,6 +19267,7 @@ if test -f "$ltmain"; then
- predeps_GCJ \
- postdeps_GCJ \
- compiler_lib_search_path_GCJ \
-+ compiler_lib_search_dirs_GCJ \
- archive_cmds_GCJ \
- archive_expsym_cmds_GCJ \
- postinstall_cmds_GCJ \
-@@ -19146,6 +19516,10 @@ predeps=$lt_predeps_GCJ
- # shared library.
- postdeps=$lt_postdeps_GCJ
-
-+# The directories searched by this compiler when creating a shared
-+# library
-+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ
-+
- # The library search path used internally by the compiler when linking
- # a shared library.
- compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
-@@ -19319,7 +19693,7 @@ 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*
-+$rm -r conftest*
-
-
- # Allow CC to be a program name with arguments.
-@@ -19379,6 +19753,7 @@ if test -f "$ltmain"; then
- predeps_RC \
- postdeps_RC \
- compiler_lib_search_path_RC \
-+ compiler_lib_search_dirs_RC \
- archive_cmds_RC \
- archive_expsym_cmds_RC \
- postinstall_cmds_RC \
-@@ -19627,6 +20002,10 @@ predeps=$lt_predeps_RC
- # shared library.
- postdeps=$lt_postdeps_RC
-
-+# The directories searched by this compiler when creating a shared
-+# library
-+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC
-+
- # The library search path used internally by the compiler when linking
- # a shared library.
- compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-@@ -28713,7 +29092,7 @@ _ACEOF
-
- fi
- fi
-- USE_NLS=yes
-+ USE_NLS=yes
-
-
- gt_cv_have_gettext=no
-@@ -31934,6 +32313,8 @@ ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
- RANLIB!$RANLIB$ac_delim
-+DSYMUTIL!$DSYMUTIL$ac_delim
-+NMEDIT!$NMEDIT$ac_delim
- CPP!$CPP$ac_delim
- CXX!$CXX$ac_delim
- CXXFLAGS!$CXXFLAGS$ac_delim
-@@ -32028,8 +32409,6 @@ LIBXUL_CXXFLAGS!$LIBXUL_CXXFLAGS$ac_deli
- LIBXUL_LDFLAGS!$LIBXUL_LDFLAGS$ac_delim
- LIBXUL_LIBS!$LIBXUL_LIBS$ac_delim
- HAVE_LIBXUL_TRUE!$HAVE_LIBXUL_TRUE$ac_delim
--HAVE_LIBXUL_FALSE!$HAVE_LIBXUL_FALSE$ac_delim
--HAVE_LIBXUL_DEBUG_TRUE!$HAVE_LIBXUL_DEBUG_TRUE$ac_delim
- _ACEOF
-
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -32071,6 +32450,8 @@ _ACEOF
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
-+HAVE_LIBXUL_FALSE!$HAVE_LIBXUL_FALSE$ac_delim
-+HAVE_LIBXUL_DEBUG_TRUE!$HAVE_LIBXUL_DEBUG_TRUE$ac_delim
- HAVE_LIBXUL_DEBUG_FALSE!$HAVE_LIBXUL_DEBUG_FALSE$ac_delim
- WITH_XULRUNNER_ENGINE_TRUE!$WITH_XULRUNNER_ENGINE_TRUE$ac_delim
- WITH_XULRUNNER_ENGINE_FALSE!$WITH_XULRUNNER_ENGINE_FALSE$ac_delim
-@@ -32166,8 +32547,6 @@ GNOME_LIBS!$GNOME_LIBS$ac_delim
- LSB_RELEASE!$LSB_RELEASE$ac_delim
- GGE_VERSION!$GGE_VERSION$ac_delim
- GGE_API_VERSION!$GGE_API_VERSION$ac_delim
--LIBOBJS!$LIBOBJS$ac_delim
--LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
-
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -32206,6 +32585,51 @@ CEOF$ac_eof
- _ACEOF
-
-
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+ cat >conf$$subs.sed <<_ACEOF
-+LIBOBJS!$LIBOBJS$ac_delim
-+LTLIBOBJS!$LTLIBOBJS$ac_delim
-+_ACEOF
-+
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 2; then
-+ break
-+ elif $ac_last_try; then
-+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+ { (exit 1); exit 1; }; }
-+ else
-+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+ fi
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+ ac_eof=`expr $ac_eof + 1`
-+fi
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+:end
-+s/|#_!!_#|//g
-+CEOF$ac_eof
-+_ACEOF
-+
-+
- # VPATH may cause trouble with some makes, so we remove $(srcdir),
- # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
- # trailing colons and then remove the whole line if VPATH becomes empty
-@@ -32455,7 +32879,7 @@ s&@abs_top_builddir@&$ac_abs_top_builddi
- s&@INSTALL@&$ac_INSTALL&;t t
- s&@MKDIR_P@&$ac_MKDIR_P&;t t
- $ac_datarootdir_hack
--" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed 's/|#_!!_#|//g' >$tmp/out
-+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" >$tmp/out
-
- test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-@@ -32569,21 +32993,22 @@ echo "$as_me: $ac_file is unchanged" >&6
- fi
- rm -f "$tmp/out12"
- # Compute $ac_file's index in $config_headers.
-+_am_arg=$ac_file
- _am_stamp_count=1
- for _am_header in $config_headers :; do
- case $_am_header in
-- $ac_file | $ac_file:* )
-+ $_am_arg | $_am_arg:* )
- break ;;
- * )
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
- esac
- done
--echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
--$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X$ac_file : 'X\(//\)[^/]' \| \
-- X$ac_file : 'X\(//\)$' \| \
-- X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
--echo X$ac_file |
-+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$_am_arg" : 'X\(//\)[^/]' \| \
-+ X"$_am_arg" : 'X\(//\)$' \| \
-+ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X"$_am_arg" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
-@@ -32620,7 +33045,7 @@ echo "$as_me: executing $ac_file command
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
-- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
-+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`$as_dirname -- "$mf" ||
- $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$mf" : 'X\(//\)[^/]' \| \
-Index: epiphany-2.21.90/gtk-doc.make
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ epiphany-2.21.90/gtk-doc.make 2008-02-18 20:52:34.324881394 +0100
-@@ -0,0 +1,174 @@
-+# -*- mode: makefile -*-
-+
-+####################################
-+# Everything below here is generic #
-+####################################
-+
-+if GTK_DOC_USE_LIBTOOL
-+GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-+GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
-+else
-+GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-+GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
-+endif
-+
-+# We set GPATH here; this gives us semantics for GNU make
-+# which are more like other make's VPATH, when it comes to
-+# whether a source that is a target of one rule is then
-+# searched for in VPATH/GPATH.
-+#
-+GPATH = $(srcdir)
-+
-+TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
-+
-+EXTRA_DIST = \
-+ $(content_files) \
-+ $(HTML_IMAGES) \
-+ $(DOC_MAIN_SGML_FILE) \
-+ $(DOC_MODULE)-sections.txt \
-+ $(DOC_MODULE)-overrides.txt
-+
-+DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-+ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
-+
-+SCANOBJ_FILES = \
-+ $(DOC_MODULE).args \
-+ $(DOC_MODULE).hierarchy \
-+ $(DOC_MODULE).interfaces \
-+ $(DOC_MODULE).prerequisites \
-+ $(DOC_MODULE).signals
-+
-+REPORT_FILES = \
-+ $(DOC_MODULE)-undocumented.txt \
-+ $(DOC_MODULE)-undeclared.txt \
-+ $(DOC_MODULE)-unused.txt
-+
-+CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
-+
-+if ENABLE_GTK_DOC
-+all-local: html-build.stamp
-+else
-+all-local:
-+endif
-+
-+docs: html-build.stamp
-+
-+#### scan ####
-+
-+scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-+ @echo 'gtk-doc: Scanning header files'
-+ @-chmod -R u+w $(srcdir)
-+ cd $(srcdir) && \
-+ gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
-+ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
-+ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
-+ else \
-+ cd $(srcdir) ; \
-+ for i in $(SCANOBJ_FILES) ; do \
-+ test -f $$i || touch $$i ; \
-+ done \
-+ fi
-+ touch scan-build.stamp
-+
-+$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
-+ @true
-+
-+#### templates ####
-+
-+tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-+ @echo 'gtk-doc: Rebuilding template files'
-+ @-chmod -R u+w $(srcdir)
-+ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-+ touch tmpl-build.stamp
-+
-+tmpl.stamp: tmpl-build.stamp
-+ @true
-+
-+tmpl/*.sgml:
-+ @true
-+
-+
-+#### xml ####
-+
-+sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-+ @echo 'gtk-doc: Building XML'
-+ @-chmod -R u+w $(srcdir)
-+ cd $(srcdir) && \
-+ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
-+ touch sgml-build.stamp
-+
-+sgml.stamp: sgml-build.stamp
-+ @true
-+
-+#### html ####
-+
-+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-+ @echo 'gtk-doc: Building HTML'
-+ @-chmod -R u+w $(srcdir)
-+ rm -rf $(srcdir)/html
-+ mkdir $(srcdir)/html
-+ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-+ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
-+ @echo 'gtk-doc: Fixing cross-references'
-+ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-+ touch html-build.stamp
-+
-+##############
-+
-+clean-local:
-+ rm -f *~ *.bak
-+ rm -rf .libs
-+
-+distclean-local:
-+ cd $(srcdir) && \
-+ rm -rf xml $(REPORT_FILES) \
-+ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-+
-+maintainer-clean-local: clean
-+ cd $(srcdir) && rm -rf xml html
-+
-+install-data-local:
-+ installfiles=`echo $(srcdir)/html/*`; \
-+ if test "$$installfiles" = '$(srcdir)/html/*'; \
-+ then echo '-- Nothing to install' ; \
-+ else \
-+ $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
-+ for i in $$installfiles; do \
-+ echo '-- Installing '$$i ; \
-+ $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
-+ done; \
-+ echo '-- Installing $(srcdir)/html/index.sgml' ; \
-+ $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
-+ if test `which gtkdoc-rebase` != ""; then \
-+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
-+ fi \
-+ fi
-+
-+
-+uninstall-local:
-+ rm -f $(DESTDIR)$(TARGET_DIR)/*
-+
-+#
-+# Require gtk-doc when making dist
-+#
-+if ENABLE_GTK_DOC
-+dist-check-gtkdoc:
-+else
-+dist-check-gtkdoc:
-+ @echo "*** gtk-doc must be installed and enabled in order to make dist"
-+ @false
-+endif
-+
-+dist-hook: dist-check-gtkdoc dist-hook-local
-+ mkdir $(distdir)/tmpl
-+ mkdir $(distdir)/xml
-+ mkdir $(distdir)/html
-+ -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-+ -cp $(srcdir)/xml/*.xml $(distdir)/xml
-+ cp $(srcdir)/html/* $(distdir)/html
-+ cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
-+ cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
-+ cd $(distdir) && rm -f $(DISTCLEANFILES)
-+ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
-+
-+.PHONY : dist-hook-local docs
-Index: epiphany-2.21.90/ltmain.sh
-===================================================================
---- epiphany-2.21.90.orig/ltmain.sh 2007-08-14 19:43:36.000000000 +0200
-+++ epiphany-2.21.90/ltmain.sh 2008-02-02 14:06:18.000000000 +0100
-@@ -2,7 +2,7 @@
- # NOTE: Changing this file will not affect anything until you rerun configure.
- #
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
--# 2007 Free Software Foundation, Inc.
-+# 2007, 2008 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,8 +43,8 @@ EXIT_FAILURE=1
+ libephymisc_la_CFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CFLAGS) \
+diff -ruN epiphany-browser-2.22.0.orig/ltmain.sh epiphany-browser-2.22.0/ltmain.sh
+--- epiphany-browser-2.22.0.orig/ltmain.sh 2008-03-10 22:36:55.000000000 +0000
++++ epiphany-browser-2.22.0/ltmain.sh 2008-02-02 13:28:24.000000000 +0000
+@@ -43,7 +43,7 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
--VERSION="1.5.24 Debian 1.5.24-1ubuntu1"
--TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
+-VERSION="1.5.26 Debian 1.5.26-1ubuntu1"
+VERSION="1.5.26 Debian 1.5.26-1"
-+TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
+ TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -113,15 +113,21 @@ esac
- # 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.
--for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-+lt_env=
-+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
- do
- eval "if test \"\${$lt_var+set}\" = set; then
- save_$lt_var=\$$lt_var
-+ lt_env=\"$lt_var=\$$lt_var \$lt_env\"
- $lt_var=C
- export $lt_var
- fi"
- done
+diff -ruN epiphany-browser-2.22.0.orig/plugins/desktop-file/Makefile.in epiphany-browser-2.22.0/plugins/desktop-file/Makefile.in
+--- epiphany-browser-2.22.0.orig/plugins/desktop-file/Makefile.in 2008-03-10 22:36:55.000000000 +0000
++++ epiphany-browser-2.22.0/plugins/desktop-file/Makefile.in 2008-03-10 22:37:35.000000000 +0000
+@@ -316,7 +316,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ with_engine = @with_engine@
+-plugindir = $(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins
++plugindir = $(libexecdir)/$(EPIPHANY_MAJOR)/plugins
+ plugin_LTLIBRARIES = libdesktopfileplugin.la
+ libdesktopfileplugin_la_SOURCES = \
+ plugin.cpp
+diff -ruN epiphany-browser-2.22.0.orig/src/Makefile.in epiphany-browser-2.22.0/src/Makefile.in
+--- epiphany-browser-2.22.0.orig/src/Makefile.in 2008-03-10 22:36:55.000000000 +0000
++++ epiphany-browser-2.22.0/src/Makefile.in 2008-03-10 22:37:36.000000000 +0000
+@@ -542,8 +542,8 @@
+ -I$(top_srcdir)/lib/egg \
+ -I$(top_srcdir)/lib/widgets \
+ -I$(top_srcdir)/src/bookmarks \
+- -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \
+- -DLOADER_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/loaders"\" \
++ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \
++ -DLOADER_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/loaders"\" \
+ -DDATADIR=\""$(pkgdatadir)"\" \
+ -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
+ $(AM_CPPFLAGS)
+@@ -581,8 +581,8 @@
+ @ENABLE_PYTHON_TRUE@ -I$(top_builddir)/src \
+ @ENABLE_PYTHON_TRUE@ -I$(top_builddir)/src/bookmarks \
+ @ENABLE_PYTHON_TRUE@ $(PYTHON_INCLUDES) \
+- at ENABLE_PYTHON_TRUE@ -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \
+- at ENABLE_PYTHON_TRUE@ -DLOADER_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/loaders"\" \
++ at ENABLE_PYTHON_TRUE@ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \
++ at ENABLE_PYTHON_TRUE@ -DLOADER_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/loaders"\" \
+ @ENABLE_PYTHON_TRUE@ -DDATADIR=\""$(datadir)"\" \
+ @ENABLE_PYTHON_TRUE@ $(AM_CPPFLAGS)
-+if test -n "$lt_env"; then
-+ lt_env="env $lt_env"
-+fi
-+
- # Make sure IFS has a sensible default
- lt_nl='
- '
-@@ -485,7 +491,7 @@ do
- echo "\
- $PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
-
--Copyright (C) 2007 Free Software Foundation, Inc.
-+Copyright (C) 2008 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 $?
-@@ -788,6 +794,7 @@ if test -z "$show_help"; then
- *.for) xform=for ;;
- *.java) xform=java ;;
- *.obj) xform=obj ;;
-+ *.sx) xform=sx ;;
- esac
-
- libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-@@ -956,7 +963,7 @@ EOF
- $run $rm "$lobj" "$output_obj"
-
- $show "$command"
-- if $run eval "$command"; then :
-+ if $run eval $lt_env "$command"; then :
- else
- test -n "$output_obj" && $run $rm $removelist
- exit $EXIT_FAILURE
-@@ -1028,7 +1035,7 @@ EOF
- command="$command$suppress_output"
- $run $rm "$obj" "$output_obj"
- $show "$command"
-- if $run eval "$command"; then :
-+ if $run eval $lt_env "$command"; then :
- else
- $run $rm $removelist
- exit $EXIT_FAILURE
-@@ -1161,6 +1168,7 @@ EOF
- thread_safe=no
- vinfo=
- vinfo_number=no
-+ single_module="${wl}-single_module"
-
- func_infer_tag $base_compile
-
-@@ -1646,6 +1654,11 @@ EOF
- continue
- ;;
-
-+ -multi_module)
-+ single_module="${wl}-multi_module"
-+ continue
-+ ;;
-+
- -module)
- module=yes
- continue
-@@ -2152,7 +2165,12 @@ EOF
- continue
- fi
- name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-- for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-+ if test "$linkmode" = lib; then
-+ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
-+ else
-+ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
-+ fi
-+ for searchdir in $searchdirs; do
- for search_ext in .la $std_shrext .so .a; do
- # Search the libtool library
- lib="$searchdir/lib${name}${search_ext}"
-@@ -2948,12 +2966,18 @@ EOF
- # we do not want to link against static libs,
- # but need to link against shared
- eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-+ eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- if test -n "$deplibrary_names" ; then
- for tmp in $deplibrary_names ; do
- depdepl=$tmp
- done
-- if test -f "$path/$depdepl" ; then
-+ if test -f "$deplibdir/$depdepl" ; then
-+ depdepl="$deplibdir/$depdepl"
-+ elif test -f "$path/$depdepl" ; then
- depdepl="$path/$depdepl"
-+ else
-+ # Can't find it, oh well...
-+ depdepl=
- fi
- # do not add paths which are already there
- case " $newlib_search_path " in
-@@ -3101,9 +3125,10 @@ EOF
-
- case $linkmode in
- oldlib)
-- if test -n "$deplibs"; then
-- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-- fi
-+ case " $deplibs" in
-+ *\ -l* | *\ -L*)
-+ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
-+ esac
-
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
-@@ -4245,9 +4270,10 @@ EOF
- ;;
-
- obj)
-- if test -n "$deplibs"; then
-- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-- fi
-+ case " $deplibs" in
-+ *\ -l* | *\ -L*)
-+ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
-+ esac
-
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
-@@ -6486,7 +6512,7 @@ relink_command=\"$relink_command\""
- fi
-
- # Restore saved environment variables
-- for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-+ for lt_var in LANG LANGUAGE 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
Modified: desktop/experimental/epiphany-browser/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/rules?rev=14918&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/rules (original)
+++ desktop/experimental/epiphany-browser/debian/rules Mon Mar 10 23:54:53 2008
@@ -20,7 +20,7 @@
CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
-FLAVORS := gecko webkit
+FLAVORS := gecko #webkit
common_configure_flags := \
--prefix=/usr \
@@ -97,7 +97,7 @@
mv debian/epiphany-gecko/etc/* debian/epiphany-browser-data/etc
rmdir debian/epiphany-gecko/etc
mv debian/epiphany-gecko/usr/share debian/epiphany-browser-data/usr/
- cd debian/epiphany-webkit && rm -rf etc usr/share usr/lib/pkgconfig usr/include
+ #cd debian/epiphany-webkit && rm -rf etc usr/share usr/lib/pkgconfig usr/include
cd debian/epiphany-browser-data/usr/share/epiphany-browser && \
mv mime-types-permissions.xml default-prefs.js $(CURDIR)/debian/epiphany-browser-data/etc/gnome/epiphany/
cd debian/epiphany-browser-data/usr/share/man/man1 && \
More information about the pkg-gnome-commits
mailing list