Merge lp:~noskcaj/ubuntu/trusty/goocanvas-2.0/2.0.2 into lp:ubuntu/trusty/goocanvas-2.0
- Trusty (14.04)
- 2.0.2
- Merge into trusty
Status: | Rejected |
---|---|
Rejected by: | Sebastien Bacher |
Proposed branch: | lp:~noskcaj/ubuntu/trusty/goocanvas-2.0/2.0.2 |
Merge into: | lp:ubuntu/trusty/goocanvas-2.0 |
Diff against target: |
34078 lines (+10699/-7511) 143 files modified
ChangeLog (+92/-0) INSTALL (+7/-2) Makefile.in (+95/-40) NEWS (+8/-0) README (+1/-1) aclocal.m4 (+2208/-1496) bindings/Makefile.in (+51/-20) bindings/python/Makefile.in (+66/-25) config.guess (+147/-118) config.sub (+136/-68) configure (+1944/-905) configure.in (+7/-7) debian/changelog (+16/-0) debian/compat (+1/-1) debian/control (+4/-2) debian/copyright (+1/-1) debian/gir1.2-goocanvas-2.0-9.install (+1/-1) debian/libgoocanvas-2.0-9-common.install (+1/-1) debian/libgoocanvas-2.0-9.install (+1/-1) debian/libgoocanvas-2.0-9.symbols (+270/-0) debian/libgoocanvas-2.0-dev.install (+6/-6) debian/libgoocanvas-2.0-dev.links (+1/-1) debian/rules (+4/-6) demo/Makefile.in (+71/-40) demo/demo-animation.c (+3/-3) demo/demo-arrowhead.c (+2/-2) demo/demo-clipping.c (+2/-2) demo/demo-events.c (+1/-1) demo/demo-features.c (+1/-1) demo/demo-fifteen.c (+4/-4) demo/demo-focus.c (+2/-2) demo/demo-grabs.c (+19/-13) demo/demo-large-items.c (+2/-2) demo/demo-paths.c (+4/-4) demo/demo-scalability.c (+2/-2) demo/demo-table.c (+1/-1) demo/demo.c (+15/-10) demo/generic-position-demo.c (+1/-1) demo/mv-demo-animation.c (+3/-3) demo/mv-demo-arrowhead.c (+2/-2) demo/mv-demo-clipping.c (+2/-2) demo/mv-demo-events.c (+1/-1) demo/mv-demo-features.c (+1/-1) demo/mv-demo-fifteen.c (+4/-4) demo/mv-demo-focus.c (+2/-2) demo/mv-demo-grabs.c (+18/-13) demo/mv-demo-paths.c (+4/-4) demo/mv-demo-scalability.c (+2/-2) demo/mv-demo-table.c (+1/-1) demo/mv-demo.c (+15/-15) demo/mv-generic-position-demo.c (+1/-1) demo/mv-table-demo.c (+1/-1) demo/table-demo.c (+1/-1) demo/units-demo.c (+3/-2) demo/widgets-demo.c (+4/-4) depcomp (+134/-56) docs/Makefile.in (+110/-56) docs/goocanvas2-docs.sgml (+1/-0) docs/goocanvas2-sections.txt (+1/-0) docs/html/GooCanvas.html (+239/-95) docs/html/GooCanvasEllipse.html (+20/-20) docs/html/GooCanvasEllipseModel.html (+20/-20) docs/html/GooCanvasGrid.html (+20/-20) docs/html/GooCanvasGridModel.html (+20/-20) docs/html/GooCanvasGroup.html (+19/-19) docs/html/GooCanvasGroupModel.html (+19/-19) docs/html/GooCanvasImage.html (+23/-23) docs/html/GooCanvasImageModel.html (+23/-23) docs/html/GooCanvasItem.html (+315/-112) docs/html/GooCanvasItemModel.html (+197/-74) docs/html/GooCanvasItemModelSimple.html (+32/-32) docs/html/GooCanvasItemSimple.html (+79/-46) docs/html/GooCanvasPath.html (+22/-22) docs/html/GooCanvasPathModel.html (+22/-22) docs/html/GooCanvasPolyline.html (+27/-24) docs/html/GooCanvasPolylineModel.html (+27/-24) docs/html/GooCanvasRect.html (+20/-20) docs/html/GooCanvasRectModel.html (+20/-20) docs/html/GooCanvasStyle.html (+57/-30) docs/html/GooCanvasTable.html (+20/-20) docs/html/GooCanvasTableModel.html (+20/-20) docs/html/GooCanvasText.html (+28/-25) docs/html/GooCanvasTextModel.html (+24/-24) docs/html/GooCanvasWidget.html (+24/-24) docs/html/ch01.html (+13/-13) docs/html/ch02.html (+13/-13) docs/html/ch03.html (+13/-13) docs/html/ch04.html (+13/-13) docs/html/ch05.html (+49/-14) docs/html/goocanvas-architecture.html (+10/-10) docs/html/goocanvas-coordinates.html (+10/-10) docs/html/goocanvas-creating-items.html (+32/-32) docs/html/goocanvas-model-view-canvas.html (+28/-28) docs/html/goocanvas-overview.html (+12/-12) docs/html/goocanvas-simple-canvas.html (+26/-26) docs/html/goocanvas-wysiwyg.html (+10/-10) docs/html/goocanvas2-GooCanvas-Types.html (+153/-70) docs/html/goocanvas2.devhelp2 (+7/-5) docs/html/index.html (+10/-7) docs/html/index.sgml (+16/-16) docs/html/style.css (+71/-16) docs/tmpl/goocanvas-unused.sgml (+0/-9) docs/tmpl/goocanvas2-unused.sgml (+0/-1103) docs/tmpl/goocanvasatk.sgml (+0/-51) docs/tmpl/goocanvasenumtypes.sgml (+0/-104) docs/tmpl/goocanvasitem.sgml (+11/-11) docs/tmpl/goocanvasutils.sgml (+9/-0) gtk-doc.make (+58/-31) install-sh (+18/-11) ltmain.sh (+2658/-1409) missing (+4/-49) mkinstalldirs (+0/-162) po/Makefile.in.in (+8/-19) po/goocanvas2.pot (+297/-291) py-compile (+33/-18) src/Makefile.am (+1/-1) src/Makefile.in (+84/-43) src/goocanvas.c (+78/-40) src/goocanvas.h (+2/-2) src/goocanvasellipse.h (+2/-2) src/goocanvasgrid.c (+3/-3) src/goocanvasgrid.h (+2/-2) src/goocanvasgroup.c (+0/-4) src/goocanvasgroup.h (+2/-2) src/goocanvasimage.h (+2/-2) src/goocanvasitem.c (+16/-16) src/goocanvasitem.h (+4/-4) src/goocanvasitemmodel.c (+12/-12) src/goocanvasitemmodel.h (+2/-2) src/goocanvasitemsimple.c (+4/-4) src/goocanvasitemsimple.h (+4/-4) src/goocanvasmarshal.c (+1/-1) src/goocanvaspath.c (+1/-1) src/goocanvaspath.h (+2/-2) src/goocanvaspolyline.h (+3/-3) src/goocanvasrect.h (+2/-2) src/goocanvasstyle.h (+2/-2) src/goocanvastable.h (+2/-2) src/goocanvastext.h (+2/-2) src/goocanvasutils.c (+20/-2) src/goocanvasutils.h (+16/-14) src/goocanvaswidget.c (+1/-1) src/goocanvaswidget.h (+1/-1) |
To merge this branch: | bzr merge lp:~noskcaj/ubuntu/trusty/goocanvas-2.0/2.0.2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sebastien Bacher | Needs Fixing | ||
Review via email: mp+198684@code.launchpad.net |
Commit message
Description of the change
New upstream release, add symbols, use dh
Jackson Doak (noskcaj) wrote : | # |
Where did i move it to multiarch? I thought i hadn't
I didn't test this, no.
Sebastien Bacher (seb128) wrote : | # |
> Where did i move it to multiarch?
diff -Nru goocanvas-
--- goocanvas-
+++ goocanvas-
@@ -1 +1 @@
-debian/
+usr/lib/
that's a side effect of moving to new dh that use multiarch location, the gir directory needs to stay where it was though
Jackson Doak (noskcaj) wrote : | # |
so should the line be "usr/lib/
usr/lib/
On Sat, Dec 14, 2013 at 7:06 AM, Sebastien Bacher <email address hidden> wrote:
> > Where did i move it to multiarch?
>
> diff -Nru goocanvas-
> goocanvas-
> --- goocanvas-
> 18:25:43.000000000 +0100
> +++ goocanvas-
> 12:43:52.000000000 +0100
> @@ -1 +1 @@
> -debian/
> +usr/lib/
>
>
> that's a side effect of moving to new dh that use multiarch location, the
> gir directory needs to stay where it was though
> --
>
> https:/
> You are the owner of lp:~noskcaj/ubuntu/trusty/goocanvas-2.0/2.0.2.
>
Sebastien Bacher (seb128) wrote : | # |
yes, you can probably try if it works by trying to import it from python by exemple
Sebastien Bacher (seb128) wrote : | # |
changing the status since it needs to be fixed before needing review again, please change back once you address the review comments
Sebastien Bacher (seb128) wrote : | # |
the update is in trusty in fact, so setting to rejected
Unmerged revisions
- 11. By Jackson Doak
-
Bump standards-version to 3.9.5
- 10. By Jackson Doak
-
Create libgoocanvas-
2.0-9.symbols - 9. By Jackson Doak
-
Enable hardening
- 8. By Jackson Doak
-
* debian/rules:
- Add disable-silent- rules - 7. By Jackson Doak
-
Switch to dh and debhelper 9
- 6. By Jackson Doak
-
Fix link location in libgoocanvas-
2.0-dev. links - 5. By Jackson Doak
-
Add versioned gpl to debian/copyright
- 4. By Jackson Doak
-
* debian/control:
- Bump b-dep versions for new release - 3. By Jackson Doak
-
New upstream release.
Preview Diff
1 | === modified file 'ChangeLog' |
2 | --- ChangeLog 2011-11-27 17:38:34 +0000 |
3 | +++ ChangeLog 2013-12-12 08:48:43 +0000 |
4 | @@ -1,3 +1,95 @@ |
5 | +2013-11-02 Damon Chaplin <damon@gnome.org> |
6 | + |
7 | + * demo/*.c: use gtk_box_pack_start() rather than gtk_container_add(), |
8 | + for boxes, as the demos didn't appear correctly. |
9 | + |
10 | +2013-11-02 Damon Chaplin <damon@gnome.org> |
11 | + |
12 | + * src/goocanvasutils.c (goo_canvas_line_dash_set_offset): new function |
13 | + to set the offset. |
14 | + |
15 | +2013-11-02 Damon Chaplin <damon@gnome.org> |
16 | + |
17 | + * src/goocanvas.c (emit_pointer_event): use gdk_event_copy() rather |
18 | + than a struct copy, to copy the private stuff like device etc. #665637 |
19 | + |
20 | +2013-11-01 Damon Chaplin <damon@gnome.org> |
21 | + |
22 | + * src/*.c: |
23 | + * demo/*.c: fixed a lot of warnings, mainly about deprecated stuff. |
24 | + |
25 | +2013-11-01 Damon Chaplin <damon@gnome.org> |
26 | + |
27 | + * .gitignore: added gtk-doc.m4 |
28 | + |
29 | +2013-11-01 Damon Chaplin <damon@gnome.org> |
30 | + |
31 | + * src/goocanvas.c: added doc about disabling mouse-wheel scrolling. |
32 | + #617900. |
33 | + |
34 | +2013-11-01 Damon Chaplin <damon@gnome.org> |
35 | + |
36 | + * src/goocanvas.c (goo_canvas_adjustment_value_changed): disabled |
37 | + the code that handled "redraw-when-scrolled" and tried to optimise |
38 | + the drawing of static items. GTK+ 3.0 always redraws everything when |
39 | + a window is scrolled, so these aren't needed. |
40 | + |
41 | + We could possibly use GtkPixelCache or similar in future, to try to |
42 | + optimise scrolling. |
43 | + |
44 | +2013-10-25 Damon Chaplin <damon@gnome.org> |
45 | + |
46 | + * src/goocanvas.c (paint_static_items, goo_canvas_draw): another |
47 | + attempt at fixing the drawing code. Now it uses the transform & clip |
48 | + from the given cairo_t and the code seems to work OK for both the old |
49 | + GTK+ and GTK+ 3.10. Bug #700674. |
50 | + |
51 | +2013-09-27 Damon Chaplin <damon@gnome.org> |
52 | + |
53 | + * demo/demo-grabs.c (on_widget_draw): draw simple rects for the widgets |
54 | + as the old code using gtk_paint_box() doesn't seem to work any more. |
55 | + |
56 | +2013-09-27 Damon Chaplin <damon@gnome.org> |
57 | + |
58 | + * src/goocanvasutils.c: added introspection flags, so it now seems to |
59 | + work OK with python at least. |
60 | + |
61 | + * bindings/python/demo.py (setup_canvas): added line dash to a path. |
62 | + |
63 | + * demo/demo.c (setup_rectangles): added line dash to one rect. |
64 | + |
65 | +2013-09-24 Damon Chaplin <damon@gnome.org> |
66 | + |
67 | + * src/goocanvasitem.c: |
68 | + * src/goocanvasitemmodel.c: added a few (allow-none) flags. #677013. |
69 | + |
70 | +2013-09-24 Damon Chaplin <damon@gnome.org> |
71 | + |
72 | + * src/Makefile.am: added -lm to LIBADD. Bug #671766. |
73 | + |
74 | +2013-08-20 Damon Chaplin <damon@gnome.org> |
75 | + |
76 | + * src/*.h: fixed a few documentation issues. |
77 | + * docs/goocanvas2-docs.sgml: added annotation glossary. |
78 | + |
79 | +2013-07-18 Damon Chaplin <damon@gnome.org> |
80 | + |
81 | + * src/goocanvas.c (paint_static_items, goo_canvas_draw): tried to |
82 | + fix drawing code to work with new GTK+ 3.9 drawing code. I'm not sure |
83 | + it is 100% there yet, but the demo seems OK. Bug #700674. |
84 | + |
85 | +2013-03-28 Murray Cumming <murrayc@murrayc.com> |
86 | + |
87 | + Fix some introspection generation warnings. |
88 | + |
89 | + Avoid gobject-introspection warnings about missing : in |
90 | + documentation comments. |
91 | + Part of bug #696736 |
92 | + |
93 | +2011-10-19 Jasper Lievisse Adriaanse <jasperla@gnome.org> |
94 | + |
95 | + * configure.in: Bump pygobject dependency to 2.90.4. Bug #661487. |
96 | + |
97 | 2011-10-09 Damon Chaplin <damon@gnome.org> |
98 | |
99 | * Released GooCanvas 2.0.1 |
100 | |
101 | === modified file 'INSTALL' |
102 | --- INSTALL 2011-11-27 17:38:34 +0000 |
103 | +++ INSTALL 2013-12-12 08:48:43 +0000 |
104 | @@ -1,8 +1,8 @@ |
105 | Installation Instructions |
106 | ************************* |
107 | |
108 | -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, |
109 | -2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
110 | +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, |
111 | +Inc. |
112 | |
113 | Copying and distribution of this file, with or without modification, |
114 | are permitted in any medium without royalty provided the copyright |
115 | @@ -226,6 +226,11 @@ |
116 | |
117 | and if that doesn't work, install pre-built binaries of GCC for HP-UX. |
118 | |
119 | + HP-UX `make' updates targets which have the same time stamps as |
120 | +their prerequisites, which makes it generally unusable when shipped |
121 | +generated files such as `configure' are involved. Use GNU `make' |
122 | +instead. |
123 | + |
124 | On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot |
125 | parse its `<wchar.h>' header file. The option `-nodtk' can be used as |
126 | a workaround. If GNU CC is not installed, it is therefore recommended |
127 | |
128 | === modified file 'Makefile.in' |
129 | --- Makefile.in 2011-11-27 17:38:34 +0000 |
130 | +++ Makefile.in 2013-12-12 08:48:43 +0000 |
131 | @@ -1,9 +1,9 @@ |
132 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
133 | +# Makefile.in generated by automake 1.11.6 from Makefile.am. |
134 | # @configure_input@ |
135 | |
136 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
137 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
138 | -# Inc. |
139 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
140 | +# Foundation, Inc. |
141 | # This Makefile.in is free software; the Free Software Foundation |
142 | # gives unlimited permission to copy and/or distribute it, |
143 | # with or without modifications, as long as this notice is preserved. |
144 | @@ -16,6 +16,23 @@ |
145 | @SET_MAKE@ |
146 | |
147 | VPATH = @srcdir@ |
148 | +am__make_dryrun = \ |
149 | + { \ |
150 | + am__dry=no; \ |
151 | + case $$MAKEFLAGS in \ |
152 | + *\\[\ \ ]*) \ |
153 | + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
154 | + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
155 | + *) \ |
156 | + for am__flg in $$MAKEFLAGS; do \ |
157 | + case $$am__flg in \ |
158 | + *=*|--*) ;; \ |
159 | + *n*) am__dry=yes; break;; \ |
160 | + esac; \ |
161 | + done;; \ |
162 | + esac; \ |
163 | + test $$am__dry = yes; \ |
164 | + } |
165 | pkgdatadir = $(datadir)/@PACKAGE@ |
166 | pkgincludedir = $(includedir)/@PACKAGE@ |
167 | pkglibdir = $(libdir)/@PACKAGE@ |
168 | @@ -39,22 +56,22 @@ |
169 | $(srcdir)/Makefile.in $(srcdir)/config.h.in \ |
170 | $(srcdir)/goocanvas-2.0.pc.in $(top_srcdir)/configure AUTHORS \ |
171 | COPYING ChangeLog INSTALL NEWS TODO config.guess config.sub \ |
172 | - depcomp install-sh ltmain.sh missing mkinstalldirs py-compile |
173 | + depcomp install-sh ltmain.sh missing py-compile |
174 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
175 | am__aclocal_m4_deps = $(top_srcdir)/configure.in |
176 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
177 | $(ACLOCAL_M4) |
178 | am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ |
179 | configure.lineno config.status.lineno |
180 | -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
181 | +mkinstalldirs = $(install_sh) -d |
182 | CONFIG_HEADER = config.h |
183 | CONFIG_CLEAN_FILES = goocanvas-2.0.pc |
184 | CONFIG_CLEAN_VPATH_FILES = |
185 | -AM_V_GEN = $(am__v_GEN_$(V)) |
186 | -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) |
187 | +AM_V_GEN = $(am__v_GEN_@AM_V@) |
188 | +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
189 | am__v_GEN_0 = @echo " GEN " $@; |
190 | -AM_V_at = $(am__v_at_$(V)) |
191 | -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) |
192 | +AM_V_at = $(am__v_at_@AM_V@) |
193 | +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) |
194 | am__v_at_0 = @ |
195 | SOURCES = |
196 | DIST_SOURCES = |
197 | @@ -65,6 +82,11 @@ |
198 | install-pdf-recursive install-ps-recursive install-recursive \ |
199 | installcheck-recursive installdirs-recursive pdf-recursive \ |
200 | ps-recursive uninstall-recursive |
201 | +am__can_run_installinfo = \ |
202 | + case $$AM_UPDATE_INFO_DIR in \ |
203 | + n|no|NO) false;; \ |
204 | + *) (install-info --version) >/dev/null 2>&1;; \ |
205 | + esac |
206 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
207 | am__vpath_adj = case $$p in \ |
208 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
209 | @@ -86,6 +108,12 @@ |
210 | am__base_list = \ |
211 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
212 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
213 | +am__uninstall_files_from_dir = { \ |
214 | + test -z "$$files" \ |
215 | + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ |
216 | + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
217 | + $(am__cd) "$$dir" && rm -f $$files; }; \ |
218 | + } |
219 | am__installdirs = "$(DESTDIR)$(pkgconfigdir)" |
220 | DATA = $(pkgconfig_DATA) |
221 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
222 | @@ -100,9 +128,11 @@ |
223 | distdir = $(PACKAGE)-$(VERSION) |
224 | top_distdir = $(distdir) |
225 | am__remove_distdir = \ |
226 | - { test ! -d "$(distdir)" \ |
227 | - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
228 | - && rm -fr "$(distdir)"; }; } |
229 | + if test -d "$(distdir)"; then \ |
230 | + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
231 | + && rm -rf "$(distdir)" \ |
232 | + || { sleep 5 && rm -rf "$(distdir)"; }; \ |
233 | + else :; fi |
234 | am__relativize = \ |
235 | dir0=`pwd`; \ |
236 | sed_first='s,^\([^/]*\)/.*$$,\1,'; \ |
237 | @@ -131,6 +161,8 @@ |
238 | DIST_ARCHIVES = $(distdir).tar.gz |
239 | GZIP_ENV = --best |
240 | distuninstallcheck_listfiles = find . -type f -print |
241 | +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ |
242 | + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' |
243 | distcleancheck_listfiles = find . -type f -print |
244 | ACLOCAL = @ACLOCAL@ |
245 | AMTAR = @AMTAR@ |
246 | @@ -151,6 +183,7 @@ |
247 | DATADIRNAME = @DATADIRNAME@ |
248 | DEFS = @DEFS@ |
249 | DEPDIR = @DEPDIR@ |
250 | +DLLTOOL = @DLLTOOL@ |
251 | DSYMUTIL = @DSYMUTIL@ |
252 | DUMPBIN = @DUMPBIN@ |
253 | ECHO_C = @ECHO_C@ |
254 | @@ -166,6 +199,9 @@ |
255 | GMSGFMT = @GMSGFMT@ |
256 | GREP = @GREP@ |
257 | GTKDOC_CHECK = @GTKDOC_CHECK@ |
258 | +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ |
259 | +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ |
260 | +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ |
261 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ |
262 | GTKDOC_REBASE = @GTKDOC_REBASE@ |
263 | HTML_DIR = @HTML_DIR@ |
264 | @@ -195,6 +231,7 @@ |
265 | LT_VERSION_INFO = @LT_VERSION_INFO@ |
266 | MAINT = @MAINT@ |
267 | MAKEINFO = @MAKEINFO@ |
268 | +MANIFEST_TOOL = @MANIFEST_TOOL@ |
269 | MKDIR_P = @MKDIR_P@ |
270 | MKINSTALLDIRS = @MKINSTALLDIRS@ |
271 | MSGFMT = @MSGFMT@ |
272 | @@ -217,6 +254,8 @@ |
273 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
274 | PERL = @PERL@ |
275 | PKG_CONFIG = @PKG_CONFIG@ |
276 | +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ |
277 | +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ |
278 | POFILES = @POFILES@ |
279 | POSUB = @POSUB@ |
280 | PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ |
281 | @@ -241,6 +280,7 @@ |
282 | abs_srcdir = @abs_srcdir@ |
283 | abs_top_builddir = @abs_top_builddir@ |
284 | abs_top_srcdir = @abs_top_srcdir@ |
285 | +ac_ct_AR = @ac_ct_AR@ |
286 | ac_ct_CC = @ac_ct_CC@ |
287 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
288 | am__include = @am__include@ |
289 | @@ -273,7 +313,6 @@ |
290 | libexecdir = @libexecdir@ |
291 | localedir = @localedir@ |
292 | localstatedir = @localstatedir@ |
293 | -lt_ECHO = @lt_ECHO@ |
294 | mandir = @mandir@ |
295 | mkdir_p = @mkdir_p@ |
296 | oldincludedir = @oldincludedir@ |
297 | @@ -306,7 +345,7 @@ |
298 | $(MAKE) $(AM_MAKEFLAGS) all-recursive |
299 | |
300 | .SUFFIXES: |
301 | -am--refresh: |
302 | +am--refresh: Makefile |
303 | @: |
304 | $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) |
305 | @for dep in $?; do \ |
306 | @@ -342,10 +381,8 @@ |
307 | $(am__aclocal_m4_deps): |
308 | |
309 | config.h: stamp-h1 |
310 | - @if test ! -f $@; then \ |
311 | - rm -f stamp-h1; \ |
312 | - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ |
313 | - else :; fi |
314 | + @if test ! -f $@; then rm -f stamp-h1; else :; fi |
315 | + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi |
316 | |
317 | stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status |
318 | @rm -f stamp-h1 |
319 | @@ -370,8 +407,11 @@ |
320 | -rm -f libtool config.lt |
321 | install-pkgconfigDATA: $(pkgconfig_DATA) |
322 | @$(NORMAL_INSTALL) |
323 | - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" |
324 | @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ |
325 | + if test -n "$$list"; then \ |
326 | + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ |
327 | + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ |
328 | + fi; \ |
329 | for p in $$list; do \ |
330 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
331 | echo "$$d$$p"; \ |
332 | @@ -385,9 +425,7 @@ |
333 | @$(NORMAL_UNINSTALL) |
334 | @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ |
335 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
336 | - test -n "$$files" || exit 0; \ |
337 | - echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ |
338 | - cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files |
339 | + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) |
340 | |
341 | # This directory's subdirectories are mostly independent; you can cd |
342 | # into them and run `make' without going through this Makefile. |
343 | @@ -558,13 +596,10 @@ |
344 | done |
345 | @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
346 | if test "$$subdir" = .; then :; else \ |
347 | - test -d "$(distdir)/$$subdir" \ |
348 | - || $(MKDIR_P) "$(distdir)/$$subdir" \ |
349 | - || exit 1; \ |
350 | - fi; \ |
351 | - done |
352 | - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
353 | - if test "$$subdir" = .; then :; else \ |
354 | + $(am__make_dryrun) \ |
355 | + || test -d "$(distdir)/$$subdir" \ |
356 | + || $(MKDIR_P) "$(distdir)/$$subdir" \ |
357 | + || exit 1; \ |
358 | dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ |
359 | $(am__relativize); \ |
360 | new_distdir=$$reldir; \ |
361 | @@ -596,7 +631,11 @@ |
362 | $(am__remove_distdir) |
363 | |
364 | dist-bzip2: distdir |
365 | - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 |
366 | + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 |
367 | + $(am__remove_distdir) |
368 | + |
369 | +dist-lzip: distdir |
370 | + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz |
371 | $(am__remove_distdir) |
372 | |
373 | dist-lzma: distdir |
374 | @@ -604,7 +643,7 @@ |
375 | $(am__remove_distdir) |
376 | |
377 | dist-xz: distdir |
378 | - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz |
379 | + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz |
380 | $(am__remove_distdir) |
381 | |
382 | dist-tarZ: distdir |
383 | @@ -635,6 +674,8 @@ |
384 | bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ |
385 | *.tar.lzma*) \ |
386 | lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ |
387 | + *.tar.lz*) \ |
388 | + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ |
389 | *.tar.xz*) \ |
390 | xz -dc $(distdir).tar.xz | $(am__untar) ;;\ |
391 | *.tar.Z*) \ |
392 | @@ -644,7 +685,7 @@ |
393 | *.zip*) \ |
394 | unzip $(distdir).zip ;;\ |
395 | esac |
396 | - chmod -R a-w $(distdir); chmod a+w $(distdir) |
397 | + chmod -R a-w $(distdir); chmod u+w $(distdir) |
398 | mkdir $(distdir)/_build |
399 | mkdir $(distdir)/_inst |
400 | chmod a-w $(distdir) |
401 | @@ -654,6 +695,7 @@ |
402 | && am__cwd=`pwd` \ |
403 | && $(am__cd) $(distdir)/_build \ |
404 | && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
405 | + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ |
406 | $(DISTCHECK_CONFIGURE_FLAGS) \ |
407 | && $(MAKE) $(AM_MAKEFLAGS) \ |
408 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ |
409 | @@ -682,8 +724,16 @@ |
410 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ |
411 | sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' |
412 | distuninstallcheck: |
413 | - @$(am__cd) '$(distuninstallcheck_dir)' \ |
414 | - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ |
415 | + @test -n '$(distuninstallcheck_dir)' || { \ |
416 | + echo 'ERROR: trying to run $@ with an empty' \ |
417 | + '$$(distuninstallcheck_dir)' >&2; \ |
418 | + exit 1; \ |
419 | + }; \ |
420 | + $(am__cd) '$(distuninstallcheck_dir)' || { \ |
421 | + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ |
422 | + exit 1; \ |
423 | + }; \ |
424 | + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ |
425 | || { echo "ERROR: files left after uninstall:" ; \ |
426 | if test -n "$(DESTDIR)"; then \ |
427 | echo " (check DESTDIR support)"; \ |
428 | @@ -717,10 +767,15 @@ |
429 | |
430 | installcheck: installcheck-recursive |
431 | install-strip: |
432 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
433 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
434 | - `test -z '$(STRIP)' || \ |
435 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
436 | + if test -z '$(STRIP)'; then \ |
437 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
438 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
439 | + install; \ |
440 | + else \ |
441 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
442 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
443 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
444 | + fi |
445 | mostlyclean-generic: |
446 | |
447 | clean-generic: |
448 | @@ -808,8 +863,8 @@ |
449 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
450 | all all-am am--refresh check check-am clean clean-generic \ |
451 | clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ |
452 | - dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ |
453 | - distcheck distclean distclean-generic distclean-hdr \ |
454 | + dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \ |
455 | + dist-zip distcheck distclean distclean-generic distclean-hdr \ |
456 | distclean-libtool distclean-tags distcleancheck distdir \ |
457 | distuninstallcheck dvi dvi-am html html-am info info-am \ |
458 | install install-am install-data install-data-am install-dvi \ |
459 | |
460 | === modified file 'NEWS' |
461 | --- NEWS 2011-11-27 17:38:34 +0000 |
462 | +++ NEWS 2013-12-12 08:48:43 +0000 |
463 | @@ -1,4 +1,12 @@ |
464 | |
465 | +GooCanvas 2.0.2 (Nov 3 2013) |
466 | +=============== |
467 | + |
468 | + o Fixed the drawing code to work with GTK+ 3.10. |
469 | + o Added/fixed a few introspection flags. GooCanvasLineDash should now be |
470 | + usable via introspection. |
471 | + |
472 | + |
473 | GooCanvas 2.0.1 (Oct 9 2011) |
474 | =============== |
475 | |
476 | |
477 | === modified file 'README' |
478 | --- README 2011-11-27 17:38:34 +0000 |
479 | +++ README 2013-12-12 08:48:43 +0000 |
480 | @@ -55,5 +55,5 @@ |
481 | |
482 | Damon Chaplin (damon@gnome.org) |
483 | |
484 | -(FooCanvas can be found in GNOME svn in the 'foocanvas' module. |
485 | +(FooCanvas can be found in GNOME git repository in the 'foocanvas' module. |
486 | FooCanvas was based on GnomeCanvas, which is in the 'libgnomecanvas' module.) |
487 | |
488 | === modified file 'aclocal.m4' |
489 | --- aclocal.m4 2011-11-27 17:38:34 +0000 |
490 | +++ aclocal.m4 2013-12-12 08:48:43 +0000 |
491 | @@ -1,7 +1,8 @@ |
492 | -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- |
493 | +# generated automatically by aclocal 1.11.6 -*- Autoconf -*- |
494 | |
495 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
496 | -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
497 | +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, |
498 | +# Inc. |
499 | # This file is free software; the Free Software Foundation |
500 | # gives unlimited permission to copy and/or distribute it, |
501 | # with or without modifications, as long as this notice is preserved. |
502 | @@ -19,600 +20,11 @@ |
503 | If you have problems, you may need to regenerate the build system entirely. |
504 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
505 | |
506 | -# Copyright (C) 1995-2002 Free Software Foundation, Inc. |
507 | -# Copyright (C) 2001-2003,2004 Red Hat, Inc. |
508 | -# |
509 | -# This file is free software, distributed under the terms of the GNU |
510 | -# General Public License. As a special exception to the GNU General |
511 | -# Public License, this file may be distributed as part of a program |
512 | -# that contains a configuration script generated by Autoconf, under |
513 | -# the same distribution terms as the rest of that program. |
514 | -# |
515 | -# This file can be copied and used freely without restrictions. It can |
516 | -# be used in projects which are not available under the GNU Public License |
517 | -# but which still want to provide support for the GNU gettext functionality. |
518 | -# |
519 | -# Macro to add for using GNU gettext. |
520 | -# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996 |
521 | -# |
522 | -# Modified to never use included libintl. |
523 | -# Owen Taylor <otaylor@redhat.com>, 12/15/1998 |
524 | -# |
525 | -# Major rework to remove unused code |
526 | -# Owen Taylor <otaylor@redhat.com>, 12/11/2002 |
527 | -# |
528 | -# Added better handling of ALL_LINGUAS from GNU gettext version |
529 | -# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002 |
530 | -# |
531 | -# Modified to require ngettext |
532 | -# Matthias Clasen <mclasen@redhat.com> 08/06/2004 |
533 | -# |
534 | -# We need this here as well, since someone might use autoconf-2.5x |
535 | -# to configure GLib then an older version to configure a package |
536 | -# using AM_GLIB_GNU_GETTEXT |
537 | -AC_PREREQ(2.53) |
538 | - |
539 | -dnl |
540 | -dnl We go to great lengths to make sure that aclocal won't |
541 | -dnl try to pull in the installed version of these macros |
542 | -dnl when running aclocal in the glib directory. |
543 | -dnl |
544 | -m4_copy([AC_DEFUN],[glib_DEFUN]) |
545 | -m4_copy([AC_REQUIRE],[glib_REQUIRE]) |
546 | -dnl |
547 | -dnl At the end, if we're not within glib, we'll define the public |
548 | -dnl definitions in terms of our private definitions. |
549 | -dnl |
550 | - |
551 | -# GLIB_LC_MESSAGES |
552 | -#-------------------- |
553 | -glib_DEFUN([GLIB_LC_MESSAGES], |
554 | - [AC_CHECK_HEADERS([locale.h]) |
555 | - if test $ac_cv_header_locale_h = yes; then |
556 | - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, |
557 | - [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], |
558 | - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) |
559 | - if test $am_cv_val_LC_MESSAGES = yes; then |
560 | - AC_DEFINE(HAVE_LC_MESSAGES, 1, |
561 | - [Define if your <locale.h> file defines LC_MESSAGES.]) |
562 | - fi |
563 | - fi]) |
564 | - |
565 | -# GLIB_PATH_PROG_WITH_TEST |
566 | -#---------------------------- |
567 | -dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, |
568 | -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) |
569 | -glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], |
570 | -[# Extract the first word of "$2", so it can be a program name with args. |
571 | -set dummy $2; ac_word=[$]2 |
572 | -AC_MSG_CHECKING([for $ac_word]) |
573 | -AC_CACHE_VAL(ac_cv_path_$1, |
574 | -[case "[$]$1" in |
575 | - /*) |
576 | - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. |
577 | - ;; |
578 | - *) |
579 | - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" |
580 | - for ac_dir in ifelse([$5], , $PATH, [$5]); do |
581 | - test -z "$ac_dir" && ac_dir=. |
582 | - if test -f $ac_dir/$ac_word; then |
583 | - if [$3]; then |
584 | - ac_cv_path_$1="$ac_dir/$ac_word" |
585 | - break |
586 | - fi |
587 | - fi |
588 | - done |
589 | - IFS="$ac_save_ifs" |
590 | -dnl If no 4th arg is given, leave the cache variable unset, |
591 | -dnl so AC_PATH_PROGS will keep looking. |
592 | -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" |
593 | -])dnl |
594 | - ;; |
595 | -esac])dnl |
596 | -$1="$ac_cv_path_$1" |
597 | -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then |
598 | - AC_MSG_RESULT([$]$1) |
599 | -else |
600 | - AC_MSG_RESULT(no) |
601 | -fi |
602 | -AC_SUBST($1)dnl |
603 | -]) |
604 | - |
605 | -# GLIB_WITH_NLS |
606 | -#----------------- |
607 | -glib_DEFUN([GLIB_WITH_NLS], |
608 | - dnl NLS is obligatory |
609 | - [USE_NLS=yes |
610 | - AC_SUBST(USE_NLS) |
611 | - |
612 | - gt_cv_have_gettext=no |
613 | - |
614 | - CATOBJEXT=NONE |
615 | - XGETTEXT=: |
616 | - INTLLIBS= |
617 | - |
618 | - AC_CHECK_HEADER(libintl.h, |
619 | - [gt_cv_func_dgettext_libintl="no" |
620 | - libintl_extra_libs="" |
621 | - |
622 | - # |
623 | - # First check in libc |
624 | - # |
625 | - AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, |
626 | - [AC_TRY_LINK([ |
627 | -#include <libintl.h> |
628 | -], |
629 | - [return !ngettext ("","", 1)], |
630 | - gt_cv_func_ngettext_libc=yes, |
631 | - gt_cv_func_ngettext_libc=no) |
632 | - ]) |
633 | - |
634 | - if test "$gt_cv_func_ngettext_libc" = "yes" ; then |
635 | - AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, |
636 | - [AC_TRY_LINK([ |
637 | -#include <libintl.h> |
638 | -], |
639 | - [return !dgettext ("","")], |
640 | - gt_cv_func_dgettext_libc=yes, |
641 | - gt_cv_func_dgettext_libc=no) |
642 | - ]) |
643 | - fi |
644 | - |
645 | - if test "$gt_cv_func_ngettext_libc" = "yes" ; then |
646 | - AC_CHECK_FUNCS(bind_textdomain_codeset) |
647 | - fi |
648 | - |
649 | - # |
650 | - # If we don't have everything we want, check in libintl |
651 | - # |
652 | - if test "$gt_cv_func_dgettext_libc" != "yes" \ |
653 | - || test "$gt_cv_func_ngettext_libc" != "yes" \ |
654 | - || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then |
655 | - |
656 | - AC_CHECK_LIB(intl, bindtextdomain, |
657 | - [AC_CHECK_LIB(intl, ngettext, |
658 | - [AC_CHECK_LIB(intl, dgettext, |
659 | - gt_cv_func_dgettext_libintl=yes)])]) |
660 | - |
661 | - if test "$gt_cv_func_dgettext_libintl" != "yes" ; then |
662 | - AC_MSG_CHECKING([if -liconv is needed to use gettext]) |
663 | - AC_MSG_RESULT([]) |
664 | - AC_CHECK_LIB(intl, ngettext, |
665 | - [AC_CHECK_LIB(intl, dcgettext, |
666 | - [gt_cv_func_dgettext_libintl=yes |
667 | - libintl_extra_libs=-liconv], |
668 | - :,-liconv)], |
669 | - :,-liconv) |
670 | - fi |
671 | - |
672 | - # |
673 | - # If we found libintl, then check in it for bind_textdomain_codeset(); |
674 | - # we'll prefer libc if neither have bind_textdomain_codeset(), |
675 | - # and both have dgettext and ngettext |
676 | - # |
677 | - if test "$gt_cv_func_dgettext_libintl" = "yes" ; then |
678 | - glib_save_LIBS="$LIBS" |
679 | - LIBS="$LIBS -lintl $libintl_extra_libs" |
680 | - unset ac_cv_func_bind_textdomain_codeset |
681 | - AC_CHECK_FUNCS(bind_textdomain_codeset) |
682 | - LIBS="$glib_save_LIBS" |
683 | - |
684 | - if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then |
685 | - gt_cv_func_dgettext_libc=no |
686 | - else |
687 | - if test "$gt_cv_func_dgettext_libc" = "yes" \ |
688 | - && test "$gt_cv_func_ngettext_libc" = "yes"; then |
689 | - gt_cv_func_dgettext_libintl=no |
690 | - fi |
691 | - fi |
692 | - fi |
693 | - fi |
694 | - |
695 | - if test "$gt_cv_func_dgettext_libc" = "yes" \ |
696 | - || test "$gt_cv_func_dgettext_libintl" = "yes"; then |
697 | - gt_cv_have_gettext=yes |
698 | - fi |
699 | - |
700 | - if test "$gt_cv_func_dgettext_libintl" = "yes"; then |
701 | - INTLLIBS="-lintl $libintl_extra_libs" |
702 | - fi |
703 | - |
704 | - if test "$gt_cv_have_gettext" = "yes"; then |
705 | - AC_DEFINE(HAVE_GETTEXT,1, |
706 | - [Define if the GNU gettext() function is already present or preinstalled.]) |
707 | - GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, |
708 | - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl |
709 | - if test "$MSGFMT" != "no"; then |
710 | - glib_save_LIBS="$LIBS" |
711 | - LIBS="$LIBS $INTLLIBS" |
712 | - AC_CHECK_FUNCS(dcgettext) |
713 | - MSGFMT_OPTS= |
714 | - AC_MSG_CHECKING([if msgfmt accepts -c]) |
715 | - GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ |
716 | -msgid "" |
717 | -msgstr "" |
718 | -"Content-Type: text/plain; charset=UTF-8\n" |
719 | -"Project-Id-Version: test 1.0\n" |
720 | -"PO-Revision-Date: 2007-02-15 12:01+0100\n" |
721 | -"Last-Translator: test <foo@bar.xx>\n" |
722 | -"Language-Team: C <LL@li.org>\n" |
723 | -"MIME-Version: 1.0\n" |
724 | -"Content-Transfer-Encoding: 8bit\n" |
725 | -], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) |
726 | - AC_SUBST(MSGFMT_OPTS) |
727 | - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) |
728 | - GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, |
729 | - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) |
730 | - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; |
731 | - return _nl_msg_cat_cntr], |
732 | - [CATOBJEXT=.gmo |
733 | - DATADIRNAME=share], |
734 | - [case $host in |
735 | - *-*-solaris*) |
736 | - dnl On Solaris, if bind_textdomain_codeset is in libc, |
737 | - dnl GNU format message catalog is always supported, |
738 | - dnl since both are added to the libc all together. |
739 | - dnl Hence, we'd like to go with DATADIRNAME=share and |
740 | - dnl and CATOBJEXT=.gmo in this case. |
741 | - AC_CHECK_FUNC(bind_textdomain_codeset, |
742 | - [CATOBJEXT=.gmo |
743 | - DATADIRNAME=share], |
744 | - [CATOBJEXT=.mo |
745 | - DATADIRNAME=lib]) |
746 | - ;; |
747 | - *) |
748 | - CATOBJEXT=.mo |
749 | - DATADIRNAME=lib |
750 | - ;; |
751 | - esac]) |
752 | - LIBS="$glib_save_LIBS" |
753 | - INSTOBJEXT=.mo |
754 | - else |
755 | - gt_cv_have_gettext=no |
756 | - fi |
757 | - fi |
758 | - ]) |
759 | - |
760 | - if test "$gt_cv_have_gettext" = "yes" ; then |
761 | - AC_DEFINE(ENABLE_NLS, 1, |
762 | - [always defined to indicate that i18n is enabled]) |
763 | - fi |
764 | - |
765 | - dnl Test whether we really found GNU xgettext. |
766 | - if test "$XGETTEXT" != ":"; then |
767 | - dnl If it is not GNU xgettext we define it as : so that the |
768 | - dnl Makefiles still can work. |
769 | - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then |
770 | - : ; |
771 | - else |
772 | - AC_MSG_RESULT( |
773 | - [found xgettext program is not GNU xgettext; ignore it]) |
774 | - XGETTEXT=":" |
775 | - fi |
776 | - fi |
777 | - |
778 | - # We need to process the po/ directory. |
779 | - POSUB=po |
780 | - |
781 | - AC_OUTPUT_COMMANDS( |
782 | - [case "$CONFIG_FILES" in *po/Makefile.in*) |
783 | - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile |
784 | - esac]) |
785 | - |
786 | - dnl These rules are solely for the distribution goal. While doing this |
787 | - dnl we only have to keep exactly one list of the available catalogs |
788 | - dnl in configure.in. |
789 | - for lang in $ALL_LINGUAS; do |
790 | - GMOFILES="$GMOFILES $lang.gmo" |
791 | - POFILES="$POFILES $lang.po" |
792 | - done |
793 | - |
794 | - dnl Make all variables we use known to autoconf. |
795 | - AC_SUBST(CATALOGS) |
796 | - AC_SUBST(CATOBJEXT) |
797 | - AC_SUBST(DATADIRNAME) |
798 | - AC_SUBST(GMOFILES) |
799 | - AC_SUBST(INSTOBJEXT) |
800 | - AC_SUBST(INTLLIBS) |
801 | - AC_SUBST(PO_IN_DATADIR_TRUE) |
802 | - AC_SUBST(PO_IN_DATADIR_FALSE) |
803 | - AC_SUBST(POFILES) |
804 | - AC_SUBST(POSUB) |
805 | - ]) |
806 | - |
807 | -# AM_GLIB_GNU_GETTEXT |
808 | -# ------------------- |
809 | -# Do checks necessary for use of gettext. If a suitable implementation |
810 | -# of gettext is found in either in libintl or in the C library, |
811 | -# it will set INTLLIBS to the libraries needed for use of gettext |
812 | -# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable |
813 | -# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() |
814 | -# on various variables needed by the Makefile.in.in installed by |
815 | -# glib-gettextize. |
816 | -dnl |
817 | -glib_DEFUN([GLIB_GNU_GETTEXT], |
818 | - [AC_REQUIRE([AC_PROG_CC])dnl |
819 | - AC_REQUIRE([AC_HEADER_STDC])dnl |
820 | - |
821 | - GLIB_LC_MESSAGES |
822 | - GLIB_WITH_NLS |
823 | - |
824 | - if test "$gt_cv_have_gettext" = "yes"; then |
825 | - if test "x$ALL_LINGUAS" = "x"; then |
826 | - LINGUAS= |
827 | - else |
828 | - AC_MSG_CHECKING(for catalogs to be installed) |
829 | - NEW_LINGUAS= |
830 | - for presentlang in $ALL_LINGUAS; do |
831 | - useit=no |
832 | - if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then |
833 | - desiredlanguages="$LINGUAS" |
834 | - else |
835 | - desiredlanguages="$ALL_LINGUAS" |
836 | - fi |
837 | - for desiredlang in $desiredlanguages; do |
838 | - # Use the presentlang catalog if desiredlang is |
839 | - # a. equal to presentlang, or |
840 | - # b. a variant of presentlang (because in this case, |
841 | - # presentlang can be used as a fallback for messages |
842 | - # which are not translated in the desiredlang catalog). |
843 | - case "$desiredlang" in |
844 | - "$presentlang"*) useit=yes;; |
845 | - esac |
846 | - done |
847 | - if test $useit = yes; then |
848 | - NEW_LINGUAS="$NEW_LINGUAS $presentlang" |
849 | - fi |
850 | - done |
851 | - LINGUAS=$NEW_LINGUAS |
852 | - AC_MSG_RESULT($LINGUAS) |
853 | - fi |
854 | - |
855 | - dnl Construct list of names of catalog files to be constructed. |
856 | - if test -n "$LINGUAS"; then |
857 | - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done |
858 | - fi |
859 | - fi |
860 | - |
861 | - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly |
862 | - dnl find the mkinstalldirs script in another subdir but ($top_srcdir). |
863 | - dnl Try to locate is. |
864 | - MKINSTALLDIRS= |
865 | - if test -n "$ac_aux_dir"; then |
866 | - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" |
867 | - fi |
868 | - if test -z "$MKINSTALLDIRS"; then |
869 | - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" |
870 | - fi |
871 | - AC_SUBST(MKINSTALLDIRS) |
872 | - |
873 | - dnl Generate list of files to be processed by xgettext which will |
874 | - dnl be included in po/Makefile. |
875 | - test -d po || mkdir po |
876 | - if test "x$srcdir" != "x."; then |
877 | - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then |
878 | - posrcprefix="$srcdir/" |
879 | - else |
880 | - posrcprefix="../$srcdir/" |
881 | - fi |
882 | - else |
883 | - posrcprefix="../" |
884 | - fi |
885 | - rm -f po/POTFILES |
886 | - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ |
887 | - < $srcdir/po/POTFILES.in > po/POTFILES |
888 | - ]) |
889 | - |
890 | -# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) |
891 | -# ------------------------------- |
892 | -# Define VARIABLE to the location where catalog files will |
893 | -# be installed by po/Makefile. |
894 | -glib_DEFUN([GLIB_DEFINE_LOCALEDIR], |
895 | -[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl |
896 | -glib_save_prefix="$prefix" |
897 | -glib_save_exec_prefix="$exec_prefix" |
898 | -glib_save_datarootdir="$datarootdir" |
899 | -test "x$prefix" = xNONE && prefix=$ac_default_prefix |
900 | -test "x$exec_prefix" = xNONE && exec_prefix=$prefix |
901 | -datarootdir=`eval echo "${datarootdir}"` |
902 | -if test "x$CATOBJEXT" = "x.mo" ; then |
903 | - localedir=`eval echo "${libdir}/locale"` |
904 | -else |
905 | - localedir=`eval echo "${datadir}/locale"` |
906 | -fi |
907 | -prefix="$glib_save_prefix" |
908 | -exec_prefix="$glib_save_exec_prefix" |
909 | -datarootdir="$glib_save_datarootdir" |
910 | -AC_DEFINE_UNQUOTED($1, "$localedir", |
911 | - [Define the location where the catalogs will be installed]) |
912 | -]) |
913 | - |
914 | -dnl |
915 | -dnl Now the definitions that aclocal will find |
916 | -dnl |
917 | -ifdef(glib_configure_in,[],[ |
918 | -AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) |
919 | -AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) |
920 | -])dnl |
921 | - |
922 | -# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) |
923 | -# |
924 | -# Create a temporary file with TEST-FILE as its contents and pass the |
925 | -# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with |
926 | -# 0 and perform ACTION-IF-FAIL for any other exit status. |
927 | -AC_DEFUN([GLIB_RUN_PROG], |
928 | -[cat >conftest.foo <<_ACEOF |
929 | -$2 |
930 | -_ACEOF |
931 | -if AC_RUN_LOG([$1 conftest.foo]); then |
932 | - m4_ifval([$3], [$3], [:]) |
933 | -m4_ifvaln([$4], [else $4])dnl |
934 | -echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD |
935 | -sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD |
936 | -fi]) |
937 | - |
938 | - |
939 | -dnl -*- mode: autoconf -*- |
940 | - |
941 | -# serial 1 |
942 | - |
943 | -dnl Usage: |
944 | -dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) |
945 | -AC_DEFUN([GTK_DOC_CHECK], |
946 | -[ |
947 | - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first |
948 | - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first |
949 | - |
950 | - dnl check for tools we added during development |
951 | - AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check]) |
952 | - AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) |
953 | - AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) |
954 | - |
955 | - dnl for overriding the documentation installation directory |
956 | - AC_ARG_WITH([html-dir], |
957 | - AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, |
958 | - [with_html_dir='${datadir}/gtk-doc/html']) |
959 | - HTML_DIR="$with_html_dir" |
960 | - AC_SUBST([HTML_DIR]) |
961 | - |
962 | - dnl enable/disable documentation building |
963 | - AC_ARG_ENABLE([gtk-doc], |
964 | - AS_HELP_STRING([--enable-gtk-doc], |
965 | - [use gtk-doc to build documentation [[default=no]]]),, |
966 | - [enable_gtk_doc=no]) |
967 | - |
968 | - if test x$enable_gtk_doc = xyes; then |
969 | - ifelse([$1],[], |
970 | - [PKG_CHECK_EXISTS([gtk-doc],, |
971 | - AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], |
972 | - [PKG_CHECK_EXISTS([gtk-doc >= $1],, |
973 | - AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))]) |
974 | - fi |
975 | - |
976 | - AC_MSG_CHECKING([whether to build gtk-doc documentation]) |
977 | - AC_MSG_RESULT($enable_gtk_doc) |
978 | - |
979 | - dnl enable/disable output formats |
980 | - AC_ARG_ENABLE([gtk-doc-html], |
981 | - AS_HELP_STRING([--enable-gtk-doc-html], |
982 | - [build documentation in html format [[default=yes]]]),, |
983 | - [enable_gtk_doc_html=yes]) |
984 | - AC_ARG_ENABLE([gtk-doc-pdf], |
985 | - AS_HELP_STRING([--enable-gtk-doc-pdf], |
986 | - [build documentation in pdf format [[default=no]]]),, |
987 | - [enable_gtk_doc_pdf=no]) |
988 | - |
989 | - if test -z "$GTKDOC_MKPDF"; then |
990 | - enable_gtk_doc_pdf=no |
991 | - fi |
992 | - |
993 | - |
994 | - AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) |
995 | - AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) |
996 | - AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) |
997 | - AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) |
998 | - AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) |
999 | -]) |
1000 | - |
1001 | -dnl -*- mode: autoconf -*- |
1002 | -dnl Copyright 2009 Johan Dahlin |
1003 | -dnl |
1004 | -dnl This file is free software; the author(s) gives unlimited |
1005 | -dnl permission to copy and/or distribute it, with or without |
1006 | -dnl modifications, as long as this notice is preserved. |
1007 | -dnl |
1008 | - |
1009 | -# serial 1 |
1010 | - |
1011 | -m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], |
1012 | -[ |
1013 | - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first |
1014 | - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first |
1015 | - AC_BEFORE([LT_INIT],[$0])dnl setup libtool first |
1016 | - |
1017 | - dnl enable/disable introspection |
1018 | - m4_if([$2], [require], |
1019 | - [dnl |
1020 | - enable_introspection=yes |
1021 | - ],[dnl |
1022 | - AC_ARG_ENABLE(introspection, |
1023 | - AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], |
1024 | - [Enable introspection for this build]),, |
1025 | - [enable_introspection=auto]) |
1026 | - ])dnl |
1027 | - |
1028 | - AC_MSG_CHECKING([for gobject-introspection]) |
1029 | - |
1030 | - dnl presence/version checking |
1031 | - AS_CASE([$enable_introspection], |
1032 | - [no], [dnl |
1033 | - found_introspection="no (disabled, use --enable-introspection to enable)" |
1034 | - ],dnl |
1035 | - [yes],[dnl |
1036 | - PKG_CHECK_EXISTS([gobject-introspection-1.0],, |
1037 | - AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) |
1038 | - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], |
1039 | - found_introspection=yes, |
1040 | - AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) |
1041 | - ],dnl |
1042 | - [auto],[dnl |
1043 | - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) |
1044 | - ],dnl |
1045 | - [dnl |
1046 | - AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) |
1047 | - ])dnl |
1048 | - |
1049 | - AC_MSG_RESULT([$found_introspection]) |
1050 | - |
1051 | - INTROSPECTION_SCANNER= |
1052 | - INTROSPECTION_COMPILER= |
1053 | - INTROSPECTION_GENERATE= |
1054 | - INTROSPECTION_GIRDIR= |
1055 | - INTROSPECTION_TYPELIBDIR= |
1056 | - if test "x$found_introspection" = "xyes"; then |
1057 | - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` |
1058 | - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` |
1059 | - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` |
1060 | - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` |
1061 | - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" |
1062 | - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` |
1063 | - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` |
1064 | - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection |
1065 | - fi |
1066 | - AC_SUBST(INTROSPECTION_SCANNER) |
1067 | - AC_SUBST(INTROSPECTION_COMPILER) |
1068 | - AC_SUBST(INTROSPECTION_GENERATE) |
1069 | - AC_SUBST(INTROSPECTION_GIRDIR) |
1070 | - AC_SUBST(INTROSPECTION_TYPELIBDIR) |
1071 | - AC_SUBST(INTROSPECTION_CFLAGS) |
1072 | - AC_SUBST(INTROSPECTION_LIBS) |
1073 | - AC_SUBST(INTROSPECTION_MAKEFILE) |
1074 | - |
1075 | - AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") |
1076 | -]) |
1077 | - |
1078 | - |
1079 | -dnl Usage: |
1080 | -dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) |
1081 | - |
1082 | -AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], |
1083 | -[ |
1084 | - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) |
1085 | -]) |
1086 | - |
1087 | -dnl Usage: |
1088 | -dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) |
1089 | - |
1090 | - |
1091 | -AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], |
1092 | -[ |
1093 | - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) |
1094 | -]) |
1095 | - |
1096 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
1097 | # |
1098 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
1099 | -# 2006, 2007, 2008 Free Software Foundation, Inc. |
1100 | +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
1101 | +# Foundation, Inc. |
1102 | # Written by Gordon Matzigkeit, 1996 |
1103 | # |
1104 | # This file is free software; the Free Software Foundation gives |
1105 | @@ -621,7 +33,8 @@ |
1106 | |
1107 | m4_define([_LT_COPYING], [dnl |
1108 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
1109 | -# 2006, 2007, 2008 Free Software Foundation, Inc. |
1110 | +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
1111 | +# Foundation, Inc. |
1112 | # Written by Gordon Matzigkeit, 1996 |
1113 | # |
1114 | # This file is part of GNU Libtool. |
1115 | @@ -648,7 +61,7 @@ |
1116 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
1117 | ]) |
1118 | |
1119 | -# serial 56 LT_INIT |
1120 | +# serial 57 LT_INIT |
1121 | |
1122 | |
1123 | # LT_PREREQ(VERSION) |
1124 | @@ -677,6 +90,7 @@ |
1125 | # ------------------ |
1126 | AC_DEFUN([LT_INIT], |
1127 | [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT |
1128 | +AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl |
1129 | AC_BEFORE([$0], [LT_LANG])dnl |
1130 | AC_BEFORE([$0], [LT_OUTPUT])dnl |
1131 | AC_BEFORE([$0], [LTDL_INIT])dnl |
1132 | @@ -693,6 +107,8 @@ |
1133 | AC_REQUIRE([LTOBSOLETE_VERSION])dnl |
1134 | m4_require([_LT_PROG_LTMAIN])dnl |
1135 | |
1136 | +_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) |
1137 | + |
1138 | dnl Parse OPTIONS |
1139 | _LT_SET_OPTIONS([$0], [$1]) |
1140 | |
1141 | @@ -729,7 +145,7 @@ |
1142 | *) break;; |
1143 | esac |
1144 | done |
1145 | -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` |
1146 | +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` |
1147 | ]) |
1148 | |
1149 | |
1150 | @@ -749,6 +165,11 @@ |
1151 | m4_defun([_LT_SETUP], |
1152 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl |
1153 | AC_REQUIRE([AC_CANONICAL_BUILD])dnl |
1154 | +AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl |
1155 | +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl |
1156 | + |
1157 | +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl |
1158 | +dnl |
1159 | _LT_DECL([], [host_alias], [0], [The host system])dnl |
1160 | _LT_DECL([], [host], [0])dnl |
1161 | _LT_DECL([], [host_os], [0])dnl |
1162 | @@ -771,10 +192,13 @@ |
1163 | dnl |
1164 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
1165 | m4_require([_LT_CHECK_SHELL_FEATURES])dnl |
1166 | +m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl |
1167 | m4_require([_LT_CMD_RELOAD])dnl |
1168 | m4_require([_LT_CHECK_MAGIC_METHOD])dnl |
1169 | +m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl |
1170 | m4_require([_LT_CMD_OLD_ARCHIVE])dnl |
1171 | m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl |
1172 | +m4_require([_LT_WITH_SYSROOT])dnl |
1173 | |
1174 | _LT_CONFIG_LIBTOOL_INIT([ |
1175 | # See if we are running on zsh, and set the options which allow our |
1176 | @@ -790,7 +214,6 @@ |
1177 | _LT_CHECK_OBJDIR |
1178 | |
1179 | m4_require([_LT_TAG_COMPILER])dnl |
1180 | -_LT_PROG_ECHO_BACKSLASH |
1181 | |
1182 | case $host_os in |
1183 | aix3*) |
1184 | @@ -804,23 +227,6 @@ |
1185 | ;; |
1186 | esac |
1187 | |
1188 | -# Sed substitution that helps us do robust quoting. It backslashifies |
1189 | -# metacharacters that are still active within double-quoted strings. |
1190 | -sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' |
1191 | - |
1192 | -# Same as above, but do not quote variable references. |
1193 | -double_quote_subst='s/\([["`\\]]\)/\\\1/g' |
1194 | - |
1195 | -# Sed substitution to delay expansion of an escaped shell variable in a |
1196 | -# double_quote_subst'ed string. |
1197 | -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' |
1198 | - |
1199 | -# Sed substitution to delay expansion of an escaped single quote. |
1200 | -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' |
1201 | - |
1202 | -# Sed substitution to avoid accidental globbing in evaled expressions |
1203 | -no_glob_subst='s/\*/\\\*/g' |
1204 | - |
1205 | # Global variables: |
1206 | ofile=libtool |
1207 | can_build_shared=yes |
1208 | @@ -861,6 +267,28 @@ |
1209 | ])# _LT_SETUP |
1210 | |
1211 | |
1212 | +# _LT_PREPARE_SED_QUOTE_VARS |
1213 | +# -------------------------- |
1214 | +# Define a few sed substitution that help us do robust quoting. |
1215 | +m4_defun([_LT_PREPARE_SED_QUOTE_VARS], |
1216 | +[# Backslashify metacharacters that are still active within |
1217 | +# double-quoted strings. |
1218 | +sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' |
1219 | + |
1220 | +# Same as above, but do not quote variable references. |
1221 | +double_quote_subst='s/\([["`\\]]\)/\\\1/g' |
1222 | + |
1223 | +# Sed substitution to delay expansion of an escaped shell variable in a |
1224 | +# double_quote_subst'ed string. |
1225 | +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' |
1226 | + |
1227 | +# Sed substitution to delay expansion of an escaped single quote. |
1228 | +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' |
1229 | + |
1230 | +# Sed substitution to avoid accidental globbing in evaled expressions |
1231 | +no_glob_subst='s/\*/\\\*/g' |
1232 | +]) |
1233 | + |
1234 | # _LT_PROG_LTMAIN |
1235 | # --------------- |
1236 | # Note that this code is called both from `configure', and `config.status' |
1237 | @@ -1013,7 +441,7 @@ |
1238 | # declaration there will have the same value as in `configure'. VARNAME |
1239 | # must have a single quote delimited value for this to work. |
1240 | m4_define([_LT_CONFIG_STATUS_DECLARE], |
1241 | -[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) |
1242 | +[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) |
1243 | |
1244 | |
1245 | # _LT_CONFIG_STATUS_DECLARATIONS |
1246 | @@ -1023,7 +451,7 @@ |
1247 | # embedded single quotes properly. In configure, this macro expands |
1248 | # each variable declared with _LT_DECL (and _LT_TAGDECL) into: |
1249 | # |
1250 | -# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`' |
1251 | +# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`' |
1252 | m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], |
1253 | [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), |
1254 | [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) |
1255 | @@ -1122,12 +550,20 @@ |
1256 | LTCFLAGS='$LTCFLAGS' |
1257 | compiler='$compiler_DEFAULT' |
1258 | |
1259 | +# A function that is used when there is no print builtin or printf. |
1260 | +func_fallback_echo () |
1261 | +{ |
1262 | + eval 'cat <<_LTECHO_EOF |
1263 | +\$[]1 |
1264 | +_LTECHO_EOF' |
1265 | +} |
1266 | + |
1267 | # Quote evaled strings. |
1268 | for var in lt_decl_all_varnames([[ \ |
1269 | ]], lt_decl_quote_varnames); do |
1270 | - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in |
1271 | + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in |
1272 | *[[\\\\\\\`\\"\\\$]]*) |
1273 | - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" |
1274 | + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" |
1275 | ;; |
1276 | *) |
1277 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" |
1278 | @@ -1138,9 +574,9 @@ |
1279 | # Double-quote double-evaled strings. |
1280 | for var in lt_decl_all_varnames([[ \ |
1281 | ]], lt_decl_dquote_varnames); do |
1282 | - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in |
1283 | + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in |
1284 | *[[\\\\\\\`\\"\\\$]]*) |
1285 | - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" |
1286 | + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" |
1287 | ;; |
1288 | *) |
1289 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" |
1290 | @@ -1148,16 +584,38 @@ |
1291 | esac |
1292 | done |
1293 | |
1294 | -# Fix-up fallback echo if it was mangled by the above quoting rules. |
1295 | -case \$lt_ECHO in |
1296 | -*'\\\[$]0 --fallback-echo"')dnl " |
1297 | - lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` |
1298 | - ;; |
1299 | -esac |
1300 | - |
1301 | _LT_OUTPUT_LIBTOOL_INIT |
1302 | ]) |
1303 | |
1304 | +# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) |
1305 | +# ------------------------------------ |
1306 | +# Generate a child script FILE with all initialization necessary to |
1307 | +# reuse the environment learned by the parent script, and make the |
1308 | +# file executable. If COMMENT is supplied, it is inserted after the |
1309 | +# `#!' sequence but before initialization text begins. After this |
1310 | +# macro, additional text can be appended to FILE to form the body of |
1311 | +# the child script. The macro ends with non-zero status if the |
1312 | +# file could not be fully written (such as if the disk is full). |
1313 | +m4_ifdef([AS_INIT_GENERATED], |
1314 | +[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], |
1315 | +[m4_defun([_LT_GENERATED_FILE_INIT], |
1316 | +[m4_require([AS_PREPARE])]dnl |
1317 | +[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl |
1318 | +[lt_write_fail=0 |
1319 | +cat >$1 <<_ASEOF || lt_write_fail=1 |
1320 | +#! $SHELL |
1321 | +# Generated by $as_me. |
1322 | +$2 |
1323 | +SHELL=\${CONFIG_SHELL-$SHELL} |
1324 | +export SHELL |
1325 | +_ASEOF |
1326 | +cat >>$1 <<\_ASEOF || lt_write_fail=1 |
1327 | +AS_SHELL_SANITIZE |
1328 | +_AS_PREPARE |
1329 | +exec AS_MESSAGE_FD>&1 |
1330 | +_ASEOF |
1331 | +test $lt_write_fail = 0 && chmod +x $1[]dnl |
1332 | +m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT |
1333 | |
1334 | # LT_OUTPUT |
1335 | # --------- |
1336 | @@ -1167,20 +625,11 @@ |
1337 | AC_DEFUN([LT_OUTPUT], |
1338 | [: ${CONFIG_LT=./config.lt} |
1339 | AC_MSG_NOTICE([creating $CONFIG_LT]) |
1340 | -cat >"$CONFIG_LT" <<_LTEOF |
1341 | -#! $SHELL |
1342 | -# Generated by $as_me. |
1343 | -# Run this file to recreate a libtool stub with the current configuration. |
1344 | +_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], |
1345 | +[# Run this file to recreate a libtool stub with the current configuration.]) |
1346 | |
1347 | +cat >>"$CONFIG_LT" <<\_LTEOF |
1348 | lt_cl_silent=false |
1349 | -SHELL=\${CONFIG_SHELL-$SHELL} |
1350 | -_LTEOF |
1351 | - |
1352 | -cat >>"$CONFIG_LT" <<\_LTEOF |
1353 | -AS_SHELL_SANITIZE |
1354 | -_AS_PREPARE |
1355 | - |
1356 | -exec AS_MESSAGE_FD>&1 |
1357 | exec AS_MESSAGE_LOG_FD>>config.log |
1358 | { |
1359 | echo |
1360 | @@ -1206,7 +655,7 @@ |
1361 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) |
1362 | configured by $[0], generated by m4_PACKAGE_STRING. |
1363 | |
1364 | -Copyright (C) 2008 Free Software Foundation, Inc. |
1365 | +Copyright (C) 2011 Free Software Foundation, Inc. |
1366 | This config.lt script is free software; the Free Software Foundation |
1367 | gives unlimited permision to copy, distribute and modify it." |
1368 | |
1369 | @@ -1251,15 +700,13 @@ |
1370 | # appending to config.log, which fails on DOS, as config.log is still kept |
1371 | # open by configure. Here we exec the FD to /dev/null, effectively closing |
1372 | # config.log, so it can be properly (re)opened and appended to by config.lt. |
1373 | -if test "$no_create" != yes; then |
1374 | - lt_cl_success=: |
1375 | - test "$silent" = yes && |
1376 | - lt_config_lt_args="$lt_config_lt_args --quiet" |
1377 | - exec AS_MESSAGE_LOG_FD>/dev/null |
1378 | - $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false |
1379 | - exec AS_MESSAGE_LOG_FD>>config.log |
1380 | - $lt_cl_success || AS_EXIT(1) |
1381 | -fi |
1382 | +lt_cl_success=: |
1383 | +test "$silent" = yes && |
1384 | + lt_config_lt_args="$lt_config_lt_args --quiet" |
1385 | +exec AS_MESSAGE_LOG_FD>/dev/null |
1386 | +$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false |
1387 | +exec AS_MESSAGE_LOG_FD>>config.log |
1388 | +$lt_cl_success || AS_EXIT(1) |
1389 | ])# LT_OUTPUT |
1390 | |
1391 | |
1392 | @@ -1322,15 +769,12 @@ |
1393 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
1394 | # text mode, it properly converts lines to CR/LF. This bash problem |
1395 | # is reportedly fixed, but why not run on old versions too? |
1396 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
1397 | - || (rm -f "$cfgfile"; exit 1) |
1398 | - |
1399 | - _LT_PROG_XSI_SHELLFNS |
1400 | - |
1401 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
1402 | - || (rm -f "$cfgfile"; exit 1) |
1403 | - |
1404 | - mv -f "$cfgfile" "$ofile" || |
1405 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
1406 | + || (rm -f "$cfgfile"; exit 1) |
1407 | + |
1408 | + _LT_PROG_REPLACE_SHELLFNS |
1409 | + |
1410 | + mv -f "$cfgfile" "$ofile" || |
1411 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
1412 | chmod +x "$ofile" |
1413 | ], |
1414 | @@ -1375,6 +819,7 @@ |
1415 | m4_case([$1], |
1416 | [C], [_LT_LANG(C)], |
1417 | [C++], [_LT_LANG(CXX)], |
1418 | + [Go], [_LT_LANG(GO)], |
1419 | [Java], [_LT_LANG(GCJ)], |
1420 | [Fortran 77], [_LT_LANG(F77)], |
1421 | [Fortran], [_LT_LANG(FC)], |
1422 | @@ -1396,6 +841,29 @@ |
1423 | ])# _LT_LANG |
1424 | |
1425 | |
1426 | +m4_ifndef([AC_PROG_GO], [ |
1427 | +# NOTE: This macro has been submitted for inclusion into # |
1428 | +# GNU Autoconf as AC_PROG_GO. When it is available in # |
1429 | +# a released version of Autoconf we should remove this # |
1430 | +# macro and use it instead. # |
1431 | +m4_defun([AC_PROG_GO], |
1432 | +[AC_LANG_PUSH(Go)dnl |
1433 | +AC_ARG_VAR([GOC], [Go compiler command])dnl |
1434 | +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl |
1435 | +_AC_ARG_VAR_LDFLAGS()dnl |
1436 | +AC_CHECK_TOOL(GOC, gccgo) |
1437 | +if test -z "$GOC"; then |
1438 | + if test -n "$ac_tool_prefix"; then |
1439 | + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) |
1440 | + fi |
1441 | +fi |
1442 | +if test -z "$GOC"; then |
1443 | + AC_CHECK_PROG(GOC, gccgo, gccgo, false) |
1444 | +fi |
1445 | +])#m4_defun |
1446 | +])#m4_ifndef |
1447 | + |
1448 | + |
1449 | # _LT_LANG_DEFAULT_CONFIG |
1450 | # ----------------------- |
1451 | m4_defun([_LT_LANG_DEFAULT_CONFIG], |
1452 | @@ -1426,6 +894,10 @@ |
1453 | m4_ifdef([LT_PROG_GCJ], |
1454 | [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) |
1455 | |
1456 | +AC_PROVIDE_IFELSE([AC_PROG_GO], |
1457 | + [LT_LANG(GO)], |
1458 | + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) |
1459 | + |
1460 | AC_PROVIDE_IFELSE([LT_PROG_RC], |
1461 | [LT_LANG(RC)], |
1462 | [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) |
1463 | @@ -1436,11 +908,13 @@ |
1464 | AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) |
1465 | AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) |
1466 | AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) |
1467 | +AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) |
1468 | dnl aclocal-1.4 backwards compatibility: |
1469 | dnl AC_DEFUN([AC_LIBTOOL_CXX], []) |
1470 | dnl AC_DEFUN([AC_LIBTOOL_F77], []) |
1471 | dnl AC_DEFUN([AC_LIBTOOL_FC], []) |
1472 | dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) |
1473 | +dnl AC_DEFUN([AC_LIBTOOL_RC], []) |
1474 | |
1475 | |
1476 | # _LT_TAG_COMPILER |
1477 | @@ -1526,7 +1000,13 @@ |
1478 | $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ |
1479 | -dynamiclib -Wl,-single_module conftest.c 2>conftest.err |
1480 | _lt_result=$? |
1481 | - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then |
1482 | + # If there is a non-empty error log, and "single_module" |
1483 | + # appears in it, assume the flag caused a linker warning |
1484 | + if test -s conftest.err && $GREP single_module conftest.err; then |
1485 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
1486 | + # Otherwise, if the output was created with a 0 exit code from |
1487 | + # the compiler, it worked. |
1488 | + elif test -f libconftest.dylib && test $_lt_result -eq 0; then |
1489 | lt_cv_apple_cc_single_mod=yes |
1490 | else |
1491 | cat conftest.err >&AS_MESSAGE_LOG_FD |
1492 | @@ -1534,6 +1014,7 @@ |
1493 | rm -rf libconftest.dylib* |
1494 | rm -f conftest.* |
1495 | fi]) |
1496 | + |
1497 | AC_CACHE_CHECK([for -exported_symbols_list linker flag], |
1498 | [lt_cv_ld_exported_symbols_list], |
1499 | [lt_cv_ld_exported_symbols_list=no |
1500 | @@ -1545,6 +1026,34 @@ |
1501 | [lt_cv_ld_exported_symbols_list=no]) |
1502 | LDFLAGS="$save_LDFLAGS" |
1503 | ]) |
1504 | + |
1505 | + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], |
1506 | + [lt_cv_ld_force_load=no |
1507 | + cat > conftest.c << _LT_EOF |
1508 | +int forced_loaded() { return 2;} |
1509 | +_LT_EOF |
1510 | + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD |
1511 | + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD |
1512 | + echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD |
1513 | + $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD |
1514 | + echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD |
1515 | + $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD |
1516 | + cat > conftest.c << _LT_EOF |
1517 | +int main() { return 0;} |
1518 | +_LT_EOF |
1519 | + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD |
1520 | + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err |
1521 | + _lt_result=$? |
1522 | + if test -s conftest.err && $GREP force_load conftest.err; then |
1523 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
1524 | + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then |
1525 | + lt_cv_ld_force_load=yes |
1526 | + else |
1527 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
1528 | + fi |
1529 | + rm -f conftest.err libconftest.a conftest conftest.c |
1530 | + rm -rf conftest.dSYM |
1531 | + ]) |
1532 | case $host_os in |
1533 | rhapsody* | darwin1.[[012]]) |
1534 | _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; |
1535 | @@ -1572,7 +1081,7 @@ |
1536 | else |
1537 | _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' |
1538 | fi |
1539 | - if test "$DSYMUTIL" != ":"; then |
1540 | + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then |
1541 | _lt_dsymutil='~$DSYMUTIL $lib || :' |
1542 | else |
1543 | _lt_dsymutil= |
1544 | @@ -1582,8 +1091,8 @@ |
1545 | ]) |
1546 | |
1547 | |
1548 | -# _LT_DARWIN_LINKER_FEATURES |
1549 | -# -------------------------- |
1550 | +# _LT_DARWIN_LINKER_FEATURES([TAG]) |
1551 | +# --------------------------------- |
1552 | # Checks for linker and compiler features on darwin |
1553 | m4_defun([_LT_DARWIN_LINKER_FEATURES], |
1554 | [ |
1555 | @@ -1592,7 +1101,13 @@ |
1556 | _LT_TAGVAR(hardcode_direct, $1)=no |
1557 | _LT_TAGVAR(hardcode_automatic, $1)=yes |
1558 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
1559 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='' |
1560 | + if test "$lt_cv_ld_force_load" = "yes"; then |
1561 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' |
1562 | + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], |
1563 | + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) |
1564 | + else |
1565 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='' |
1566 | + fi |
1567 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
1568 | _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" |
1569 | case $cc_basename in |
1570 | @@ -1600,7 +1115,7 @@ |
1571 | *) _lt_dar_can_shared=$GCC ;; |
1572 | esac |
1573 | if test "$_lt_dar_can_shared" = "yes"; then |
1574 | - output_verbose_link_cmd=echo |
1575 | + output_verbose_link_cmd=func_echo_all |
1576 | _LT_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}" |
1577 | _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" |
1578 | _LT_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}" |
1579 | @@ -1616,203 +1131,142 @@ |
1580 | fi |
1581 | ]) |
1582 | |
1583 | -# _LT_SYS_MODULE_PATH_AIX |
1584 | -# ----------------------- |
1585 | +# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) |
1586 | +# ---------------------------------- |
1587 | # Links a minimal program and checks the executable |
1588 | # for the system default hardcoded library path. In most cases, |
1589 | # this is /usr/lib:/lib, but when the MPI compilers are used |
1590 | # the location of the communication and MPI libs are included too. |
1591 | # If we don't find anything, use the default library path according |
1592 | # to the aix ld manual. |
1593 | +# Store the results from the different compilers for each TAGNAME. |
1594 | +# Allow to override them for all tags through lt_cv_aix_libpath. |
1595 | m4_defun([_LT_SYS_MODULE_PATH_AIX], |
1596 | [m4_require([_LT_DECL_SED])dnl |
1597 | -AC_LINK_IFELSE(AC_LANG_PROGRAM,[ |
1598 | -lt_aix_libpath_sed=' |
1599 | - /Import File Strings/,/^$/ { |
1600 | - /^0/ { |
1601 | - s/^0 *\(.*\)$/\1/ |
1602 | - p |
1603 | - } |
1604 | - }' |
1605 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
1606 | -# Check for a 64-bit object if we didn't find anything. |
1607 | -if test -z "$aix_libpath"; then |
1608 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
1609 | -fi],[]) |
1610 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
1611 | +if test "${lt_cv_aix_libpath+set}" = set; then |
1612 | + aix_libpath=$lt_cv_aix_libpath |
1613 | +else |
1614 | + AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], |
1615 | + [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ |
1616 | + lt_aix_libpath_sed='[ |
1617 | + /Import File Strings/,/^$/ { |
1618 | + /^0/ { |
1619 | + s/^0 *\([^ ]*\) *$/\1/ |
1620 | + p |
1621 | + } |
1622 | + }]' |
1623 | + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
1624 | + # Check for a 64-bit object if we didn't find anything. |
1625 | + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then |
1626 | + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
1627 | + fi],[]) |
1628 | + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then |
1629 | + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" |
1630 | + fi |
1631 | + ]) |
1632 | + aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) |
1633 | +fi |
1634 | ])# _LT_SYS_MODULE_PATH_AIX |
1635 | |
1636 | |
1637 | # _LT_SHELL_INIT(ARG) |
1638 | # ------------------- |
1639 | m4_define([_LT_SHELL_INIT], |
1640 | -[ifdef([AC_DIVERSION_NOTICE], |
1641 | - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], |
1642 | - [AC_DIVERT_PUSH(NOTICE)]) |
1643 | -$1 |
1644 | -AC_DIVERT_POP |
1645 | -])# _LT_SHELL_INIT |
1646 | +[m4_divert_text([M4SH-INIT], [$1 |
1647 | +])])# _LT_SHELL_INIT |
1648 | + |
1649 | |
1650 | |
1651 | # _LT_PROG_ECHO_BACKSLASH |
1652 | # ----------------------- |
1653 | -# Add some code to the start of the generated configure script which |
1654 | -# will find an echo command which doesn't interpret backslashes. |
1655 | +# Find how we can fake an echo command that does not interpret backslash. |
1656 | +# In particular, with Autoconf 2.60 or later we add some code to the start |
1657 | +# of the generated configure script which will find a shell with a builtin |
1658 | +# printf (which we can use as an echo command). |
1659 | m4_defun([_LT_PROG_ECHO_BACKSLASH], |
1660 | -[_LT_SHELL_INIT([ |
1661 | -# Check that we are running under the correct shell. |
1662 | -SHELL=${CONFIG_SHELL-/bin/sh} |
1663 | - |
1664 | -case X$lt_ECHO in |
1665 | -X*--fallback-echo) |
1666 | - # Remove one level of quotation (which was required for Make). |
1667 | - ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` |
1668 | - ;; |
1669 | +[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' |
1670 | +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO |
1671 | +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
1672 | + |
1673 | +AC_MSG_CHECKING([how to print strings]) |
1674 | +# Test print first, because it will be a builtin if present. |
1675 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
1676 | + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
1677 | + ECHO='print -r --' |
1678 | +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
1679 | + ECHO='printf %s\n' |
1680 | +else |
1681 | + # Use this function as a fallback that always works. |
1682 | + func_fallback_echo () |
1683 | + { |
1684 | + eval 'cat <<_LTECHO_EOF |
1685 | +$[]1 |
1686 | +_LTECHO_EOF' |
1687 | + } |
1688 | + ECHO='func_fallback_echo' |
1689 | +fi |
1690 | + |
1691 | +# func_echo_all arg... |
1692 | +# Invoke $ECHO with all args, space-separated. |
1693 | +func_echo_all () |
1694 | +{ |
1695 | + $ECHO "$*" |
1696 | +} |
1697 | + |
1698 | +case "$ECHO" in |
1699 | + printf*) AC_MSG_RESULT([printf]) ;; |
1700 | + print*) AC_MSG_RESULT([print -r]) ;; |
1701 | + *) AC_MSG_RESULT([cat]) ;; |
1702 | esac |
1703 | |
1704 | -ECHO=${lt_ECHO-echo} |
1705 | -if test "X[$]1" = X--no-reexec; then |
1706 | - # Discard the --no-reexec flag, and continue. |
1707 | - shift |
1708 | -elif test "X[$]1" = X--fallback-echo; then |
1709 | - # Avoid inline document here, it may be left over |
1710 | - : |
1711 | -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then |
1712 | - # Yippee, $ECHO works! |
1713 | - : |
1714 | -else |
1715 | - # Restart under the correct shell. |
1716 | - exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} |
1717 | -fi |
1718 | - |
1719 | -if test "X[$]1" = X--fallback-echo; then |
1720 | - # used as fallback echo |
1721 | - shift |
1722 | - cat <<_LT_EOF |
1723 | -[$]* |
1724 | -_LT_EOF |
1725 | - exit 0 |
1726 | -fi |
1727 | - |
1728 | -# The HP-UX ksh and POSIX shell print the target directory to stdout |
1729 | -# if CDPATH is set. |
1730 | -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
1731 | - |
1732 | -if test -z "$lt_ECHO"; then |
1733 | - if test "X${echo_test_string+set}" != Xset; then |
1734 | - # find a string as large as possible, as long as the shell can cope with it |
1735 | - for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do |
1736 | - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... |
1737 | - if { echo_test_string=`eval $cmd`; } 2>/dev/null && |
1738 | - { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null |
1739 | - then |
1740 | - break |
1741 | - fi |
1742 | - done |
1743 | - fi |
1744 | - |
1745 | - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && |
1746 | - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && |
1747 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
1748 | - : |
1749 | - else |
1750 | - # The Solaris, AIX, and Digital Unix default echo programs unquote |
1751 | - # backslashes. This makes it impossible to quote backslashes using |
1752 | - # echo "$something" | sed 's/\\/\\\\/g' |
1753 | - # |
1754 | - # So, first we look for a working echo in the user's PATH. |
1755 | - |
1756 | - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR |
1757 | - for dir in $PATH /usr/ucb; do |
1758 | - IFS="$lt_save_ifs" |
1759 | - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && |
1760 | - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && |
1761 | - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && |
1762 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
1763 | - ECHO="$dir/echo" |
1764 | - break |
1765 | - fi |
1766 | - done |
1767 | - IFS="$lt_save_ifs" |
1768 | - |
1769 | - if test "X$ECHO" = Xecho; then |
1770 | - # We didn't find a better echo, so look for alternatives. |
1771 | - if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && |
1772 | - echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && |
1773 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
1774 | - # This shell has a builtin print -r that does the trick. |
1775 | - ECHO='print -r' |
1776 | - elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && |
1777 | - test "X$CONFIG_SHELL" != X/bin/ksh; then |
1778 | - # If we have ksh, try running configure again with it. |
1779 | - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} |
1780 | - export ORIGINAL_CONFIG_SHELL |
1781 | - CONFIG_SHELL=/bin/ksh |
1782 | - export CONFIG_SHELL |
1783 | - exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} |
1784 | - else |
1785 | - # Try using printf. |
1786 | - ECHO='printf %s\n' |
1787 | - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && |
1788 | - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && |
1789 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
1790 | - # Cool, printf works |
1791 | - : |
1792 | - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && |
1793 | - test "X$echo_testing_string" = 'X\t' && |
1794 | - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && |
1795 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
1796 | - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL |
1797 | - export CONFIG_SHELL |
1798 | - SHELL="$CONFIG_SHELL" |
1799 | - export SHELL |
1800 | - ECHO="$CONFIG_SHELL [$]0 --fallback-echo" |
1801 | - elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && |
1802 | - test "X$echo_testing_string" = 'X\t' && |
1803 | - echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && |
1804 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
1805 | - ECHO="$CONFIG_SHELL [$]0 --fallback-echo" |
1806 | - else |
1807 | - # maybe with a smaller string... |
1808 | - prev=: |
1809 | - |
1810 | - for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do |
1811 | - if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null |
1812 | - then |
1813 | - break |
1814 | - fi |
1815 | - prev="$cmd" |
1816 | - done |
1817 | - |
1818 | - if test "$prev" != 'sed 50q "[$]0"'; then |
1819 | - echo_test_string=`eval $prev` |
1820 | - export echo_test_string |
1821 | - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} |
1822 | - else |
1823 | - # Oops. We lost completely, so just stick with echo. |
1824 | - ECHO=echo |
1825 | - fi |
1826 | - fi |
1827 | - fi |
1828 | - fi |
1829 | - fi |
1830 | -fi |
1831 | - |
1832 | -# Copy echo and quote the copy suitably for passing to libtool from |
1833 | -# the Makefile, instead of quoting the original, which is used later. |
1834 | -lt_ECHO=$ECHO |
1835 | -if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then |
1836 | - lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" |
1837 | -fi |
1838 | - |
1839 | -AC_SUBST(lt_ECHO) |
1840 | -]) |
1841 | +m4_ifdef([_AS_DETECT_SUGGESTED], |
1842 | +[_AS_DETECT_SUGGESTED([ |
1843 | + test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( |
1844 | + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' |
1845 | + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO |
1846 | + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
1847 | + PATH=/empty FPATH=/empty; export PATH FPATH |
1848 | + test "X`printf %s $ECHO`" = "X$ECHO" \ |
1849 | + || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) |
1850 | + |
1851 | _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) |
1852 | -_LT_DECL([], [ECHO], [1], |
1853 | - [An echo program that does not interpret backslashes]) |
1854 | +_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) |
1855 | ])# _LT_PROG_ECHO_BACKSLASH |
1856 | |
1857 | |
1858 | +# _LT_WITH_SYSROOT |
1859 | +# ---------------- |
1860 | +AC_DEFUN([_LT_WITH_SYSROOT], |
1861 | +[AC_MSG_CHECKING([for sysroot]) |
1862 | +AC_ARG_WITH([sysroot], |
1863 | +[ --with-sysroot[=DIR] Search for dependent libraries within DIR |
1864 | + (or the compiler's sysroot if not specified).], |
1865 | +[], [with_sysroot=no]) |
1866 | + |
1867 | +dnl lt_sysroot will always be passed unquoted. We quote it here |
1868 | +dnl in case the user passed a directory name. |
1869 | +lt_sysroot= |
1870 | +case ${with_sysroot} in #( |
1871 | + yes) |
1872 | + if test "$GCC" = yes; then |
1873 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
1874 | + fi |
1875 | + ;; #( |
1876 | + /*) |
1877 | + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` |
1878 | + ;; #( |
1879 | + no|'') |
1880 | + ;; #( |
1881 | + *) |
1882 | + AC_MSG_RESULT([${with_sysroot}]) |
1883 | + AC_MSG_ERROR([The sysroot must be an absolute path.]) |
1884 | + ;; |
1885 | +esac |
1886 | + |
1887 | + AC_MSG_RESULT([${lt_sysroot:-no}]) |
1888 | +_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl |
1889 | +[dependent libraries, and in which our libraries should be installed.])]) |
1890 | + |
1891 | # _LT_ENABLE_LOCK |
1892 | # --------------- |
1893 | m4_defun([_LT_ENABLE_LOCK], |
1894 | @@ -1841,7 +1295,7 @@ |
1895 | ;; |
1896 | *-*-irix6*) |
1897 | # Find out which ABI we are using. |
1898 | - echo '[#]line __oline__ "configure"' > conftest.$ac_ext |
1899 | + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext |
1900 | if AC_TRY_EVAL(ac_compile); then |
1901 | if test "$lt_cv_prog_gnu_ld" = yes; then |
1902 | case `/usr/bin/file conftest.$ac_objext` in |
1903 | @@ -1934,14 +1388,27 @@ |
1904 | CFLAGS="$SAVE_CFLAGS" |
1905 | fi |
1906 | ;; |
1907 | -sparc*-*solaris*) |
1908 | +*-*solaris*) |
1909 | # Find out which ABI we are using. |
1910 | echo 'int i;' > conftest.$ac_ext |
1911 | if AC_TRY_EVAL(ac_compile); then |
1912 | case `/usr/bin/file conftest.o` in |
1913 | *64-bit*) |
1914 | case $lt_cv_prog_gnu_ld in |
1915 | - yes*) LD="${LD-ld} -m elf64_sparc" ;; |
1916 | + yes*) |
1917 | + case $host in |
1918 | + i?86-*-solaris*) |
1919 | + LD="${LD-ld} -m elf_x86_64" |
1920 | + ;; |
1921 | + sparc*-*-solaris*) |
1922 | + LD="${LD-ld} -m elf64_sparc" |
1923 | + ;; |
1924 | + esac |
1925 | + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. |
1926 | + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then |
1927 | + LD="${LD-ld}_sol2" |
1928 | + fi |
1929 | + ;; |
1930 | *) |
1931 | if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then |
1932 | LD="${LD-ld} -64" |
1933 | @@ -1959,14 +1426,47 @@ |
1934 | ])# _LT_ENABLE_LOCK |
1935 | |
1936 | |
1937 | +# _LT_PROG_AR |
1938 | +# ----------- |
1939 | +m4_defun([_LT_PROG_AR], |
1940 | +[AC_CHECK_TOOLS(AR, [ar], false) |
1941 | +: ${AR=ar} |
1942 | +: ${AR_FLAGS=cru} |
1943 | +_LT_DECL([], [AR], [1], [The archiver]) |
1944 | +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) |
1945 | + |
1946 | +AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], |
1947 | + [lt_cv_ar_at_file=no |
1948 | + AC_COMPILE_IFELSE([AC_LANG_PROGRAM], |
1949 | + [echo conftest.$ac_objext > conftest.lst |
1950 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' |
1951 | + AC_TRY_EVAL([lt_ar_try]) |
1952 | + if test "$ac_status" -eq 0; then |
1953 | + # Ensure the archiver fails upon bogus file names. |
1954 | + rm -f conftest.$ac_objext libconftest.a |
1955 | + AC_TRY_EVAL([lt_ar_try]) |
1956 | + if test "$ac_status" -ne 0; then |
1957 | + lt_cv_ar_at_file=@ |
1958 | + fi |
1959 | + fi |
1960 | + rm -f conftest.* libconftest.a |
1961 | + ]) |
1962 | + ]) |
1963 | + |
1964 | +if test "x$lt_cv_ar_at_file" = xno; then |
1965 | + archiver_list_spec= |
1966 | +else |
1967 | + archiver_list_spec=$lt_cv_ar_at_file |
1968 | +fi |
1969 | +_LT_DECL([], [archiver_list_spec], [1], |
1970 | + [How to feed a file listing to the archiver]) |
1971 | +])# _LT_PROG_AR |
1972 | + |
1973 | + |
1974 | # _LT_CMD_OLD_ARCHIVE |
1975 | # ------------------- |
1976 | m4_defun([_LT_CMD_OLD_ARCHIVE], |
1977 | -[AC_CHECK_TOOL(AR, ar, false) |
1978 | -test -z "$AR" && AR=ar |
1979 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
1980 | -_LT_DECL([], [AR], [1], [The archiver]) |
1981 | -_LT_DECL([], [AR_FLAGS], [1]) |
1982 | +[_LT_PROG_AR |
1983 | |
1984 | AC_CHECK_TOOL(STRIP, strip, :) |
1985 | test -z "$STRIP" && STRIP=: |
1986 | @@ -1985,18 +1485,27 @@ |
1987 | if test -n "$RANLIB"; then |
1988 | case $host_os in |
1989 | openbsd*) |
1990 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" |
1991 | + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" |
1992 | ;; |
1993 | *) |
1994 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" |
1995 | + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" |
1996 | ;; |
1997 | esac |
1998 | - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" |
1999 | + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" |
2000 | fi |
2001 | + |
2002 | +case $host_os in |
2003 | + darwin*) |
2004 | + lock_old_archive_extraction=yes ;; |
2005 | + *) |
2006 | + lock_old_archive_extraction=no ;; |
2007 | +esac |
2008 | _LT_DECL([], [old_postinstall_cmds], [2]) |
2009 | _LT_DECL([], [old_postuninstall_cmds], [2]) |
2010 | _LT_TAGDECL([], [old_archive_cmds], [2], |
2011 | [Commands used to build an old-style archive]) |
2012 | +_LT_DECL([], [lock_old_archive_extraction], [0], |
2013 | + [Whether to use a lock for old archive extraction]) |
2014 | ])# _LT_CMD_OLD_ARCHIVE |
2015 | |
2016 | |
2017 | @@ -2021,15 +1530,15 @@ |
2018 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
2019 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ |
2020 | -e 's:$: $lt_compiler_flag:'` |
2021 | - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
2022 | + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
2023 | (eval "$lt_compile" 2>conftest.err) |
2024 | ac_status=$? |
2025 | cat conftest.err >&AS_MESSAGE_LOG_FD |
2026 | - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
2027 | + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
2028 | if (exit $ac_status) && test -s "$ac_outfile"; then |
2029 | # The compiler can only warn and ignore the option if not recognized |
2030 | # So say no if there are warnings other than the usual output. |
2031 | - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp |
2032 | + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp |
2033 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
2034 | if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then |
2035 | $2=yes |
2036 | @@ -2069,7 +1578,7 @@ |
2037 | if test -s conftest.err; then |
2038 | # Append any errors to the config.log. |
2039 | cat conftest.err 1>&AS_MESSAGE_LOG_FD |
2040 | - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp |
2041 | + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp |
2042 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
2043 | if diff conftest.exp conftest.er2 >/dev/null; then |
2044 | $2=yes |
2045 | @@ -2132,6 +1641,11 @@ |
2046 | lt_cv_sys_max_cmd_len=8192; |
2047 | ;; |
2048 | |
2049 | + mint*) |
2050 | + # On MiNT this can take a long time and run out of memory. |
2051 | + lt_cv_sys_max_cmd_len=8192; |
2052 | + ;; |
2053 | + |
2054 | amigaos*) |
2055 | # On AmigaOS with pdksh, this test takes hours, literally. |
2056 | # So we just punt and use a minimum line length of 8192. |
2057 | @@ -2157,6 +1671,11 @@ |
2058 | lt_cv_sys_max_cmd_len=196608 |
2059 | ;; |
2060 | |
2061 | + os2*) |
2062 | + # The test takes a long time on OS/2. |
2063 | + lt_cv_sys_max_cmd_len=8192 |
2064 | + ;; |
2065 | + |
2066 | osf*) |
2067 | # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure |
2068 | # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not |
2069 | @@ -2196,8 +1715,8 @@ |
2070 | # If test is not a shell built-in, we'll probably end up computing a |
2071 | # maximum length that is only half of the actual maximum length, but |
2072 | # we can't tell. |
2073 | - while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ |
2074 | - = "XX$teststring$teststring"; } >/dev/null 2>&1 && |
2075 | + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ |
2076 | + = "X$teststring$teststring"; } >/dev/null 2>&1 && |
2077 | test $i != 17 # 1/2 MB should be enough |
2078 | do |
2079 | i=`expr $i + 1` |
2080 | @@ -2248,7 +1767,7 @@ |
2081 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
2082 | lt_status=$lt_dlunknown |
2083 | cat > conftest.$ac_ext <<_LT_EOF |
2084 | -[#line __oline__ "configure" |
2085 | +[#line $LINENO "configure" |
2086 | #include "confdefs.h" |
2087 | |
2088 | #if HAVE_DLFCN_H |
2089 | @@ -2289,7 +1808,13 @@ |
2090 | # endif |
2091 | #endif |
2092 | |
2093 | -void fnord() { int i=42;} |
2094 | +/* When -fvisbility=hidden is used, assume the code has been annotated |
2095 | + correspondingly for the symbols needed. */ |
2096 | +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
2097 | +int fnord () __attribute__((visibility("default"))); |
2098 | +#endif |
2099 | + |
2100 | +int fnord () { return 42; } |
2101 | int main () |
2102 | { |
2103 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
2104 | @@ -2298,7 +1823,11 @@ |
2105 | if (self) |
2106 | { |
2107 | if (dlsym (self,"fnord")) status = $lt_dlno_uscore; |
2108 | - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; |
2109 | + else |
2110 | + { |
2111 | + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; |
2112 | + else puts (dlerror ()); |
2113 | + } |
2114 | /* dlclose (self); */ |
2115 | } |
2116 | else |
2117 | @@ -2474,16 +2003,16 @@ |
2118 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
2119 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ |
2120 | -e 's:$: $lt_compiler_flag:'` |
2121 | - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
2122 | + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
2123 | (eval "$lt_compile" 2>out/conftest.err) |
2124 | ac_status=$? |
2125 | cat out/conftest.err >&AS_MESSAGE_LOG_FD |
2126 | - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
2127 | + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
2128 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
2129 | then |
2130 | # The compiler can only warn and ignore the option if not recognized |
2131 | # So say no if there are warnings |
2132 | - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp |
2133 | + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp |
2134 | $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 |
2135 | if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then |
2136 | _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes |
2137 | @@ -2642,6 +2171,7 @@ |
2138 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
2139 | m4_require([_LT_DECL_OBJDUMP])dnl |
2140 | m4_require([_LT_DECL_SED])dnl |
2141 | +m4_require([_LT_CHECK_SHELL_FEATURES])dnl |
2142 | AC_MSG_CHECKING([dynamic linker characteristics]) |
2143 | m4_if([$1], |
2144 | [], [ |
2145 | @@ -2650,16 +2180,23 @@ |
2146 | darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; |
2147 | *) lt_awk_arg="/^libraries:/" ;; |
2148 | esac |
2149 | - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` |
2150 | - if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then |
2151 | + case $host_os in |
2152 | + mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; |
2153 | + *) lt_sed_strip_eq="s,=/,/,g" ;; |
2154 | + esac |
2155 | + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` |
2156 | + case $lt_search_path_spec in |
2157 | + *\;*) |
2158 | # if the path contains ";" then we assume it to be the separator |
2159 | # otherwise default to the standard path separator (i.e. ":") - it is |
2160 | # assumed that no part of a normal pathname contains ";" but that should |
2161 | # okay in the real world where ";" in dirpaths is itself problematic. |
2162 | - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` |
2163 | - else |
2164 | - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
2165 | - fi |
2166 | + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` |
2167 | + ;; |
2168 | + *) |
2169 | + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` |
2170 | + ;; |
2171 | + esac |
2172 | # Ok, now we have the path, separated by spaces, we can step through it |
2173 | # and add multilib dir if necessary. |
2174 | lt_tmp_lt_search_path_spec= |
2175 | @@ -2672,7 +2209,7 @@ |
2176 | lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" |
2177 | fi |
2178 | done |
2179 | - lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' |
2180 | + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' |
2181 | BEGIN {RS=" "; FS="/|\n";} { |
2182 | lt_foo=""; |
2183 | lt_count=0; |
2184 | @@ -2692,7 +2229,13 @@ |
2185 | if (lt_foo != "") { lt_freq[[lt_foo]]++; } |
2186 | if (lt_freq[[lt_foo]] == 1) { print lt_foo; } |
2187 | }'` |
2188 | - sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` |
2189 | + # AWK program above erroneously prepends '/' to C:/dos/paths |
2190 | + # for these hosts. |
2191 | + case $host_os in |
2192 | + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ |
2193 | + $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; |
2194 | + esac |
2195 | + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` |
2196 | else |
2197 | sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" |
2198 | fi]) |
2199 | @@ -2718,7 +2261,7 @@ |
2200 | |
2201 | case $host_os in |
2202 | aix3*) |
2203 | - version_type=linux |
2204 | + version_type=linux # correct to gnu/linux during the next big refactor |
2205 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' |
2206 | shlibpath_var=LIBPATH |
2207 | |
2208 | @@ -2727,7 +2270,7 @@ |
2209 | ;; |
2210 | |
2211 | aix[[4-9]]*) |
2212 | - version_type=linux |
2213 | + version_type=linux # correct to gnu/linux during the next big refactor |
2214 | need_lib_prefix=no |
2215 | need_version=no |
2216 | hardcode_into_libs=yes |
2217 | @@ -2780,7 +2323,7 @@ |
2218 | m68k) |
2219 | library_names_spec='$libname.ixlibrary $libname.a' |
2220 | # Create ${libname}_ixlibrary.a entries in /sys/libs. |
2221 | - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' |
2222 | + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' |
2223 | ;; |
2224 | esac |
2225 | ;; |
2226 | @@ -2792,7 +2335,7 @@ |
2227 | ;; |
2228 | |
2229 | bsdi[[45]]*) |
2230 | - version_type=linux |
2231 | + version_type=linux # correct to gnu/linux during the next big refactor |
2232 | need_version=no |
2233 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2234 | soname_spec='${libname}${release}${shared_ext}$major' |
2235 | @@ -2811,8 +2354,9 @@ |
2236 | need_version=no |
2237 | need_lib_prefix=no |
2238 | |
2239 | - case $GCC,$host_os in |
2240 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
2241 | + case $GCC,$cc_basename in |
2242 | + yes,*) |
2243 | + # gcc |
2244 | library_names_spec='$libname.dll.a' |
2245 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
2246 | postinstall_cmds='base_file=`basename \${file}`~ |
2247 | @@ -2833,36 +2377,83 @@ |
2248 | cygwin*) |
2249 | # Cygwin DLLs use 'cyg' prefix rather than 'lib' |
2250 | soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
2251 | - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" |
2252 | +m4_if([$1], [],[ |
2253 | + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) |
2254 | ;; |
2255 | mingw* | cegcc*) |
2256 | # MinGW DLLs use traditional 'lib' prefix |
2257 | soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
2258 | - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` |
2259 | - if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then |
2260 | - # It is most probably a Windows format PATH printed by |
2261 | - # mingw gcc, but we are running on Cygwin. Gcc prints its search |
2262 | - # path with ; separators, and with drive letters. We can handle the |
2263 | - # drive letters (cygwin fileutils understands them), so leave them, |
2264 | - # especially as we might pass files found there to a mingw objdump, |
2265 | - # which wouldn't understand a cygwinified path. Ahh. |
2266 | - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
2267 | - else |
2268 | - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
2269 | - fi |
2270 | ;; |
2271 | pw32*) |
2272 | # pw32 DLLs use 'pw' prefix rather than 'lib' |
2273 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
2274 | ;; |
2275 | esac |
2276 | + dynamic_linker='Win32 ld.exe' |
2277 | + ;; |
2278 | + |
2279 | + *,cl*) |
2280 | + # Native MSVC |
2281 | + libname_spec='$name' |
2282 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
2283 | + library_names_spec='${libname}.dll.lib' |
2284 | + |
2285 | + case $build_os in |
2286 | + mingw*) |
2287 | + sys_lib_search_path_spec= |
2288 | + lt_save_ifs=$IFS |
2289 | + IFS=';' |
2290 | + for lt_path in $LIB |
2291 | + do |
2292 | + IFS=$lt_save_ifs |
2293 | + # Let DOS variable expansion print the short 8.3 style file name. |
2294 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
2295 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
2296 | + done |
2297 | + IFS=$lt_save_ifs |
2298 | + # Convert to MSYS style. |
2299 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` |
2300 | + ;; |
2301 | + cygwin*) |
2302 | + # Convert to unix form, then to dos form, then back to unix form |
2303 | + # but this time dos style (no spaces!) so that the unix form looks |
2304 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
2305 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
2306 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
2307 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
2308 | + ;; |
2309 | + *) |
2310 | + sys_lib_search_path_spec="$LIB" |
2311 | + if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then |
2312 | + # It is most probably a Windows format PATH. |
2313 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
2314 | + else |
2315 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
2316 | + fi |
2317 | + # FIXME: find the short name or the path components, as spaces are |
2318 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
2319 | + ;; |
2320 | + esac |
2321 | + |
2322 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
2323 | + postinstall_cmds='base_file=`basename \${file}`~ |
2324 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
2325 | + dldir=$destdir/`dirname \$dlpath`~ |
2326 | + test -d \$dldir || mkdir -p \$dldir~ |
2327 | + $install_prog $dir/$dlname \$dldir/$dlname' |
2328 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
2329 | + dlpath=$dir/\$dldll~ |
2330 | + $RM \$dlpath' |
2331 | + shlibpath_overrides_runpath=yes |
2332 | + dynamic_linker='Win32 link.exe' |
2333 | ;; |
2334 | |
2335 | *) |
2336 | + # Assume MSVC wrapper |
2337 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' |
2338 | + dynamic_linker='Win32 ld.exe' |
2339 | ;; |
2340 | esac |
2341 | - dynamic_linker='Win32 ld.exe' |
2342 | # FIXME: first we should search . and the directory the executable is in |
2343 | shlibpath_var=PATH |
2344 | ;; |
2345 | @@ -2883,7 +2474,7 @@ |
2346 | ;; |
2347 | |
2348 | dgux*) |
2349 | - version_type=linux |
2350 | + version_type=linux # correct to gnu/linux during the next big refactor |
2351 | need_lib_prefix=no |
2352 | need_version=no |
2353 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' |
2354 | @@ -2891,10 +2482,6 @@ |
2355 | shlibpath_var=LD_LIBRARY_PATH |
2356 | ;; |
2357 | |
2358 | -freebsd1*) |
2359 | - dynamic_linker=no |
2360 | - ;; |
2361 | - |
2362 | freebsd* | dragonfly*) |
2363 | # DragonFly does not have aout. When/if they implement a new |
2364 | # versioning mechanism, adjust this. |
2365 | @@ -2902,7 +2489,7 @@ |
2366 | objformat=`/usr/bin/objformat` |
2367 | else |
2368 | case $host_os in |
2369 | - freebsd[[123]]*) objformat=aout ;; |
2370 | + freebsd[[23]].*) objformat=aout ;; |
2371 | *) objformat=elf ;; |
2372 | esac |
2373 | fi |
2374 | @@ -2920,7 +2507,7 @@ |
2375 | esac |
2376 | shlibpath_var=LD_LIBRARY_PATH |
2377 | case $host_os in |
2378 | - freebsd2*) |
2379 | + freebsd2.*) |
2380 | shlibpath_overrides_runpath=yes |
2381 | ;; |
2382 | freebsd3.[[01]]* | freebsdelf3.[[01]]*) |
2383 | @@ -2940,12 +2527,26 @@ |
2384 | ;; |
2385 | |
2386 | gnu*) |
2387 | - version_type=linux |
2388 | + version_type=linux # correct to gnu/linux during the next big refactor |
2389 | need_lib_prefix=no |
2390 | need_version=no |
2391 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
2392 | soname_spec='${libname}${release}${shared_ext}$major' |
2393 | shlibpath_var=LD_LIBRARY_PATH |
2394 | + shlibpath_overrides_runpath=no |
2395 | + hardcode_into_libs=yes |
2396 | + ;; |
2397 | + |
2398 | +haiku*) |
2399 | + version_type=linux # correct to gnu/linux during the next big refactor |
2400 | + need_lib_prefix=no |
2401 | + need_version=no |
2402 | + dynamic_linker="$host_os runtime_loader" |
2403 | + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
2404 | + soname_spec='${libname}${release}${shared_ext}$major' |
2405 | + shlibpath_var=LIBRARY_PATH |
2406 | + shlibpath_overrides_runpath=yes |
2407 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' |
2408 | hardcode_into_libs=yes |
2409 | ;; |
2410 | |
2411 | @@ -2991,12 +2592,14 @@ |
2412 | soname_spec='${libname}${release}${shared_ext}$major' |
2413 | ;; |
2414 | esac |
2415 | - # HP-UX runs *really* slowly unless shared libraries are mode 555. |
2416 | + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... |
2417 | postinstall_cmds='chmod 555 $lib' |
2418 | + # or fails outright, so override atomically: |
2419 | + install_override_mode=555 |
2420 | ;; |
2421 | |
2422 | interix[[3-9]]*) |
2423 | - version_type=linux |
2424 | + version_type=linux # correct to gnu/linux during the next big refactor |
2425 | need_lib_prefix=no |
2426 | need_version=no |
2427 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
2428 | @@ -3012,7 +2615,7 @@ |
2429 | nonstopux*) version_type=nonstopux ;; |
2430 | *) |
2431 | if test "$lt_cv_prog_gnu_ld" = yes; then |
2432 | - version_type=linux |
2433 | + version_type=linux # correct to gnu/linux during the next big refactor |
2434 | else |
2435 | version_type=irix |
2436 | fi ;; |
2437 | @@ -3049,9 +2652,9 @@ |
2438 | dynamic_linker=no |
2439 | ;; |
2440 | |
2441 | -# This must be Linux ELF. |
2442 | -linux* | k*bsd*-gnu) |
2443 | - version_type=linux |
2444 | +# This must be glibc/ELF. |
2445 | +linux* | k*bsd*-gnu | kopensolaris*-gnu) |
2446 | + version_type=linux # correct to gnu/linux during the next big refactor |
2447 | need_lib_prefix=no |
2448 | need_version=no |
2449 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2450 | @@ -3059,16 +2662,21 @@ |
2451 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' |
2452 | shlibpath_var=LD_LIBRARY_PATH |
2453 | shlibpath_overrides_runpath=no |
2454 | + |
2455 | # Some binutils ld are patched to set DT_RUNPATH |
2456 | - save_LDFLAGS=$LDFLAGS |
2457 | - save_libdir=$libdir |
2458 | - eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ |
2459 | - LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" |
2460 | - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], |
2461 | - [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], |
2462 | - [shlibpath_overrides_runpath=yes])]) |
2463 | - LDFLAGS=$save_LDFLAGS |
2464 | - libdir=$save_libdir |
2465 | + AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], |
2466 | + [lt_cv_shlibpath_overrides_runpath=no |
2467 | + save_LDFLAGS=$LDFLAGS |
2468 | + save_libdir=$libdir |
2469 | + eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ |
2470 | + LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" |
2471 | + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], |
2472 | + [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], |
2473 | + [lt_cv_shlibpath_overrides_runpath=yes])]) |
2474 | + LDFLAGS=$save_LDFLAGS |
2475 | + libdir=$save_libdir |
2476 | + ]) |
2477 | + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath |
2478 | |
2479 | # This implies no fast_install, which is unacceptable. |
2480 | # Some rework will be needed to allow for fast_install |
2481 | @@ -3080,8 +2688,9 @@ |
2482 | |
2483 | # Append ld.so.conf contents to the search path |
2484 | if test -f /etc/ld.so.conf; then |
2485 | - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` |
2486 | + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` |
2487 | sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" |
2488 | + |
2489 | fi |
2490 | |
2491 | # We used to test for /lib/ld.so.1 and disable shared libraries on |
2492 | @@ -3112,7 +2721,7 @@ |
2493 | ;; |
2494 | |
2495 | newsos6) |
2496 | - version_type=linux |
2497 | + version_type=linux # correct to gnu/linux during the next big refactor |
2498 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2499 | shlibpath_var=LD_LIBRARY_PATH |
2500 | shlibpath_overrides_runpath=yes |
2501 | @@ -3181,7 +2790,7 @@ |
2502 | ;; |
2503 | |
2504 | solaris*) |
2505 | - version_type=linux |
2506 | + version_type=linux # correct to gnu/linux during the next big refactor |
2507 | need_lib_prefix=no |
2508 | need_version=no |
2509 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2510 | @@ -3206,7 +2815,7 @@ |
2511 | ;; |
2512 | |
2513 | sysv4 | sysv4.3*) |
2514 | - version_type=linux |
2515 | + version_type=linux # correct to gnu/linux during the next big refactor |
2516 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2517 | soname_spec='${libname}${release}${shared_ext}$major' |
2518 | shlibpath_var=LD_LIBRARY_PATH |
2519 | @@ -3230,7 +2839,7 @@ |
2520 | |
2521 | sysv4*MP*) |
2522 | if test -d /usr/nec ;then |
2523 | - version_type=linux |
2524 | + version_type=linux # correct to gnu/linux during the next big refactor |
2525 | library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' |
2526 | soname_spec='$libname${shared_ext}.$major' |
2527 | shlibpath_var=LD_LIBRARY_PATH |
2528 | @@ -3261,7 +2870,7 @@ |
2529 | |
2530 | tpf*) |
2531 | # TPF is a cross-target only. Preferred cross-host = GNU/Linux. |
2532 | - version_type=linux |
2533 | + version_type=linux # correct to gnu/linux during the next big refactor |
2534 | need_lib_prefix=no |
2535 | need_version=no |
2536 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2537 | @@ -3271,7 +2880,7 @@ |
2538 | ;; |
2539 | |
2540 | uts4*) |
2541 | - version_type=linux |
2542 | + version_type=linux # correct to gnu/linux during the next big refactor |
2543 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2544 | soname_spec='${libname}${release}${shared_ext}$major' |
2545 | shlibpath_var=LD_LIBRARY_PATH |
2546 | @@ -3313,6 +2922,8 @@ |
2547 | The last name is the one that the linker finds with -lNAME]]) |
2548 | _LT_DECL([], [soname_spec], [1], |
2549 | [[The coded name of the library, if different from the real name]]) |
2550 | +_LT_DECL([], [install_override_mode], [1], |
2551 | + [Permission mode override for installation of shared libraries]) |
2552 | _LT_DECL([], [postinstall_cmds], [2], |
2553 | [Command to use after installation of a shared archive]) |
2554 | _LT_DECL([], [postuninstall_cmds], [2], |
2555 | @@ -3425,6 +3036,7 @@ |
2556 | AC_REQUIRE([AC_CANONICAL_BUILD])dnl |
2557 | m4_require([_LT_DECL_SED])dnl |
2558 | m4_require([_LT_DECL_EGREP])dnl |
2559 | +m4_require([_LT_PROG_ECHO_BACKSLASH])dnl |
2560 | |
2561 | AC_ARG_WITH([gnu-ld], |
2562 | [AS_HELP_STRING([--with-gnu-ld], |
2563 | @@ -3546,6 +3158,11 @@ |
2564 | esac |
2565 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
2566 | case $host_os in |
2567 | + cygwin* | mingw* | pw32* | cegcc*) |
2568 | + if test "$GCC" != yes; then |
2569 | + reload_cmds=false |
2570 | + fi |
2571 | + ;; |
2572 | darwin*) |
2573 | if test "$GCC" = yes; then |
2574 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
2575 | @@ -3554,8 +3171,8 @@ |
2576 | fi |
2577 | ;; |
2578 | esac |
2579 | -_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl |
2580 | -_LT_DECL([], [reload_cmds], [2])dnl |
2581 | +_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl |
2582 | +_LT_TAGDECL([], [reload_cmds], [2])dnl |
2583 | ])# _LT_CMD_RELOAD |
2584 | |
2585 | |
2586 | @@ -3607,16 +3224,18 @@ |
2587 | # Base MSYS/MinGW do not provide the 'file' command needed by |
2588 | # func_win32_libid shell function, so use a weaker test based on 'objdump', |
2589 | # unless we find 'file', for example because we are cross-compiling. |
2590 | - if ( file / ) >/dev/null 2>&1; then |
2591 | + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. |
2592 | + if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then |
2593 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
2594 | lt_cv_file_magic_cmd='func_win32_libid' |
2595 | else |
2596 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
2597 | + # Keep this pattern in sync with the one in func_win32_libid. |
2598 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
2599 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
2600 | fi |
2601 | ;; |
2602 | |
2603 | -cegcc) |
2604 | +cegcc*) |
2605 | # use the weaker test based on 'objdump'. See mingw*. |
2606 | lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' |
2607 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
2608 | @@ -3646,6 +3265,10 @@ |
2609 | lt_cv_deplibs_check_method=pass_all |
2610 | ;; |
2611 | |
2612 | +haiku*) |
2613 | + lt_cv_deplibs_check_method=pass_all |
2614 | + ;; |
2615 | + |
2616 | hpux10.20* | hpux11*) |
2617 | lt_cv_file_magic_cmd=/usr/bin/file |
2618 | case $host_cpu in |
2619 | @@ -3654,11 +3277,11 @@ |
2620 | lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so |
2621 | ;; |
2622 | hppa*64*) |
2623 | - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] |
2624 | + [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] |
2625 | lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl |
2626 | ;; |
2627 | *) |
2628 | - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' |
2629 | + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' |
2630 | lt_cv_file_magic_test_file=/usr/lib/libc.sl |
2631 | ;; |
2632 | esac |
2633 | @@ -3679,8 +3302,8 @@ |
2634 | lt_cv_deplibs_check_method=pass_all |
2635 | ;; |
2636 | |
2637 | -# This must be Linux ELF. |
2638 | -linux* | k*bsd*-gnu) |
2639 | +# This must be glibc/ELF. |
2640 | +linux* | k*bsd*-gnu | kopensolaris*-gnu) |
2641 | lt_cv_deplibs_check_method=pass_all |
2642 | ;; |
2643 | |
2644 | @@ -3758,6 +3381,21 @@ |
2645 | ;; |
2646 | esac |
2647 | ]) |
2648 | + |
2649 | +file_magic_glob= |
2650 | +want_nocaseglob=no |
2651 | +if test "$build" = "$host"; then |
2652 | + case $host_os in |
2653 | + mingw* | pw32*) |
2654 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
2655 | + want_nocaseglob=yes |
2656 | + else |
2657 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` |
2658 | + fi |
2659 | + ;; |
2660 | + esac |
2661 | +fi |
2662 | + |
2663 | file_magic_cmd=$lt_cv_file_magic_cmd |
2664 | deplibs_check_method=$lt_cv_deplibs_check_method |
2665 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
2666 | @@ -3765,7 +3403,11 @@ |
2667 | _LT_DECL([], [deplibs_check_method], [1], |
2668 | [Method to check whether dependent libraries are shared objects]) |
2669 | _LT_DECL([], [file_magic_cmd], [1], |
2670 | - [Command to use when deplibs_check_method == "file_magic"]) |
2671 | + [Command to use when deplibs_check_method = "file_magic"]) |
2672 | +_LT_DECL([], [file_magic_glob], [1], |
2673 | + [How to find potential files when deplibs_check_method = "file_magic"]) |
2674 | +_LT_DECL([], [want_nocaseglob], [1], |
2675 | + [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) |
2676 | ])# _LT_CHECK_MAGIC_METHOD |
2677 | |
2678 | |
2679 | @@ -3822,7 +3464,19 @@ |
2680 | NM="$lt_cv_path_NM" |
2681 | else |
2682 | # Didn't find any BSD compatible name lister, look for dumpbin. |
2683 | - AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) |
2684 | + if test -n "$DUMPBIN"; then : |
2685 | + # Let the user override the test. |
2686 | + else |
2687 | + AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) |
2688 | + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in |
2689 | + *COFF*) |
2690 | + DUMPBIN="$DUMPBIN -symbols" |
2691 | + ;; |
2692 | + *) |
2693 | + DUMPBIN=: |
2694 | + ;; |
2695 | + esac |
2696 | + fi |
2697 | AC_SUBST([DUMPBIN]) |
2698 | if test "$DUMPBIN" != ":"; then |
2699 | NM="$DUMPBIN" |
2700 | @@ -3835,13 +3489,13 @@ |
2701 | AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], |
2702 | [lt_cv_nm_interface="BSD nm" |
2703 | echo "int some_variable = 0;" > conftest.$ac_ext |
2704 | - (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) |
2705 | + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) |
2706 | (eval "$ac_compile" 2>conftest.err) |
2707 | cat conftest.err >&AS_MESSAGE_LOG_FD |
2708 | - (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) |
2709 | + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) |
2710 | (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) |
2711 | cat conftest.err >&AS_MESSAGE_LOG_FD |
2712 | - (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) |
2713 | + (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) |
2714 | cat conftest.out >&AS_MESSAGE_LOG_FD |
2715 | if $GREP 'External.*some_variable' conftest.out > /dev/null; then |
2716 | lt_cv_nm_interface="MS dumpbin" |
2717 | @@ -3856,6 +3510,67 @@ |
2718 | dnl AC_DEFUN([AM_PROG_NM], []) |
2719 | dnl AC_DEFUN([AC_PROG_NM], []) |
2720 | |
2721 | +# _LT_CHECK_SHAREDLIB_FROM_LINKLIB |
2722 | +# -------------------------------- |
2723 | +# how to determine the name of the shared library |
2724 | +# associated with a specific link library. |
2725 | +# -- PORTME fill in with the dynamic library characteristics |
2726 | +m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], |
2727 | +[m4_require([_LT_DECL_EGREP]) |
2728 | +m4_require([_LT_DECL_OBJDUMP]) |
2729 | +m4_require([_LT_DECL_DLLTOOL]) |
2730 | +AC_CACHE_CHECK([how to associate runtime and link libraries], |
2731 | +lt_cv_sharedlib_from_linklib_cmd, |
2732 | +[lt_cv_sharedlib_from_linklib_cmd='unknown' |
2733 | + |
2734 | +case $host_os in |
2735 | +cygwin* | mingw* | pw32* | cegcc*) |
2736 | + # two different shell functions defined in ltmain.sh |
2737 | + # decide which to use based on capabilities of $DLLTOOL |
2738 | + case `$DLLTOOL --help 2>&1` in |
2739 | + *--identify-strict*) |
2740 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
2741 | + ;; |
2742 | + *) |
2743 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
2744 | + ;; |
2745 | + esac |
2746 | + ;; |
2747 | +*) |
2748 | + # fallback: assume linklib IS sharedlib |
2749 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
2750 | + ;; |
2751 | +esac |
2752 | +]) |
2753 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
2754 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
2755 | + |
2756 | +_LT_DECL([], [sharedlib_from_linklib_cmd], [1], |
2757 | + [Command to associate shared and link libraries]) |
2758 | +])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB |
2759 | + |
2760 | + |
2761 | +# _LT_PATH_MANIFEST_TOOL |
2762 | +# ---------------------- |
2763 | +# locate the manifest tool |
2764 | +m4_defun([_LT_PATH_MANIFEST_TOOL], |
2765 | +[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) |
2766 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
2767 | +AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], |
2768 | + [lt_cv_path_mainfest_tool=no |
2769 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD |
2770 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
2771 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
2772 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
2773 | + lt_cv_path_mainfest_tool=yes |
2774 | + fi |
2775 | + rm -f conftest*]) |
2776 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
2777 | + MANIFEST_TOOL=: |
2778 | +fi |
2779 | +_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl |
2780 | +])# _LT_PATH_MANIFEST_TOOL |
2781 | + |
2782 | |
2783 | # LT_LIB_M |
2784 | # -------- |
2785 | @@ -3864,7 +3579,7 @@ |
2786 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl |
2787 | LIBM= |
2788 | case $host in |
2789 | -*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) |
2790 | +*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) |
2791 | # These system don't have libm, or don't need it |
2792 | ;; |
2793 | *-ncr-sysv4.3*) |
2794 | @@ -3892,7 +3607,12 @@ |
2795 | _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= |
2796 | |
2797 | if test "$GCC" = yes; then |
2798 | - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' |
2799 | + case $cc_basename in |
2800 | + nvcc*) |
2801 | + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; |
2802 | + *) |
2803 | + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; |
2804 | + esac |
2805 | |
2806 | _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], |
2807 | lt_cv_prog_compiler_rtti_exceptions, |
2808 | @@ -3909,6 +3629,7 @@ |
2809 | m4_defun([_LT_CMD_GLOBAL_SYMBOLS], |
2810 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl |
2811 | AC_REQUIRE([AC_PROG_CC])dnl |
2812 | +AC_REQUIRE([AC_PROG_AWK])dnl |
2813 | AC_REQUIRE([LT_PATH_NM])dnl |
2814 | AC_REQUIRE([LT_PATH_LD])dnl |
2815 | m4_require([_LT_DECL_SED])dnl |
2816 | @@ -3976,8 +3697,8 @@ |
2817 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
2818 | |
2819 | # Transform an extracted symbol line into symbol name and symbol address |
2820 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" |
2821 | -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" |
2822 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" |
2823 | +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" |
2824 | |
2825 | # Handle CRLF in mingw tool chain |
2826 | opt_cr= |
2827 | @@ -4001,6 +3722,7 @@ |
2828 | # which start with @ or ?. |
2829 | lt_cv_sys_global_symbol_pipe="$AWK ['"\ |
2830 | " {last_section=section; section=\$ 3};"\ |
2831 | +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ |
2832 | " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ |
2833 | " \$ 0!~/External *\|/{next};"\ |
2834 | " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ |
2835 | @@ -4013,6 +3735,7 @@ |
2836 | else |
2837 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
2838 | fi |
2839 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
2840 | |
2841 | # Check to see that the pipe works correctly. |
2842 | pipe_works=no |
2843 | @@ -4034,7 +3757,7 @@ |
2844 | if AC_TRY_EVAL(ac_compile); then |
2845 | # Now try to grab the symbols. |
2846 | nlist=conftest.nm |
2847 | - if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then |
2848 | + if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then |
2849 | # Try sorting and uniquifying the output. |
2850 | if sort "$nlist" | uniq > "$nlist"T; then |
2851 | mv -f "$nlist"T "$nlist" |
2852 | @@ -4046,6 +3769,18 @@ |
2853 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
2854 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
2855 | cat <<_LT_EOF > conftest.$ac_ext |
2856 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
2857 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
2858 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
2859 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
2860 | +# define LT@&t@_DLSYM_CONST |
2861 | +#elif defined(__osf__) |
2862 | +/* This system does not cope well with relocations in const data. */ |
2863 | +# define LT@&t@_DLSYM_CONST |
2864 | +#else |
2865 | +# define LT@&t@_DLSYM_CONST const |
2866 | +#endif |
2867 | + |
2868 | #ifdef __cplusplus |
2869 | extern "C" { |
2870 | #endif |
2871 | @@ -4057,7 +3792,7 @@ |
2872 | cat <<_LT_EOF >> conftest.$ac_ext |
2873 | |
2874 | /* The mapping between symbol names and symbols. */ |
2875 | -const struct { |
2876 | +LT@&t@_DLSYM_CONST struct { |
2877 | const char *name; |
2878 | void *address; |
2879 | } |
2880 | @@ -4083,15 +3818,15 @@ |
2881 | _LT_EOF |
2882 | # Now try linking the two files. |
2883 | mv conftest.$ac_objext conftstm.$ac_objext |
2884 | - lt_save_LIBS="$LIBS" |
2885 | - lt_save_CFLAGS="$CFLAGS" |
2886 | + lt_globsym_save_LIBS=$LIBS |
2887 | + lt_globsym_save_CFLAGS=$CFLAGS |
2888 | LIBS="conftstm.$ac_objext" |
2889 | CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" |
2890 | if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then |
2891 | pipe_works=yes |
2892 | fi |
2893 | - LIBS="$lt_save_LIBS" |
2894 | - CFLAGS="$lt_save_CFLAGS" |
2895 | + LIBS=$lt_globsym_save_LIBS |
2896 | + CFLAGS=$lt_globsym_save_CFLAGS |
2897 | else |
2898 | echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD |
2899 | fi |
2900 | @@ -4124,6 +3859,13 @@ |
2901 | AC_MSG_RESULT(ok) |
2902 | fi |
2903 | |
2904 | +# Response file support. |
2905 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
2906 | + nm_file_list_spec='@' |
2907 | +elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then |
2908 | + nm_file_list_spec='@' |
2909 | +fi |
2910 | + |
2911 | _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], |
2912 | [Take the output of nm and produce a listing of raw symbols and C names]) |
2913 | _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], |
2914 | @@ -4134,6 +3876,8 @@ |
2915 | _LT_DECL([global_symbol_to_c_name_address_lib_prefix], |
2916 | [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], |
2917 | [Transform the output of nm in a C name address pair when lib prefix is needed]) |
2918 | +_LT_DECL([], [nm_file_list_spec], [1], |
2919 | + [Specify filename containing input files for $NM]) |
2920 | ]) # _LT_CMD_GLOBAL_SYMBOLS |
2921 | |
2922 | |
2923 | @@ -4145,7 +3889,6 @@ |
2924 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
2925 | _LT_TAGVAR(lt_prog_compiler_static, $1)= |
2926 | |
2927 | -AC_MSG_CHECKING([for $compiler option to produce PIC]) |
2928 | m4_if([$1], [CXX], [ |
2929 | # C++ specific cases for pic, static, wl, etc. |
2930 | if test "$GXX" = yes; then |
2931 | @@ -4196,6 +3939,11 @@ |
2932 | # DJGPP does not support shared libraries at all |
2933 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
2934 | ;; |
2935 | + haiku*) |
2936 | + # PIC is the default for Haiku. |
2937 | + # The "-static" flag exists, but is broken. |
2938 | + _LT_TAGVAR(lt_prog_compiler_static, $1)= |
2939 | + ;; |
2940 | interix[[3-9]]*) |
2941 | # Interix 3.x gcc -fpic/-fPIC options generate broken code. |
2942 | # Instead, we relocate shared libraries at runtime. |
2943 | @@ -4245,6 +3993,12 @@ |
2944 | ;; |
2945 | esac |
2946 | ;; |
2947 | + mingw* | cygwin* | os2* | pw32* | cegcc*) |
2948 | + # This hack is so that the source file can tell whether it is being |
2949 | + # built for inclusion in a dll (and should export symbols for example). |
2950 | + m4_if([$1], [GCJ], [], |
2951 | + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) |
2952 | + ;; |
2953 | dgux*) |
2954 | case $cc_basename in |
2955 | ec++*) |
2956 | @@ -4301,7 +4055,7 @@ |
2957 | ;; |
2958 | esac |
2959 | ;; |
2960 | - linux* | k*bsd*-gnu) |
2961 | + linux* | k*bsd*-gnu | kopensolaris*-gnu) |
2962 | case $cc_basename in |
2963 | KCC*) |
2964 | # KAI C++ Compiler |
2965 | @@ -4334,8 +4088,8 @@ |
2966 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
2967 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
2968 | ;; |
2969 | - xlc* | xlC*) |
2970 | - # IBM XL 8.0 on PPC |
2971 | + xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) |
2972 | + # IBM XL 8.0, 9.0 on PPC and BlueGene |
2973 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
2974 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' |
2975 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' |
2976 | @@ -4397,7 +4151,7 @@ |
2977 | ;; |
2978 | solaris*) |
2979 | case $cc_basename in |
2980 | - CC*) |
2981 | + CC* | sunCC*) |
2982 | # Sun C++ 4.2, 5.x and Centerline C++ |
2983 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
2984 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
2985 | @@ -4501,6 +4255,12 @@ |
2986 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' |
2987 | ;; |
2988 | |
2989 | + haiku*) |
2990 | + # PIC is the default for Haiku. |
2991 | + # The "-static" flag exists, but is broken. |
2992 | + _LT_TAGVAR(lt_prog_compiler_static, $1)= |
2993 | + ;; |
2994 | + |
2995 | hpux*) |
2996 | # PIC is the default for 64-bit PA HP-UX, but not for 32-bit |
2997 | # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag |
2998 | @@ -4543,6 +4303,15 @@ |
2999 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
3000 | ;; |
3001 | esac |
3002 | + |
3003 | + case $cc_basename in |
3004 | + nvcc*) # Cuda Compiler Driver 2.2 |
3005 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' |
3006 | + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then |
3007 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" |
3008 | + fi |
3009 | + ;; |
3010 | + esac |
3011 | else |
3012 | # PORTME Check for flag to pass linker flags through the system compiler. |
3013 | case $host_os in |
3014 | @@ -4585,7 +4354,7 @@ |
3015 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
3016 | ;; |
3017 | |
3018 | - linux* | k*bsd*-gnu) |
3019 | + linux* | k*bsd*-gnu | kopensolaris*-gnu) |
3020 | case $cc_basename in |
3021 | # old Intel for x86_64 which still supported -KPIC. |
3022 | ecc*) |
3023 | @@ -4606,7 +4375,13 @@ |
3024 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' |
3025 | _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' |
3026 | ;; |
3027 | - pgcc* | pgf77* | pgf90* | pgf95*) |
3028 | + nagfor*) |
3029 | + # NAG Fortran compiler |
3030 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' |
3031 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' |
3032 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
3033 | + ;; |
3034 | + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
3035 | # Portland Group compilers (*not* the Pentium gcc compiler, |
3036 | # which looks to be a dead project) |
3037 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
3038 | @@ -4618,25 +4393,40 @@ |
3039 | # All Alpha code is PIC. |
3040 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
3041 | ;; |
3042 | - xl*) |
3043 | - # IBM XL C 8.0/Fortran 10.1 on PPC |
3044 | + xl* | bgxl* | bgf* | mpixl*) |
3045 | + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene |
3046 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
3047 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' |
3048 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' |
3049 | ;; |
3050 | *) |
3051 | case `$CC -V 2>&1 | sed 5q` in |
3052 | + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) |
3053 | + # Sun Fortran 8.3 passes all unrecognized flags to the linker |
3054 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
3055 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
3056 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='' |
3057 | + ;; |
3058 | + *Sun\ F* | *Sun*Fortran*) |
3059 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
3060 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
3061 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' |
3062 | + ;; |
3063 | *Sun\ C*) |
3064 | # Sun C 5.9 |
3065 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
3066 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
3067 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
3068 | ;; |
3069 | - *Sun\ F*) |
3070 | - # Sun Fortran 8.3 passes all unrecognized flags to the linker |
3071 | - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
3072 | + *Intel*\ [[CF]]*Compiler*) |
3073 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
3074 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
3075 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' |
3076 | + ;; |
3077 | + *Portland\ Group*) |
3078 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
3079 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' |
3080 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
3081 | - _LT_TAGVAR(lt_prog_compiler_wl, $1)='' |
3082 | ;; |
3083 | esac |
3084 | ;; |
3085 | @@ -4668,7 +4458,7 @@ |
3086 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
3087 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
3088 | case $cc_basename in |
3089 | - f77* | f90* | f95*) |
3090 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
3091 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; |
3092 | *) |
3093 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; |
3094 | @@ -4725,9 +4515,11 @@ |
3095 | _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" |
3096 | ;; |
3097 | esac |
3098 | -AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) |
3099 | -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], |
3100 | - [How to pass a linker flag through the compiler]) |
3101 | + |
3102 | +AC_CACHE_CHECK([for $compiler option to produce PIC], |
3103 | + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], |
3104 | + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) |
3105 | +_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) |
3106 | |
3107 | # |
3108 | # Check to make sure the PIC flag actually works. |
3109 | @@ -4746,6 +4538,8 @@ |
3110 | _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], |
3111 | [Additional compiler flags for building library objects]) |
3112 | |
3113 | +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], |
3114 | + [How to pass a linker flag through the compiler]) |
3115 | # |
3116 | # Check to make sure the static flag actually works. |
3117 | # |
3118 | @@ -4766,6 +4560,7 @@ |
3119 | m4_defun([_LT_LINKER_SHLIBS], |
3120 | [AC_REQUIRE([LT_PATH_LD])dnl |
3121 | AC_REQUIRE([LT_PATH_NM])dnl |
3122 | +m4_require([_LT_PATH_MANIFEST_TOOL])dnl |
3123 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
3124 | m4_require([_LT_DECL_EGREP])dnl |
3125 | m4_require([_LT_DECL_SED])dnl |
3126 | @@ -4774,27 +4569,37 @@ |
3127 | AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) |
3128 | m4_if([$1], [CXX], [ |
3129 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
3130 | + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] |
3131 | case $host_os in |
3132 | aix[[4-9]]*) |
3133 | # If we're using GNU nm, then we don't want the "-C" option. |
3134 | # -C means demangle to AIX nm, but means don't demangle with GNU nm |
3135 | + # Also, AIX nm treats weak defined symbols like other global defined |
3136 | + # symbols, whereas GNU nm marks them as "W". |
3137 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then |
3138 | - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
3139 | + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
3140 | else |
3141 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
3142 | fi |
3143 | ;; |
3144 | pw32*) |
3145 | _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" |
3146 | - ;; |
3147 | + ;; |
3148 | cygwin* | mingw* | cegcc*) |
3149 | - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' |
3150 | - ;; |
3151 | + case $cc_basename in |
3152 | + cl*) |
3153 | + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' |
3154 | + ;; |
3155 | + *) |
3156 | + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' |
3157 | + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] |
3158 | + ;; |
3159 | + esac |
3160 | + ;; |
3161 | *) |
3162 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
3163 | - ;; |
3164 | + ;; |
3165 | esac |
3166 | - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] |
3167 | ], [ |
3168 | runpath_var= |
3169 | _LT_TAGVAR(allow_undefined_flag, $1)= |
3170 | @@ -4809,7 +4614,6 @@ |
3171 | _LT_TAGVAR(hardcode_direct, $1)=no |
3172 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
3173 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
3174 | - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= |
3175 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
3176 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
3177 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
3178 | @@ -4857,7 +4661,33 @@ |
3179 | esac |
3180 | |
3181 | _LT_TAGVAR(ld_shlibs, $1)=yes |
3182 | + |
3183 | + # On some targets, GNU ld is compatible enough with the native linker |
3184 | + # that we're better off using the native interface for both. |
3185 | + lt_use_gnu_ld_interface=no |
3186 | if test "$with_gnu_ld" = yes; then |
3187 | + case $host_os in |
3188 | + aix*) |
3189 | + # The AIX port of GNU ld has always aspired to compatibility |
3190 | + # with the native linker. However, as the warning in the GNU ld |
3191 | + # block says, versions before 2.19.5* couldn't really create working |
3192 | + # shared libraries, regardless of the interface used. |
3193 | + case `$LD -v 2>&1` in |
3194 | + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; |
3195 | + *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; |
3196 | + *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; |
3197 | + *) |
3198 | + lt_use_gnu_ld_interface=yes |
3199 | + ;; |
3200 | + esac |
3201 | + ;; |
3202 | + *) |
3203 | + lt_use_gnu_ld_interface=yes |
3204 | + ;; |
3205 | + esac |
3206 | + fi |
3207 | + |
3208 | + if test "$lt_use_gnu_ld_interface" = yes; then |
3209 | # If archive_cmds runs LD, not CC, wlarc should be empty |
3210 | wlarc='${wl}' |
3211 | |
3212 | @@ -4875,6 +4705,7 @@ |
3213 | fi |
3214 | supports_anon_versioning=no |
3215 | case `$LD -v 2>&1` in |
3216 | + *GNU\ gold*) supports_anon_versioning=yes ;; |
3217 | *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 |
3218 | *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... |
3219 | *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... |
3220 | @@ -4890,11 +4721,12 @@ |
3221 | _LT_TAGVAR(ld_shlibs, $1)=no |
3222 | cat <<_LT_EOF 1>&2 |
3223 | |
3224 | -*** Warning: the GNU linker, at least up to release 2.9.1, is reported |
3225 | +*** Warning: the GNU linker, at least up to release 2.19, is reported |
3226 | *** to be unable to reliably create shared libraries on AIX. |
3227 | *** Therefore, libtool is disabling shared libraries support. If you |
3228 | -*** really care for shared libraries, you may want to modify your PATH |
3229 | -*** so that a non-GNU linker is found, and then restart. |
3230 | +*** really care for shared libraries, you may want to install binutils |
3231 | +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. |
3232 | +*** You will then need to restart the configuration process. |
3233 | |
3234 | _LT_EOF |
3235 | fi |
3236 | @@ -4930,10 +4762,12 @@ |
3237 | # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, |
3238 | # as there is no search path for DLLs. |
3239 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
3240 | + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' |
3241 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
3242 | _LT_TAGVAR(always_export_symbols, $1)=no |
3243 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
3244 | - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' |
3245 | + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' |
3246 | + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] |
3247 | |
3248 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
3249 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
3250 | @@ -4951,6 +4785,11 @@ |
3251 | fi |
3252 | ;; |
3253 | |
3254 | + haiku*) |
3255 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
3256 | + _LT_TAGVAR(link_all_deplibs, $1)=yes |
3257 | + ;; |
3258 | + |
3259 | interix[[3-9]]*) |
3260 | _LT_TAGVAR(hardcode_direct, $1)=no |
3261 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
3262 | @@ -4966,7 +4805,7 @@ |
3263 | _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' |
3264 | ;; |
3265 | |
3266 | - gnu* | linux* | tpf* | k*bsd*-gnu) |
3267 | + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) |
3268 | tmp_diet=no |
3269 | if test "$host_os" = linux-dietlibc; then |
3270 | case $cc_basename in |
3271 | @@ -4976,15 +4815,16 @@ |
3272 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ |
3273 | && test "$tmp_diet" = no |
3274 | then |
3275 | - tmp_addflag= |
3276 | + tmp_addflag=' $pic_flag' |
3277 | tmp_sharedflag='-shared' |
3278 | case $cc_basename,$host_cpu in |
3279 | pgcc*) # Portland Group C compiler |
3280 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
3281 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
3282 | tmp_addflag=' $pic_flag' |
3283 | ;; |
3284 | - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers |
3285 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
3286 | + pgf77* | pgf90* | pgf95* | pgfortran*) |
3287 | + # Portland Group f77 and f90 compilers |
3288 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
3289 | tmp_addflag=' $pic_flag -Mnomain' ;; |
3290 | ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 |
3291 | tmp_addflag=' -i_dynamic' ;; |
3292 | @@ -4995,13 +4835,17 @@ |
3293 | lf95*) # Lahey Fortran 8.1 |
3294 | _LT_TAGVAR(whole_archive_flag_spec, $1)= |
3295 | tmp_sharedflag='--shared' ;; |
3296 | - xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) |
3297 | + xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) |
3298 | tmp_sharedflag='-qmkshrobj' |
3299 | tmp_addflag= ;; |
3300 | + nvcc*) # Cuda Compiler Driver 2.2 |
3301 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
3302 | + _LT_TAGVAR(compiler_needs_object, $1)=yes |
3303 | + ;; |
3304 | esac |
3305 | case `$CC -V 2>&1 | sed 5q` in |
3306 | *Sun\ C*) # Sun C 5.9 |
3307 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
3308 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
3309 | _LT_TAGVAR(compiler_needs_object, $1)=yes |
3310 | tmp_sharedflag='-G' ;; |
3311 | *Sun\ F*) # Sun Fortran 8.3 |
3312 | @@ -5017,17 +4861,16 @@ |
3313 | fi |
3314 | |
3315 | case $cc_basename in |
3316 | - xlf*) |
3317 | + xlf* | bgf* | bgxlf* | mpixlf*) |
3318 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself |
3319 | _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' |
3320 | - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
3321 | - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' |
3322 | - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
3323 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
3324 | + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
3325 | if test "x$supports_anon_versioning" = xyes; then |
3326 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ |
3327 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
3328 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
3329 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
3330 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
3331 | fi |
3332 | ;; |
3333 | esac |
3334 | @@ -5041,8 +4884,8 @@ |
3335 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
3336 | wlarc= |
3337 | else |
3338 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
3339 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
3340 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
3341 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
3342 | fi |
3343 | ;; |
3344 | |
3345 | @@ -5060,8 +4903,8 @@ |
3346 | |
3347 | _LT_EOF |
3348 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
3349 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
3350 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
3351 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
3352 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
3353 | else |
3354 | _LT_TAGVAR(ld_shlibs, $1)=no |
3355 | fi |
3356 | @@ -5107,8 +4950,8 @@ |
3357 | |
3358 | *) |
3359 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
3360 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
3361 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
3362 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
3363 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
3364 | else |
3365 | _LT_TAGVAR(ld_shlibs, $1)=no |
3366 | fi |
3367 | @@ -5148,8 +4991,10 @@ |
3368 | else |
3369 | # If we're using GNU nm, then we don't want the "-C" option. |
3370 | # -C means demangle to AIX nm, but means don't demangle with GNU nm |
3371 | + # Also, AIX nm treats weak defined symbols like other global |
3372 | + # defined symbols, whereas GNU nm marks them as "W". |
3373 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then |
3374 | - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
3375 | + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
3376 | else |
3377 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
3378 | fi |
3379 | @@ -5236,9 +5081,9 @@ |
3380 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' |
3381 | # Determine the default libpath from the value encoded in an |
3382 | # empty executable. |
3383 | - _LT_SYS_MODULE_PATH_AIX |
3384 | + _LT_SYS_MODULE_PATH_AIX([$1]) |
3385 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
3386 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
3387 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
3388 | else |
3389 | if test "$host_cpu" = ia64; then |
3390 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' |
3391 | @@ -5247,14 +5092,19 @@ |
3392 | else |
3393 | # Determine the default libpath from the value encoded in an |
3394 | # empty executable. |
3395 | - _LT_SYS_MODULE_PATH_AIX |
3396 | + _LT_SYS_MODULE_PATH_AIX([$1]) |
3397 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
3398 | # Warning - without using the other run time loading flags, |
3399 | # -berok will link without error, but may produce a broken library. |
3400 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' |
3401 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' |
3402 | - # Exported symbols can be pulled into shared objects from archives |
3403 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' |
3404 | + if test "$with_gnu_ld" = yes; then |
3405 | + # We only use this code for GNU lds that support --whole-archive. |
3406 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' |
3407 | + else |
3408 | + # Exported symbols can be pulled into shared objects from archives |
3409 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' |
3410 | + fi |
3411 | _LT_TAGVAR(archive_cmds_need_lc, $1)=yes |
3412 | # This is similar to how AIX traditionally builds its shared libraries. |
3413 | _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' |
3414 | @@ -5286,20 +5136,64 @@ |
3415 | # Microsoft Visual C++. |
3416 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
3417 | # no search path for DLLs. |
3418 | - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
3419 | - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
3420 | - # Tell ltmain to make .lib files, not .a files. |
3421 | - libext=lib |
3422 | - # Tell ltmain to make .dll files, not .so files. |
3423 | - shrext_cmds=".dll" |
3424 | - # FIXME: Setting linknames here is a bad hack. |
3425 | - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' |
3426 | - # The linker will automatically build a .lib file if we build a DLL. |
3427 | - _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
3428 | - # FIXME: Should let the user specify the lib program. |
3429 | - _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' |
3430 | - _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' |
3431 | - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
3432 | + case $cc_basename in |
3433 | + cl*) |
3434 | + # Native MSVC |
3435 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
3436 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
3437 | + _LT_TAGVAR(always_export_symbols, $1)=yes |
3438 | + _LT_TAGVAR(file_list_spec, $1)='@' |
3439 | + # Tell ltmain to make .lib files, not .a files. |
3440 | + libext=lib |
3441 | + # Tell ltmain to make .dll files, not .so files. |
3442 | + shrext_cmds=".dll" |
3443 | + # FIXME: Setting linknames here is a bad hack. |
3444 | + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
3445 | + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
3446 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
3447 | + else |
3448 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
3449 | + fi~ |
3450 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
3451 | + linknames=' |
3452 | + # The linker will not automatically build a static lib if we build a DLL. |
3453 | + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
3454 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
3455 | + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' |
3456 | + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' |
3457 | + # Don't use ranlib |
3458 | + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' |
3459 | + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ |
3460 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
3461 | + case $lt_outputfile in |
3462 | + *.exe|*.EXE) ;; |
3463 | + *) |
3464 | + lt_outputfile="$lt_outputfile.exe" |
3465 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
3466 | + ;; |
3467 | + esac~ |
3468 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
3469 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
3470 | + $RM "$lt_outputfile.manifest"; |
3471 | + fi' |
3472 | + ;; |
3473 | + *) |
3474 | + # Assume MSVC wrapper |
3475 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
3476 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
3477 | + # Tell ltmain to make .lib files, not .a files. |
3478 | + libext=lib |
3479 | + # Tell ltmain to make .dll files, not .so files. |
3480 | + shrext_cmds=".dll" |
3481 | + # FIXME: Setting linknames here is a bad hack. |
3482 | + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
3483 | + # The linker will automatically build a .lib file if we build a DLL. |
3484 | + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
3485 | + # FIXME: Should let the user specify the lib program. |
3486 | + _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' |
3487 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
3488 | + ;; |
3489 | + esac |
3490 | ;; |
3491 | |
3492 | darwin* | rhapsody*) |
3493 | @@ -5312,10 +5206,6 @@ |
3494 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
3495 | ;; |
3496 | |
3497 | - freebsd1*) |
3498 | - _LT_TAGVAR(ld_shlibs, $1)=no |
3499 | - ;; |
3500 | - |
3501 | # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor |
3502 | # support. Future versions do this automatically, but an explicit c++rt0.o |
3503 | # does not break anything, and helps significantly (at the cost of a little |
3504 | @@ -5328,7 +5218,7 @@ |
3505 | ;; |
3506 | |
3507 | # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
3508 | - freebsd2*) |
3509 | + freebsd2.*) |
3510 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
3511 | _LT_TAGVAR(hardcode_direct, $1)=yes |
3512 | _LT_TAGVAR(hardcode_minus_L, $1)=yes |
3513 | @@ -5337,7 +5227,7 @@ |
3514 | |
3515 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
3516 | freebsd* | dragonfly*) |
3517 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
3518 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
3519 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' |
3520 | _LT_TAGVAR(hardcode_direct, $1)=yes |
3521 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
3522 | @@ -5345,7 +5235,7 @@ |
3523 | |
3524 | hpux9*) |
3525 | if test "$GCC" = yes; then |
3526 | - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
3527 | + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
3528 | else |
3529 | _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
3530 | fi |
3531 | @@ -5360,14 +5250,13 @@ |
3532 | ;; |
3533 | |
3534 | hpux10*) |
3535 | - if test "$GCC" = yes -a "$with_gnu_ld" = no; then |
3536 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
3537 | + if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
3538 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
3539 | else |
3540 | _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
3541 | fi |
3542 | if test "$with_gnu_ld" = no; then |
3543 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' |
3544 | - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' |
3545 | _LT_TAGVAR(hardcode_libdir_separator, $1)=: |
3546 | _LT_TAGVAR(hardcode_direct, $1)=yes |
3547 | _LT_TAGVAR(hardcode_direct_absolute, $1)=yes |
3548 | @@ -5379,16 +5268,16 @@ |
3549 | ;; |
3550 | |
3551 | hpux11*) |
3552 | - if test "$GCC" = yes -a "$with_gnu_ld" = no; then |
3553 | + if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
3554 | case $host_cpu in |
3555 | hppa*64*) |
3556 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
3557 | ;; |
3558 | ia64*) |
3559 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
3560 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
3561 | ;; |
3562 | *) |
3563 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
3564 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
3565 | ;; |
3566 | esac |
3567 | else |
3568 | @@ -5400,7 +5289,14 @@ |
3569 | _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
3570 | ;; |
3571 | *) |
3572 | - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
3573 | + m4_if($1, [], [ |
3574 | + # Older versions of the 11.00 compiler do not understand -b yet |
3575 | + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) |
3576 | + _LT_LINKER_OPTION([if $CC understands -b], |
3577 | + _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], |
3578 | + [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], |
3579 | + [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], |
3580 | + [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) |
3581 | ;; |
3582 | esac |
3583 | fi |
3584 | @@ -5428,19 +5324,34 @@ |
3585 | |
3586 | irix5* | irix6* | nonstopux*) |
3587 | if test "$GCC" = yes; then |
3588 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
3589 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
3590 | # Try to use the -exported_symbol ld option, if it does not |
3591 | # work, assume that -exports_file does not work either and |
3592 | # implicitly export all symbols. |
3593 | - save_LDFLAGS="$LDFLAGS" |
3594 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
3595 | - AC_LINK_IFELSE(int foo(void) {}, |
3596 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
3597 | - ) |
3598 | - LDFLAGS="$save_LDFLAGS" |
3599 | + # This should be the same for all languages, so no per-tag cache variable. |
3600 | + AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], |
3601 | + [lt_cv_irix_exported_symbol], |
3602 | + [save_LDFLAGS="$LDFLAGS" |
3603 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
3604 | + AC_LINK_IFELSE( |
3605 | + [AC_LANG_SOURCE( |
3606 | + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], |
3607 | + [C++], [[int foo (void) { return 0; }]], |
3608 | + [Fortran 77], [[ |
3609 | + subroutine foo |
3610 | + end]], |
3611 | + [Fortran], [[ |
3612 | + subroutine foo |
3613 | + end]])])], |
3614 | + [lt_cv_irix_exported_symbol=yes], |
3615 | + [lt_cv_irix_exported_symbol=no]) |
3616 | + LDFLAGS="$save_LDFLAGS"]) |
3617 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
3618 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
3619 | + fi |
3620 | else |
3621 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
3622 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' |
3623 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
3624 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' |
3625 | fi |
3626 | _LT_TAGVAR(archive_cmds_need_lc, $1)='no' |
3627 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
3628 | @@ -5502,17 +5413,17 @@ |
3629 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
3630 | _LT_TAGVAR(hardcode_minus_L, $1)=yes |
3631 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
3632 | - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' |
3633 | + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' |
3634 | _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' |
3635 | ;; |
3636 | |
3637 | osf3*) |
3638 | if test "$GCC" = yes; then |
3639 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
3640 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
3641 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
3642 | else |
3643 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
3644 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
3645 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
3646 | fi |
3647 | _LT_TAGVAR(archive_cmds_need_lc, $1)='no' |
3648 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
3649 | @@ -5522,13 +5433,13 @@ |
3650 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
3651 | if test "$GCC" = yes; then |
3652 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
3653 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
3654 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
3655 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
3656 | else |
3657 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
3658 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
3659 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
3660 | _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ |
3661 | - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' |
3662 | + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' |
3663 | |
3664 | # Both c and cxx compiler support -rpath directly |
3665 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' |
3666 | @@ -5541,9 +5452,9 @@ |
3667 | _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' |
3668 | if test "$GCC" = yes; then |
3669 | wlarc='${wl}' |
3670 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
3671 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
3672 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
3673 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
3674 | + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
3675 | else |
3676 | case `$CC -V 2>&1` in |
3677 | *"Compilers 5.0"*) |
3678 | @@ -5719,36 +5630,38 @@ |
3679 | # Test whether the compiler implicitly links with -lc since on some |
3680 | # systems, -lgcc has to come before -lc. If gcc already passes -lc |
3681 | # to ld, don't add -lc before -lgcc. |
3682 | - AC_MSG_CHECKING([whether -lc should be explicitly linked in]) |
3683 | - $RM conftest* |
3684 | - echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
3685 | + AC_CACHE_CHECK([whether -lc should be explicitly linked in], |
3686 | + [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), |
3687 | + [$RM conftest* |
3688 | + echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
3689 | |
3690 | - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then |
3691 | - soname=conftest |
3692 | - lib=conftest |
3693 | - libobjs=conftest.$ac_objext |
3694 | - deplibs= |
3695 | - wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) |
3696 | - pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) |
3697 | - compiler_flags=-v |
3698 | - linker_flags=-v |
3699 | - verstring= |
3700 | - output_objdir=. |
3701 | - libname=conftest |
3702 | - lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) |
3703 | - _LT_TAGVAR(allow_undefined_flag, $1)= |
3704 | - if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) |
3705 | - then |
3706 | - _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
3707 | - else |
3708 | - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes |
3709 | - fi |
3710 | - _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag |
3711 | - else |
3712 | - cat conftest.err 1>&5 |
3713 | - fi |
3714 | - $RM conftest* |
3715 | - AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) |
3716 | + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then |
3717 | + soname=conftest |
3718 | + lib=conftest |
3719 | + libobjs=conftest.$ac_objext |
3720 | + deplibs= |
3721 | + wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) |
3722 | + pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) |
3723 | + compiler_flags=-v |
3724 | + linker_flags=-v |
3725 | + verstring= |
3726 | + output_objdir=. |
3727 | + libname=conftest |
3728 | + lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) |
3729 | + _LT_TAGVAR(allow_undefined_flag, $1)= |
3730 | + if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) |
3731 | + then |
3732 | + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no |
3733 | + else |
3734 | + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes |
3735 | + fi |
3736 | + _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag |
3737 | + else |
3738 | + cat conftest.err 1>&5 |
3739 | + fi |
3740 | + $RM conftest* |
3741 | + ]) |
3742 | + _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) |
3743 | ;; |
3744 | esac |
3745 | fi |
3746 | @@ -5785,9 +5698,6 @@ |
3747 | _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], |
3748 | [Flag to hardcode $libdir into a binary during linking. |
3749 | This must work even if $libdir does not exist]) |
3750 | -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], |
3751 | - [[If ld is used when linking, flag to hardcode $libdir into a binary |
3752 | - during linking. This must work even if $libdir does not exist]]) |
3753 | _LT_TAGDECL([], [hardcode_libdir_separator], [1], |
3754 | [Whether we need a single "-rpath" flag with a separated argument]) |
3755 | _LT_TAGDECL([], [hardcode_direct], [0], |
3756 | @@ -5813,8 +5723,6 @@ |
3757 | to runtime path list]) |
3758 | _LT_TAGDECL([], [link_all_deplibs], [0], |
3759 | [Whether libtool must link a program against all its dependency libraries]) |
3760 | -_LT_TAGDECL([], [fix_srcfile_path], [1], |
3761 | - [Fix the shell variable $srcfile for the compiler]) |
3762 | _LT_TAGDECL([], [always_export_symbols], [0], |
3763 | [Set to "yes" if exported symbols are required]) |
3764 | _LT_TAGDECL([], [export_symbols_cmds], [2], |
3765 | @@ -5825,6 +5733,8 @@ |
3766 | [Symbols that must always be exported]) |
3767 | _LT_TAGDECL([], [prelink_cmds], [2], |
3768 | [Commands necessary for linking programs (against libraries) with templates]) |
3769 | +_LT_TAGDECL([], [postlink_cmds], [2], |
3770 | + [Commands necessary for finishing linking programs]) |
3771 | _LT_TAGDECL([], [file_list_spec], [1], |
3772 | [Specify filename containing input files]) |
3773 | dnl FIXME: Not yet implemented |
3774 | @@ -5914,14 +5824,15 @@ |
3775 | ])# _LT_LANG_C_CONFIG |
3776 | |
3777 | |
3778 | -# _LT_PROG_CXX |
3779 | -# ------------ |
3780 | -# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ |
3781 | -# compiler, we have our own version here. |
3782 | -m4_defun([_LT_PROG_CXX], |
3783 | -[ |
3784 | -pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) |
3785 | -AC_PROG_CXX |
3786 | +# _LT_LANG_CXX_CONFIG([TAG]) |
3787 | +# -------------------------- |
3788 | +# Ensure that the configuration variables for a C++ compiler are suitably |
3789 | +# defined. These variables are subsequently used by _LT_CONFIG to write |
3790 | +# the compiler configuration to `libtool'. |
3791 | +m4_defun([_LT_LANG_CXX_CONFIG], |
3792 | +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
3793 | +m4_require([_LT_DECL_EGREP])dnl |
3794 | +m4_require([_LT_PATH_MANIFEST_TOOL])dnl |
3795 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && |
3796 | ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || |
3797 | (test "X$CXX" != "Xg++"))) ; then |
3798 | @@ -5929,22 +5840,6 @@ |
3799 | else |
3800 | _lt_caught_CXX_error=yes |
3801 | fi |
3802 | -popdef([AC_MSG_ERROR]) |
3803 | -])# _LT_PROG_CXX |
3804 | - |
3805 | -dnl aclocal-1.4 backwards compatibility: |
3806 | -dnl AC_DEFUN([_LT_PROG_CXX], []) |
3807 | - |
3808 | - |
3809 | -# _LT_LANG_CXX_CONFIG([TAG]) |
3810 | -# -------------------------- |
3811 | -# Ensure that the configuration variables for a C++ compiler are suitably |
3812 | -# defined. These variables are subsequently used by _LT_CONFIG to write |
3813 | -# the compiler configuration to `libtool'. |
3814 | -m4_defun([_LT_LANG_CXX_CONFIG], |
3815 | -[AC_REQUIRE([_LT_PROG_CXX])dnl |
3816 | -m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
3817 | -m4_require([_LT_DECL_EGREP])dnl |
3818 | |
3819 | AC_LANG_PUSH(C++) |
3820 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
3821 | @@ -5956,7 +5851,6 @@ |
3822 | _LT_TAGVAR(hardcode_direct, $1)=no |
3823 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
3824 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
3825 | -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= |
3826 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
3827 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
3828 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
3829 | @@ -5966,6 +5860,8 @@ |
3830 | _LT_TAGVAR(module_expsym_cmds, $1)= |
3831 | _LT_TAGVAR(link_all_deplibs, $1)=unknown |
3832 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
3833 | +_LT_TAGVAR(reload_flag, $1)=$reload_flag |
3834 | +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds |
3835 | _LT_TAGVAR(no_undefined_flag, $1)= |
3836 | _LT_TAGVAR(whole_archive_flag_spec, $1)= |
3837 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no |
3838 | @@ -5997,6 +5893,7 @@ |
3839 | |
3840 | # Allow CC to be a program name with arguments. |
3841 | lt_save_CC=$CC |
3842 | + lt_save_CFLAGS=$CFLAGS |
3843 | lt_save_LD=$LD |
3844 | lt_save_GCC=$GCC |
3845 | GCC=$GXX |
3846 | @@ -6014,6 +5911,7 @@ |
3847 | fi |
3848 | test -z "${LDCXX+set}" || LD=$LDCXX |
3849 | CC=${CXX-"c++"} |
3850 | + CFLAGS=$CXXFLAGS |
3851 | compiler=$CC |
3852 | _LT_TAGVAR(compiler, $1)=$CC |
3853 | _LT_CC_BASENAME([$compiler]) |
3854 | @@ -6035,8 +5933,8 @@ |
3855 | # Check if GNU C++ uses GNU ld as the underlying linker, since the |
3856 | # archiving commands below assume that GNU ld is being used. |
3857 | if test "$with_gnu_ld" = yes; then |
3858 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' |
3859 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
3860 | + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' |
3861 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
3862 | |
3863 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
3864 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
3865 | @@ -6068,7 +5966,7 @@ |
3866 | # Commands to make compiler produce verbose output that lists |
3867 | # what "hidden" libraries, object files and flags are used when |
3868 | # linking a shared library. |
3869 | - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' |
3870 | + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
3871 | |
3872 | else |
3873 | GXX=no |
3874 | @@ -6177,10 +6075,10 @@ |
3875 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' |
3876 | # Determine the default libpath from the value encoded in an empty |
3877 | # executable. |
3878 | - _LT_SYS_MODULE_PATH_AIX |
3879 | + _LT_SYS_MODULE_PATH_AIX([$1]) |
3880 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
3881 | |
3882 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
3883 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
3884 | else |
3885 | if test "$host_cpu" = ia64; then |
3886 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' |
3887 | @@ -6189,14 +6087,19 @@ |
3888 | else |
3889 | # Determine the default libpath from the value encoded in an |
3890 | # empty executable. |
3891 | - _LT_SYS_MODULE_PATH_AIX |
3892 | + _LT_SYS_MODULE_PATH_AIX([$1]) |
3893 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
3894 | # Warning - without using the other run time loading flags, |
3895 | # -berok will link without error, but may produce a broken library. |
3896 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' |
3897 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' |
3898 | - # Exported symbols can be pulled into shared objects from archives |
3899 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' |
3900 | + if test "$with_gnu_ld" = yes; then |
3901 | + # We only use this code for GNU lds that support --whole-archive. |
3902 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' |
3903 | + else |
3904 | + # Exported symbols can be pulled into shared objects from archives |
3905 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' |
3906 | + fi |
3907 | _LT_TAGVAR(archive_cmds_need_lc, $1)=yes |
3908 | # This is similar to how AIX traditionally builds its shared |
3909 | # libraries. |
3910 | @@ -6226,28 +6129,75 @@ |
3911 | ;; |
3912 | |
3913 | cygwin* | mingw* | pw32* | cegcc*) |
3914 | - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, |
3915 | - # as there is no search path for DLLs. |
3916 | - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
3917 | - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
3918 | - _LT_TAGVAR(always_export_symbols, $1)=no |
3919 | - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
3920 | + case $GXX,$cc_basename in |
3921 | + ,cl* | no,cl*) |
3922 | + # Native MSVC |
3923 | + # hardcode_libdir_flag_spec is actually meaningless, as there is |
3924 | + # no search path for DLLs. |
3925 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
3926 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
3927 | + _LT_TAGVAR(always_export_symbols, $1)=yes |
3928 | + _LT_TAGVAR(file_list_spec, $1)='@' |
3929 | + # Tell ltmain to make .lib files, not .a files. |
3930 | + libext=lib |
3931 | + # Tell ltmain to make .dll files, not .so files. |
3932 | + shrext_cmds=".dll" |
3933 | + # FIXME: Setting linknames here is a bad hack. |
3934 | + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
3935 | + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
3936 | + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
3937 | + else |
3938 | + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
3939 | + fi~ |
3940 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
3941 | + linknames=' |
3942 | + # The linker will not automatically build a static lib if we build a DLL. |
3943 | + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
3944 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
3945 | + # Don't use ranlib |
3946 | + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' |
3947 | + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ |
3948 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
3949 | + case $lt_outputfile in |
3950 | + *.exe|*.EXE) ;; |
3951 | + *) |
3952 | + lt_outputfile="$lt_outputfile.exe" |
3953 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
3954 | + ;; |
3955 | + esac~ |
3956 | + func_to_tool_file "$lt_outputfile"~ |
3957 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
3958 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
3959 | + $RM "$lt_outputfile.manifest"; |
3960 | + fi' |
3961 | + ;; |
3962 | + *) |
3963 | + # g++ |
3964 | + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, |
3965 | + # as there is no search path for DLLs. |
3966 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
3967 | + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' |
3968 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
3969 | + _LT_TAGVAR(always_export_symbols, $1)=no |
3970 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
3971 | |
3972 | - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
3973 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
3974 | - # If the export-symbols file already is a .def file (1st line |
3975 | - # is EXPORTS), use it as is; otherwise, prepend... |
3976 | - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
3977 | - cp $export_symbols $output_objdir/$soname.def; |
3978 | - else |
3979 | - echo EXPORTS > $output_objdir/$soname.def; |
3980 | - cat $export_symbols >> $output_objdir/$soname.def; |
3981 | - fi~ |
3982 | - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
3983 | - else |
3984 | - _LT_TAGVAR(ld_shlibs, $1)=no |
3985 | - fi |
3986 | - ;; |
3987 | + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
3988 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
3989 | + # If the export-symbols file already is a .def file (1st line |
3990 | + # is EXPORTS), use it as is; otherwise, prepend... |
3991 | + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
3992 | + cp $export_symbols $output_objdir/$soname.def; |
3993 | + else |
3994 | + echo EXPORTS > $output_objdir/$soname.def; |
3995 | + cat $export_symbols >> $output_objdir/$soname.def; |
3996 | + fi~ |
3997 | + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
3998 | + else |
3999 | + _LT_TAGVAR(ld_shlibs, $1)=no |
4000 | + fi |
4001 | + ;; |
4002 | + esac |
4003 | + ;; |
4004 | darwin* | rhapsody*) |
4005 | _LT_DARWIN_LINKER_FEATURES($1) |
4006 | ;; |
4007 | @@ -6270,7 +6220,7 @@ |
4008 | esac |
4009 | ;; |
4010 | |
4011 | - freebsd[[12]]*) |
4012 | + freebsd2.*) |
4013 | # C++ shared libraries reported to be fairly broken before |
4014 | # switch to ELF |
4015 | _LT_TAGVAR(ld_shlibs, $1)=no |
4016 | @@ -6289,6 +6239,11 @@ |
4017 | gnu*) |
4018 | ;; |
4019 | |
4020 | + haiku*) |
4021 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4022 | + _LT_TAGVAR(link_all_deplibs, $1)=yes |
4023 | + ;; |
4024 | + |
4025 | hpux9*) |
4026 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' |
4027 | _LT_TAGVAR(hardcode_libdir_separator, $1)=: |
4028 | @@ -6313,11 +6268,11 @@ |
4029 | # explicitly linking system object files so we need to strip them |
4030 | # from the output so that they don't get included in the library |
4031 | # dependencies. |
4032 | - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' |
4033 | + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' |
4034 | ;; |
4035 | *) |
4036 | if test "$GXX" = yes; then |
4037 | - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
4038 | + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
4039 | else |
4040 | # FIXME: insert proper C++ library support |
4041 | _LT_TAGVAR(ld_shlibs, $1)=no |
4042 | @@ -6378,7 +6333,7 @@ |
4043 | # explicitly linking system object files so we need to strip them |
4044 | # from the output so that they don't get included in the library |
4045 | # dependencies. |
4046 | - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' |
4047 | + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' |
4048 | ;; |
4049 | *) |
4050 | if test "$GXX" = yes; then |
4051 | @@ -6388,10 +6343,10 @@ |
4052 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
4053 | ;; |
4054 | ia64*) |
4055 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
4056 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
4057 | ;; |
4058 | *) |
4059 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
4060 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
4061 | ;; |
4062 | esac |
4063 | fi |
4064 | @@ -6421,7 +6376,7 @@ |
4065 | case $cc_basename in |
4066 | CC*) |
4067 | # SGI C++ |
4068 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
4069 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
4070 | |
4071 | # Archives containing C++ object files must be created using |
4072 | # "CC -ar", where "CC" is the IRIX C++ compiler. This is |
4073 | @@ -6432,9 +6387,9 @@ |
4074 | *) |
4075 | if test "$GXX" = yes; then |
4076 | if test "$with_gnu_ld" = no; then |
4077 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4078 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4079 | else |
4080 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' |
4081 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' |
4082 | fi |
4083 | fi |
4084 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
4085 | @@ -6445,7 +6400,7 @@ |
4086 | _LT_TAGVAR(inherit_rpath, $1)=yes |
4087 | ;; |
4088 | |
4089 | - linux* | k*bsd*-gnu) |
4090 | + linux* | k*bsd*-gnu | kopensolaris*-gnu) |
4091 | case $cc_basename in |
4092 | KCC*) |
4093 | # Kuck and Associates, Inc. (KAI) C++ Compiler |
4094 | @@ -6463,7 +6418,7 @@ |
4095 | # explicitly linking system object files so we need to strip them |
4096 | # from the output so that they don't get included in the library |
4097 | # dependencies. |
4098 | - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' |
4099 | + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' |
4100 | |
4101 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' |
4102 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
4103 | @@ -6500,26 +6455,26 @@ |
4104 | pgCC* | pgcpp*) |
4105 | # Portland Group C++ compiler |
4106 | case `$CC -V` in |
4107 | - *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) |
4108 | + *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) |
4109 | _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ |
4110 | rm -rf $tpldir~ |
4111 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ |
4112 | - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' |
4113 | + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' |
4114 | _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ |
4115 | rm -rf $tpldir~ |
4116 | $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ |
4117 | - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ |
4118 | + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ |
4119 | $RANLIB $oldlib' |
4120 | _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ |
4121 | rm -rf $tpldir~ |
4122 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
4123 | - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
4124 | + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
4125 | _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ |
4126 | rm -rf $tpldir~ |
4127 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
4128 | - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' |
4129 | + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' |
4130 | ;; |
4131 | - *) # Version 6 will use weak symbols |
4132 | + *) # Version 6 and above use weak symbols |
4133 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
4134 | _LT_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' |
4135 | ;; |
4136 | @@ -6527,7 +6482,7 @@ |
4137 | |
4138 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' |
4139 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
4140 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
4141 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
4142 | ;; |
4143 | cxx*) |
4144 | # Compaq C++ |
4145 | @@ -6546,9 +6501,9 @@ |
4146 | # explicitly linking system object files so we need to strip them |
4147 | # from the output so that they don't get included in the library |
4148 | # dependencies. |
4149 | - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' |
4150 | + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' |
4151 | ;; |
4152 | - xl*) |
4153 | + xl* | mpixl* | bgxl*) |
4154 | # IBM XL 8.0 on PPC, with GNU ld |
4155 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
4156 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
4157 | @@ -6568,13 +6523,13 @@ |
4158 | _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
4159 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' |
4160 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' |
4161 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
4162 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
4163 | _LT_TAGVAR(compiler_needs_object, $1)=yes |
4164 | |
4165 | # Not sure whether something based on |
4166 | # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 |
4167 | # would be better. |
4168 | - output_verbose_link_cmd='echo' |
4169 | + output_verbose_link_cmd='func_echo_all' |
4170 | |
4171 | # Archives containing C++ object files must be created using |
4172 | # "CC -xar", where "CC" is the Sun C++ compiler. This is |
4173 | @@ -6643,7 +6598,7 @@ |
4174 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' |
4175 | _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' |
4176 | fi |
4177 | - output_verbose_link_cmd=echo |
4178 | + output_verbose_link_cmd=func_echo_all |
4179 | else |
4180 | _LT_TAGVAR(ld_shlibs, $1)=no |
4181 | fi |
4182 | @@ -6678,15 +6633,15 @@ |
4183 | case $host in |
4184 | osf3*) |
4185 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
4186 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
4187 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
4188 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
4189 | ;; |
4190 | *) |
4191 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
4192 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
4193 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
4194 | _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ |
4195 | echo "-hidden">> $lib.exp~ |
4196 | - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ |
4197 | + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ |
4198 | $RM $lib.exp' |
4199 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' |
4200 | ;; |
4201 | @@ -6702,17 +6657,17 @@ |
4202 | # explicitly linking system object files so we need to strip them |
4203 | # from the output so that they don't get included in the library |
4204 | # dependencies. |
4205 | - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' |
4206 | + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' |
4207 | ;; |
4208 | *) |
4209 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
4210 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
4211 | case $host in |
4212 | osf3*) |
4213 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4214 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4215 | ;; |
4216 | *) |
4217 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4218 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4219 | ;; |
4220 | esac |
4221 | |
4222 | @@ -6722,7 +6677,7 @@ |
4223 | # Commands to make compiler produce verbose output that lists |
4224 | # what "hidden" libraries, object files and flags are used when |
4225 | # linking a shared library. |
4226 | - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' |
4227 | + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
4228 | |
4229 | else |
4230 | # FIXME: insert proper C++ library support |
4231 | @@ -6758,7 +6713,7 @@ |
4232 | |
4233 | solaris*) |
4234 | case $cc_basename in |
4235 | - CC*) |
4236 | + CC* | sunCC*) |
4237 | # Sun C++ 4.2, 5.x and Centerline C++ |
4238 | _LT_TAGVAR(archive_cmds_need_lc,$1)=yes |
4239 | _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' |
4240 | @@ -6779,7 +6734,7 @@ |
4241 | esac |
4242 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
4243 | |
4244 | - output_verbose_link_cmd='echo' |
4245 | + output_verbose_link_cmd='func_echo_all' |
4246 | |
4247 | # Archives containing C++ object files must be created using |
4248 | # "CC -xar", where "CC" is the Sun C++ compiler. This is |
4249 | @@ -6799,14 +6754,14 @@ |
4250 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
4251 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' |
4252 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then |
4253 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' |
4254 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' |
4255 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
4256 | - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' |
4257 | + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' |
4258 | |
4259 | # Commands to make compiler produce verbose output that lists |
4260 | # what "hidden" libraries, object files and flags are used when |
4261 | # linking a shared library. |
4262 | - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' |
4263 | + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
4264 | else |
4265 | # g++ 2.7 appears to require `-G' NOT `-shared' on this |
4266 | # platform. |
4267 | @@ -6817,7 +6772,7 @@ |
4268 | # Commands to make compiler produce verbose output that lists |
4269 | # what "hidden" libraries, object files and flags are used when |
4270 | # linking a shared library. |
4271 | - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' |
4272 | + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
4273 | fi |
4274 | |
4275 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' |
4276 | @@ -6871,6 +6826,10 @@ |
4277 | CC*) |
4278 | _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
4279 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
4280 | + _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ |
4281 | + '"$_LT_TAGVAR(old_archive_cmds, $1)" |
4282 | + _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ |
4283 | + '"$_LT_TAGVAR(reload_cmds, $1)" |
4284 | ;; |
4285 | *) |
4286 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
4287 | @@ -6926,6 +6885,7 @@ |
4288 | fi # test -n "$compiler" |
4289 | |
4290 | CC=$lt_save_CC |
4291 | + CFLAGS=$lt_save_CFLAGS |
4292 | LDCXX=$LD |
4293 | LD=$lt_save_LD |
4294 | GCC=$lt_save_GCC |
4295 | @@ -6940,6 +6900,29 @@ |
4296 | ])# _LT_LANG_CXX_CONFIG |
4297 | |
4298 | |
4299 | +# _LT_FUNC_STRIPNAME_CNF |
4300 | +# ---------------------- |
4301 | +# func_stripname_cnf prefix suffix name |
4302 | +# strip PREFIX and SUFFIX off of NAME. |
4303 | +# PREFIX and SUFFIX must not contain globbing or regex special |
4304 | +# characters, hashes, percent signs, but SUFFIX may contain a leading |
4305 | +# dot (in which case that matches only a dot). |
4306 | +# |
4307 | +# This function is identical to the (non-XSI) version of func_stripname, |
4308 | +# except this one can be used by m4 code that may be executed by configure, |
4309 | +# rather than the libtool script. |
4310 | +m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl |
4311 | +AC_REQUIRE([_LT_DECL_SED]) |
4312 | +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) |
4313 | +func_stripname_cnf () |
4314 | +{ |
4315 | + case ${2} in |
4316 | + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
4317 | + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
4318 | + esac |
4319 | +} # func_stripname_cnf |
4320 | +])# _LT_FUNC_STRIPNAME_CNF |
4321 | + |
4322 | # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) |
4323 | # --------------------------------- |
4324 | # Figure out "hidden" library dependencies from verbose |
4325 | @@ -6948,6 +6931,7 @@ |
4326 | # objects, libraries and library flags. |
4327 | m4_defun([_LT_SYS_HIDDEN_LIBDEPS], |
4328 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
4329 | +AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl |
4330 | # Dependencies to place before and after the object being linked: |
4331 | _LT_TAGVAR(predep_objects, $1)= |
4332 | _LT_TAGVAR(postdep_objects, $1)= |
4333 | @@ -6997,7 +6981,20 @@ |
4334 | } |
4335 | }; |
4336 | _LT_EOF |
4337 | +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF |
4338 | +package foo |
4339 | +func foo() { |
4340 | +} |
4341 | +_LT_EOF |
4342 | ]) |
4343 | + |
4344 | +_lt_libdeps_save_CFLAGS=$CFLAGS |
4345 | +case "$CC $CFLAGS " in #( |
4346 | +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; |
4347 | +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; |
4348 | +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; |
4349 | +esac |
4350 | + |
4351 | dnl Parse the compiler output and extract the necessary |
4352 | dnl objects, libraries and library flags. |
4353 | if AC_TRY_EVAL(ac_compile); then |
4354 | @@ -7009,7 +7006,7 @@ |
4355 | pre_test_object_deps_done=no |
4356 | |
4357 | for p in `eval "$output_verbose_link_cmd"`; do |
4358 | - case $p in |
4359 | + case ${prev}${p} in |
4360 | |
4361 | -L* | -R* | -l*) |
4362 | # Some compilers place space between "-{L,R}" and the path. |
4363 | @@ -7018,13 +7015,22 @@ |
4364 | test $p = "-R"; then |
4365 | prev=$p |
4366 | continue |
4367 | - else |
4368 | - prev= |
4369 | fi |
4370 | |
4371 | + # Expand the sysroot to ease extracting the directories later. |
4372 | + if test -z "$prev"; then |
4373 | + case $p in |
4374 | + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; |
4375 | + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; |
4376 | + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; |
4377 | + esac |
4378 | + fi |
4379 | + case $p in |
4380 | + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; |
4381 | + esac |
4382 | if test "$pre_test_object_deps_done" = no; then |
4383 | - case $p in |
4384 | - -L* | -R*) |
4385 | + case ${prev} in |
4386 | + -L | -R) |
4387 | # Internal compiler library paths should come after those |
4388 | # provided the user. The postdeps already come after the |
4389 | # user supplied libs so there is no need to process them. |
4390 | @@ -7044,8 +7050,10 @@ |
4391 | _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" |
4392 | fi |
4393 | fi |
4394 | + prev= |
4395 | ;; |
4396 | |
4397 | + *.lto.$objext) ;; # Ignore GCC LTO objects |
4398 | *.$objext) |
4399 | # This assumes that the test object file only shows up |
4400 | # once in the compiler output. |
4401 | @@ -7081,6 +7089,7 @@ |
4402 | fi |
4403 | |
4404 | $RM -f confest.$objext |
4405 | +CFLAGS=$_lt_libdeps_save_CFLAGS |
4406 | |
4407 | # PORTME: override above test on systems where it is broken |
4408 | m4_if([$1], [CXX], |
4409 | @@ -7117,7 +7126,7 @@ |
4410 | |
4411 | solaris*) |
4412 | case $cc_basename in |
4413 | - CC*) |
4414 | + CC* | sunCC*) |
4415 | # The more standards-conforming stlport4 library is |
4416 | # incompatible with the Cstd library. Avoid specifying |
4417 | # it if it's in CXXFLAGS. Ignore libCrun as |
4418 | @@ -7161,32 +7170,16 @@ |
4419 | ])# _LT_SYS_HIDDEN_LIBDEPS |
4420 | |
4421 | |
4422 | -# _LT_PROG_F77 |
4423 | -# ------------ |
4424 | -# Since AC_PROG_F77 is broken, in that it returns the empty string |
4425 | -# if there is no fortran compiler, we have our own version here. |
4426 | -m4_defun([_LT_PROG_F77], |
4427 | -[ |
4428 | -pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) |
4429 | -AC_PROG_F77 |
4430 | -if test -z "$F77" || test "X$F77" = "Xno"; then |
4431 | - _lt_disable_F77=yes |
4432 | -fi |
4433 | -popdef([AC_MSG_ERROR]) |
4434 | -])# _LT_PROG_F77 |
4435 | - |
4436 | -dnl aclocal-1.4 backwards compatibility: |
4437 | -dnl AC_DEFUN([_LT_PROG_F77], []) |
4438 | - |
4439 | - |
4440 | # _LT_LANG_F77_CONFIG([TAG]) |
4441 | # -------------------------- |
4442 | # Ensure that the configuration variables for a Fortran 77 compiler are |
4443 | # suitably defined. These variables are subsequently used by _LT_CONFIG |
4444 | # to write the compiler configuration to `libtool'. |
4445 | m4_defun([_LT_LANG_F77_CONFIG], |
4446 | -[AC_REQUIRE([_LT_PROG_F77])dnl |
4447 | -AC_LANG_PUSH(Fortran 77) |
4448 | +[AC_LANG_PUSH(Fortran 77) |
4449 | +if test -z "$F77" || test "X$F77" = "Xno"; then |
4450 | + _lt_disable_F77=yes |
4451 | +fi |
4452 | |
4453 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
4454 | _LT_TAGVAR(allow_undefined_flag, $1)= |
4455 | @@ -7196,7 +7189,6 @@ |
4456 | _LT_TAGVAR(hardcode_direct, $1)=no |
4457 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
4458 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
4459 | -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= |
4460 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
4461 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
4462 | _LT_TAGVAR(hardcode_automatic, $1)=no |
4463 | @@ -7205,6 +7197,8 @@ |
4464 | _LT_TAGVAR(module_expsym_cmds, $1)= |
4465 | _LT_TAGVAR(link_all_deplibs, $1)=unknown |
4466 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
4467 | +_LT_TAGVAR(reload_flag, $1)=$reload_flag |
4468 | +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds |
4469 | _LT_TAGVAR(no_undefined_flag, $1)= |
4470 | _LT_TAGVAR(whole_archive_flag_spec, $1)= |
4471 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no |
4472 | @@ -7244,7 +7238,9 @@ |
4473 | # Allow CC to be a program name with arguments. |
4474 | lt_save_CC="$CC" |
4475 | lt_save_GCC=$GCC |
4476 | + lt_save_CFLAGS=$CFLAGS |
4477 | CC=${F77-"f77"} |
4478 | + CFLAGS=$FFLAGS |
4479 | compiler=$CC |
4480 | _LT_TAGVAR(compiler, $1)=$CC |
4481 | _LT_CC_BASENAME([$compiler]) |
4482 | @@ -7298,38 +7294,24 @@ |
4483 | |
4484 | GCC=$lt_save_GCC |
4485 | CC="$lt_save_CC" |
4486 | + CFLAGS="$lt_save_CFLAGS" |
4487 | fi # test "$_lt_disable_F77" != yes |
4488 | |
4489 | AC_LANG_POP |
4490 | ])# _LT_LANG_F77_CONFIG |
4491 | |
4492 | |
4493 | -# _LT_PROG_FC |
4494 | -# ----------- |
4495 | -# Since AC_PROG_FC is broken, in that it returns the empty string |
4496 | -# if there is no fortran compiler, we have our own version here. |
4497 | -m4_defun([_LT_PROG_FC], |
4498 | -[ |
4499 | -pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) |
4500 | -AC_PROG_FC |
4501 | -if test -z "$FC" || test "X$FC" = "Xno"; then |
4502 | - _lt_disable_FC=yes |
4503 | -fi |
4504 | -popdef([AC_MSG_ERROR]) |
4505 | -])# _LT_PROG_FC |
4506 | - |
4507 | -dnl aclocal-1.4 backwards compatibility: |
4508 | -dnl AC_DEFUN([_LT_PROG_FC], []) |
4509 | - |
4510 | - |
4511 | # _LT_LANG_FC_CONFIG([TAG]) |
4512 | # ------------------------- |
4513 | # Ensure that the configuration variables for a Fortran compiler are |
4514 | # suitably defined. These variables are subsequently used by _LT_CONFIG |
4515 | # to write the compiler configuration to `libtool'. |
4516 | m4_defun([_LT_LANG_FC_CONFIG], |
4517 | -[AC_REQUIRE([_LT_PROG_FC])dnl |
4518 | -AC_LANG_PUSH(Fortran) |
4519 | +[AC_LANG_PUSH(Fortran) |
4520 | + |
4521 | +if test -z "$FC" || test "X$FC" = "Xno"; then |
4522 | + _lt_disable_FC=yes |
4523 | +fi |
4524 | |
4525 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
4526 | _LT_TAGVAR(allow_undefined_flag, $1)= |
4527 | @@ -7339,7 +7321,6 @@ |
4528 | _LT_TAGVAR(hardcode_direct, $1)=no |
4529 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
4530 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
4531 | -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= |
4532 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
4533 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
4534 | _LT_TAGVAR(hardcode_automatic, $1)=no |
4535 | @@ -7348,6 +7329,8 @@ |
4536 | _LT_TAGVAR(module_expsym_cmds, $1)= |
4537 | _LT_TAGVAR(link_all_deplibs, $1)=unknown |
4538 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
4539 | +_LT_TAGVAR(reload_flag, $1)=$reload_flag |
4540 | +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds |
4541 | _LT_TAGVAR(no_undefined_flag, $1)= |
4542 | _LT_TAGVAR(whole_archive_flag_spec, $1)= |
4543 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no |
4544 | @@ -7387,7 +7370,9 @@ |
4545 | # Allow CC to be a program name with arguments. |
4546 | lt_save_CC="$CC" |
4547 | lt_save_GCC=$GCC |
4548 | + lt_save_CFLAGS=$CFLAGS |
4549 | CC=${FC-"f95"} |
4550 | + CFLAGS=$FCFLAGS |
4551 | compiler=$CC |
4552 | GCC=$ac_cv_fc_compiler_gnu |
4553 | |
4554 | @@ -7443,7 +7428,8 @@ |
4555 | fi # test -n "$compiler" |
4556 | |
4557 | GCC=$lt_save_GCC |
4558 | - CC="$lt_save_CC" |
4559 | + CC=$lt_save_CC |
4560 | + CFLAGS=$lt_save_CFLAGS |
4561 | fi # test "$_lt_disable_FC" != yes |
4562 | |
4563 | AC_LANG_POP |
4564 | @@ -7480,10 +7466,12 @@ |
4565 | _LT_LINKER_BOILERPLATE |
4566 | |
4567 | # Allow CC to be a program name with arguments. |
4568 | -lt_save_CC="$CC" |
4569 | +lt_save_CC=$CC |
4570 | +lt_save_CFLAGS=$CFLAGS |
4571 | lt_save_GCC=$GCC |
4572 | GCC=yes |
4573 | CC=${GCJ-"gcj"} |
4574 | +CFLAGS=$GCJFLAGS |
4575 | compiler=$CC |
4576 | _LT_TAGVAR(compiler, $1)=$CC |
4577 | _LT_TAGVAR(LD, $1)="$LD" |
4578 | @@ -7493,6 +7481,8 @@ |
4579 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
4580 | |
4581 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
4582 | +_LT_TAGVAR(reload_flag, $1)=$reload_flag |
4583 | +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds |
4584 | |
4585 | if test -n "$compiler"; then |
4586 | _LT_COMPILER_NO_RTTI($1) |
4587 | @@ -7508,10 +7498,78 @@ |
4588 | AC_LANG_RESTORE |
4589 | |
4590 | GCC=$lt_save_GCC |
4591 | -CC="$lt_save_CC" |
4592 | +CC=$lt_save_CC |
4593 | +CFLAGS=$lt_save_CFLAGS |
4594 | ])# _LT_LANG_GCJ_CONFIG |
4595 | |
4596 | |
4597 | +# _LT_LANG_GO_CONFIG([TAG]) |
4598 | +# -------------------------- |
4599 | +# Ensure that the configuration variables for the GNU Go compiler |
4600 | +# are suitably defined. These variables are subsequently used by _LT_CONFIG |
4601 | +# to write the compiler configuration to `libtool'. |
4602 | +m4_defun([_LT_LANG_GO_CONFIG], |
4603 | +[AC_REQUIRE([LT_PROG_GO])dnl |
4604 | +AC_LANG_SAVE |
4605 | + |
4606 | +# Source file extension for Go test sources. |
4607 | +ac_ext=go |
4608 | + |
4609 | +# Object file extension for compiled Go test sources. |
4610 | +objext=o |
4611 | +_LT_TAGVAR(objext, $1)=$objext |
4612 | + |
4613 | +# Code to be used in simple compile tests |
4614 | +lt_simple_compile_test_code="package main; func main() { }" |
4615 | + |
4616 | +# Code to be used in simple link tests |
4617 | +lt_simple_link_test_code='package main; func main() { }' |
4618 | + |
4619 | +# ltmain only uses $CC for tagged configurations so make sure $CC is set. |
4620 | +_LT_TAG_COMPILER |
4621 | + |
4622 | +# save warnings/boilerplate of simple test code |
4623 | +_LT_COMPILER_BOILERPLATE |
4624 | +_LT_LINKER_BOILERPLATE |
4625 | + |
4626 | +# Allow CC to be a program name with arguments. |
4627 | +lt_save_CC=$CC |
4628 | +lt_save_CFLAGS=$CFLAGS |
4629 | +lt_save_GCC=$GCC |
4630 | +GCC=yes |
4631 | +CC=${GOC-"gccgo"} |
4632 | +CFLAGS=$GOFLAGS |
4633 | +compiler=$CC |
4634 | +_LT_TAGVAR(compiler, $1)=$CC |
4635 | +_LT_TAGVAR(LD, $1)="$LD" |
4636 | +_LT_CC_BASENAME([$compiler]) |
4637 | + |
4638 | +# Go did not exist at the time GCC didn't implicitly link libc in. |
4639 | +_LT_TAGVAR(archive_cmds_need_lc, $1)=no |
4640 | + |
4641 | +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
4642 | +_LT_TAGVAR(reload_flag, $1)=$reload_flag |
4643 | +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds |
4644 | + |
4645 | +if test -n "$compiler"; then |
4646 | + _LT_COMPILER_NO_RTTI($1) |
4647 | + _LT_COMPILER_PIC($1) |
4648 | + _LT_COMPILER_C_O($1) |
4649 | + _LT_COMPILER_FILE_LOCKS($1) |
4650 | + _LT_LINKER_SHLIBS($1) |
4651 | + _LT_LINKER_HARDCODE_LIBPATH($1) |
4652 | + |
4653 | + _LT_CONFIG($1) |
4654 | +fi |
4655 | + |
4656 | +AC_LANG_RESTORE |
4657 | + |
4658 | +GCC=$lt_save_GCC |
4659 | +CC=$lt_save_CC |
4660 | +CFLAGS=$lt_save_CFLAGS |
4661 | +])# _LT_LANG_GO_CONFIG |
4662 | + |
4663 | + |
4664 | # _LT_LANG_RC_CONFIG([TAG]) |
4665 | # ------------------------- |
4666 | # Ensure that the configuration variables for the Windows resource compiler |
4667 | @@ -7543,9 +7601,11 @@ |
4668 | |
4669 | # Allow CC to be a program name with arguments. |
4670 | lt_save_CC="$CC" |
4671 | +lt_save_CFLAGS=$CFLAGS |
4672 | lt_save_GCC=$GCC |
4673 | GCC= |
4674 | CC=${RC-"windres"} |
4675 | +CFLAGS= |
4676 | compiler=$CC |
4677 | _LT_TAGVAR(compiler, $1)=$CC |
4678 | _LT_CC_BASENAME([$compiler]) |
4679 | @@ -7558,7 +7618,8 @@ |
4680 | |
4681 | GCC=$lt_save_GCC |
4682 | AC_LANG_RESTORE |
4683 | -CC="$lt_save_CC" |
4684 | +CC=$lt_save_CC |
4685 | +CFLAGS=$lt_save_CFLAGS |
4686 | ])# _LT_LANG_RC_CONFIG |
4687 | |
4688 | |
4689 | @@ -7578,6 +7639,13 @@ |
4690 | dnl AC_DEFUN([LT_AC_PROG_GCJ], []) |
4691 | |
4692 | |
4693 | +# LT_PROG_GO |
4694 | +# ---------- |
4695 | +AC_DEFUN([LT_PROG_GO], |
4696 | +[AC_CHECK_TOOL(GOC, gccgo,) |
4697 | +]) |
4698 | + |
4699 | + |
4700 | # LT_PROG_RC |
4701 | # ---------- |
4702 | AC_DEFUN([LT_PROG_RC], |
4703 | @@ -7617,6 +7685,15 @@ |
4704 | AC_SUBST([OBJDUMP]) |
4705 | ]) |
4706 | |
4707 | +# _LT_DECL_DLLTOOL |
4708 | +# ---------------- |
4709 | +# Ensure DLLTOOL variable is set. |
4710 | +m4_defun([_LT_DECL_DLLTOOL], |
4711 | +[AC_CHECK_TOOL(DLLTOOL, dlltool, false) |
4712 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
4713 | +_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) |
4714 | +AC_SUBST([DLLTOOL]) |
4715 | +]) |
4716 | |
4717 | # _LT_DECL_SED |
4718 | # ------------ |
4719 | @@ -7708,8 +7785,8 @@ |
4720 | # Try some XSI features |
4721 | xsi_shell=no |
4722 | ( _lt_dummy="a/b/c" |
4723 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
4724 | - = c,a/b,, \ |
4725 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
4726 | + = c,a/b,b/c, \ |
4727 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
4728 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
4729 | && xsi_shell=yes |
4730 | @@ -7748,222 +7825,177 @@ |
4731 | ])# _LT_CHECK_SHELL_FEATURES |
4732 | |
4733 | |
4734 | -# _LT_PROG_XSI_SHELLFNS |
4735 | -# --------------------- |
4736 | -# Bourne and XSI compatible variants of some useful shell functions. |
4737 | -m4_defun([_LT_PROG_XSI_SHELLFNS], |
4738 | -[case $xsi_shell in |
4739 | - yes) |
4740 | - cat << \_LT_EOF >> "$cfgfile" |
4741 | - |
4742 | -# func_dirname file append nondir_replacement |
4743 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
4744 | -# otherwise set result to NONDIR_REPLACEMENT. |
4745 | -func_dirname () |
4746 | -{ |
4747 | - case ${1} in |
4748 | - */*) func_dirname_result="${1%/*}${2}" ;; |
4749 | - * ) func_dirname_result="${3}" ;; |
4750 | - esac |
4751 | -} |
4752 | - |
4753 | -# func_basename file |
4754 | -func_basename () |
4755 | -{ |
4756 | - func_basename_result="${1##*/}" |
4757 | -} |
4758 | - |
4759 | -# func_dirname_and_basename file append nondir_replacement |
4760 | -# perform func_basename and func_dirname in a single function |
4761 | -# call: |
4762 | -# dirname: Compute the dirname of FILE. If nonempty, |
4763 | -# add APPEND to the result, otherwise set result |
4764 | -# to NONDIR_REPLACEMENT. |
4765 | -# value returned in "$func_dirname_result" |
4766 | -# basename: Compute filename of FILE. |
4767 | -# value retuned in "$func_basename_result" |
4768 | -# Implementation must be kept synchronized with func_dirname |
4769 | -# and func_basename. For efficiency, we do not delegate to |
4770 | -# those functions but instead duplicate the functionality here. |
4771 | -func_dirname_and_basename () |
4772 | -{ |
4773 | - case ${1} in |
4774 | - */*) func_dirname_result="${1%/*}${2}" ;; |
4775 | - * ) func_dirname_result="${3}" ;; |
4776 | - esac |
4777 | - func_basename_result="${1##*/}" |
4778 | -} |
4779 | - |
4780 | -# func_stripname prefix suffix name |
4781 | -# strip PREFIX and SUFFIX off of NAME. |
4782 | -# PREFIX and SUFFIX must not contain globbing or regex special |
4783 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
4784 | -# dot (in which case that matches only a dot). |
4785 | -func_stripname () |
4786 | -{ |
4787 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
4788 | - # positional parameters, so assign one to ordinary parameter first. |
4789 | - func_stripname_result=${3} |
4790 | - func_stripname_result=${func_stripname_result#"${1}"} |
4791 | - func_stripname_result=${func_stripname_result%"${2}"} |
4792 | -} |
4793 | - |
4794 | -# func_opt_split |
4795 | -func_opt_split () |
4796 | -{ |
4797 | - func_opt_split_opt=${1%%=*} |
4798 | - func_opt_split_arg=${1#*=} |
4799 | -} |
4800 | - |
4801 | -# func_lo2o object |
4802 | -func_lo2o () |
4803 | -{ |
4804 | - case ${1} in |
4805 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
4806 | - *) func_lo2o_result=${1} ;; |
4807 | - esac |
4808 | -} |
4809 | - |
4810 | -# func_xform libobj-or-source |
4811 | -func_xform () |
4812 | -{ |
4813 | - func_xform_result=${1%.*}.lo |
4814 | -} |
4815 | - |
4816 | -# func_arith arithmetic-term... |
4817 | -func_arith () |
4818 | -{ |
4819 | - func_arith_result=$(( $[*] )) |
4820 | -} |
4821 | - |
4822 | -# func_len string |
4823 | -# STRING may not start with a hyphen. |
4824 | -func_len () |
4825 | -{ |
4826 | - func_len_result=${#1} |
4827 | -} |
4828 | - |
4829 | -_LT_EOF |
4830 | - ;; |
4831 | - *) # Bourne compatible functions. |
4832 | - cat << \_LT_EOF >> "$cfgfile" |
4833 | - |
4834 | -# func_dirname file append nondir_replacement |
4835 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
4836 | -# otherwise set result to NONDIR_REPLACEMENT. |
4837 | -func_dirname () |
4838 | -{ |
4839 | - # Extract subdirectory from the argument. |
4840 | - func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` |
4841 | - if test "X$func_dirname_result" = "X${1}"; then |
4842 | - func_dirname_result="${3}" |
4843 | - else |
4844 | - func_dirname_result="$func_dirname_result${2}" |
4845 | - fi |
4846 | -} |
4847 | - |
4848 | -# func_basename file |
4849 | -func_basename () |
4850 | -{ |
4851 | - func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` |
4852 | -} |
4853 | - |
4854 | -dnl func_dirname_and_basename |
4855 | -dnl A portable version of this function is already defined in general.m4sh |
4856 | -dnl so there is no need for it here. |
4857 | - |
4858 | -# func_stripname prefix suffix name |
4859 | -# strip PREFIX and SUFFIX off of NAME. |
4860 | -# PREFIX and SUFFIX must not contain globbing or regex special |
4861 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
4862 | -# dot (in which case that matches only a dot). |
4863 | -# func_strip_suffix prefix name |
4864 | -func_stripname () |
4865 | -{ |
4866 | - case ${2} in |
4867 | - .*) func_stripname_result=`$ECHO "X${3}" \ |
4868 | - | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; |
4869 | - *) func_stripname_result=`$ECHO "X${3}" \ |
4870 | - | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; |
4871 | - esac |
4872 | -} |
4873 | - |
4874 | -# sed scripts: |
4875 | -my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' |
4876 | -my_sed_long_arg='1s/^-[[^=]]*=//' |
4877 | - |
4878 | -# func_opt_split |
4879 | -func_opt_split () |
4880 | -{ |
4881 | - func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` |
4882 | - func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` |
4883 | -} |
4884 | - |
4885 | -# func_lo2o object |
4886 | -func_lo2o () |
4887 | -{ |
4888 | - func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` |
4889 | -} |
4890 | - |
4891 | -# func_xform libobj-or-source |
4892 | -func_xform () |
4893 | -{ |
4894 | - func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` |
4895 | -} |
4896 | - |
4897 | -# func_arith arithmetic-term... |
4898 | -func_arith () |
4899 | -{ |
4900 | - func_arith_result=`expr "$[@]"` |
4901 | -} |
4902 | - |
4903 | -# func_len string |
4904 | -# STRING may not start with a hyphen. |
4905 | -func_len () |
4906 | -{ |
4907 | - func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` |
4908 | -} |
4909 | - |
4910 | -_LT_EOF |
4911 | -esac |
4912 | - |
4913 | -case $lt_shell_append in |
4914 | - yes) |
4915 | - cat << \_LT_EOF >> "$cfgfile" |
4916 | - |
4917 | -# func_append var value |
4918 | -# Append VALUE to the end of shell variable VAR. |
4919 | -func_append () |
4920 | -{ |
4921 | - eval "$[1]+=\$[2]" |
4922 | -} |
4923 | -_LT_EOF |
4924 | - ;; |
4925 | - *) |
4926 | - cat << \_LT_EOF >> "$cfgfile" |
4927 | - |
4928 | -# func_append var value |
4929 | -# Append VALUE to the end of shell variable VAR. |
4930 | -func_append () |
4931 | -{ |
4932 | - eval "$[1]=\$$[1]\$[2]" |
4933 | -} |
4934 | - |
4935 | -_LT_EOF |
4936 | - ;; |
4937 | - esac |
4938 | -]) |
4939 | +# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) |
4940 | +# ------------------------------------------------------ |
4941 | +# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and |
4942 | +# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. |
4943 | +m4_defun([_LT_PROG_FUNCTION_REPLACE], |
4944 | +[dnl { |
4945 | +sed -e '/^$1 ()$/,/^} # $1 /c\ |
4946 | +$1 ()\ |
4947 | +{\ |
4948 | +m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) |
4949 | +} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ |
4950 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
4951 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
4952 | +test 0 -eq $? || _lt_function_replace_fail=: |
4953 | +]) |
4954 | + |
4955 | + |
4956 | +# _LT_PROG_REPLACE_SHELLFNS |
4957 | +# ------------------------- |
4958 | +# Replace existing portable implementations of several shell functions with |
4959 | +# equivalent extended shell implementations where those features are available.. |
4960 | +m4_defun([_LT_PROG_REPLACE_SHELLFNS], |
4961 | +[if test x"$xsi_shell" = xyes; then |
4962 | + _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl |
4963 | + case ${1} in |
4964 | + */*) func_dirname_result="${1%/*}${2}" ;; |
4965 | + * ) func_dirname_result="${3}" ;; |
4966 | + esac]) |
4967 | + |
4968 | + _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl |
4969 | + func_basename_result="${1##*/}"]) |
4970 | + |
4971 | + _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl |
4972 | + case ${1} in |
4973 | + */*) func_dirname_result="${1%/*}${2}" ;; |
4974 | + * ) func_dirname_result="${3}" ;; |
4975 | + esac |
4976 | + func_basename_result="${1##*/}"]) |
4977 | + |
4978 | + _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl |
4979 | + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
4980 | + # positional parameters, so assign one to ordinary parameter first. |
4981 | + func_stripname_result=${3} |
4982 | + func_stripname_result=${func_stripname_result#"${1}"} |
4983 | + func_stripname_result=${func_stripname_result%"${2}"}]) |
4984 | + |
4985 | + _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl |
4986 | + func_split_long_opt_name=${1%%=*} |
4987 | + func_split_long_opt_arg=${1#*=}]) |
4988 | + |
4989 | + _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl |
4990 | + func_split_short_opt_arg=${1#??} |
4991 | + func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) |
4992 | + |
4993 | + _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl |
4994 | + case ${1} in |
4995 | + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
4996 | + *) func_lo2o_result=${1} ;; |
4997 | + esac]) |
4998 | + |
4999 | + _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) |
5000 | + |
thank you for your work, gobject- introspection doesn't support multiarch though, you need to move the typelib back into a non multiarch location
did you also test the new version with something (do we have code using that library?)