Codebase list epiphany-browser / fe3a1d8
* Build-depend on libwebkitgtk-dev 0~svn29752. * New upstream development release. * Update build-dependencies accordingly. * refresh 02_ac_init.patch, 03_dbus.patch, 05_libexecdir.patch, 07_bookmarks.patch, 09_download_dialog.patch, 10_url_double-click.patch, 99_autoreconf.patch. Josselin Mouette 16 years ago
10 changed file(s) with 2527 addition(s) and 108 deletion(s). Raw diff Collapse all Expand all
+12
-3
debian/changelog less more
0 epiphany-browser (2.21.4-1) UNRELEASED; urgency=low
1
0 epiphany-browser (2.21.90-1) experimental; urgency=low
1
2 [ Sam Morris ]
23 * New upstream development release.
34 * refresh 02_ac_init.patch, 05_libexecdir.patch, 06_ssl_weak_ciphers.patch,
45 09_download_dialog.patch, 10_url_double-click.patch
78 upstream.
89 * drop 14_webkit-scrollbars.patch: EphyTab no longer exists.
910
10 -- Sam Morris <sam@robots.org.uk> Mon, 14 Jan 2008 21:06:03 +0000
11 [ Josselin Mouette ]
12 * Build-depend on libwebkitgtk-dev 0~svn29752.
13 * New upstream development release.
14 * Update build-dependencies accordingly.
15 * refresh 02_ac_init.patch, 03_dbus.patch, 05_libexecdir.patch,
16 07_bookmarks.patch, 09_download_dialog.patch,
17 10_url_double-click.patch, 99_autoreconf.patch.
18
19 -- Josselin Mouette <joss@debian.org> Sat, 16 Feb 2008 17:45:29 +0100
1120
1221 epiphany-browser (2.20.3-1) unstable; urgency=low
1322
+6
-5
debian/control less more
44 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Sebastian Dröge <slomo@debian.org>
55 Build-Depends: debhelper (>= 5),
66 pkg-config,
7 libglib2.0-dev (>= 2.13.4),
8 libgtk2.0-dev (>= 2.11.6),
7 libglib2.0-dev (>= 2.15.2),
8 libgtk2.0-dev (>= 2.12.0),
99 libxml2-dev (>= 2.6.12),
1010 libxslt1-dev (>= 1.1.7),
1111 libglade2-dev (>= 2.3.1),
12 libgnomevfs2-dev (>= 2.9.2),
1312 libgnome2-dev (>= 2.14.0),
1413 libgnomeui-dev (>= 2.16.0-2),
1514 libgconf2-dev,
1615 libgnome-desktop-dev (>= 2.9.91),
1716 libstartup-notification0-dev (>= 0.5),
17 libnotify-dev (>= 0.4),
1818 libdbus-glib-1-dev (>= 0.60),
1919 scrollkeeper,
2020 gnome-pkg-tools (>= 0.10),
3030 network-manager-dev,
3131 quilt,
3232 libenchant-dev (>= 1.0),
33 libwebkitgtk-dev (>= 0~svn24770),
33 libavahi-gobject-dev (>= 0.6.22),
34 libwebkitgtk-dev (>= 0~svn29752),
3435 gtk-doc-tools (>= 1.0)
3536 Standards-Version: 3.7.3
3637
129130 Section: gnome
130131 Priority: extra
131132 Depends: epiphany-gecko (= ${binary:Version}) | epiphany-webkit (= ${binary:Version})
132 Recommends: libxul0d-dbg | libwebkitgtk0d-dbg
133 Recommends: libxul0d-dbg | libwebkitgtk1d-dbg
133134 Description: Debugging symbols for the GNOME web browser
134135 Epiphany is a simple yet powerful GNOME web browser targeted at
135136 non-technical users. Its principles are simplicity and standards
+6
-5
debian/control.in less more
44 Uploaders: @GNOME_TEAM@
55 Build-Depends: debhelper (>= 5),
66 pkg-config,
7 libglib2.0-dev (>= 2.13.4),
8 libgtk2.0-dev (>= 2.11.6),
7 libglib2.0-dev (>= 2.15.2),
8 libgtk2.0-dev (>= 2.12.0),
99 libxml2-dev (>= 2.6.12),
1010 libxslt1-dev (>= 1.1.7),
1111 libglade2-dev (>= 2.3.1),
12 libgnomevfs2-dev (>= 2.9.2),
1312 libgnome2-dev (>= 2.14.0),
1413 libgnomeui-dev (>= 2.16.0-2),
1514 libgconf2-dev,
1615 libgnome-desktop-dev (>= 2.9.91),
1716 libstartup-notification0-dev (>= 0.5),
17 libnotify-dev (>= 0.4),
1818 libdbus-glib-1-dev (>= 0.60),
1919 scrollkeeper,
2020 gnome-pkg-tools (>= 0.10),
3030 network-manager-dev,
3131 quilt,
3232 libenchant-dev (>= 1.0),
33 libwebkitgtk-dev (>= 0~svn24770),
33 libavahi-gobject-dev (>= 0.6.22),
34 libwebkitgtk-dev (>= 0~svn29752),
3435 gtk-doc-tools (>= 1.0)
3536 Standards-Version: 3.7.3
3637
129130 Section: gnome
130131 Priority: extra
131132 Depends: epiphany-gecko (= ${binary:Version}) | epiphany-webkit (= ${binary:Version})
132 Recommends: libxul0d-dbg | libwebkitgtk0d-dbg
133 Recommends: libxul0d-dbg | libwebkitgtk1d-dbg
133134 Description: Debugging symbols for the GNOME web browser
134135 Epiphany is a simple yet powerful GNOME web browser targeted at
135136 non-technical users. Its principles are simplicity and standards
+4
-4
debian/patches/02_ac_init.patch less more
0 Index: epiphany-browser-2.21.4/configure.ac
0 Index: epiphany-2.21.90/configure.ac
11 ===================================================================
2 --- epiphany-browser-2.21.4.orig/configure.ac 2007-12-16 13:25:57.000000000 +0000
3 +++ epiphany-browser-2.21.4/configure.ac 2008-01-14 21:45:09.000000000 +0000
4 @@ -24,7 +24,7 @@
2 --- epiphany-2.21.90.orig/configure.ac 2008-01-28 18:40:32.000000000 +0100
3 +++ epiphany-2.21.90/configure.ac 2008-02-18 20:50:32.088885831 +0100
4 @@ -23,7 +23,7 @@ m4_define([epiphany_version],[epiphany_v
55 # This can be either "trunk" or "branches/gnome-x-y"
66 m4_define([epiphany_branch],["trunk"])
77
+4
-4
debian/patches/03_dbus.patch less more
0 Index: epiphany-2.20.0/src/ephy-main.c
0 Index: epiphany-2.21.90/src/ephy-main.c
11 ===================================================================
2 --- epiphany-2.20.0.orig/src/ephy-main.c 2007-09-21 14:46:15.134076289 +0200
3 +++ epiphany-2.20.0/src/ephy-main.c 2007-09-21 14:47:40.806958509 +0200
4 @@ -624,11 +624,13 @@
2 --- epiphany-2.21.90.orig/src/ephy-main.c 2008-01-14 23:51:06.000000000 +0100
3 +++ epiphany-2.21.90/src/ephy-main.c 2008-02-18 20:50:49.992883987 +0100
4 @@ -638,11 +638,13 @@ main (int argc,
55
66 if (!_ephy_dbus_startup (!private_instance, &error))
77 {
+41
-41
debian/patches/05_libexecdir.patch less more
0 Index: epiphany-browser-2.21.4/data/epiphany.pc.in
0 Index: epiphany-2.21.90/data/epiphany.pc.in
11 ===================================================================
2 --- epiphany-browser-2.21.4.orig/data/epiphany.pc.in 2007-11-04 23:44:58.000000000 +0000
3 +++ epiphany-browser-2.21.4/data/epiphany.pc.in 2008-01-14 21:46:10.000000000 +0000
4 @@ -2,8 +2,8 @@
2 --- epiphany-2.21.90.orig/data/epiphany.pc.in 2007-11-05 00:44:58.000000000 +0100
3 +++ epiphany-2.21.90/data/epiphany.pc.in 2008-02-18 20:50:54.264884396 +0100
4 @@ -2,8 +2,8 @@ prefix=@prefix@
55 exec_prefix=@exec_prefix@
66 libdir=@libdir@
77 includedir=@includedir@/epiphany/@EPIPHANY_MAJOR@
1212 datarootdir=@datarootdir@
1313 datadir=@datadir@
1414 icondir=@datadir@/@PACKAGE@/icons
15 Index: epiphany-browser-2.21.4/embed/mozilla/Makefile.am
15 Index: epiphany-2.21.90/embed/mozilla/Makefile.am
1616 ===================================================================
17 --- epiphany-browser-2.21.4.orig/embed/mozilla/Makefile.am 2007-07-16 21:02:17.000000000 +0100
18 +++ epiphany-browser-2.21.4/embed/mozilla/Makefile.am 2008-01-14 21:46:10.000000000 +0000
19 @@ -141,7 +141,7 @@
17 --- epiphany-2.21.90.orig/embed/mozilla/Makefile.am 2007-12-30 00:48:32.000000000 +0100
18 +++ epiphany-2.21.90/embed/mozilla/Makefile.am 2008-02-18 20:50:54.264884396 +0100
19 @@ -149,7 +149,7 @@ libephymozillaembed_la_CPPFLAGS = \
2020 -I$(top_srcdir) \
2121 $(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) \
2222 -DSHARE_DIR=\"$(pkgdatadir)\" \
2525 -DMOZILLA_HOME=\"$(GECKO_HOME)\" \
2626 -DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \
2727 -DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \
28 Index: epiphany-browser-2.21.4/embed/mozilla/Makefile.in
28 Index: epiphany-2.21.90/embed/mozilla/Makefile.in
2929 ===================================================================
30 --- epiphany-browser-2.21.4.orig/embed/mozilla/Makefile.in 2007-12-16 13:26:20.000000000 +0000
31 +++ epiphany-browser-2.21.4/embed/mozilla/Makefile.in 2008-01-14 21:46:10.000000000 +0000
32 @@ -489,7 +489,7 @@
30 --- epiphany-2.21.90.orig/embed/mozilla/Makefile.in 2008-01-28 18:40:58.000000000 +0100
31 +++ epiphany-2.21.90/embed/mozilla/Makefile.in 2008-02-18 20:50:54.264884396 +0100
32 @@ -498,7 +498,7 @@ libephymozillaembed_la_CPPFLAGS = \
3333 -I$(top_srcdir) \
3434 $(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) \
3535 -DSHARE_DIR=\"$(pkgdatadir)\" \
3838 -DMOZILLA_HOME=\"$(GECKO_HOME)\" \
3939 -DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \
4040 -DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \
41 Index: epiphany-browser-2.21.4/lib/Makefile.am
41 Index: epiphany-2.21.90/lib/Makefile.am
4242 ===================================================================
43 --- epiphany-browser-2.21.4.orig/lib/Makefile.am 2007-11-12 10:48:23.000000000 +0000
44 +++ epiphany-browser-2.21.4/lib/Makefile.am 2008-01-14 21:46:10.000000000 +0000
45 @@ -78,7 +78,7 @@
46 libephymisc_la_CPPFLAGS = \
47 -I$(top_builddir)/lib \
43 --- epiphany-2.21.90.orig/lib/Makefile.am 2008-01-24 16:33:00.000000000 +0100
44 +++ epiphany-2.21.90/lib/Makefile.am 2008-02-18 20:50:54.264884396 +0100
45 @@ -80,7 +80,7 @@ libephymisc_la_CPPFLAGS = \
46 -I$(top_builddir)/lib/egg \
47 -I$(top_srcdir)/lib/egg \
4848 -DSHARE_DIR=\"$(pkgdatadir)\" \
4949 - -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \
5050 + -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \
5151 $(AM_CPPFLAGS)
5252
5353 libephymisc_la_CFLAGS = \
54 Index: epiphany-browser-2.21.4/lib/Makefile.in
54 Index: epiphany-2.21.90/lib/Makefile.in
5555 ===================================================================
56 --- epiphany-browser-2.21.4.orig/lib/Makefile.in 2007-12-16 13:26:23.000000000 +0000
57 +++ epiphany-browser-2.21.4/lib/Makefile.in 2008-01-14 21:46:10.000000000 +0000
58 @@ -441,7 +441,7 @@
59 libephymisc_la_CPPFLAGS = \
60 -I$(top_builddir)/lib \
56 --- epiphany-2.21.90.orig/lib/Makefile.in 2008-01-28 18:41:01.000000000 +0100
57 +++ epiphany-2.21.90/lib/Makefile.in 2008-02-18 20:50:54.264884396 +0100
58 @@ -442,7 +442,7 @@ libephymisc_la_CPPFLAGS = \
59 -I$(top_builddir)/lib/egg \
60 -I$(top_srcdir)/lib/egg \
6161 -DSHARE_DIR=\"$(pkgdatadir)\" \
6262 - -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \
6363 + -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \
6464 $(AM_CPPFLAGS)
6565
6666 libephymisc_la_CFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CFLAGS) \
67 Index: epiphany-browser-2.21.4/plugins/desktop-file/Makefile.am
67 Index: epiphany-2.21.90/plugins/desktop-file/Makefile.am
6868 ===================================================================
69 --- epiphany-browser-2.21.4.orig/plugins/desktop-file/Makefile.am 2007-07-16 21:02:37.000000000 +0100
70 +++ epiphany-browser-2.21.4/plugins/desktop-file/Makefile.am 2008-01-14 21:46:10.000000000 +0000
69 --- epiphany-2.21.90.orig/plugins/desktop-file/Makefile.am 2007-07-16 22:02:37.000000000 +0200
70 +++ epiphany-2.21.90/plugins/desktop-file/Makefile.am 2008-02-18 20:50:54.264884396 +0100
7171 @@ -1,4 +1,4 @@
7272 -plugindir = $(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins
7373 +plugindir = $(libexecdir)/$(EPIPHANY_MAJOR)/plugins
7474 plugin_LTLIBRARIES = libdesktopfileplugin.la
7575
7676 libdesktopfileplugin_la_SOURCES = \
77 Index: epiphany-browser-2.21.4/plugins/desktop-file/Makefile.in
77 Index: epiphany-2.21.90/plugins/desktop-file/Makefile.in
7878 ===================================================================
79 --- epiphany-browser-2.21.4.orig/plugins/desktop-file/Makefile.in 2007-12-16 13:26:23.000000000 +0000
80 +++ epiphany-browser-2.21.4/plugins/desktop-file/Makefile.in 2008-01-14 21:46:10.000000000 +0000
81 @@ -323,7 +323,7 @@
79 --- epiphany-2.21.90.orig/plugins/desktop-file/Makefile.in 2008-01-28 18:41:02.000000000 +0100
80 +++ epiphany-2.21.90/plugins/desktop-file/Makefile.in 2008-02-18 20:50:54.268884295 +0100
81 @@ -322,7 +322,7 @@ target_alias = @target_alias@
8282 top_builddir = @top_builddir@
8383 top_srcdir = @top_srcdir@
8484 with_engine = @with_engine@
8787 plugin_LTLIBRARIES = libdesktopfileplugin.la
8888 libdesktopfileplugin_la_SOURCES = \
8989 plugin.cpp
90 Index: epiphany-browser-2.21.4/src/Makefile.am
90 Index: epiphany-2.21.90/src/Makefile.am
9191 ===================================================================
92 --- epiphany-browser-2.21.4.orig/src/Makefile.am 2007-11-16 15:09:42.000000000 +0000
93 +++ epiphany-browser-2.21.4/src/Makefile.am 2008-01-14 21:46:10.000000000 +0000
94 @@ -113,8 +113,8 @@
92 --- epiphany-2.21.90.orig/src/Makefile.am 2007-11-16 16:09:42.000000000 +0100
93 +++ epiphany-2.21.90/src/Makefile.am 2008-02-18 20:50:54.268884295 +0100
94 @@ -113,8 +113,8 @@ libephymain_la_CPPFLAGS = \
9595 -I$(top_srcdir)/lib/egg \
9696 -I$(top_srcdir)/lib/widgets \
9797 -I$(top_srcdir)/src/bookmarks \
102102 -DDATADIR=\""$(pkgdatadir)"\" \
103103 -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
104104 $(AM_CPPFLAGS)
105 @@ -165,8 +165,8 @@
105 @@ -165,8 +165,8 @@ libpyphany_la_CPPFLAGS = \
106106 -I$(top_builddir)/src \
107107 -I$(top_builddir)/src/bookmarks \
108108 $(PYTHON_INCLUDES) \
113113 -DDATADIR=\""$(datadir)"\" \
114114 $(AM_CPPFLAGS)
115115
116 Index: epiphany-browser-2.21.4/src/Makefile.in
116 Index: epiphany-2.21.90/src/Makefile.in
117117 ===================================================================
118 --- epiphany-browser-2.21.4.orig/src/Makefile.in 2007-12-16 13:26:24.000000000 +0000
119 +++ epiphany-browser-2.21.4/src/Makefile.in 2008-01-14 21:46:10.000000000 +0000
120 @@ -558,8 +558,8 @@
118 --- epiphany-2.21.90.orig/src/Makefile.in 2008-01-28 18:41:02.000000000 +0100
119 +++ epiphany-2.21.90/src/Makefile.in 2008-02-18 20:50:54.268884295 +0100
120 @@ -557,8 +557,8 @@ libephymain_la_CPPFLAGS = \
121121 -I$(top_srcdir)/lib/egg \
122122 -I$(top_srcdir)/lib/widgets \
123123 -I$(top_srcdir)/src/bookmarks \
128128 -DDATADIR=\""$(pkgdatadir)"\" \
129129 -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
130130 $(AM_CPPFLAGS)
131 @@ -597,8 +597,8 @@
131 @@ -596,8 +596,8 @@ libephymain_la_CFLAGS = \
132132 @ENABLE_PYTHON_TRUE@ -I$(top_builddir)/src \
133133 @ENABLE_PYTHON_TRUE@ -I$(top_builddir)/src/bookmarks \
134134 @ENABLE_PYTHON_TRUE@ $(PYTHON_INCLUDES) \
+4
-4
debian/patches/07_bookmarks.patch less more
0 Index: epiphany-browser-2.18.0/src/bookmarks/ephy-bookmarks.c
0 Index: epiphany-2.21.90/src/bookmarks/ephy-bookmarks.c
11 ===================================================================
2 --- epiphany-browser-2.18.0.orig/src/bookmarks/ephy-bookmarks.c 2007-03-06 12:31:26.000000000 +0000
3 +++ epiphany-browser-2.18.0/src/bookmarks/ephy-bookmarks.c 2007-03-11 21:01:42.000000000 +0000
4 @@ -102,6 +102,10 @@
2 --- epiphany-2.21.90.orig/src/bookmarks/ephy-bookmarks.c 2008-01-14 23:51:06.000000000 +0100
3 +++ epiphany-2.21.90/src/bookmarks/ephy-bookmarks.c 2008-02-18 20:51:27.552884572 +0100
4 @@ -108,6 +108,10 @@ static const EphyBookmarksBookmarkInfo d
55 * For instance in .nl these should be
66 * "http://www.google.nl" and "http://www.google.nl/search?q=%s"
77 */
+12
-12
debian/patches/09_download_dialog.patch less more
00 Index: embed/mozilla/ContentHandler.cpp
11 ===================================================================
2 --- embed/mozilla/ContentHandler.cpp.orig 2007-09-13 14:21:40.000000000 +0100
3 +++ embed/mozilla/ContentHandler.cpp 2008-01-14 21:47:37.000000000 +0000
4 @@ -336,8 +336,11 @@
2 --- embed/mozilla/ContentHandler.cpp.orig 2008-01-14 23:51:08.000000000 +0100
3 +++ embed/mozilla/ContentHandler.cpp 2008-02-18 20:51:42.960884593 +0100
4 @@ -337,8 +337,11 @@ NS_METHOD GContentHandler::MIMEConfirmAc
55
66 gtk_dialog_add_button (GTK_DIALOG (dialog),
77 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
1515
1616 gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY);
1717
18 @@ -385,20 +388,16 @@
18 @@ -386,20 +389,16 @@ NS_METHOD GContentHandler::MIMEInitiateA
1919 }
2020
2121 if (auto_downloads)
4444 }
4545 Index: data/glade/prefs-dialog.glade
4646 ===================================================================
47 --- data/glade/prefs-dialog.glade.orig 2007-11-12 10:48:23.000000000 +0000
48 +++ data/glade/prefs-dialog.glade 2008-01-14 21:47:37.000000000 +0000
47 --- data/glade/prefs-dialog.glade.orig 2007-11-12 11:48:23.000000000 +0100
48 +++ data/glade/prefs-dialog.glade 2008-02-18 20:51:42.960884593 +0100
4949 @@ -303,6 +303,25 @@
5050 <property name="spacing">6</property>
5151
100100 </widget>
101101 Index: src/prefs-dialog.c
102102 ===================================================================
103 --- src/prefs-dialog.c.orig 2007-11-16 15:09:42.000000000 +0000
104 +++ src/prefs-dialog.c 2008-01-14 21:47:37.000000000 +0000
105 @@ -393,6 +393,13 @@
103 --- src/prefs-dialog.c.orig 2008-01-14 23:51:06.000000000 +0100
104 +++ src/prefs-dialog.c 2008-02-18 20:51:42.960884593 +0100
105 @@ -392,6 +392,13 @@ prefs_dialog_show_help (EphyDialog *dial
106106 }
107107
108108 static void
116116 setup_font_combo (EphyDialog *dialog,
117117 const char *type,
118118 const char *code,
119 @@ -1529,6 +1536,7 @@
119 @@ -1521,6 +1528,7 @@ prefs_dialog_init (PrefsDialog *pd)
120120 EphyDialog *dialog = EPHY_DIALOG (pd);
121121 EphyEncodings *encodings;
122122 GtkWidget *window, *curr_button, *blank_button;
124124 GtkWidget *clear_cache_button, *font_prefs_button;
125125 GtkWidget *css_checkbox, *css_edit_box, *css_edit_button, *css_container;
126126 gboolean sensitive;
127 @@ -1549,6 +1557,8 @@
127 @@ -1541,6 +1549,8 @@ prefs_dialog_init (PrefsDialog *pd)
128128 properties[WINDOW_PROP].id, &window,
129129 properties[HOMEPAGE_CURRENT_PROP].id, &curr_button,
130130 properties[HOMEPAGE_BLANK_PROP].id, &blank_button,
133133 properties[FONT_PREFS_BUTTON_PROP].id, &font_prefs_button,
134134 properties[CSS_CHECKBOX_PROP].id, &css_checkbox,
135135 properties[CSS_EDIT_BOX_PROP].id, &css_edit_box,
136 @@ -1572,6 +1582,10 @@
136 @@ -1564,6 +1574,10 @@ prefs_dialog_init (PrefsDialog *pd)
137137 gtk_widget_set_sensitive (curr_button, sensitive);
138138 gtk_widget_set_sensitive (blank_button, sensitive);
139139
+5
-5
debian/patches/10_url_double-click.patch less more
0 Index: epiphany-browser-2.21.4/lib/widgets/ephy-location-entry.c
0 Index: epiphany-2.21.90/lib/widgets/ephy-location-entry.c
11 ===================================================================
2 --- epiphany-browser-2.21.4.orig/lib/widgets/ephy-location-entry.c 2007-10-04 00:32:03.000000000 +0100
3 +++ epiphany-browser-2.21.4/lib/widgets/ephy-location-entry.c 2008-01-14 21:48:01.000000000 +0000
4 @@ -368,18 +368,6 @@
2 --- epiphany-2.21.90.orig/lib/widgets/ephy-location-entry.c 2007-12-30 00:48:31.000000000 +0100
3 +++ epiphany-2.21.90/lib/widgets/ephy-location-entry.c 2008-02-18 20:51:53.032885539 +0100
4 @@ -351,18 +351,6 @@ editable_changed_cb (GtkEditable *editab
55 }
66
77 static gboolean
2020 entry_key_press_cb (GtkEntry *entry,
2121 GdkEventKey *event,
2222 EphyLocationEntry *lentry)
23 @@ -938,8 +926,6 @@
23 @@ -839,8 +827,6 @@ ephy_location_entry_construct_contents (
2424 G_CALLBACK (entry_key_press_after_cb), entry);
2525 g_signal_connect_after (priv->icon_entry->entry, "activate",
2626 G_CALLBACK (entry_activate_after_cb), entry);
+2433
-25
debian/patches/99_autoreconf.patch less more
11 aclocal-1.10 -I m4
22 automake-1.10
33 autoconf
4 Index: epiphany-browser-2.21.4/aclocal.m4
4 Index: epiphany-2.21.90/aclocal.m4
55 ===================================================================
6 --- epiphany-browser-2.21.4.orig/aclocal.m4 2007-12-16 13:26:10.000000000 +0000
7 +++ epiphany-browser-2.21.4/aclocal.m4 2008-01-14 22:05:28.000000000 +0000
8 @@ -682,7 +682,7 @@
6 --- epiphany-2.21.90.orig/aclocal.m4 2008-01-28 18:40:51.000000000 +0100
7 +++ epiphany-2.21.90/aclocal.m4 2008-02-18 20:53:08.888884126 +0100
8 @@ -1,7 +1,7 @@
9 -# generated automatically by aclocal 1.10 -*- Autoconf -*-
10 +# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
11
12 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
13 -# 2005, 2006 Free Software Foundation, Inc.
14 +# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
15 # This file is free software; the Free Software Foundation
16 # gives unlimited permission to copy and/or distribute it,
17 # with or without modifications, as long as this notice is preserved.
18 @@ -11,10 +11,13 @@
19 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
20 # PARTICULAR PURPOSE.
21
22 -m4_if(m4_PACKAGE_VERSION, [2.61],,
23 -[m4_fatal([this file was generated for autoconf 2.61.
24 -You have another version of autoconf. If you want to use that,
25 -you should regenerate the build system entirely.], [63])])
26 +m4_ifndef([AC_AUTOCONF_VERSION],
27 + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
28 +m4_if(AC_AUTOCONF_VERSION, [2.61],,
29 +[m4_warning([this file was generated for autoconf 2.61.
30 +You have another version of autoconf. It may work, but is not guaranteed to.
31 +If you have problems, you may need to regenerate the build system entirely.
32 +To do so, use the procedure documented by the package, typically `autoreconf'.])])
33
34 dnl AM_GCONF_SOURCE_2
35 dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
36 @@ -159,8 +162,7 @@ AC_SUBST($1)dnl
37 #-----------------
38 glib_DEFUN([GLIB_WITH_NLS],
39 dnl NLS is obligatory
40 - [AC_REQUIRE([AC_CANONICAL_HOST])dnl
41 - USE_NLS=yes
42 + [USE_NLS=yes
43 AC_SUBST(USE_NLS)
44
45 gt_cv_have_gettext=no
46 @@ -682,7 +684,7 @@ AC_DEFUN([GNOME_CXX_WARNINGS],[
947
1048 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
1149
1250 -# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL
13 +# serial 51 Debian 1.5.24-2 AC_PROG_LIBTOOL
51 +# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL
1452
1553
1654 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
17 Index: epiphany-browser-2.21.4/configure
55 @@ -770,7 +772,6 @@ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
56 AC_REQUIRE([AC_OBJEXT])dnl
57 AC_REQUIRE([AC_EXEEXT])dnl
58 dnl
59 -
60 AC_LIBTOOL_SYS_MAX_CMD_LEN
61 AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
62 AC_LIBTOOL_OBJDIR
63 @@ -872,6 +873,8 @@ file_magic*)
64 ;;
65 esac
66
67 +_LT_REQUIRED_DARWIN_CHECKS
68 +
69 AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
70 AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
71 enable_win32_dll=yes, enable_win32_dll=no)
72 @@ -951,9 +954,80 @@ ac_outfile=conftest.$ac_objext
73 echo "$lt_simple_link_test_code" >conftest.$ac_ext
74 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
75 _lt_linker_boilerplate=`cat conftest.err`
76 -$rm conftest*
77 +$rm -r conftest*
78 ])# _LT_LINKER_BOILERPLATE
79
80 +# _LT_REQUIRED_DARWIN_CHECKS
81 +# --------------------------
82 +# Check for some things on darwin
83 +AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
84 + case $host_os in
85 + rhapsody* | darwin*)
86 + AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
87 + AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
88 +
89 + AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
90 + [lt_cv_apple_cc_single_mod=no
91 + if test -z "${LT_MULTI_MODULE}"; then
92 + # By default we will add the -single_module flag. You can override
93 + # by either setting the environment variable LT_MULTI_MODULE
94 + # non-empty at configure time, or by adding -multi_module to the
95 + # link flags.
96 + echo "int foo(void){return 1;}" > conftest.c
97 + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
98 + -dynamiclib ${wl}-single_module conftest.c
99 + if test -f libconftest.dylib; then
100 + lt_cv_apple_cc_single_mod=yes
101 + rm -rf libconftest.dylib*
102 + fi
103 + rm conftest.c
104 + fi])
105 + AC_CACHE_CHECK([for -exported_symbols_list linker flag],
106 + [lt_cv_ld_exported_symbols_list],
107 + [lt_cv_ld_exported_symbols_list=no
108 + save_LDFLAGS=$LDFLAGS
109 + echo "_main" > conftest.sym
110 + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
111 + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
112 + [lt_cv_ld_exported_symbols_list=yes],
113 + [lt_cv_ld_exported_symbols_list=no])
114 + LDFLAGS="$save_LDFLAGS"
115 + ])
116 + case $host_os in
117 + rhapsody* | darwin1.[[0123]])
118 + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
119 + darwin1.*)
120 + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
121 + darwin*)
122 + # if running on 10.5 or later, the deployment target defaults
123 + # to the OS version, if on x86, and 10.4, the deployment
124 + # target defaults to 10.4. Don't you love it?
125 + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
126 + 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
127 + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
128 + 10.[[012]]*)
129 + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
130 + 10.*)
131 + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
132 + esac
133 + ;;
134 + esac
135 + if test "$lt_cv_apple_cc_single_mod" = "yes"; then
136 + _lt_dar_single_mod='$single_module'
137 + fi
138 + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
139 + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
140 + else
141 + _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
142 + fi
143 + if test "$DSYMUTIL" != ":"; then
144 + _lt_dsymutil="~$DSYMUTIL \$lib || :"
145 + else
146 + _lt_dsymutil=
147 + fi
148 + ;;
149 + esac
150 +])
151
152 # _LT_AC_SYS_LIBPATH_AIX
153 # ----------------------
154 @@ -1278,7 +1352,11 @@ sparc*-*solaris*)
155 *64-bit*)
156 case $lt_cv_prog_gnu_ld in
157 yes*) LD="${LD-ld} -m elf64_sparc" ;;
158 - *) LD="${LD-ld} -64" ;;
159 + *)
160 + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
161 + LD="${LD-ld} -64"
162 + fi
163 + ;;
164 esac
165 ;;
166 esac
167 @@ -1371,7 +1449,7 @@ AC_CACHE_CHECK([$1], [$2],
168 $2=yes
169 fi
170 fi
171 - $rm conftest*
172 + $rm -r conftest*
173 LDFLAGS="$save_LDFLAGS"
174 ])
175
176 @@ -1642,7 +1720,7 @@ else
177 AC_CHECK_FUNC([shl_load],
178 [lt_cv_dlopen="shl_load"],
179 [AC_CHECK_LIB([dld], [shl_load],
180 - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
181 + [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
182 [AC_CHECK_FUNC([dlopen],
183 [lt_cv_dlopen="dlopen"],
184 [AC_CHECK_LIB([dl], [dlopen],
185 @@ -1650,7 +1728,7 @@ else
186 [AC_CHECK_LIB([svld], [dlopen],
187 [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
188 [AC_CHECK_LIB([dld], [dld_link],
189 - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
190 + [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
191 ])
192 ])
193 ])
194 @@ -1967,7 +2045,7 @@ aix3*)
195 soname_spec='${libname}${release}${shared_ext}$major'
196 ;;
197
198 -aix4* | aix5*)
199 +aix[[4-9]]*)
200 version_type=linux
201 need_lib_prefix=no
202 need_version=no
203 @@ -2500,6 +2578,13 @@ esac
204 AC_MSG_RESULT([$dynamic_linker])
205 test "$dynamic_linker" = no && can_build_shared=no
206
207 +AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
208 +[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
209 +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
210 +AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
211 +[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
212 +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
213 +
214 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
215 if test "$GCC" = yes; then
216 variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
217 @@ -2999,7 +3084,7 @@ lt_cv_deplibs_check_method='unknown'
218 # whether `pass_all' will *always* work, you probably want this one.
219
220 case $host_os in
221 -aix4* | aix5*)
222 +aix[[4-9]]*)
223 lt_cv_deplibs_check_method=pass_all
224 ;;
225
226 @@ -3435,7 +3520,7 @@ aix3*)
227 fi
228 ;;
229
230 -aix4* | aix5*)
231 +aix[[4-9]]*)
232 if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
233 test "$enable_shared" = yes && enable_static=no
234 fi
235 @@ -3492,6 +3577,7 @@ _LT_AC_TAGVAR(postdep_objects, $1)=
236 _LT_AC_TAGVAR(predeps, $1)=
237 _LT_AC_TAGVAR(postdeps, $1)=
238 _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
239 +_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
240
241 # Source file extension for C++ test sources.
242 ac_ext=cpp
243 @@ -3601,7 +3687,7 @@ case $host_os in
244 # FIXME: insert proper C++ library support
245 _LT_AC_TAGVAR(ld_shlibs, $1)=no
246 ;;
247 - aix4* | aix5*)
248 + aix[[4-9]]*)
249 if test "$host_cpu" = ia64; then
250 # On IA64, the linker does run time linking by default, so we don't
251 # have to do anything special.
252 @@ -3614,7 +3700,7 @@ case $host_os in
253 # Test if we are trying to use run time linking or normal
254 # AIX style linking. If -brtl is somewhere in LDFLAGS, we
255 # need to do runtime linking.
256 - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
257 + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
258 for ld_flag in $LDFLAGS; do
259 case $ld_flag in
260 *-brtl*)
261 @@ -3760,51 +3846,23 @@ case $host_os in
262 fi
263 ;;
264 darwin* | rhapsody*)
265 - case $host_os in
266 - rhapsody* | darwin1.[[012]])
267 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
268 - ;;
269 - *) # Darwin 1.3 on
270 - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
271 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
272 - else
273 - case ${MACOSX_DEPLOYMENT_TARGET} in
274 - 10.[[012]])
275 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
276 - ;;
277 - 10.*)
278 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
279 - ;;
280 - esac
281 - fi
282 - ;;
283 - esac
284 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
285 _LT_AC_TAGVAR(hardcode_direct, $1)=no
286 _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
287 _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
288 _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
289 _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
290 -
291 - if test "$GXX" = yes ; then
292 - lt_int_apple_cc_single_mod=no
293 + _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
294 + if test "$GXX" = yes ; then
295 output_verbose_link_cmd='echo'
296 - if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
297 - lt_int_apple_cc_single_mod=yes
298 + _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}"
299 + _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
300 + _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}"
301 + _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}"
302 + if test "$lt_cv_apple_cc_single_mod" != "yes"; then
303 + _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}"
304 + _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}"
305 fi
306 - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
307 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
308 - else
309 - _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'
310 - fi
311 - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
312 - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
313 - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
314 - _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}'
315 - else
316 - _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}'
317 - fi
318 - _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}'
319 else
320 case $cc_basename in
321 xlc*)
322 @@ -4055,7 +4113,7 @@ case $host_os in
323 _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
324 _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
325 ;;
326 - pgCC*)
327 + pgCC* | pgcpp*)
328 # Portland Group C++ compiler
329 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
330 _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'
331 @@ -4490,7 +4548,8 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
332 # compiler output when linking a shared library.
333 # Parse the compiler output and extract the necessary
334 # objects, libraries and library flags.
335 -AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
336 +AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
337 +[AC_REQUIRE([LT_AC_PROG_SED])dnl
338 dnl we can't use the lt_simple_compile_test_code here,
339 dnl because it contains code intended for an executable,
340 dnl not a library. It's possible we should let each
341 @@ -4615,6 +4674,11 @@ fi
342
343 $rm -f confest.$objext
344
345 +_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
346 +if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
347 + _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
348 +fi
349 +
350 # PORTME: override above test on systems where it is broken
351 ifelse([$1],[CXX],
352 [case $host_os in
353 @@ -4671,7 +4735,6 @@ solaris*)
354 ;;
355 esac
356 ])
357 -
358 case " $_LT_AC_TAGVAR(postdeps, $1) " in
359 *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
360 esac
361 @@ -4756,7 +4819,7 @@ aix3*)
362 postinstall_cmds='$RANLIB $lib'
363 fi
364 ;;
365 -aix4* | aix5*)
366 +aix[[4-9]]*)
367 if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
368 test "$enable_shared" = yes && enable_static=no
369 fi
370 @@ -4933,6 +4996,7 @@ if test -f "$ltmain"; then
371 _LT_AC_TAGVAR(predeps, $1) \
372 _LT_AC_TAGVAR(postdeps, $1) \
373 _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
374 + _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
375 _LT_AC_TAGVAR(archive_cmds, $1) \
376 _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
377 _LT_AC_TAGVAR(postinstall_cmds, $1) \
378 @@ -4995,7 +5059,7 @@ ifelse([$1], [],
379 # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
380 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
381 #
382 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
383 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
384 # Free Software Foundation, Inc.
385 #
386 # This file is part of GNU Libtool:
387 @@ -5232,6 +5296,10 @@ predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
388 # shared library.
389 postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
390
391 +# The directories searched by this compiler when creating a shared
392 +# library
393 +compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
394 +
395 # The library search path used internally by the compiler when linking
396 # a shared library.
397 compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
398 @@ -5581,7 +5649,7 @@ EOF
399 echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
400 cat conftest.$ac_ext >&5
401 fi
402 - rm -f conftest* conftst*
403 + rm -rf conftest* conftst*
404
405 # Do not use the global_symbol_pipe unless it works.
406 if test "$pipe_works" = yes; then
407 @@ -5638,7 +5706,8 @@ AC_MSG_CHECKING([for $compiler option to
408 # built for inclusion in a dll (and should export symbols for example).
409 # Although the cygwin gcc ignores -fPIC, still need this for old-style
410 # (--disable-auto-import) libraries
411 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
412 + m4_if([$1], [GCJ], [],
413 + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
414 ;;
415 darwin* | rhapsody*)
416 # PIC is the default on this platform
417 @@ -5675,7 +5744,7 @@ AC_MSG_CHECKING([for $compiler option to
418 esac
419 else
420 case $host_os in
421 - aix4* | aix5*)
422 + aix[[4-9]]*)
423 # All AIX code is PIC.
424 if test "$host_cpu" = ia64; then
425 # AIX 5 now supports IA64 processor
426 @@ -5771,7 +5840,7 @@ AC_MSG_CHECKING([for $compiler option to
427 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
428 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
429 ;;
430 - pgCC*)
431 + pgCC* | pgcpp*)
432 # Portland Group C++ compiler.
433 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
434 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
435 @@ -5922,7 +5991,8 @@ AC_MSG_CHECKING([for $compiler option to
436 # built for inclusion in a dll (and should export symbols for example).
437 # Although the cygwin gcc ignores -fPIC, still need this for old-style
438 # (--disable-auto-import) libraries
439 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
440 + m4_if([$1], [GCJ], [],
441 + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
442 ;;
443
444 darwin* | rhapsody*)
445 @@ -5992,7 +6062,8 @@ AC_MSG_CHECKING([for $compiler option to
446 mingw* | cygwin* | pw32* | os2*)
447 # This hack is so that the source file can tell whether it is being
448 # built for inclusion in a dll (and should export symbols for example).
449 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
450 + m4_if([$1], [GCJ], [],
451 + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
452 ;;
453
454 hpux9* | hpux10* | hpux11*)
455 @@ -6129,7 +6200,7 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_co
456 #
457 if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
458 AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
459 - _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
460 + _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
461 [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
462 [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
463 "" | " "*) ;;
464 @@ -6153,7 +6224,7 @@ esac
465 #
466 wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
467 AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
468 - _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
469 + _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
470 $lt_tmp_static_flag,
471 [],
472 [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
473 @@ -6169,7 +6240,7 @@ AC_MSG_CHECKING([whether the $compiler l
474 ifelse([$1],[CXX],[
475 _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
476 case $host_os in
477 - aix4* | aix5*)
478 + aix[[4-9]]*)
479 # If we're using GNU nm, then we don't want the "-C" option.
480 # -C means demangle to AIX nm, but means don't demangle with GNU nm
481 if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
482 @@ -6191,6 +6262,7 @@ ifelse([$1],[CXX],[
483 _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
484 ;;
485 esac
486 + _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
487 ],[
488 runpath_var=
489 _LT_AC_TAGVAR(allow_undefined_flag, $1)=
490 @@ -6221,12 +6293,14 @@ ifelse([$1],[CXX],[
491 # it will be wrapped by ` (' and `)$', so one must not match beginning or
492 # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
493 # as well as any symbol that contains `d'.
494 - _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
495 + _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
496 # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
497 # platforms (ab)use it in PIC code, but their linkers get confused if
498 # the symbol is explicitly referenced. Since portable code cannot
499 # rely on this symbol name, it's probably fine to never include it in
500 # preloaded symbol tables.
501 + # Exclude shared library initialization/finalization symbols.
502 +dnl Note also adjust exclude_expsyms for C++ above.
503 extract_expsyms_cmds=
504 # Just being paranoid about ensuring that cc_basename is set.
505 _LT_CC_BASENAME([$compiler])
506 @@ -6276,7 +6350,7 @@ ifelse([$1],[CXX],[
507
508 # See if GNU ld supports shared libraries.
509 case $host_os in
510 - aix3* | aix4* | aix5*)
511 + aix[[3-9]]*)
512 # On AIX/PPC, the GNU linker is very broken
513 if test "$host_cpu" != ia64; then
514 _LT_AC_TAGVAR(ld_shlibs, $1)=no
515 @@ -6496,7 +6570,7 @@ _LT_EOF
516 fi
517 ;;
518
519 - aix4* | aix5*)
520 + aix[[4-9]]*)
521 if test "$host_cpu" = ia64; then
522 # On IA64, the linker does run time linking by default, so we don't
523 # have to do anything special.
524 @@ -6516,7 +6590,7 @@ _LT_EOF
525 # Test if we are trying to use run time linking or normal
526 # AIX style linking. If -brtl is somewhere in LDFLAGS, we
527 # need to do runtime linking.
528 - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
529 + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
530 for ld_flag in $LDFLAGS; do
531 if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
532 aix_use_runtimelinking=yes
533 @@ -6676,11 +6750,10 @@ _LT_EOF
534 _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
535 if test "$GCC" = yes ; then
536 output_verbose_link_cmd='echo'
537 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
538 - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
539 - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
540 - _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}'
541 - _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}'
542 + _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}"
543 + _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
544 + _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}"
545 + _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}"
546 else
547 case $cc_basename in
548 xlc*)
549 @@ -7419,7 +7492,7 @@ else
550 fi[]dnl
551 ])# PKG_CHECK_MODULES
552
553 -# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
554 +# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
555 #
556 # This file is free software; the Free Software Foundation
557 # gives unlimited permission to copy and/or distribute it,
558 @@ -7434,7 +7507,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
559 [am__api_version='1.10'
560 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
561 dnl require some minimum version. Point them to the right macro.
562 -m4_if([$1], [1.10], [],
563 +m4_if([$1], [1.10.1], [],
564 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
565 ])
566
567 @@ -7450,8 +7523,10 @@ m4_define([_AM_AUTOCONF_VERSION], [])
568 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
569 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
570 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
571 -[AM_AUTOMAKE_VERSION([1.10])dnl
572 -_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
573 +[AM_AUTOMAKE_VERSION([1.10.1])dnl
574 +m4_ifndef([AC_AUTOCONF_VERSION],
575 + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
576 +_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
577
578 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
579
580 @@ -7746,7 +7821,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS
581 # each Makefile.in and add a new line on top of each file to say so.
582 # Grep'ing the whole file is not good either: AIX grep has a line
583 # limit of 2048, but all sed's we know have understand at least 4000.
584 - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
585 + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
586 dirpart=`AS_DIRNAME("$mf")`
587 else
588 continue
589 @@ -7794,13 +7869,13 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
590 # Do all the work for Automake. -*- Autoconf -*-
591
592 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
593 -# 2005, 2006 Free Software Foundation, Inc.
594 +# 2005, 2006, 2008 Free Software Foundation, Inc.
595 #
596 # This file is free software; the Free Software Foundation
597 # gives unlimited permission to copy and/or distribute it,
598 # with or without modifications, as long as this notice is preserved.
599
600 -# serial 12
601 +# serial 13
602
603 # This macro actually does too much. Some checks are only needed if
604 # your package does certain things. But this isn't really a big deal.
605 @@ -7905,16 +7980,17 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC],
606 # our stamp files there.
607 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
608 [# Compute $1's index in $config_headers.
609 +_am_arg=$1
610 _am_stamp_count=1
611 for _am_header in $config_headers :; do
612 case $_am_header in
613 - $1 | $1:* )
614 + $_am_arg | $_am_arg:* )
615 break ;;
616 * )
617 _am_stamp_count=`expr $_am_stamp_count + 1` ;;
618 esac
619 done
620 -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
621 +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
622
623 # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
624 #
625 @@ -8396,7 +8472,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
626
627 # _AM_SUBST_NOTMAKE(VARIABLE)
628 # ---------------------------
629 -# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
630 +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
631 # This macro is traced by Automake.
632 AC_DEFUN([_AM_SUBST_NOTMAKE])
633
634 Index: epiphany-2.21.90/configure
18635 ===================================================================
19 --- epiphany-browser-2.21.4.orig/configure 2007-12-16 13:26:26.000000000 +0000
20 +++ epiphany-browser-2.21.4/configure 2008-01-14 22:05:55.000000000 +0000
21 @@ -727,7 +727,7 @@
636 --- epiphany-2.21.90.orig/configure 2008-01-28 18:41:04.000000000 +0100
637 +++ epiphany-2.21.90/configure 2008-02-18 20:53:19.236879248 +0100
638 @@ -727,7 +727,7 @@ SHELL=${CONFIG_SHELL-/bin/sh}
22639
23640 # Identity of this package.
24641 PACKAGE_NAME='GNOME Web Browser'
25642 -PACKAGE_TARNAME='epiphany'
26643 +PACKAGE_TARNAME='epiphany-browser'
27 PACKAGE_VERSION='2.21.4'
28 PACKAGE_STRING='GNOME Web Browser 2.21.4'
644 PACKAGE_VERSION='2.21.90'
645 PACKAGE_STRING='GNOME Web Browser 2.21.90'
29646 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany'
30 @@ -1658,7 +1658,7 @@
647 @@ -867,6 +867,8 @@ LN_S
648 ECHO
649 AR
650 RANLIB
651 +DSYMUTIL
652 +NMEDIT
653 CPP
654 CXX
655 CXXFLAGS
656 @@ -1653,7 +1655,7 @@ Fine tuning of the installation director
31657 --infodir=DIR info documentation [DATAROOTDIR/info]
32658 --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
33659 --mandir=DIR man documentation [DATAROOTDIR/man]
36662 --htmldir=DIR html documentation [DOCDIR]
37663 --dvidir=DIR dvi documentation [DOCDIR]
38664 --pdfdir=DIR pdf documentation [DOCDIR]
39 @@ -2608,7 +2608,7 @@
665 @@ -2600,7 +2602,7 @@ fi
40666
41667
42668 # Define the identity of the package.
43669 - PACKAGE='epiphany'
44670 + PACKAGE='epiphany-browser'
45 VERSION='2.21.4'
46
47
48 Index: epiphany-browser-2.21.4/gtk-doc.make
671 VERSION='2.21.90'
672
673
674 @@ -4536,7 +4538,7 @@ lt_cv_deplibs_check_method='unknown'
675 # whether `pass_all' will *always* work, you probably want this one.
676
677 case $host_os in
678 -aix4* | aix5*)
679 +aix[4-9]*)
680 lt_cv_deplibs_check_method=pass_all
681 ;;
682
683 @@ -4752,7 +4754,7 @@ ia64-*-hpux*)
684 ;;
685 *-*-irix6*)
686 # Find out which ABI we are using.
687 - echo '#line 4755 "configure"' > conftest.$ac_ext
688 + echo '#line 4757 "configure"' > conftest.$ac_ext
689 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
690 (eval $ac_compile) 2>&5
691 ac_status=$?
692 @@ -4924,7 +4926,11 @@ sparc*-*solaris*)
693 *64-bit*)
694 case $lt_cv_prog_gnu_ld in
695 yes*) LD="${LD-ld} -m elf64_sparc" ;;
696 - *) LD="${LD-ld} -64" ;;
697 + *)
698 + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
699 + LD="${LD-ld} -64"
700 + fi
701 + ;;
702 esac
703 ;;
704 esac
705 @@ -6526,7 +6532,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
706
707
708 # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
709 -
710 # find the maximum length of command line arguments
711 { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
712 echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
713 @@ -6841,7 +6846,7 @@ EOF
714 echo "$progname: failed program was:" >&5
715 cat conftest.$ac_ext >&5
716 fi
717 - rm -f conftest* conftst*
718 + rm -rf conftest* conftst*
719
720 # Do not use the global_symbol_pipe unless it works.
721 if test "$pipe_works" = yes; then
722 @@ -7401,6 +7406,318 @@ fi
723 ;;
724 esac
725
726 +
727 + case $host_os in
728 + rhapsody* | darwin*)
729 + if test -n "$ac_tool_prefix"; then
730 + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
731 +set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
732 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
733 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
734 +if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
735 + echo $ECHO_N "(cached) $ECHO_C" >&6
736 +else
737 + if test -n "$DSYMUTIL"; then
738 + ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
739 +else
740 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
741 +for as_dir in $PATH
742 +do
743 + IFS=$as_save_IFS
744 + test -z "$as_dir" && as_dir=.
745 + for ac_exec_ext in '' $ac_executable_extensions; do
746 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
747 + ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
748 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
749 + break 2
750 + fi
751 +done
752 +done
753 +IFS=$as_save_IFS
754 +
755 +fi
756 +fi
757 +DSYMUTIL=$ac_cv_prog_DSYMUTIL
758 +if test -n "$DSYMUTIL"; then
759 + { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
760 +echo "${ECHO_T}$DSYMUTIL" >&6; }
761 +else
762 + { echo "$as_me:$LINENO: result: no" >&5
763 +echo "${ECHO_T}no" >&6; }
764 +fi
765 +
766 +
767 +fi
768 +if test -z "$ac_cv_prog_DSYMUTIL"; then
769 + ac_ct_DSYMUTIL=$DSYMUTIL
770 + # Extract the first word of "dsymutil", so it can be a program name with args.
771 +set dummy dsymutil; ac_word=$2
772 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
773 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
774 +if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
775 + echo $ECHO_N "(cached) $ECHO_C" >&6
776 +else
777 + if test -n "$ac_ct_DSYMUTIL"; then
778 + ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
779 +else
780 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
781 +for as_dir in $PATH
782 +do
783 + IFS=$as_save_IFS
784 + test -z "$as_dir" && as_dir=.
785 + for ac_exec_ext in '' $ac_executable_extensions; do
786 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
787 + ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
788 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
789 + break 2
790 + fi
791 +done
792 +done
793 +IFS=$as_save_IFS
794 +
795 +fi
796 +fi
797 +ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
798 +if test -n "$ac_ct_DSYMUTIL"; then
799 + { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
800 +echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
801 +else
802 + { echo "$as_me:$LINENO: result: no" >&5
803 +echo "${ECHO_T}no" >&6; }
804 +fi
805 +
806 + if test "x$ac_ct_DSYMUTIL" = x; then
807 + DSYMUTIL=":"
808 + else
809 + case $cross_compiling:$ac_tool_warned in
810 +yes:)
811 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
812 +whose name does not start with the host triplet. If you think this
813 +configuration is useful to you, please write to autoconf@gnu.org." >&5
814 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
815 +whose name does not start with the host triplet. If you think this
816 +configuration is useful to you, please write to autoconf@gnu.org." >&2;}
817 +ac_tool_warned=yes ;;
818 +esac
819 + DSYMUTIL=$ac_ct_DSYMUTIL
820 + fi
821 +else
822 + DSYMUTIL="$ac_cv_prog_DSYMUTIL"
823 +fi
824 +
825 + if test -n "$ac_tool_prefix"; then
826 + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
827 +set dummy ${ac_tool_prefix}nmedit; ac_word=$2
828 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
829 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
830 +if test "${ac_cv_prog_NMEDIT+set}" = set; then
831 + echo $ECHO_N "(cached) $ECHO_C" >&6
832 +else
833 + if test -n "$NMEDIT"; then
834 + ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
835 +else
836 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
837 +for as_dir in $PATH
838 +do
839 + IFS=$as_save_IFS
840 + test -z "$as_dir" && as_dir=.
841 + for ac_exec_ext in '' $ac_executable_extensions; do
842 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
843 + ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
844 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
845 + break 2
846 + fi
847 +done
848 +done
849 +IFS=$as_save_IFS
850 +
851 +fi
852 +fi
853 +NMEDIT=$ac_cv_prog_NMEDIT
854 +if test -n "$NMEDIT"; then
855 + { echo "$as_me:$LINENO: result: $NMEDIT" >&5
856 +echo "${ECHO_T}$NMEDIT" >&6; }
857 +else
858 + { echo "$as_me:$LINENO: result: no" >&5
859 +echo "${ECHO_T}no" >&6; }
860 +fi
861 +
862 +
863 +fi
864 +if test -z "$ac_cv_prog_NMEDIT"; then
865 + ac_ct_NMEDIT=$NMEDIT
866 + # Extract the first word of "nmedit", so it can be a program name with args.
867 +set dummy nmedit; ac_word=$2
868 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
869 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
870 +if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
871 + echo $ECHO_N "(cached) $ECHO_C" >&6
872 +else
873 + if test -n "$ac_ct_NMEDIT"; then
874 + ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
875 +else
876 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
877 +for as_dir in $PATH
878 +do
879 + IFS=$as_save_IFS
880 + test -z "$as_dir" && as_dir=.
881 + for ac_exec_ext in '' $ac_executable_extensions; do
882 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
883 + ac_cv_prog_ac_ct_NMEDIT="nmedit"
884 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
885 + break 2
886 + fi
887 +done
888 +done
889 +IFS=$as_save_IFS
890 +
891 +fi
892 +fi
893 +ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
894 +if test -n "$ac_ct_NMEDIT"; then
895 + { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
896 +echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
897 +else
898 + { echo "$as_me:$LINENO: result: no" >&5
899 +echo "${ECHO_T}no" >&6; }
900 +fi
901 +
902 + if test "x$ac_ct_NMEDIT" = x; then
903 + NMEDIT=":"
904 + else
905 + case $cross_compiling:$ac_tool_warned in
906 +yes:)
907 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
908 +whose name does not start with the host triplet. If you think this
909 +configuration is useful to you, please write to autoconf@gnu.org." >&5
910 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
911 +whose name does not start with the host triplet. If you think this
912 +configuration is useful to you, please write to autoconf@gnu.org." >&2;}
913 +ac_tool_warned=yes ;;
914 +esac
915 + NMEDIT=$ac_ct_NMEDIT
916 + fi
917 +else
918 + NMEDIT="$ac_cv_prog_NMEDIT"
919 +fi
920 +
921 +
922 + { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
923 +echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
924 +if test "${lt_cv_apple_cc_single_mod+set}" = set; then
925 + echo $ECHO_N "(cached) $ECHO_C" >&6
926 +else
927 + lt_cv_apple_cc_single_mod=no
928 + if test -z "${LT_MULTI_MODULE}"; then
929 + # By default we will add the -single_module flag. You can override
930 + # by either setting the environment variable LT_MULTI_MODULE
931 + # non-empty at configure time, or by adding -multi_module to the
932 + # link flags.
933 + echo "int foo(void){return 1;}" > conftest.c
934 + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
935 + -dynamiclib ${wl}-single_module conftest.c
936 + if test -f libconftest.dylib; then
937 + lt_cv_apple_cc_single_mod=yes
938 + rm -rf libconftest.dylib*
939 + fi
940 + rm conftest.c
941 + fi
942 +fi
943 +{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
944 +echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
945 + { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
946 +echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
947 +if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
948 + echo $ECHO_N "(cached) $ECHO_C" >&6
949 +else
950 + lt_cv_ld_exported_symbols_list=no
951 + save_LDFLAGS=$LDFLAGS
952 + echo "_main" > conftest.sym
953 + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
954 + cat >conftest.$ac_ext <<_ACEOF
955 +/* confdefs.h. */
956 +_ACEOF
957 +cat confdefs.h >>conftest.$ac_ext
958 +cat >>conftest.$ac_ext <<_ACEOF
959 +/* end confdefs.h. */
960 +
961 +int
962 +main ()
963 +{
964 +
965 + ;
966 + return 0;
967 +}
968 +_ACEOF
969 +rm -f conftest.$ac_objext conftest$ac_exeext
970 +if { (ac_try="$ac_link"
971 +case "(($ac_try" in
972 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
973 + *) ac_try_echo=$ac_try;;
974 +esac
975 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
976 + (eval "$ac_link") 2>conftest.er1
977 + ac_status=$?
978 + grep -v '^ *+' conftest.er1 >conftest.err
979 + rm -f conftest.er1
980 + cat conftest.err >&5
981 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
982 + (exit $ac_status); } && {
983 + test -z "$ac_c_werror_flag" ||
984 + test ! -s conftest.err
985 + } && test -s conftest$ac_exeext &&
986 + $as_test_x conftest$ac_exeext; then
987 + lt_cv_ld_exported_symbols_list=yes
988 +else
989 + echo "$as_me: failed program was:" >&5
990 +sed 's/^/| /' conftest.$ac_ext >&5
991 +
992 + lt_cv_ld_exported_symbols_list=no
993 +fi
994 +
995 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
996 + conftest$ac_exeext conftest.$ac_ext
997 + LDFLAGS="$save_LDFLAGS"
998 +
999 +fi
1000 +{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
1001 +echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
1002 + case $host_os in
1003 + rhapsody* | darwin1.[0123])
1004 + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
1005 + darwin1.*)
1006 + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
1007 + darwin*)
1008 + # if running on 10.5 or later, the deployment target defaults
1009 + # to the OS version, if on x86, and 10.4, the deployment
1010 + # target defaults to 10.4. Don't you love it?
1011 + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
1012 + 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
1013 + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
1014 + 10.[012]*)
1015 + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
1016 + 10.*)
1017 + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
1018 + esac
1019 + ;;
1020 + esac
1021 + if test "$lt_cv_apple_cc_single_mod" = "yes"; then
1022 + _lt_dar_single_mod='$single_module'
1023 + fi
1024 + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
1025 + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
1026 + else
1027 + _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
1028 + fi
1029 + if test "$DSYMUTIL" != ":"; then
1030 + _lt_dsymutil="~$DSYMUTIL \$lib || :"
1031 + else
1032 + _lt_dsymutil=
1033 + fi
1034 + ;;
1035 + esac
1036 +
1037 +
1038 enable_dlopen=yes
1039 enable_win32_dll=no
1040
1041 @@ -7466,7 +7783,7 @@ ac_outfile=conftest.$ac_objext
1042 echo "$lt_simple_link_test_code" >conftest.$ac_ext
1043 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
1044 _lt_linker_boilerplate=`cat conftest.err`
1045 -$rm conftest*
1046 +$rm -r conftest*
1047
1048
1049
1050 @@ -7494,11 +7811,11 @@ else
1051 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1052 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1053 -e 's:$: $lt_compiler_flag:'`
1054 - (eval echo "\"\$as_me:7497: $lt_compile\"" >&5)
1055 + (eval echo "\"\$as_me:7814: $lt_compile\"" >&5)
1056 (eval "$lt_compile" 2>conftest.err)
1057 ac_status=$?
1058 cat conftest.err >&5
1059 - echo "$as_me:7501: \$? = $ac_status" >&5
1060 + echo "$as_me:7818: \$? = $ac_status" >&5
1061 if (exit $ac_status) && test -s "$ac_outfile"; then
1062 # The compiler can only warn and ignore the option if not recognized
1063 # So say no if there are warnings other than the usual output.
1064 @@ -7768,10 +8085,10 @@ if test -n "$lt_prog_compiler_pic"; then
1065
1066 { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
1067 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
1068 -if test "${lt_prog_compiler_pic_works+set}" = set; then
1069 +if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
1070 echo $ECHO_N "(cached) $ECHO_C" >&6
1071 else
1072 - lt_prog_compiler_pic_works=no
1073 + lt_cv_prog_compiler_pic_works=no
1074 ac_outfile=conftest.$ac_objext
1075 echo "$lt_simple_compile_test_code" > conftest.$ac_ext
1076 lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
1077 @@ -7784,27 +8101,27 @@ else
1078 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1079 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1080 -e 's:$: $lt_compiler_flag:'`
1081 - (eval echo "\"\$as_me:7787: $lt_compile\"" >&5)
1082 + (eval echo "\"\$as_me:8104: $lt_compile\"" >&5)
1083 (eval "$lt_compile" 2>conftest.err)
1084 ac_status=$?
1085 cat conftest.err >&5
1086 - echo "$as_me:7791: \$? = $ac_status" >&5
1087 + echo "$as_me:8108: \$? = $ac_status" >&5
1088 if (exit $ac_status) && test -s "$ac_outfile"; then
1089 # The compiler can only warn and ignore the option if not recognized
1090 # So say no if there are warnings other than the usual output.
1091 $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
1092 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
1093 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
1094 - lt_prog_compiler_pic_works=yes
1095 + lt_cv_prog_compiler_pic_works=yes
1096 fi
1097 fi
1098 $rm conftest*
1099
1100 fi
1101 -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
1102 -echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
1103 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
1104 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
1105
1106 -if test x"$lt_prog_compiler_pic_works" = xyes; then
1107 +if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
1108 case $lt_prog_compiler_pic in
1109 "" | " "*) ;;
1110 *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
1111 @@ -7831,10 +8148,10 @@ esac
1112 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
1113 { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
1114 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
1115 -if test "${lt_prog_compiler_static_works+set}" = set; then
1116 +if test "${lt_cv_prog_compiler_static_works+set}" = set; then
1117 echo $ECHO_N "(cached) $ECHO_C" >&6
1118 else
1119 - lt_prog_compiler_static_works=no
1120 + lt_cv_prog_compiler_static_works=no
1121 save_LDFLAGS="$LDFLAGS"
1122 LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
1123 echo "$lt_simple_link_test_code" > conftest.$ac_ext
1124 @@ -7847,20 +8164,20 @@ else
1125 $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
1126 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
1127 if diff conftest.exp conftest.er2 >/dev/null; then
1128 - lt_prog_compiler_static_works=yes
1129 + lt_cv_prog_compiler_static_works=yes
1130 fi
1131 else
1132 - lt_prog_compiler_static_works=yes
1133 + lt_cv_prog_compiler_static_works=yes
1134 fi
1135 fi
1136 - $rm conftest*
1137 + $rm -r conftest*
1138 LDFLAGS="$save_LDFLAGS"
1139
1140 fi
1141 -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
1142 -echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
1143 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
1144 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
1145
1146 -if test x"$lt_prog_compiler_static_works" = xyes; then
1147 +if test x"$lt_cv_prog_compiler_static_works" = xyes; then
1148 :
1149 else
1150 lt_prog_compiler_static=
1151 @@ -7888,11 +8205,11 @@ else
1152 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1153 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1154 -e 's:$: $lt_compiler_flag:'`
1155 - (eval echo "\"\$as_me:7891: $lt_compile\"" >&5)
1156 + (eval echo "\"\$as_me:8208: $lt_compile\"" >&5)
1157 (eval "$lt_compile" 2>out/conftest.err)
1158 ac_status=$?
1159 cat out/conftest.err >&5
1160 - echo "$as_me:7895: \$? = $ac_status" >&5
1161 + echo "$as_me:8212: \$? = $ac_status" >&5
1162 if (exit $ac_status) && test -s out/conftest2.$ac_objext
1163 then
1164 # The compiler can only warn and ignore the option if not recognized
1165 @@ -7972,12 +8289,13 @@ echo $ECHO_N "checking whether the $comp
1166 # it will be wrapped by ` (' and `)$', so one must not match beginning or
1167 # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
1168 # as well as any symbol that contains `d'.
1169 - exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
1170 + exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
1171 # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
1172 # platforms (ab)use it in PIC code, but their linkers get confused if
1173 # the symbol is explicitly referenced. Since portable code cannot
1174 # rely on this symbol name, it's probably fine to never include it in
1175 # preloaded symbol tables.
1176 + # Exclude shared library initialization/finalization symbols.
1177 extract_expsyms_cmds=
1178 # Just being paranoid about ensuring that cc_basename is set.
1179 for cc_temp in $compiler""; do
1180 @@ -8036,7 +8354,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
1181
1182 # See if GNU ld supports shared libraries.
1183 case $host_os in
1184 - aix3* | aix4* | aix5*)
1185 + aix[3-9]*)
1186 # On AIX/PPC, the GNU linker is very broken
1187 if test "$host_cpu" != ia64; then
1188 ld_shlibs=no
1189 @@ -8256,7 +8574,7 @@ _LT_EOF
1190 fi
1191 ;;
1192
1193 - aix4* | aix5*)
1194 + aix[4-9]*)
1195 if test "$host_cpu" = ia64; then
1196 # On IA64, the linker does run time linking by default, so we don't
1197 # have to do anything special.
1198 @@ -8276,7 +8594,7 @@ _LT_EOF
1199 # Test if we are trying to use run time linking or normal
1200 # AIX style linking. If -brtl is somewhere in LDFLAGS, we
1201 # need to do runtime linking.
1202 - case $host_os in aix4.[23]|aix4.[23].*|aix5*)
1203 + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
1204 for ld_flag in $LDFLAGS; do
1205 if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
1206 aix_use_runtimelinking=yes
1207 @@ -8548,11 +8866,10 @@ if test -z "$aix_libpath"; then aix_libp
1208 link_all_deplibs=yes
1209 if test "$GCC" = yes ; then
1210 output_verbose_link_cmd='echo'
1211 - archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
1212 - module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
1213 - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
1214 - 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}'
1215 - 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}'
1216 + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
1217 + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
1218 + 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}"
1219 + 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}"
1220 else
1221 case $cc_basename in
1222 xlc*)
1223 @@ -9072,7 +9389,7 @@ aix3*)
1224 soname_spec='${libname}${release}${shared_ext}$major'
1225 ;;
1226
1227 -aix4* | aix5*)
1228 +aix[4-9]*)
1229 version_type=linux
1230 need_lib_prefix=no
1231 need_version=no
1232 @@ -9606,6 +9923,21 @@ esac
1233 echo "${ECHO_T}$dynamic_linker" >&6; }
1234 test "$dynamic_linker" = no && can_build_shared=no
1235
1236 +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
1237 + echo $ECHO_N "(cached) $ECHO_C" >&6
1238 +else
1239 + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
1240 +fi
1241 +
1242 +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
1243 +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
1244 + echo $ECHO_N "(cached) $ECHO_C" >&6
1245 +else
1246 + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
1247 +fi
1248 +
1249 +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
1250 +
1251 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
1252 if test "$GCC" = yes; then
1253 variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
1254 @@ -9925,7 +10257,7 @@ fi
1255 { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
1256 echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
1257 if test $ac_cv_lib_dld_shl_load = yes; then
1258 - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
1259 + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
1260 else
1261 { echo "$as_me:$LINENO: checking for dlopen" >&5
1262 echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
1263 @@ -10201,7 +10533,7 @@ fi
1264 { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
1265 echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
1266 if test $ac_cv_lib_dld_dld_link = yes; then
1267 - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
1268 + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
1269 fi
1270
1271
1272 @@ -10250,7 +10582,7 @@ else
1273 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1274 lt_status=$lt_dlunknown
1275 cat > conftest.$ac_ext <<EOF
1276 -#line 10253 "configure"
1277 +#line 10585 "configure"
1278 #include "confdefs.h"
1279
1280 #if HAVE_DLFCN_H
1281 @@ -10350,7 +10682,7 @@ else
1282 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1283 lt_status=$lt_dlunknown
1284 cat > conftest.$ac_ext <<EOF
1285 -#line 10353 "configure"
1286 +#line 10685 "configure"
1287 #include "confdefs.h"
1288
1289 #if HAVE_DLFCN_H
1290 @@ -10477,7 +10809,7 @@ aix3*)
1291 fi
1292 ;;
1293
1294 -aix4* | aix5*)
1295 +aix[4-9]*)
1296 if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
1297 test "$enable_shared" = yes && enable_static=no
1298 fi
1299 @@ -10533,6 +10865,7 @@ if test -f "$ltmain"; then
1300 predeps \
1301 postdeps \
1302 compiler_lib_search_path \
1303 + compiler_lib_search_dirs \
1304 archive_cmds \
1305 archive_expsym_cmds \
1306 postinstall_cmds \
1307 @@ -10593,7 +10926,7 @@ echo "$as_me: creating $ofile" >&6;}
1308 # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
1309 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
1310 #
1311 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
1312 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
1313 # Free Software Foundation, Inc.
1314 #
1315 # This file is part of GNU Libtool:
1316 @@ -10829,6 +11162,10 @@ predeps=$lt_predeps
1317 # shared library.
1318 postdeps=$lt_postdeps
1319
1320 +# The directories searched by this compiler when creating a shared
1321 +# library
1322 +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
1323 +
1324 # The library search path used internally by the compiler when linking
1325 # a shared library.
1326 compiler_lib_search_path=$lt_compiler_lib_search_path
1327 @@ -11077,6 +11414,7 @@ postdep_objects_CXX=
1328 predeps_CXX=
1329 postdeps_CXX=
1330 compiler_lib_search_path_CXX=
1331 +compiler_lib_search_dirs_CXX=
1332
1333 # Source file extension for C++ test sources.
1334 ac_ext=cpp
1335 @@ -11114,7 +11452,7 @@ ac_outfile=conftest.$ac_objext
1336 echo "$lt_simple_link_test_code" >conftest.$ac_ext
1337 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
1338 _lt_linker_boilerplate=`cat conftest.err`
1339 -$rm conftest*
1340 +$rm -r conftest*
1341
1342
1343 # Allow CC to be a program name with arguments.
1344 @@ -11321,7 +11659,7 @@ case $host_os in
1345 # FIXME: insert proper C++ library support
1346 ld_shlibs_CXX=no
1347 ;;
1348 - aix4* | aix5*)
1349 + aix[4-9]*)
1350 if test "$host_cpu" = ia64; then
1351 # On IA64, the linker does run time linking by default, so we don't
1352 # have to do anything special.
1353 @@ -11334,7 +11672,7 @@ case $host_os in
1354 # Test if we are trying to use run time linking or normal
1355 # AIX style linking. If -brtl is somewhere in LDFLAGS, we
1356 # need to do runtime linking.
1357 - case $host_os in aix4.[23]|aix4.[23].*|aix5*)
1358 + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
1359 for ld_flag in $LDFLAGS; do
1360 case $ld_flag in
1361 *-brtl*)
1362 @@ -11592,51 +11930,23 @@ if test -z "$aix_libpath"; then aix_libp
1363 fi
1364 ;;
1365 darwin* | rhapsody*)
1366 - case $host_os in
1367 - rhapsody* | darwin1.[012])
1368 - allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
1369 - ;;
1370 - *) # Darwin 1.3 on
1371 - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
1372 - allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
1373 - else
1374 - case ${MACOSX_DEPLOYMENT_TARGET} in
1375 - 10.[012])
1376 - allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
1377 - ;;
1378 - 10.*)
1379 - allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
1380 - ;;
1381 - esac
1382 - fi
1383 - ;;
1384 - esac
1385 archive_cmds_need_lc_CXX=no
1386 hardcode_direct_CXX=no
1387 hardcode_automatic_CXX=yes
1388 hardcode_shlibpath_var_CXX=unsupported
1389 whole_archive_flag_spec_CXX=''
1390 link_all_deplibs_CXX=yes
1391 -
1392 - if test "$GXX" = yes ; then
1393 - lt_int_apple_cc_single_mod=no
1394 + allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
1395 + if test "$GXX" = yes ; then
1396 output_verbose_link_cmd='echo'
1397 - if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
1398 - lt_int_apple_cc_single_mod=yes
1399 + 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}"
1400 + module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
1401 + 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}"
1402 + 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}"
1403 + if test "$lt_cv_apple_cc_single_mod" != "yes"; then
1404 + 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}"
1405 + 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}"
1406 fi
1407 - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
1408 - archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
1409 - else
1410 - 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'
1411 - fi
1412 - module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
1413 - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
1414 - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
1415 - 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}'
1416 - else
1417 - 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}'
1418 - fi
1419 - 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}'
1420 else
1421 case $cc_basename in
1422 xlc*)
1423 @@ -11887,7 +12197,7 @@ if test -z "$aix_libpath"; then aix_libp
1424 export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
1425 whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
1426 ;;
1427 - pgCC*)
1428 + pgCC* | pgcpp*)
1429 # Portland Group C++ compiler
1430 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
1431 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'
1432 @@ -12294,7 +12604,6 @@ test "$ld_shlibs_CXX" = no && can_build_
1433 GCC_CXX="$GXX"
1434 LD_CXX="$LD"
1435
1436 -
1437 cat > conftest.$ac_ext <<EOF
1438 class Foo
1439 {
1440 @@ -12396,6 +12705,11 @@ fi
1441
1442 $rm -f confest.$objext
1443
1444 +compiler_lib_search_dirs_CXX=
1445 +if test -n "$compiler_lib_search_path_CXX"; then
1446 + compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
1447 +fi
1448 +
1449 # PORTME: override above test on systems where it is broken
1450 case $host_os in
1451 interix[3-9]*)
1452 @@ -12451,7 +12765,6 @@ solaris*)
1453 ;;
1454 esac
1455
1456 -
1457 case " $postdeps_CXX " in
1458 *" -lc "*) archive_cmds_need_lc_CXX=no ;;
1459 esac
1460 @@ -12527,7 +12840,7 @@ echo $ECHO_N "checking for $compiler opt
1461 esac
1462 else
1463 case $host_os in
1464 - aix4* | aix5*)
1465 + aix[4-9]*)
1466 # All AIX code is PIC.
1467 if test "$host_cpu" = ia64; then
1468 # AIX 5 now supports IA64 processor
1469 @@ -12623,7 +12936,7 @@ echo $ECHO_N "checking for $compiler opt
1470 lt_prog_compiler_pic_CXX='-KPIC'
1471 lt_prog_compiler_static_CXX='-static'
1472 ;;
1473 - pgCC*)
1474 + pgCC* | pgcpp*)
1475 # Portland Group C++ compiler.
1476 lt_prog_compiler_wl_CXX='-Wl,'
1477 lt_prog_compiler_pic_CXX='-fpic'
1478 @@ -12754,10 +13067,10 @@ if test -n "$lt_prog_compiler_pic_CXX";
1479
1480 { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
1481 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
1482 -if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
1483 +if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
1484 echo $ECHO_N "(cached) $ECHO_C" >&6
1485 else
1486 - lt_prog_compiler_pic_works_CXX=no
1487 + lt_cv_prog_compiler_pic_works_CXX=no
1488 ac_outfile=conftest.$ac_objext
1489 echo "$lt_simple_compile_test_code" > conftest.$ac_ext
1490 lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
1491 @@ -12770,27 +13083,27 @@ else
1492 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1493 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1494 -e 's:$: $lt_compiler_flag:'`
1495 - (eval echo "\"\$as_me:12773: $lt_compile\"" >&5)
1496 + (eval echo "\"\$as_me:13086: $lt_compile\"" >&5)
1497 (eval "$lt_compile" 2>conftest.err)
1498 ac_status=$?
1499 cat conftest.err >&5
1500 - echo "$as_me:12777: \$? = $ac_status" >&5
1501 + echo "$as_me:13090: \$? = $ac_status" >&5
1502 if (exit $ac_status) && test -s "$ac_outfile"; then
1503 # The compiler can only warn and ignore the option if not recognized
1504 # So say no if there are warnings other than the usual output.
1505 $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
1506 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
1507 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
1508 - lt_prog_compiler_pic_works_CXX=yes
1509 + lt_cv_prog_compiler_pic_works_CXX=yes
1510 fi
1511 fi
1512 $rm conftest*
1513
1514 fi
1515 -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
1516 -echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
1517 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
1518 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
1519
1520 -if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
1521 +if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
1522 case $lt_prog_compiler_pic_CXX in
1523 "" | " "*) ;;
1524 *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
1525 @@ -12817,10 +13130,10 @@ esac
1526 wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
1527 { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
1528 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
1529 -if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
1530 +if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
1531 echo $ECHO_N "(cached) $ECHO_C" >&6
1532 else
1533 - lt_prog_compiler_static_works_CXX=no
1534 + lt_cv_prog_compiler_static_works_CXX=no
1535 save_LDFLAGS="$LDFLAGS"
1536 LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
1537 echo "$lt_simple_link_test_code" > conftest.$ac_ext
1538 @@ -12833,20 +13146,20 @@ else
1539 $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
1540 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
1541 if diff conftest.exp conftest.er2 >/dev/null; then
1542 - lt_prog_compiler_static_works_CXX=yes
1543 + lt_cv_prog_compiler_static_works_CXX=yes
1544 fi
1545 else
1546 - lt_prog_compiler_static_works_CXX=yes
1547 + lt_cv_prog_compiler_static_works_CXX=yes
1548 fi
1549 fi
1550 - $rm conftest*
1551 + $rm -r conftest*
1552 LDFLAGS="$save_LDFLAGS"
1553
1554 fi
1555 -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
1556 -echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
1557 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
1558 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
1559
1560 -if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
1561 +if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
1562 :
1563 else
1564 lt_prog_compiler_static_CXX=
1565 @@ -12874,11 +13187,11 @@ else
1566 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1567 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1568 -e 's:$: $lt_compiler_flag:'`
1569 - (eval echo "\"\$as_me:12877: $lt_compile\"" >&5)
1570 + (eval echo "\"\$as_me:13190: $lt_compile\"" >&5)
1571 (eval "$lt_compile" 2>out/conftest.err)
1572 ac_status=$?
1573 cat out/conftest.err >&5
1574 - echo "$as_me:12881: \$? = $ac_status" >&5
1575 + echo "$as_me:13194: \$? = $ac_status" >&5
1576 if (exit $ac_status) && test -s out/conftest2.$ac_objext
1577 then
1578 # The compiler can only warn and ignore the option if not recognized
1579 @@ -12931,7 +13244,7 @@ echo $ECHO_N "checking whether the $comp
1580
1581 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
1582 case $host_os in
1583 - aix4* | aix5*)
1584 + aix[4-9]*)
1585 # If we're using GNU nm, then we don't want the "-C" option.
1586 # -C means demangle to AIX nm, but means don't demangle with GNU nm
1587 if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
1588 @@ -12953,6 +13266,7 @@ echo $ECHO_N "checking whether the $comp
1589 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
1590 ;;
1591 esac
1592 + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
1593
1594 { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
1595 echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
1596 @@ -13054,7 +13368,7 @@ aix3*)
1597 soname_spec='${libname}${release}${shared_ext}$major'
1598 ;;
1599
1600 -aix4* | aix5*)
1601 +aix[4-9]*)
1602 version_type=linux
1603 need_lib_prefix=no
1604 need_version=no
1605 @@ -13587,6 +13901,21 @@ esac
1606 echo "${ECHO_T}$dynamic_linker" >&6; }
1607 test "$dynamic_linker" = no && can_build_shared=no
1608
1609 +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
1610 + echo $ECHO_N "(cached) $ECHO_C" >&6
1611 +else
1612 + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
1613 +fi
1614 +
1615 +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
1616 +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
1617 + echo $ECHO_N "(cached) $ECHO_C" >&6
1618 +else
1619 + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
1620 +fi
1621 +
1622 +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
1623 +
1624 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
1625 if test "$GCC" = yes; then
1626 variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
1627 @@ -13670,6 +13999,7 @@ if test -f "$ltmain"; then
1628 predeps_CXX \
1629 postdeps_CXX \
1630 compiler_lib_search_path_CXX \
1631 + compiler_lib_search_dirs_CXX \
1632 archive_cmds_CXX \
1633 archive_expsym_cmds_CXX \
1634 postinstall_cmds_CXX \
1635 @@ -13918,6 +14248,10 @@ predeps=$lt_predeps_CXX
1636 # shared library.
1637 postdeps=$lt_postdeps_CXX
1638
1639 +# The directories searched by this compiler when creating a shared
1640 +# library
1641 +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
1642 +
1643 # The library search path used internally by the compiler when linking
1644 # a shared library.
1645 compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
1646 @@ -14132,7 +14466,7 @@ ac_outfile=conftest.$ac_objext
1647 echo "$lt_simple_link_test_code" >conftest.$ac_ext
1648 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
1649 _lt_linker_boilerplate=`cat conftest.err`
1650 -$rm conftest*
1651 +$rm -r conftest*
1652
1653
1654 # Allow CC to be a program name with arguments.
1655 @@ -14170,7 +14504,7 @@ aix3*)
1656 postinstall_cmds='$RANLIB $lib'
1657 fi
1658 ;;
1659 -aix4* | aix5*)
1660 +aix[4-9]*)
1661 if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
1662 test "$enable_shared" = yes && enable_static=no
1663 fi
1664 @@ -14435,10 +14769,10 @@ if test -n "$lt_prog_compiler_pic_F77";
1665
1666 { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
1667 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
1668 -if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
1669 +if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
1670 echo $ECHO_N "(cached) $ECHO_C" >&6
1671 else
1672 - lt_prog_compiler_pic_works_F77=no
1673 + lt_cv_prog_compiler_pic_works_F77=no
1674 ac_outfile=conftest.$ac_objext
1675 echo "$lt_simple_compile_test_code" > conftest.$ac_ext
1676 lt_compiler_flag="$lt_prog_compiler_pic_F77"
1677 @@ -14451,27 +14785,27 @@ else
1678 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1679 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1680 -e 's:$: $lt_compiler_flag:'`
1681 - (eval echo "\"\$as_me:14454: $lt_compile\"" >&5)
1682 + (eval echo "\"\$as_me:14788: $lt_compile\"" >&5)
1683 (eval "$lt_compile" 2>conftest.err)
1684 ac_status=$?
1685 cat conftest.err >&5
1686 - echo "$as_me:14458: \$? = $ac_status" >&5
1687 + echo "$as_me:14792: \$? = $ac_status" >&5
1688 if (exit $ac_status) && test -s "$ac_outfile"; then
1689 # The compiler can only warn and ignore the option if not recognized
1690 # So say no if there are warnings other than the usual output.
1691 $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
1692 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
1693 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
1694 - lt_prog_compiler_pic_works_F77=yes
1695 + lt_cv_prog_compiler_pic_works_F77=yes
1696 fi
1697 fi
1698 $rm conftest*
1699
1700 fi
1701 -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
1702 -echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
1703 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
1704 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }
1705
1706 -if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
1707 +if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
1708 case $lt_prog_compiler_pic_F77 in
1709 "" | " "*) ;;
1710 *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
1711 @@ -14498,10 +14832,10 @@ esac
1712 wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
1713 { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
1714 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
1715 -if test "${lt_prog_compiler_static_works_F77+set}" = set; then
1716 +if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
1717 echo $ECHO_N "(cached) $ECHO_C" >&6
1718 else
1719 - lt_prog_compiler_static_works_F77=no
1720 + lt_cv_prog_compiler_static_works_F77=no
1721 save_LDFLAGS="$LDFLAGS"
1722 LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
1723 echo "$lt_simple_link_test_code" > conftest.$ac_ext
1724 @@ -14514,20 +14848,20 @@ else
1725 $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
1726 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
1727 if diff conftest.exp conftest.er2 >/dev/null; then
1728 - lt_prog_compiler_static_works_F77=yes
1729 + lt_cv_prog_compiler_static_works_F77=yes
1730 fi
1731 else
1732 - lt_prog_compiler_static_works_F77=yes
1733 + lt_cv_prog_compiler_static_works_F77=yes
1734 fi
1735 fi
1736 - $rm conftest*
1737 + $rm -r conftest*
1738 LDFLAGS="$save_LDFLAGS"
1739
1740 fi
1741 -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
1742 -echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
1743 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
1744 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }
1745
1746 -if test x"$lt_prog_compiler_static_works_F77" = xyes; then
1747 +if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
1748 :
1749 else
1750 lt_prog_compiler_static_F77=
1751 @@ -14555,11 +14889,11 @@ else
1752 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1753 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1754 -e 's:$: $lt_compiler_flag:'`
1755 - (eval echo "\"\$as_me:14558: $lt_compile\"" >&5)
1756 + (eval echo "\"\$as_me:14892: $lt_compile\"" >&5)
1757 (eval "$lt_compile" 2>out/conftest.err)
1758 ac_status=$?
1759 cat out/conftest.err >&5
1760 - echo "$as_me:14562: \$? = $ac_status" >&5
1761 + echo "$as_me:14896: \$? = $ac_status" >&5
1762 if (exit $ac_status) && test -s out/conftest2.$ac_objext
1763 then
1764 # The compiler can only warn and ignore the option if not recognized
1765 @@ -14639,12 +14973,13 @@ echo $ECHO_N "checking whether the $comp
1766 # it will be wrapped by ` (' and `)$', so one must not match beginning or
1767 # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
1768 # as well as any symbol that contains `d'.
1769 - exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
1770 + exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
1771 # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
1772 # platforms (ab)use it in PIC code, but their linkers get confused if
1773 # the symbol is explicitly referenced. Since portable code cannot
1774 # rely on this symbol name, it's probably fine to never include it in
1775 # preloaded symbol tables.
1776 + # Exclude shared library initialization/finalization symbols.
1777 extract_expsyms_cmds=
1778 # Just being paranoid about ensuring that cc_basename is set.
1779 for cc_temp in $compiler""; do
1780 @@ -14703,7 +15038,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
1781
1782 # See if GNU ld supports shared libraries.
1783 case $host_os in
1784 - aix3* | aix4* | aix5*)
1785 + aix[3-9]*)
1786 # On AIX/PPC, the GNU linker is very broken
1787 if test "$host_cpu" != ia64; then
1788 ld_shlibs_F77=no
1789 @@ -14923,7 +15258,7 @@ _LT_EOF
1790 fi
1791 ;;
1792
1793 - aix4* | aix5*)
1794 + aix[4-9]*)
1795 if test "$host_cpu" = ia64; then
1796 # On IA64, the linker does run time linking by default, so we don't
1797 # have to do anything special.
1798 @@ -14943,7 +15278,7 @@ _LT_EOF
1799 # Test if we are trying to use run time linking or normal
1800 # AIX style linking. If -brtl is somewhere in LDFLAGS, we
1801 # need to do runtime linking.
1802 - case $host_os in aix4.[23]|aix4.[23].*|aix5*)
1803 + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
1804 for ld_flag in $LDFLAGS; do
1805 if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
1806 aix_use_runtimelinking=yes
1807 @@ -15195,11 +15530,10 @@ if test -z "$aix_libpath"; then aix_libp
1808 link_all_deplibs_F77=yes
1809 if test "$GCC" = yes ; then
1810 output_verbose_link_cmd='echo'
1811 - archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
1812 - module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
1813 - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
1814 - 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}'
1815 - 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}'
1816 + 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}"
1817 + module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
1818 + 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}"
1819 + 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}"
1820 else
1821 case $cc_basename in
1822 xlc*)
1823 @@ -15668,7 +16002,7 @@ aix3*)
1824 soname_spec='${libname}${release}${shared_ext}$major'
1825 ;;
1826
1827 -aix4* | aix5*)
1828 +aix[4-9]*)
1829 version_type=linux
1830 need_lib_prefix=no
1831 need_version=no
1832 @@ -16201,6 +16535,21 @@ esac
1833 echo "${ECHO_T}$dynamic_linker" >&6; }
1834 test "$dynamic_linker" = no && can_build_shared=no
1835
1836 +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
1837 + echo $ECHO_N "(cached) $ECHO_C" >&6
1838 +else
1839 + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
1840 +fi
1841 +
1842 +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
1843 +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
1844 + echo $ECHO_N "(cached) $ECHO_C" >&6
1845 +else
1846 + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
1847 +fi
1848 +
1849 +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
1850 +
1851 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
1852 if test "$GCC" = yes; then
1853 variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
1854 @@ -16284,6 +16633,7 @@ if test -f "$ltmain"; then
1855 predeps_F77 \
1856 postdeps_F77 \
1857 compiler_lib_search_path_F77 \
1858 + compiler_lib_search_dirs_F77 \
1859 archive_cmds_F77 \
1860 archive_expsym_cmds_F77 \
1861 postinstall_cmds_F77 \
1862 @@ -16532,6 +16882,10 @@ predeps=$lt_predeps_F77
1863 # shared library.
1864 postdeps=$lt_postdeps_F77
1865
1866 +# The directories searched by this compiler when creating a shared
1867 +# library
1868 +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77
1869 +
1870 # The library search path used internally by the compiler when linking
1871 # a shared library.
1872 compiler_lib_search_path=$lt_compiler_lib_search_path_F77
1873 @@ -16706,7 +17060,7 @@ ac_outfile=conftest.$ac_objext
1874 echo "$lt_simple_link_test_code" >conftest.$ac_ext
1875 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
1876 _lt_linker_boilerplate=`cat conftest.err`
1877 -$rm conftest*
1878 +$rm -r conftest*
1879
1880
1881 # Allow CC to be a program name with arguments.
1882 @@ -16755,11 +17109,11 @@ else
1883 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1884 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1885 -e 's:$: $lt_compiler_flag:'`
1886 - (eval echo "\"\$as_me:16758: $lt_compile\"" >&5)
1887 + (eval echo "\"\$as_me:17112: $lt_compile\"" >&5)
1888 (eval "$lt_compile" 2>conftest.err)
1889 ac_status=$?
1890 cat conftest.err >&5
1891 - echo "$as_me:16762: \$? = $ac_status" >&5
1892 + echo "$as_me:17116: \$? = $ac_status" >&5
1893 if (exit $ac_status) && test -s "$ac_outfile"; then
1894 # The compiler can only warn and ignore the option if not recognized
1895 # So say no if there are warnings other than the usual output.
1896 @@ -16819,7 +17173,7 @@ echo $ECHO_N "checking for $compiler opt
1897 # built for inclusion in a dll (and should export symbols for example).
1898 # Although the cygwin gcc ignores -fPIC, still need this for old-style
1899 # (--disable-auto-import) libraries
1900 - lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
1901 +
1902 ;;
1903
1904 darwin* | rhapsody*)
1905 @@ -16889,7 +17243,7 @@ echo $ECHO_N "checking for $compiler opt
1906 mingw* | cygwin* | pw32* | os2*)
1907 # This hack is so that the source file can tell whether it is being
1908 # built for inclusion in a dll (and should export symbols for example).
1909 - lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
1910 +
1911 ;;
1912
1913 hpux9* | hpux10* | hpux11*)
1914 @@ -17029,10 +17383,10 @@ if test -n "$lt_prog_compiler_pic_GCJ";
1915
1916 { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
1917 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
1918 -if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
1919 +if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
1920 echo $ECHO_N "(cached) $ECHO_C" >&6
1921 else
1922 - lt_prog_compiler_pic_works_GCJ=no
1923 + lt_cv_prog_compiler_pic_works_GCJ=no
1924 ac_outfile=conftest.$ac_objext
1925 echo "$lt_simple_compile_test_code" > conftest.$ac_ext
1926 lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
1927 @@ -17045,27 +17399,27 @@ else
1928 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1929 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1930 -e 's:$: $lt_compiler_flag:'`
1931 - (eval echo "\"\$as_me:17048: $lt_compile\"" >&5)
1932 + (eval echo "\"\$as_me:17402: $lt_compile\"" >&5)
1933 (eval "$lt_compile" 2>conftest.err)
1934 ac_status=$?
1935 cat conftest.err >&5
1936 - echo "$as_me:17052: \$? = $ac_status" >&5
1937 + echo "$as_me:17406: \$? = $ac_status" >&5
1938 if (exit $ac_status) && test -s "$ac_outfile"; then
1939 # The compiler can only warn and ignore the option if not recognized
1940 # So say no if there are warnings other than the usual output.
1941 $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
1942 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
1943 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
1944 - lt_prog_compiler_pic_works_GCJ=yes
1945 + lt_cv_prog_compiler_pic_works_GCJ=yes
1946 fi
1947 fi
1948 $rm conftest*
1949
1950 fi
1951 -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
1952 -echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
1953 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
1954 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
1955
1956 -if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
1957 +if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
1958 case $lt_prog_compiler_pic_GCJ in
1959 "" | " "*) ;;
1960 *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
1961 @@ -17092,10 +17446,10 @@ esac
1962 wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
1963 { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
1964 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
1965 -if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
1966 +if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
1967 echo $ECHO_N "(cached) $ECHO_C" >&6
1968 else
1969 - lt_prog_compiler_static_works_GCJ=no
1970 + lt_cv_prog_compiler_static_works_GCJ=no
1971 save_LDFLAGS="$LDFLAGS"
1972 LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
1973 echo "$lt_simple_link_test_code" > conftest.$ac_ext
1974 @@ -17108,20 +17462,20 @@ else
1975 $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
1976 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
1977 if diff conftest.exp conftest.er2 >/dev/null; then
1978 - lt_prog_compiler_static_works_GCJ=yes
1979 + lt_cv_prog_compiler_static_works_GCJ=yes
1980 fi
1981 else
1982 - lt_prog_compiler_static_works_GCJ=yes
1983 + lt_cv_prog_compiler_static_works_GCJ=yes
1984 fi
1985 fi
1986 - $rm conftest*
1987 + $rm -r conftest*
1988 LDFLAGS="$save_LDFLAGS"
1989
1990 fi
1991 -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
1992 -echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
1993 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
1994 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }
1995
1996 -if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
1997 +if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
1998 :
1999 else
2000 lt_prog_compiler_static_GCJ=
2001 @@ -17149,11 +17503,11 @@ else
2002 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
2003 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
2004 -e 's:$: $lt_compiler_flag:'`
2005 - (eval echo "\"\$as_me:17152: $lt_compile\"" >&5)
2006 + (eval echo "\"\$as_me:17506: $lt_compile\"" >&5)
2007 (eval "$lt_compile" 2>out/conftest.err)
2008 ac_status=$?
2009 cat out/conftest.err >&5
2010 - echo "$as_me:17156: \$? = $ac_status" >&5
2011 + echo "$as_me:17510: \$? = $ac_status" >&5
2012 if (exit $ac_status) && test -s out/conftest2.$ac_objext
2013 then
2014 # The compiler can only warn and ignore the option if not recognized
2015 @@ -17233,12 +17587,13 @@ echo $ECHO_N "checking whether the $comp
2016 # it will be wrapped by ` (' and `)$', so one must not match beginning or
2017 # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
2018 # as well as any symbol that contains `d'.
2019 - exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
2020 + exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
2021 # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
2022 # platforms (ab)use it in PIC code, but their linkers get confused if
2023 # the symbol is explicitly referenced. Since portable code cannot
2024 # rely on this symbol name, it's probably fine to never include it in
2025 # preloaded symbol tables.
2026 + # Exclude shared library initialization/finalization symbols.
2027 extract_expsyms_cmds=
2028 # Just being paranoid about ensuring that cc_basename is set.
2029 for cc_temp in $compiler""; do
2030 @@ -17297,7 +17652,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
2031
2032 # See if GNU ld supports shared libraries.
2033 case $host_os in
2034 - aix3* | aix4* | aix5*)
2035 + aix[3-9]*)
2036 # On AIX/PPC, the GNU linker is very broken
2037 if test "$host_cpu" != ia64; then
2038 ld_shlibs_GCJ=no
2039 @@ -17517,7 +17872,7 @@ _LT_EOF
2040 fi
2041 ;;
2042
2043 - aix4* | aix5*)
2044 + aix[4-9]*)
2045 if test "$host_cpu" = ia64; then
2046 # On IA64, the linker does run time linking by default, so we don't
2047 # have to do anything special.
2048 @@ -17537,7 +17892,7 @@ _LT_EOF
2049 # Test if we are trying to use run time linking or normal
2050 # AIX style linking. If -brtl is somewhere in LDFLAGS, we
2051 # need to do runtime linking.
2052 - case $host_os in aix4.[23]|aix4.[23].*|aix5*)
2053 + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
2054 for ld_flag in $LDFLAGS; do
2055 if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
2056 aix_use_runtimelinking=yes
2057 @@ -17809,11 +18164,10 @@ if test -z "$aix_libpath"; then aix_libp
2058 link_all_deplibs_GCJ=yes
2059 if test "$GCC" = yes ; then
2060 output_verbose_link_cmd='echo'
2061 - archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
2062 - module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
2063 - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
2064 - 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}'
2065 - 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}'
2066 + 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}"
2067 + module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
2068 + 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}"
2069 + 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}"
2070 else
2071 case $cc_basename in
2072 xlc*)
2073 @@ -18282,7 +18636,7 @@ aix3*)
2074 soname_spec='${libname}${release}${shared_ext}$major'
2075 ;;
2076
2077 -aix4* | aix5*)
2078 +aix[4-9]*)
2079 version_type=linux
2080 need_lib_prefix=no
2081 need_version=no
2082 @@ -18815,6 +19169,21 @@ esac
2083 echo "${ECHO_T}$dynamic_linker" >&6; }
2084 test "$dynamic_linker" = no && can_build_shared=no
2085
2086 +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
2087 + echo $ECHO_N "(cached) $ECHO_C" >&6
2088 +else
2089 + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
2090 +fi
2091 +
2092 +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
2093 +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
2094 + echo $ECHO_N "(cached) $ECHO_C" >&6
2095 +else
2096 + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
2097 +fi
2098 +
2099 +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
2100 +
2101 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
2102 if test "$GCC" = yes; then
2103 variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
2104 @@ -18898,6 +19267,7 @@ if test -f "$ltmain"; then
2105 predeps_GCJ \
2106 postdeps_GCJ \
2107 compiler_lib_search_path_GCJ \
2108 + compiler_lib_search_dirs_GCJ \
2109 archive_cmds_GCJ \
2110 archive_expsym_cmds_GCJ \
2111 postinstall_cmds_GCJ \
2112 @@ -19146,6 +19516,10 @@ predeps=$lt_predeps_GCJ
2113 # shared library.
2114 postdeps=$lt_postdeps_GCJ
2115
2116 +# The directories searched by this compiler when creating a shared
2117 +# library
2118 +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ
2119 +
2120 # The library search path used internally by the compiler when linking
2121 # a shared library.
2122 compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
2123 @@ -19319,7 +19693,7 @@ ac_outfile=conftest.$ac_objext
2124 echo "$lt_simple_link_test_code" >conftest.$ac_ext
2125 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
2126 _lt_linker_boilerplate=`cat conftest.err`
2127 -$rm conftest*
2128 +$rm -r conftest*
2129
2130
2131 # Allow CC to be a program name with arguments.
2132 @@ -19379,6 +19753,7 @@ if test -f "$ltmain"; then
2133 predeps_RC \
2134 postdeps_RC \
2135 compiler_lib_search_path_RC \
2136 + compiler_lib_search_dirs_RC \
2137 archive_cmds_RC \
2138 archive_expsym_cmds_RC \
2139 postinstall_cmds_RC \
2140 @@ -19627,6 +20002,10 @@ predeps=$lt_predeps_RC
2141 # shared library.
2142 postdeps=$lt_postdeps_RC
2143
2144 +# The directories searched by this compiler when creating a shared
2145 +# library
2146 +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC
2147 +
2148 # The library search path used internally by the compiler when linking
2149 # a shared library.
2150 compiler_lib_search_path=$lt_compiler_lib_search_path_RC
2151 @@ -28713,7 +29092,7 @@ _ACEOF
2152
2153 fi
2154 fi
2155 - USE_NLS=yes
2156 + USE_NLS=yes
2157
2158
2159 gt_cv_have_gettext=no
2160 @@ -31934,6 +32313,8 @@ ac_delim='%!_!# '
2161 for ac_last_try in false false false false false :; do
2162 cat >conf$$subs.sed <<_ACEOF
2163 RANLIB!$RANLIB$ac_delim
2164 +DSYMUTIL!$DSYMUTIL$ac_delim
2165 +NMEDIT!$NMEDIT$ac_delim
2166 CPP!$CPP$ac_delim
2167 CXX!$CXX$ac_delim
2168 CXXFLAGS!$CXXFLAGS$ac_delim
2169 @@ -32028,8 +32409,6 @@ LIBXUL_CXXFLAGS!$LIBXUL_CXXFLAGS$ac_deli
2170 LIBXUL_LDFLAGS!$LIBXUL_LDFLAGS$ac_delim
2171 LIBXUL_LIBS!$LIBXUL_LIBS$ac_delim
2172 HAVE_LIBXUL_TRUE!$HAVE_LIBXUL_TRUE$ac_delim
2173 -HAVE_LIBXUL_FALSE!$HAVE_LIBXUL_FALSE$ac_delim
2174 -HAVE_LIBXUL_DEBUG_TRUE!$HAVE_LIBXUL_DEBUG_TRUE$ac_delim
2175 _ACEOF
2176
2177 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
2178 @@ -32071,6 +32450,8 @@ _ACEOF
2179 ac_delim='%!_!# '
2180 for ac_last_try in false false false false false :; do
2181 cat >conf$$subs.sed <<_ACEOF
2182 +HAVE_LIBXUL_FALSE!$HAVE_LIBXUL_FALSE$ac_delim
2183 +HAVE_LIBXUL_DEBUG_TRUE!$HAVE_LIBXUL_DEBUG_TRUE$ac_delim
2184 HAVE_LIBXUL_DEBUG_FALSE!$HAVE_LIBXUL_DEBUG_FALSE$ac_delim
2185 WITH_XULRUNNER_ENGINE_TRUE!$WITH_XULRUNNER_ENGINE_TRUE$ac_delim
2186 WITH_XULRUNNER_ENGINE_FALSE!$WITH_XULRUNNER_ENGINE_FALSE$ac_delim
2187 @@ -32166,8 +32547,6 @@ GNOME_LIBS!$GNOME_LIBS$ac_delim
2188 LSB_RELEASE!$LSB_RELEASE$ac_delim
2189 GGE_VERSION!$GGE_VERSION$ac_delim
2190 GGE_API_VERSION!$GGE_API_VERSION$ac_delim
2191 -LIBOBJS!$LIBOBJS$ac_delim
2192 -LTLIBOBJS!$LTLIBOBJS$ac_delim
2193 _ACEOF
2194
2195 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
2196 @@ -32206,6 +32585,51 @@ CEOF$ac_eof
2197 _ACEOF
2198
2199
2200 +ac_delim='%!_!# '
2201 +for ac_last_try in false false false false false :; do
2202 + cat >conf$$subs.sed <<_ACEOF
2203 +LIBOBJS!$LIBOBJS$ac_delim
2204 +LTLIBOBJS!$LTLIBOBJS$ac_delim
2205 +_ACEOF
2206 +
2207 + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 2; then
2208 + break
2209 + elif $ac_last_try; then
2210 + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
2211 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
2212 + { (exit 1); exit 1; }; }
2213 + else
2214 + ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
2215 + fi
2216 +done
2217 +
2218 +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
2219 +if test -n "$ac_eof"; then
2220 + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
2221 + ac_eof=`expr $ac_eof + 1`
2222 +fi
2223 +
2224 +cat >>$CONFIG_STATUS <<_ACEOF
2225 +cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof
2226 +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
2227 +_ACEOF
2228 +sed '
2229 +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
2230 +s/^/s,@/; s/!/@,|#_!!_#|/
2231 +:n
2232 +t n
2233 +s/'"$ac_delim"'$/,g/; t
2234 +s/$/\\/; p
2235 +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
2236 +' >>$CONFIG_STATUS <conf$$subs.sed
2237 +rm -f conf$$subs.sed
2238 +cat >>$CONFIG_STATUS <<_ACEOF
2239 +:end
2240 +s/|#_!!_#|//g
2241 +CEOF$ac_eof
2242 +_ACEOF
2243 +
2244 +
2245 # VPATH may cause trouble with some makes, so we remove $(srcdir),
2246 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
2247 # trailing colons and then remove the whole line if VPATH becomes empty
2248 @@ -32455,7 +32879,7 @@ s&@abs_top_builddir@&$ac_abs_top_builddi
2249 s&@INSTALL@&$ac_INSTALL&;t t
2250 s&@MKDIR_P@&$ac_MKDIR_P&;t t
2251 $ac_datarootdir_hack
2252 -" $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
2253 +" $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
2254
2255 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
2256 { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
2257 @@ -32569,21 +32993,22 @@ echo "$as_me: $ac_file is unchanged" >&6
2258 fi
2259 rm -f "$tmp/out12"
2260 # Compute $ac_file's index in $config_headers.
2261 +_am_arg=$ac_file
2262 _am_stamp_count=1
2263 for _am_header in $config_headers :; do
2264 case $_am_header in
2265 - $ac_file | $ac_file:* )
2266 + $_am_arg | $_am_arg:* )
2267 break ;;
2268 * )
2269 _am_stamp_count=`expr $_am_stamp_count + 1` ;;
2270 esac
2271 done
2272 -echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
2273 -$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
2274 - X$ac_file : 'X\(//\)[^/]' \| \
2275 - X$ac_file : 'X\(//\)$' \| \
2276 - X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
2277 -echo X$ac_file |
2278 +echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
2279 +$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
2280 + X"$_am_arg" : 'X\(//\)[^/]' \| \
2281 + X"$_am_arg" : 'X\(//\)$' \| \
2282 + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
2283 +echo X"$_am_arg" |
2284 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
2285 s//\1/
2286 q
2287 @@ -32620,7 +33045,7 @@ echo "$as_me: executing $ac_file command
2288 # each Makefile.in and add a new line on top of each file to say so.
2289 # Grep'ing the whole file is not good either: AIX grep has a line
2290 # limit of 2048, but all sed's we know have understand at least 4000.
2291 - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
2292 + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
2293 dirpart=`$as_dirname -- "$mf" ||
2294 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
2295 X"$mf" : 'X\(//\)[^/]' \| \
2296 Index: epiphany-2.21.90/gtk-doc.make
492297 ===================================================================
502298 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
51 +++ epiphany-browser-2.21.4/gtk-doc.make 2008-01-14 22:05:28.000000000 +0000
2299 +++ epiphany-2.21.90/gtk-doc.make 2008-02-18 20:52:34.324881394 +0100
522300 @@ -0,0 +1,174 @@
532301 +# -*- mode: makefile -*-
542302 +
2242472 + -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
2252473 +
2262474 +.PHONY : dist-hook-local docs
227 Index: epiphany-browser-2.21.4/ltmain.sh
2475 Index: epiphany-2.21.90/ltmain.sh
2282476 ===================================================================
229 --- epiphany-browser-2.21.4.orig/ltmain.sh 2007-08-01 15:12:57.000000000 +0100
230 +++ epiphany-browser-2.21.4/ltmain.sh 2007-11-27 21:23:09.000000000 +0000
231 @@ -43,7 +43,7 @@
2477 --- epiphany-2.21.90.orig/ltmain.sh 2007-08-14 19:43:36.000000000 +0200
2478 +++ epiphany-2.21.90/ltmain.sh 2008-02-02 14:06:18.000000000 +0100
2479 @@ -2,7 +2,7 @@
2480 # NOTE: Changing this file will not affect anything until you rerun configure.
2481 #
2482 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
2483 -# 2007 Free Software Foundation, Inc.
2484 +# 2007, 2008 Free Software Foundation, Inc.
2485 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
2486 #
2487 # This program is free software; you can redistribute it and/or modify
2488 @@ -43,8 +43,8 @@ EXIT_FAILURE=1
2322489
2332490 PROGRAM=ltmain.sh
2342491 PACKAGE=libtool
235 -VERSION="1.5.24 Debian 1.5.24-1"
236 +VERSION="1.5.24 Debian 1.5.24-2"
237 TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
2492 -VERSION="1.5.24 Debian 1.5.24-1ubuntu1"
2493 -TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
2494 +VERSION="1.5.26 Debian 1.5.26-1"
2495 +TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
2382496
2392497 # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
2498 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
2499 @@ -113,15 +113,21 @@ esac
2500 # These must not be set unconditionally because not all systems understand
2501 # e.g. LANG=C (notably SCO).
2502 # We save the old values to restore during execute mode.
2503 -for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
2504 +lt_env=
2505 +for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
2506 do
2507 eval "if test \"\${$lt_var+set}\" = set; then
2508 save_$lt_var=\$$lt_var
2509 + lt_env=\"$lt_var=\$$lt_var \$lt_env\"
2510 $lt_var=C
2511 export $lt_var
2512 fi"
2513 done
2514
2515 +if test -n "$lt_env"; then
2516 + lt_env="env $lt_env"
2517 +fi
2518 +
2519 # Make sure IFS has a sensible default
2520 lt_nl='
2521 '
2522 @@ -485,7 +491,7 @@ do
2523 echo "\
2524 $PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
2525
2526 -Copyright (C) 2007 Free Software Foundation, Inc.
2527 +Copyright (C) 2008 Free Software Foundation, Inc.
2528 This is free software; see the source for copying conditions. There is NO
2529 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
2530 exit $?
2531 @@ -788,6 +794,7 @@ if test -z "$show_help"; then
2532 *.for) xform=for ;;
2533 *.java) xform=java ;;
2534 *.obj) xform=obj ;;
2535 + *.sx) xform=sx ;;
2536 esac
2537
2538 libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
2539 @@ -956,7 +963,7 @@ EOF
2540 $run $rm "$lobj" "$output_obj"
2541
2542 $show "$command"
2543 - if $run eval "$command"; then :
2544 + if $run eval $lt_env "$command"; then :
2545 else
2546 test -n "$output_obj" && $run $rm $removelist
2547 exit $EXIT_FAILURE
2548 @@ -1028,7 +1035,7 @@ EOF
2549 command="$command$suppress_output"
2550 $run $rm "$obj" "$output_obj"
2551 $show "$command"
2552 - if $run eval "$command"; then :
2553 + if $run eval $lt_env "$command"; then :
2554 else
2555 $run $rm $removelist
2556 exit $EXIT_FAILURE
2557 @@ -1161,6 +1168,7 @@ EOF
2558 thread_safe=no
2559 vinfo=
2560 vinfo_number=no
2561 + single_module="${wl}-single_module"
2562
2563 func_infer_tag $base_compile
2564
2565 @@ -1646,6 +1654,11 @@ EOF
2566 continue
2567 ;;
2568
2569 + -multi_module)
2570 + single_module="${wl}-multi_module"
2571 + continue
2572 + ;;
2573 +
2574 -module)
2575 module=yes
2576 continue
2577 @@ -2152,7 +2165,12 @@ EOF
2578 continue
2579 fi
2580 name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
2581 - for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
2582 + if test "$linkmode" = lib; then
2583 + searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
2584 + else
2585 + searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
2586 + fi
2587 + for searchdir in $searchdirs; do
2588 for search_ext in .la $std_shrext .so .a; do
2589 # Search the libtool library
2590 lib="$searchdir/lib${name}${search_ext}"
2591 @@ -2948,12 +2966,18 @@ EOF
2592 # we do not want to link against static libs,
2593 # but need to link against shared
2594 eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
2595 + eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
2596 if test -n "$deplibrary_names" ; then
2597 for tmp in $deplibrary_names ; do
2598 depdepl=$tmp
2599 done
2600 - if test -f "$path/$depdepl" ; then
2601 + if test -f "$deplibdir/$depdepl" ; then
2602 + depdepl="$deplibdir/$depdepl"
2603 + elif test -f "$path/$depdepl" ; then
2604 depdepl="$path/$depdepl"
2605 + else
2606 + # Can't find it, oh well...
2607 + depdepl=
2608 fi
2609 # do not add paths which are already there
2610 case " $newlib_search_path " in
2611 @@ -3101,9 +3125,10 @@ EOF
2612
2613 case $linkmode in
2614 oldlib)
2615 - if test -n "$deplibs"; then
2616 - $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
2617 - fi
2618 + case " $deplibs" in
2619 + *\ -l* | *\ -L*)
2620 + $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
2621 + esac
2622
2623 if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
2624 $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
2625 @@ -4245,9 +4270,10 @@ EOF
2626 ;;
2627
2628 obj)
2629 - if test -n "$deplibs"; then
2630 - $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
2631 - fi
2632 + case " $deplibs" in
2633 + *\ -l* | *\ -L*)
2634 + $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
2635 + esac
2636
2637 if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
2638 $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
2639 @@ -6486,7 +6512,7 @@ relink_command=\"$relink_command\""
2640 fi
2641
2642 # Restore saved environment variables
2643 - for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
2644 + for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
2645 do
2646 eval "if test \"\${save_$lt_var+set}\" = set; then
2647 $lt_var=\$save_$lt_var; export $lt_var