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 | 1 | 2013-11-02 Damon Chaplin <damon@gnome.org> | ||
6 | 2 | |||
7 | 3 | * demo/*.c: use gtk_box_pack_start() rather than gtk_container_add(), | ||
8 | 4 | for boxes, as the demos didn't appear correctly. | ||
9 | 5 | |||
10 | 6 | 2013-11-02 Damon Chaplin <damon@gnome.org> | ||
11 | 7 | |||
12 | 8 | * src/goocanvasutils.c (goo_canvas_line_dash_set_offset): new function | ||
13 | 9 | to set the offset. | ||
14 | 10 | |||
15 | 11 | 2013-11-02 Damon Chaplin <damon@gnome.org> | ||
16 | 12 | |||
17 | 13 | * src/goocanvas.c (emit_pointer_event): use gdk_event_copy() rather | ||
18 | 14 | than a struct copy, to copy the private stuff like device etc. #665637 | ||
19 | 15 | |||
20 | 16 | 2013-11-01 Damon Chaplin <damon@gnome.org> | ||
21 | 17 | |||
22 | 18 | * src/*.c: | ||
23 | 19 | * demo/*.c: fixed a lot of warnings, mainly about deprecated stuff. | ||
24 | 20 | |||
25 | 21 | 2013-11-01 Damon Chaplin <damon@gnome.org> | ||
26 | 22 | |||
27 | 23 | * .gitignore: added gtk-doc.m4 | ||
28 | 24 | |||
29 | 25 | 2013-11-01 Damon Chaplin <damon@gnome.org> | ||
30 | 26 | |||
31 | 27 | * src/goocanvas.c: added doc about disabling mouse-wheel scrolling. | ||
32 | 28 | #617900. | ||
33 | 29 | |||
34 | 30 | 2013-11-01 Damon Chaplin <damon@gnome.org> | ||
35 | 31 | |||
36 | 32 | * src/goocanvas.c (goo_canvas_adjustment_value_changed): disabled | ||
37 | 33 | the code that handled "redraw-when-scrolled" and tried to optimise | ||
38 | 34 | the drawing of static items. GTK+ 3.0 always redraws everything when | ||
39 | 35 | a window is scrolled, so these aren't needed. | ||
40 | 36 | |||
41 | 37 | We could possibly use GtkPixelCache or similar in future, to try to | ||
42 | 38 | optimise scrolling. | ||
43 | 39 | |||
44 | 40 | 2013-10-25 Damon Chaplin <damon@gnome.org> | ||
45 | 41 | |||
46 | 42 | * src/goocanvas.c (paint_static_items, goo_canvas_draw): another | ||
47 | 43 | attempt at fixing the drawing code. Now it uses the transform & clip | ||
48 | 44 | from the given cairo_t and the code seems to work OK for both the old | ||
49 | 45 | GTK+ and GTK+ 3.10. Bug #700674. | ||
50 | 46 | |||
51 | 47 | 2013-09-27 Damon Chaplin <damon@gnome.org> | ||
52 | 48 | |||
53 | 49 | * demo/demo-grabs.c (on_widget_draw): draw simple rects for the widgets | ||
54 | 50 | as the old code using gtk_paint_box() doesn't seem to work any more. | ||
55 | 51 | |||
56 | 52 | 2013-09-27 Damon Chaplin <damon@gnome.org> | ||
57 | 53 | |||
58 | 54 | * src/goocanvasutils.c: added introspection flags, so it now seems to | ||
59 | 55 | work OK with python at least. | ||
60 | 56 | |||
61 | 57 | * bindings/python/demo.py (setup_canvas): added line dash to a path. | ||
62 | 58 | |||
63 | 59 | * demo/demo.c (setup_rectangles): added line dash to one rect. | ||
64 | 60 | |||
65 | 61 | 2013-09-24 Damon Chaplin <damon@gnome.org> | ||
66 | 62 | |||
67 | 63 | * src/goocanvasitem.c: | ||
68 | 64 | * src/goocanvasitemmodel.c: added a few (allow-none) flags. #677013. | ||
69 | 65 | |||
70 | 66 | 2013-09-24 Damon Chaplin <damon@gnome.org> | ||
71 | 67 | |||
72 | 68 | * src/Makefile.am: added -lm to LIBADD. Bug #671766. | ||
73 | 69 | |||
74 | 70 | 2013-08-20 Damon Chaplin <damon@gnome.org> | ||
75 | 71 | |||
76 | 72 | * src/*.h: fixed a few documentation issues. | ||
77 | 73 | * docs/goocanvas2-docs.sgml: added annotation glossary. | ||
78 | 74 | |||
79 | 75 | 2013-07-18 Damon Chaplin <damon@gnome.org> | ||
80 | 76 | |||
81 | 77 | * src/goocanvas.c (paint_static_items, goo_canvas_draw): tried to | ||
82 | 78 | fix drawing code to work with new GTK+ 3.9 drawing code. I'm not sure | ||
83 | 79 | it is 100% there yet, but the demo seems OK. Bug #700674. | ||
84 | 80 | |||
85 | 81 | 2013-03-28 Murray Cumming <murrayc@murrayc.com> | ||
86 | 82 | |||
87 | 83 | Fix some introspection generation warnings. | ||
88 | 84 | |||
89 | 85 | Avoid gobject-introspection warnings about missing : in | ||
90 | 86 | documentation comments. | ||
91 | 87 | Part of bug #696736 | ||
92 | 88 | |||
93 | 89 | 2011-10-19 Jasper Lievisse Adriaanse <jasperla@gnome.org> | ||
94 | 90 | |||
95 | 91 | * configure.in: Bump pygobject dependency to 2.90.4. Bug #661487. | ||
96 | 92 | |||
97 | 1 | 2011-10-09 Damon Chaplin <damon@gnome.org> | 93 | 2011-10-09 Damon Chaplin <damon@gnome.org> |
98 | 2 | 94 | ||
99 | 3 | * Released GooCanvas 2.0.1 | 95 | * Released GooCanvas 2.0.1 |
100 | 4 | 96 | ||
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 | 1 | Installation Instructions | 1 | Installation Instructions |
106 | 2 | ************************* | 2 | ************************* |
107 | 3 | 3 | ||
110 | 4 | Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, | 4 | Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, |
111 | 5 | 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | 5 | Inc. |
112 | 6 | 6 | ||
113 | 7 | Copying and distribution of this file, with or without modification, | 7 | Copying and distribution of this file, with or without modification, |
114 | 8 | are permitted in any medium without royalty provided the copyright | 8 | are permitted in any medium without royalty provided the copyright |
115 | @@ -226,6 +226,11 @@ | |||
116 | 226 | 226 | ||
117 | 227 | and if that doesn't work, install pre-built binaries of GCC for HP-UX. | 227 | and if that doesn't work, install pre-built binaries of GCC for HP-UX. |
118 | 228 | 228 | ||
119 | 229 | HP-UX `make' updates targets which have the same time stamps as | ||
120 | 230 | their prerequisites, which makes it generally unusable when shipped | ||
121 | 231 | generated files such as `configure' are involved. Use GNU `make' | ||
122 | 232 | instead. | ||
123 | 233 | |||
124 | 229 | On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot | 234 | On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot |
125 | 230 | parse its `<wchar.h>' header file. The option `-nodtk' can be used as | 235 | parse its `<wchar.h>' header file. The option `-nodtk' can be used as |
126 | 231 | a workaround. If GNU CC is not installed, it is therefore recommended | 236 | a workaround. If GNU CC is not installed, it is therefore recommended |
127 | 232 | 237 | ||
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 @@ | |||
133 | 1 | # Makefile.in generated by automake 1.11.1 from Makefile.am. | 1 | # Makefile.in generated by automake 1.11.6 from Makefile.am. |
134 | 2 | # @configure_input@ | 2 | # @configure_input@ |
135 | 3 | 3 | ||
136 | 4 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | 4 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
139 | 5 | # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | 5 | # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
140 | 6 | # Inc. | 6 | # Foundation, Inc. |
141 | 7 | # This Makefile.in is free software; the Free Software Foundation | 7 | # This Makefile.in is free software; the Free Software Foundation |
142 | 8 | # gives unlimited permission to copy and/or distribute it, | 8 | # gives unlimited permission to copy and/or distribute it, |
143 | 9 | # with or without modifications, as long as this notice is preserved. | 9 | # with or without modifications, as long as this notice is preserved. |
144 | @@ -16,6 +16,23 @@ | |||
145 | 16 | @SET_MAKE@ | 16 | @SET_MAKE@ |
146 | 17 | 17 | ||
147 | 18 | VPATH = @srcdir@ | 18 | VPATH = @srcdir@ |
148 | 19 | am__make_dryrun = \ | ||
149 | 20 | { \ | ||
150 | 21 | am__dry=no; \ | ||
151 | 22 | case $$MAKEFLAGS in \ | ||
152 | 23 | *\\[\ \ ]*) \ | ||
153 | 24 | echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ | ||
154 | 25 | | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ | ||
155 | 26 | *) \ | ||
156 | 27 | for am__flg in $$MAKEFLAGS; do \ | ||
157 | 28 | case $$am__flg in \ | ||
158 | 29 | *=*|--*) ;; \ | ||
159 | 30 | *n*) am__dry=yes; break;; \ | ||
160 | 31 | esac; \ | ||
161 | 32 | done;; \ | ||
162 | 33 | esac; \ | ||
163 | 34 | test $$am__dry = yes; \ | ||
164 | 35 | } | ||
165 | 19 | pkgdatadir = $(datadir)/@PACKAGE@ | 36 | pkgdatadir = $(datadir)/@PACKAGE@ |
166 | 20 | pkgincludedir = $(includedir)/@PACKAGE@ | 37 | pkgincludedir = $(includedir)/@PACKAGE@ |
167 | 21 | pkglibdir = $(libdir)/@PACKAGE@ | 38 | pkglibdir = $(libdir)/@PACKAGE@ |
168 | @@ -39,22 +56,22 @@ | |||
169 | 39 | $(srcdir)/Makefile.in $(srcdir)/config.h.in \ | 56 | $(srcdir)/Makefile.in $(srcdir)/config.h.in \ |
170 | 40 | $(srcdir)/goocanvas-2.0.pc.in $(top_srcdir)/configure AUTHORS \ | 57 | $(srcdir)/goocanvas-2.0.pc.in $(top_srcdir)/configure AUTHORS \ |
171 | 41 | COPYING ChangeLog INSTALL NEWS TODO config.guess config.sub \ | 58 | COPYING ChangeLog INSTALL NEWS TODO config.guess config.sub \ |
173 | 42 | depcomp install-sh ltmain.sh missing mkinstalldirs py-compile | 59 | depcomp install-sh ltmain.sh missing py-compile |
174 | 43 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | 60 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
175 | 44 | am__aclocal_m4_deps = $(top_srcdir)/configure.in | 61 | am__aclocal_m4_deps = $(top_srcdir)/configure.in |
176 | 45 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 62 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
177 | 46 | $(ACLOCAL_M4) | 63 | $(ACLOCAL_M4) |
178 | 47 | am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ | 64 | am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ |
179 | 48 | configure.lineno config.status.lineno | 65 | configure.lineno config.status.lineno |
181 | 49 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | 66 | mkinstalldirs = $(install_sh) -d |
182 | 50 | CONFIG_HEADER = config.h | 67 | CONFIG_HEADER = config.h |
183 | 51 | CONFIG_CLEAN_FILES = goocanvas-2.0.pc | 68 | CONFIG_CLEAN_FILES = goocanvas-2.0.pc |
184 | 52 | CONFIG_CLEAN_VPATH_FILES = | 69 | CONFIG_CLEAN_VPATH_FILES = |
187 | 53 | AM_V_GEN = $(am__v_GEN_$(V)) | 70 | AM_V_GEN = $(am__v_GEN_@AM_V@) |
188 | 54 | am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | 71 | am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
189 | 55 | am__v_GEN_0 = @echo " GEN " $@; | 72 | am__v_GEN_0 = @echo " GEN " $@; |
192 | 56 | AM_V_at = $(am__v_at_$(V)) | 73 | AM_V_at = $(am__v_at_@AM_V@) |
193 | 57 | am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | 74 | am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) |
194 | 58 | am__v_at_0 = @ | 75 | am__v_at_0 = @ |
195 | 59 | SOURCES = | 76 | SOURCES = |
196 | 60 | DIST_SOURCES = | 77 | DIST_SOURCES = |
197 | @@ -65,6 +82,11 @@ | |||
198 | 65 | install-pdf-recursive install-ps-recursive install-recursive \ | 82 | install-pdf-recursive install-ps-recursive install-recursive \ |
199 | 66 | installcheck-recursive installdirs-recursive pdf-recursive \ | 83 | installcheck-recursive installdirs-recursive pdf-recursive \ |
200 | 67 | ps-recursive uninstall-recursive | 84 | ps-recursive uninstall-recursive |
201 | 85 | am__can_run_installinfo = \ | ||
202 | 86 | case $$AM_UPDATE_INFO_DIR in \ | ||
203 | 87 | n|no|NO) false;; \ | ||
204 | 88 | *) (install-info --version) >/dev/null 2>&1;; \ | ||
205 | 89 | esac | ||
206 | 68 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; | 90 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
207 | 69 | am__vpath_adj = case $$p in \ | 91 | am__vpath_adj = case $$p in \ |
208 | 70 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ | 92 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
209 | @@ -86,6 +108,12 @@ | |||
210 | 86 | am__base_list = \ | 108 | am__base_list = \ |
211 | 87 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ | 109 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
212 | 88 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | 110 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
213 | 111 | am__uninstall_files_from_dir = { \ | ||
214 | 112 | test -z "$$files" \ | ||
215 | 113 | || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ | ||
216 | 114 | || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ | ||
217 | 115 | $(am__cd) "$$dir" && rm -f $$files; }; \ | ||
218 | 116 | } | ||
219 | 89 | am__installdirs = "$(DESTDIR)$(pkgconfigdir)" | 117 | am__installdirs = "$(DESTDIR)$(pkgconfigdir)" |
220 | 90 | DATA = $(pkgconfig_DATA) | 118 | DATA = $(pkgconfig_DATA) |
221 | 91 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ | 119 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
222 | @@ -100,9 +128,11 @@ | |||
223 | 100 | distdir = $(PACKAGE)-$(VERSION) | 128 | distdir = $(PACKAGE)-$(VERSION) |
224 | 101 | top_distdir = $(distdir) | 129 | top_distdir = $(distdir) |
225 | 102 | am__remove_distdir = \ | 130 | am__remove_distdir = \ |
229 | 103 | { test ! -d "$(distdir)" \ | 131 | if test -d "$(distdir)"; then \ |
230 | 104 | || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ | 132 | find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
231 | 105 | && rm -fr "$(distdir)"; }; } | 133 | && rm -rf "$(distdir)" \ |
232 | 134 | || { sleep 5 && rm -rf "$(distdir)"; }; \ | ||
233 | 135 | else :; fi | ||
234 | 106 | am__relativize = \ | 136 | am__relativize = \ |
235 | 107 | dir0=`pwd`; \ | 137 | dir0=`pwd`; \ |
236 | 108 | sed_first='s,^\([^/]*\)/.*$$,\1,'; \ | 138 | sed_first='s,^\([^/]*\)/.*$$,\1,'; \ |
237 | @@ -131,6 +161,8 @@ | |||
238 | 131 | DIST_ARCHIVES = $(distdir).tar.gz | 161 | DIST_ARCHIVES = $(distdir).tar.gz |
239 | 132 | GZIP_ENV = --best | 162 | GZIP_ENV = --best |
240 | 133 | distuninstallcheck_listfiles = find . -type f -print | 163 | distuninstallcheck_listfiles = find . -type f -print |
241 | 164 | am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | ||
242 | 165 | | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' | ||
243 | 134 | distcleancheck_listfiles = find . -type f -print | 166 | distcleancheck_listfiles = find . -type f -print |
244 | 135 | ACLOCAL = @ACLOCAL@ | 167 | ACLOCAL = @ACLOCAL@ |
245 | 136 | AMTAR = @AMTAR@ | 168 | AMTAR = @AMTAR@ |
246 | @@ -151,6 +183,7 @@ | |||
247 | 151 | DATADIRNAME = @DATADIRNAME@ | 183 | DATADIRNAME = @DATADIRNAME@ |
248 | 152 | DEFS = @DEFS@ | 184 | DEFS = @DEFS@ |
249 | 153 | DEPDIR = @DEPDIR@ | 185 | DEPDIR = @DEPDIR@ |
250 | 186 | DLLTOOL = @DLLTOOL@ | ||
251 | 154 | DSYMUTIL = @DSYMUTIL@ | 187 | DSYMUTIL = @DSYMUTIL@ |
252 | 155 | DUMPBIN = @DUMPBIN@ | 188 | DUMPBIN = @DUMPBIN@ |
253 | 156 | ECHO_C = @ECHO_C@ | 189 | ECHO_C = @ECHO_C@ |
254 | @@ -166,6 +199,9 @@ | |||
255 | 166 | GMSGFMT = @GMSGFMT@ | 199 | GMSGFMT = @GMSGFMT@ |
256 | 167 | GREP = @GREP@ | 200 | GREP = @GREP@ |
257 | 168 | GTKDOC_CHECK = @GTKDOC_CHECK@ | 201 | GTKDOC_CHECK = @GTKDOC_CHECK@ |
258 | 202 | GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ | ||
259 | 203 | GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ | ||
260 | 204 | GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ | ||
261 | 169 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ | 205 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ |
262 | 170 | GTKDOC_REBASE = @GTKDOC_REBASE@ | 206 | GTKDOC_REBASE = @GTKDOC_REBASE@ |
263 | 171 | HTML_DIR = @HTML_DIR@ | 207 | HTML_DIR = @HTML_DIR@ |
264 | @@ -195,6 +231,7 @@ | |||
265 | 195 | LT_VERSION_INFO = @LT_VERSION_INFO@ | 231 | LT_VERSION_INFO = @LT_VERSION_INFO@ |
266 | 196 | MAINT = @MAINT@ | 232 | MAINT = @MAINT@ |
267 | 197 | MAKEINFO = @MAKEINFO@ | 233 | MAKEINFO = @MAKEINFO@ |
268 | 234 | MANIFEST_TOOL = @MANIFEST_TOOL@ | ||
269 | 198 | MKDIR_P = @MKDIR_P@ | 235 | MKDIR_P = @MKDIR_P@ |
270 | 199 | MKINSTALLDIRS = @MKINSTALLDIRS@ | 236 | MKINSTALLDIRS = @MKINSTALLDIRS@ |
271 | 200 | MSGFMT = @MSGFMT@ | 237 | MSGFMT = @MSGFMT@ |
272 | @@ -217,6 +254,8 @@ | |||
273 | 217 | PATH_SEPARATOR = @PATH_SEPARATOR@ | 254 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
274 | 218 | PERL = @PERL@ | 255 | PERL = @PERL@ |
275 | 219 | PKG_CONFIG = @PKG_CONFIG@ | 256 | PKG_CONFIG = @PKG_CONFIG@ |
276 | 257 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
277 | 258 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
278 | 220 | POFILES = @POFILES@ | 259 | POFILES = @POFILES@ |
279 | 221 | POSUB = @POSUB@ | 260 | POSUB = @POSUB@ |
280 | 222 | PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ | 261 | PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ |
281 | @@ -241,6 +280,7 @@ | |||
282 | 241 | abs_srcdir = @abs_srcdir@ | 280 | abs_srcdir = @abs_srcdir@ |
283 | 242 | abs_top_builddir = @abs_top_builddir@ | 281 | abs_top_builddir = @abs_top_builddir@ |
284 | 243 | abs_top_srcdir = @abs_top_srcdir@ | 282 | abs_top_srcdir = @abs_top_srcdir@ |
285 | 283 | ac_ct_AR = @ac_ct_AR@ | ||
286 | 244 | ac_ct_CC = @ac_ct_CC@ | 284 | ac_ct_CC = @ac_ct_CC@ |
287 | 245 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ | 285 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
288 | 246 | am__include = @am__include@ | 286 | am__include = @am__include@ |
289 | @@ -273,7 +313,6 @@ | |||
290 | 273 | libexecdir = @libexecdir@ | 313 | libexecdir = @libexecdir@ |
291 | 274 | localedir = @localedir@ | 314 | localedir = @localedir@ |
292 | 275 | localstatedir = @localstatedir@ | 315 | localstatedir = @localstatedir@ |
293 | 276 | lt_ECHO = @lt_ECHO@ | ||
294 | 277 | mandir = @mandir@ | 316 | mandir = @mandir@ |
295 | 278 | mkdir_p = @mkdir_p@ | 317 | mkdir_p = @mkdir_p@ |
296 | 279 | oldincludedir = @oldincludedir@ | 318 | oldincludedir = @oldincludedir@ |
297 | @@ -306,7 +345,7 @@ | |||
298 | 306 | $(MAKE) $(AM_MAKEFLAGS) all-recursive | 345 | $(MAKE) $(AM_MAKEFLAGS) all-recursive |
299 | 307 | 346 | ||
300 | 308 | .SUFFIXES: | 347 | .SUFFIXES: |
302 | 309 | am--refresh: | 348 | am--refresh: Makefile |
303 | 310 | @: | 349 | @: |
304 | 311 | $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | 350 | $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) |
305 | 312 | @for dep in $?; do \ | 351 | @for dep in $?; do \ |
306 | @@ -342,10 +381,8 @@ | |||
307 | 342 | $(am__aclocal_m4_deps): | 381 | $(am__aclocal_m4_deps): |
308 | 343 | 382 | ||
309 | 344 | config.h: stamp-h1 | 383 | config.h: stamp-h1 |
314 | 345 | @if test ! -f $@; then \ | 384 | @if test ! -f $@; then rm -f stamp-h1; else :; fi |
315 | 346 | rm -f stamp-h1; \ | 385 | @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi |
312 | 347 | $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ | ||
313 | 348 | else :; fi | ||
316 | 349 | 386 | ||
317 | 350 | stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status | 387 | stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status |
318 | 351 | @rm -f stamp-h1 | 388 | @rm -f stamp-h1 |
319 | @@ -370,8 +407,11 @@ | |||
320 | 370 | -rm -f libtool config.lt | 407 | -rm -f libtool config.lt |
321 | 371 | install-pkgconfigDATA: $(pkgconfig_DATA) | 408 | install-pkgconfigDATA: $(pkgconfig_DATA) |
322 | 372 | @$(NORMAL_INSTALL) | 409 | @$(NORMAL_INSTALL) |
323 | 373 | test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" | ||
324 | 374 | @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ | 410 | @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ |
325 | 411 | if test -n "$$list"; then \ | ||
326 | 412 | echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ | ||
327 | 413 | $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ | ||
328 | 414 | fi; \ | ||
329 | 375 | for p in $$list; do \ | 415 | for p in $$list; do \ |
330 | 376 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | 416 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
331 | 377 | echo "$$d$$p"; \ | 417 | echo "$$d$$p"; \ |
332 | @@ -385,9 +425,7 @@ | |||
333 | 385 | @$(NORMAL_UNINSTALL) | 425 | @$(NORMAL_UNINSTALL) |
334 | 386 | @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ | 426 | @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ |
335 | 387 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ | 427 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
339 | 388 | test -n "$$files" || exit 0; \ | 428 | dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) |
337 | 389 | echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ | ||
338 | 390 | cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files | ||
340 | 391 | 429 | ||
341 | 392 | # This directory's subdirectories are mostly independent; you can cd | 430 | # This directory's subdirectories are mostly independent; you can cd |
342 | 393 | # into them and run `make' without going through this Makefile. | 431 | # into them and run `make' without going through this Makefile. |
343 | @@ -558,13 +596,10 @@ | |||
344 | 558 | done | 596 | done |
345 | 559 | @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | 597 | @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
346 | 560 | if test "$$subdir" = .; then :; else \ | 598 | if test "$$subdir" = .; then :; else \ |
354 | 561 | test -d "$(distdir)/$$subdir" \ | 599 | $(am__make_dryrun) \ |
355 | 562 | || $(MKDIR_P) "$(distdir)/$$subdir" \ | 600 | || test -d "$(distdir)/$$subdir" \ |
356 | 563 | || exit 1; \ | 601 | || $(MKDIR_P) "$(distdir)/$$subdir" \ |
357 | 564 | fi; \ | 602 | || exit 1; \ |
351 | 565 | done | ||
352 | 566 | @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
353 | 567 | if test "$$subdir" = .; then :; else \ | ||
358 | 568 | dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ | 603 | dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ |
359 | 569 | $(am__relativize); \ | 604 | $(am__relativize); \ |
360 | 570 | new_distdir=$$reldir; \ | 605 | new_distdir=$$reldir; \ |
361 | @@ -596,7 +631,11 @@ | |||
362 | 596 | $(am__remove_distdir) | 631 | $(am__remove_distdir) |
363 | 597 | 632 | ||
364 | 598 | dist-bzip2: distdir | 633 | dist-bzip2: distdir |
366 | 599 | tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 | 634 | tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 |
367 | 635 | $(am__remove_distdir) | ||
368 | 636 | |||
369 | 637 | dist-lzip: distdir | ||
370 | 638 | tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz | ||
371 | 600 | $(am__remove_distdir) | 639 | $(am__remove_distdir) |
372 | 601 | 640 | ||
373 | 602 | dist-lzma: distdir | 641 | dist-lzma: distdir |
374 | @@ -604,7 +643,7 @@ | |||
375 | 604 | $(am__remove_distdir) | 643 | $(am__remove_distdir) |
376 | 605 | 644 | ||
377 | 606 | dist-xz: distdir | 645 | dist-xz: distdir |
379 | 607 | tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz | 646 | tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz |
380 | 608 | $(am__remove_distdir) | 647 | $(am__remove_distdir) |
381 | 609 | 648 | ||
382 | 610 | dist-tarZ: distdir | 649 | dist-tarZ: distdir |
383 | @@ -635,6 +674,8 @@ | |||
384 | 635 | bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ | 674 | bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ |
385 | 636 | *.tar.lzma*) \ | 675 | *.tar.lzma*) \ |
386 | 637 | lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ | 676 | lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ |
387 | 677 | *.tar.lz*) \ | ||
388 | 678 | lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ | ||
389 | 638 | *.tar.xz*) \ | 679 | *.tar.xz*) \ |
390 | 639 | xz -dc $(distdir).tar.xz | $(am__untar) ;;\ | 680 | xz -dc $(distdir).tar.xz | $(am__untar) ;;\ |
391 | 640 | *.tar.Z*) \ | 681 | *.tar.Z*) \ |
392 | @@ -644,7 +685,7 @@ | |||
393 | 644 | *.zip*) \ | 685 | *.zip*) \ |
394 | 645 | unzip $(distdir).zip ;;\ | 686 | unzip $(distdir).zip ;;\ |
395 | 646 | esac | 687 | esac |
397 | 647 | chmod -R a-w $(distdir); chmod a+w $(distdir) | 688 | chmod -R a-w $(distdir); chmod u+w $(distdir) |
398 | 648 | mkdir $(distdir)/_build | 689 | mkdir $(distdir)/_build |
399 | 649 | mkdir $(distdir)/_inst | 690 | mkdir $(distdir)/_inst |
400 | 650 | chmod a-w $(distdir) | 691 | chmod a-w $(distdir) |
401 | @@ -654,6 +695,7 @@ | |||
402 | 654 | && am__cwd=`pwd` \ | 695 | && am__cwd=`pwd` \ |
403 | 655 | && $(am__cd) $(distdir)/_build \ | 696 | && $(am__cd) $(distdir)/_build \ |
404 | 656 | && ../configure --srcdir=.. --prefix="$$dc_install_base" \ | 697 | && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
405 | 698 | $(AM_DISTCHECK_CONFIGURE_FLAGS) \ | ||
406 | 657 | $(DISTCHECK_CONFIGURE_FLAGS) \ | 699 | $(DISTCHECK_CONFIGURE_FLAGS) \ |
407 | 658 | && $(MAKE) $(AM_MAKEFLAGS) \ | 700 | && $(MAKE) $(AM_MAKEFLAGS) \ |
408 | 659 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ | 701 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ |
409 | @@ -682,8 +724,16 @@ | |||
410 | 682 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ | 724 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ |
411 | 683 | sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' | 725 | sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' |
412 | 684 | distuninstallcheck: | 726 | distuninstallcheck: |
415 | 685 | @$(am__cd) '$(distuninstallcheck_dir)' \ | 727 | @test -n '$(distuninstallcheck_dir)' || { \ |
416 | 686 | && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ | 728 | echo 'ERROR: trying to run $@ with an empty' \ |
417 | 729 | '$$(distuninstallcheck_dir)' >&2; \ | ||
418 | 730 | exit 1; \ | ||
419 | 731 | }; \ | ||
420 | 732 | $(am__cd) '$(distuninstallcheck_dir)' || { \ | ||
421 | 733 | echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ | ||
422 | 734 | exit 1; \ | ||
423 | 735 | }; \ | ||
424 | 736 | test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ | ||
425 | 687 | || { echo "ERROR: files left after uninstall:" ; \ | 737 | || { echo "ERROR: files left after uninstall:" ; \ |
426 | 688 | if test -n "$(DESTDIR)"; then \ | 738 | if test -n "$(DESTDIR)"; then \ |
427 | 689 | echo " (check DESTDIR support)"; \ | 739 | echo " (check DESTDIR support)"; \ |
428 | @@ -717,10 +767,15 @@ | |||
429 | 717 | 767 | ||
430 | 718 | installcheck: installcheck-recursive | 768 | installcheck: installcheck-recursive |
431 | 719 | install-strip: | 769 | install-strip: |
436 | 720 | $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | 770 | if test -z '$(STRIP)'; then \ |
437 | 721 | install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | 771 | $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
438 | 722 | `test -z '$(STRIP)' || \ | 772 | install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
439 | 723 | echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | 773 | install; \ |
440 | 774 | else \ | ||
441 | 775 | $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
442 | 776 | install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
443 | 777 | "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
444 | 778 | fi | ||
445 | 724 | mostlyclean-generic: | 779 | mostlyclean-generic: |
446 | 725 | 780 | ||
447 | 726 | clean-generic: | 781 | clean-generic: |
448 | @@ -808,8 +863,8 @@ | |||
449 | 808 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ | 863 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
450 | 809 | all all-am am--refresh check check-am clean clean-generic \ | 864 | all all-am am--refresh check check-am clean clean-generic \ |
451 | 810 | clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ | 865 | clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ |
454 | 811 | dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ | 866 | dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \ |
455 | 812 | distcheck distclean distclean-generic distclean-hdr \ | 867 | dist-zip distcheck distclean distclean-generic distclean-hdr \ |
456 | 813 | distclean-libtool distclean-tags distcleancheck distdir \ | 868 | distclean-libtool distclean-tags distcleancheck distdir \ |
457 | 814 | distuninstallcheck dvi dvi-am html html-am info info-am \ | 869 | distuninstallcheck dvi dvi-am html html-am info info-am \ |
458 | 815 | install install-am install-data install-data-am install-dvi \ | 870 | install install-am install-data install-data-am install-dvi \ |
459 | 816 | 871 | ||
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 | 1 | 1 | ||
465 | 2 | GooCanvas 2.0.2 (Nov 3 2013) | ||
466 | 3 | =============== | ||
467 | 4 | |||
468 | 5 | o Fixed the drawing code to work with GTK+ 3.10. | ||
469 | 6 | o Added/fixed a few introspection flags. GooCanvasLineDash should now be | ||
470 | 7 | usable via introspection. | ||
471 | 8 | |||
472 | 9 | |||
473 | 2 | GooCanvas 2.0.1 (Oct 9 2011) | 10 | GooCanvas 2.0.1 (Oct 9 2011) |
474 | 3 | =============== | 11 | =============== |
475 | 4 | 12 | ||
476 | 5 | 13 | ||
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 | 55 | 55 | ||
482 | 56 | Damon Chaplin (damon@gnome.org) | 56 | Damon Chaplin (damon@gnome.org) |
483 | 57 | 57 | ||
485 | 58 | (FooCanvas can be found in GNOME svn in the 'foocanvas' module. | 58 | (FooCanvas can be found in GNOME git repository in the 'foocanvas' module. |
486 | 59 | FooCanvas was based on GnomeCanvas, which is in the 'libgnomecanvas' module.) | 59 | FooCanvas was based on GnomeCanvas, which is in the 'libgnomecanvas' module.) |
487 | 60 | 60 | ||
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 @@ | |||
493 | 1 | # generated automatically by aclocal 1.11.1 -*- Autoconf -*- | 1 | # generated automatically by aclocal 1.11.6 -*- Autoconf -*- |
494 | 2 | 2 | ||
495 | 3 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, | 3 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
497 | 4 | # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | 4 | # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, |
498 | 5 | # Inc. | ||
499 | 5 | # This file is free software; the Free Software Foundation | 6 | # This file is free software; the Free Software Foundation |
500 | 6 | # gives unlimited permission to copy and/or distribute it, | 7 | # gives unlimited permission to copy and/or distribute it, |
501 | 7 | # with or without modifications, as long as this notice is preserved. | 8 | # with or without modifications, as long as this notice is preserved. |
502 | @@ -19,600 +20,11 @@ | |||
503 | 19 | If you have problems, you may need to regenerate the build system entirely. | 20 | If you have problems, you may need to regenerate the build system entirely. |
504 | 20 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) | 21 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
505 | 21 | 22 | ||
506 | 22 | # Copyright (C) 1995-2002 Free Software Foundation, Inc. | ||
507 | 23 | # Copyright (C) 2001-2003,2004 Red Hat, Inc. | ||
508 | 24 | # | ||
509 | 25 | # This file is free software, distributed under the terms of the GNU | ||
510 | 26 | # General Public License. As a special exception to the GNU General | ||
511 | 27 | # Public License, this file may be distributed as part of a program | ||
512 | 28 | # that contains a configuration script generated by Autoconf, under | ||
513 | 29 | # the same distribution terms as the rest of that program. | ||
514 | 30 | # | ||
515 | 31 | # This file can be copied and used freely without restrictions. It can | ||
516 | 32 | # be used in projects which are not available under the GNU Public License | ||
517 | 33 | # but which still want to provide support for the GNU gettext functionality. | ||
518 | 34 | # | ||
519 | 35 | # Macro to add for using GNU gettext. | ||
520 | 36 | # Ulrich Drepper <drepper@cygnus.com>, 1995, 1996 | ||
521 | 37 | # | ||
522 | 38 | # Modified to never use included libintl. | ||
523 | 39 | # Owen Taylor <otaylor@redhat.com>, 12/15/1998 | ||
524 | 40 | # | ||
525 | 41 | # Major rework to remove unused code | ||
526 | 42 | # Owen Taylor <otaylor@redhat.com>, 12/11/2002 | ||
527 | 43 | # | ||
528 | 44 | # Added better handling of ALL_LINGUAS from GNU gettext version | ||
529 | 45 | # written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002 | ||
530 | 46 | # | ||
531 | 47 | # Modified to require ngettext | ||
532 | 48 | # Matthias Clasen <mclasen@redhat.com> 08/06/2004 | ||
533 | 49 | # | ||
534 | 50 | # We need this here as well, since someone might use autoconf-2.5x | ||
535 | 51 | # to configure GLib then an older version to configure a package | ||
536 | 52 | # using AM_GLIB_GNU_GETTEXT | ||
537 | 53 | AC_PREREQ(2.53) | ||
538 | 54 | |||
539 | 55 | dnl | ||
540 | 56 | dnl We go to great lengths to make sure that aclocal won't | ||
541 | 57 | dnl try to pull in the installed version of these macros | ||
542 | 58 | dnl when running aclocal in the glib directory. | ||
543 | 59 | dnl | ||
544 | 60 | m4_copy([AC_DEFUN],[glib_DEFUN]) | ||
545 | 61 | m4_copy([AC_REQUIRE],[glib_REQUIRE]) | ||
546 | 62 | dnl | ||
547 | 63 | dnl At the end, if we're not within glib, we'll define the public | ||
548 | 64 | dnl definitions in terms of our private definitions. | ||
549 | 65 | dnl | ||
550 | 66 | |||
551 | 67 | # GLIB_LC_MESSAGES | ||
552 | 68 | #-------------------- | ||
553 | 69 | glib_DEFUN([GLIB_LC_MESSAGES], | ||
554 | 70 | [AC_CHECK_HEADERS([locale.h]) | ||
555 | 71 | if test $ac_cv_header_locale_h = yes; then | ||
556 | 72 | AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, | ||
557 | 73 | [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], | ||
558 | 74 | am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) | ||
559 | 75 | if test $am_cv_val_LC_MESSAGES = yes; then | ||
560 | 76 | AC_DEFINE(HAVE_LC_MESSAGES, 1, | ||
561 | 77 | [Define if your <locale.h> file defines LC_MESSAGES.]) | ||
562 | 78 | fi | ||
563 | 79 | fi]) | ||
564 | 80 | |||
565 | 81 | # GLIB_PATH_PROG_WITH_TEST | ||
566 | 82 | #---------------------------- | ||
567 | 83 | dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, | ||
568 | 84 | dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) | ||
569 | 85 | glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], | ||
570 | 86 | [# Extract the first word of "$2", so it can be a program name with args. | ||
571 | 87 | set dummy $2; ac_word=[$]2 | ||
572 | 88 | AC_MSG_CHECKING([for $ac_word]) | ||
573 | 89 | AC_CACHE_VAL(ac_cv_path_$1, | ||
574 | 90 | [case "[$]$1" in | ||
575 | 91 | /*) | ||
576 | 92 | ac_cv_path_$1="[$]$1" # Let the user override the test with a path. | ||
577 | 93 | ;; | ||
578 | 94 | *) | ||
579 | 95 | IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" | ||
580 | 96 | for ac_dir in ifelse([$5], , $PATH, [$5]); do | ||
581 | 97 | test -z "$ac_dir" && ac_dir=. | ||
582 | 98 | if test -f $ac_dir/$ac_word; then | ||
583 | 99 | if [$3]; then | ||
584 | 100 | ac_cv_path_$1="$ac_dir/$ac_word" | ||
585 | 101 | break | ||
586 | 102 | fi | ||
587 | 103 | fi | ||
588 | 104 | done | ||
589 | 105 | IFS="$ac_save_ifs" | ||
590 | 106 | dnl If no 4th arg is given, leave the cache variable unset, | ||
591 | 107 | dnl so AC_PATH_PROGS will keep looking. | ||
592 | 108 | ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" | ||
593 | 109 | ])dnl | ||
594 | 110 | ;; | ||
595 | 111 | esac])dnl | ||
596 | 112 | $1="$ac_cv_path_$1" | ||
597 | 113 | if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then | ||
598 | 114 | AC_MSG_RESULT([$]$1) | ||
599 | 115 | else | ||
600 | 116 | AC_MSG_RESULT(no) | ||
601 | 117 | fi | ||
602 | 118 | AC_SUBST($1)dnl | ||
603 | 119 | ]) | ||
604 | 120 | |||
605 | 121 | # GLIB_WITH_NLS | ||
606 | 122 | #----------------- | ||
607 | 123 | glib_DEFUN([GLIB_WITH_NLS], | ||
608 | 124 | dnl NLS is obligatory | ||
609 | 125 | [USE_NLS=yes | ||
610 | 126 | AC_SUBST(USE_NLS) | ||
611 | 127 | |||
612 | 128 | gt_cv_have_gettext=no | ||
613 | 129 | |||
614 | 130 | CATOBJEXT=NONE | ||
615 | 131 | XGETTEXT=: | ||
616 | 132 | INTLLIBS= | ||
617 | 133 | |||
618 | 134 | AC_CHECK_HEADER(libintl.h, | ||
619 | 135 | [gt_cv_func_dgettext_libintl="no" | ||
620 | 136 | libintl_extra_libs="" | ||
621 | 137 | |||
622 | 138 | # | ||
623 | 139 | # First check in libc | ||
624 | 140 | # | ||
625 | 141 | AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, | ||
626 | 142 | [AC_TRY_LINK([ | ||
627 | 143 | #include <libintl.h> | ||
628 | 144 | ], | ||
629 | 145 | [return !ngettext ("","", 1)], | ||
630 | 146 | gt_cv_func_ngettext_libc=yes, | ||
631 | 147 | gt_cv_func_ngettext_libc=no) | ||
632 | 148 | ]) | ||
633 | 149 | |||
634 | 150 | if test "$gt_cv_func_ngettext_libc" = "yes" ; then | ||
635 | 151 | AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, | ||
636 | 152 | [AC_TRY_LINK([ | ||
637 | 153 | #include <libintl.h> | ||
638 | 154 | ], | ||
639 | 155 | [return !dgettext ("","")], | ||
640 | 156 | gt_cv_func_dgettext_libc=yes, | ||
641 | 157 | gt_cv_func_dgettext_libc=no) | ||
642 | 158 | ]) | ||
643 | 159 | fi | ||
644 | 160 | |||
645 | 161 | if test "$gt_cv_func_ngettext_libc" = "yes" ; then | ||
646 | 162 | AC_CHECK_FUNCS(bind_textdomain_codeset) | ||
647 | 163 | fi | ||
648 | 164 | |||
649 | 165 | # | ||
650 | 166 | # If we don't have everything we want, check in libintl | ||
651 | 167 | # | ||
652 | 168 | if test "$gt_cv_func_dgettext_libc" != "yes" \ | ||
653 | 169 | || test "$gt_cv_func_ngettext_libc" != "yes" \ | ||
654 | 170 | || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then | ||
655 | 171 | |||
656 | 172 | AC_CHECK_LIB(intl, bindtextdomain, | ||
657 | 173 | [AC_CHECK_LIB(intl, ngettext, | ||
658 | 174 | [AC_CHECK_LIB(intl, dgettext, | ||
659 | 175 | gt_cv_func_dgettext_libintl=yes)])]) | ||
660 | 176 | |||
661 | 177 | if test "$gt_cv_func_dgettext_libintl" != "yes" ; then | ||
662 | 178 | AC_MSG_CHECKING([if -liconv is needed to use gettext]) | ||
663 | 179 | AC_MSG_RESULT([]) | ||
664 | 180 | AC_CHECK_LIB(intl, ngettext, | ||
665 | 181 | [AC_CHECK_LIB(intl, dcgettext, | ||
666 | 182 | [gt_cv_func_dgettext_libintl=yes | ||
667 | 183 | libintl_extra_libs=-liconv], | ||
668 | 184 | :,-liconv)], | ||
669 | 185 | :,-liconv) | ||
670 | 186 | fi | ||
671 | 187 | |||
672 | 188 | # | ||
673 | 189 | # If we found libintl, then check in it for bind_textdomain_codeset(); | ||
674 | 190 | # we'll prefer libc if neither have bind_textdomain_codeset(), | ||
675 | 191 | # and both have dgettext and ngettext | ||
676 | 192 | # | ||
677 | 193 | if test "$gt_cv_func_dgettext_libintl" = "yes" ; then | ||
678 | 194 | glib_save_LIBS="$LIBS" | ||
679 | 195 | LIBS="$LIBS -lintl $libintl_extra_libs" | ||
680 | 196 | unset ac_cv_func_bind_textdomain_codeset | ||
681 | 197 | AC_CHECK_FUNCS(bind_textdomain_codeset) | ||
682 | 198 | LIBS="$glib_save_LIBS" | ||
683 | 199 | |||
684 | 200 | if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then | ||
685 | 201 | gt_cv_func_dgettext_libc=no | ||
686 | 202 | else | ||
687 | 203 | if test "$gt_cv_func_dgettext_libc" = "yes" \ | ||
688 | 204 | && test "$gt_cv_func_ngettext_libc" = "yes"; then | ||
689 | 205 | gt_cv_func_dgettext_libintl=no | ||
690 | 206 | fi | ||
691 | 207 | fi | ||
692 | 208 | fi | ||
693 | 209 | fi | ||
694 | 210 | |||
695 | 211 | if test "$gt_cv_func_dgettext_libc" = "yes" \ | ||
696 | 212 | || test "$gt_cv_func_dgettext_libintl" = "yes"; then | ||
697 | 213 | gt_cv_have_gettext=yes | ||
698 | 214 | fi | ||
699 | 215 | |||
700 | 216 | if test "$gt_cv_func_dgettext_libintl" = "yes"; then | ||
701 | 217 | INTLLIBS="-lintl $libintl_extra_libs" | ||
702 | 218 | fi | ||
703 | 219 | |||
704 | 220 | if test "$gt_cv_have_gettext" = "yes"; then | ||
705 | 221 | AC_DEFINE(HAVE_GETTEXT,1, | ||
706 | 222 | [Define if the GNU gettext() function is already present or preinstalled.]) | ||
707 | 223 | GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, | ||
708 | 224 | [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl | ||
709 | 225 | if test "$MSGFMT" != "no"; then | ||
710 | 226 | glib_save_LIBS="$LIBS" | ||
711 | 227 | LIBS="$LIBS $INTLLIBS" | ||
712 | 228 | AC_CHECK_FUNCS(dcgettext) | ||
713 | 229 | MSGFMT_OPTS= | ||
714 | 230 | AC_MSG_CHECKING([if msgfmt accepts -c]) | ||
715 | 231 | GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ | ||
716 | 232 | msgid "" | ||
717 | 233 | msgstr "" | ||
718 | 234 | "Content-Type: text/plain; charset=UTF-8\n" | ||
719 | 235 | "Project-Id-Version: test 1.0\n" | ||
720 | 236 | "PO-Revision-Date: 2007-02-15 12:01+0100\n" | ||
721 | 237 | "Last-Translator: test <foo@bar.xx>\n" | ||
722 | 238 | "Language-Team: C <LL@li.org>\n" | ||
723 | 239 | "MIME-Version: 1.0\n" | ||
724 | 240 | "Content-Transfer-Encoding: 8bit\n" | ||
725 | 241 | ], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) | ||
726 | 242 | AC_SUBST(MSGFMT_OPTS) | ||
727 | 243 | AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) | ||
728 | 244 | GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, | ||
729 | 245 | [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) | ||
730 | 246 | AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; | ||
731 | 247 | return _nl_msg_cat_cntr], | ||
732 | 248 | [CATOBJEXT=.gmo | ||
733 | 249 | DATADIRNAME=share], | ||
734 | 250 | [case $host in | ||
735 | 251 | *-*-solaris*) | ||
736 | 252 | dnl On Solaris, if bind_textdomain_codeset is in libc, | ||
737 | 253 | dnl GNU format message catalog is always supported, | ||
738 | 254 | dnl since both are added to the libc all together. | ||
739 | 255 | dnl Hence, we'd like to go with DATADIRNAME=share and | ||
740 | 256 | dnl and CATOBJEXT=.gmo in this case. | ||
741 | 257 | AC_CHECK_FUNC(bind_textdomain_codeset, | ||
742 | 258 | [CATOBJEXT=.gmo | ||
743 | 259 | DATADIRNAME=share], | ||
744 | 260 | [CATOBJEXT=.mo | ||
745 | 261 | DATADIRNAME=lib]) | ||
746 | 262 | ;; | ||
747 | 263 | *) | ||
748 | 264 | CATOBJEXT=.mo | ||
749 | 265 | DATADIRNAME=lib | ||
750 | 266 | ;; | ||
751 | 267 | esac]) | ||
752 | 268 | LIBS="$glib_save_LIBS" | ||
753 | 269 | INSTOBJEXT=.mo | ||
754 | 270 | else | ||
755 | 271 | gt_cv_have_gettext=no | ||
756 | 272 | fi | ||
757 | 273 | fi | ||
758 | 274 | ]) | ||
759 | 275 | |||
760 | 276 | if test "$gt_cv_have_gettext" = "yes" ; then | ||
761 | 277 | AC_DEFINE(ENABLE_NLS, 1, | ||
762 | 278 | [always defined to indicate that i18n is enabled]) | ||
763 | 279 | fi | ||
764 | 280 | |||
765 | 281 | dnl Test whether we really found GNU xgettext. | ||
766 | 282 | if test "$XGETTEXT" != ":"; then | ||
767 | 283 | dnl If it is not GNU xgettext we define it as : so that the | ||
768 | 284 | dnl Makefiles still can work. | ||
769 | 285 | if $XGETTEXT --omit-header /dev/null 2> /dev/null; then | ||
770 | 286 | : ; | ||
771 | 287 | else | ||
772 | 288 | AC_MSG_RESULT( | ||
773 | 289 | [found xgettext program is not GNU xgettext; ignore it]) | ||
774 | 290 | XGETTEXT=":" | ||
775 | 291 | fi | ||
776 | 292 | fi | ||
777 | 293 | |||
778 | 294 | # We need to process the po/ directory. | ||
779 | 295 | POSUB=po | ||
780 | 296 | |||
781 | 297 | AC_OUTPUT_COMMANDS( | ||
782 | 298 | [case "$CONFIG_FILES" in *po/Makefile.in*) | ||
783 | 299 | sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile | ||
784 | 300 | esac]) | ||
785 | 301 | |||
786 | 302 | dnl These rules are solely for the distribution goal. While doing this | ||
787 | 303 | dnl we only have to keep exactly one list of the available catalogs | ||
788 | 304 | dnl in configure.in. | ||
789 | 305 | for lang in $ALL_LINGUAS; do | ||
790 | 306 | GMOFILES="$GMOFILES $lang.gmo" | ||
791 | 307 | POFILES="$POFILES $lang.po" | ||
792 | 308 | done | ||
793 | 309 | |||
794 | 310 | dnl Make all variables we use known to autoconf. | ||
795 | 311 | AC_SUBST(CATALOGS) | ||
796 | 312 | AC_SUBST(CATOBJEXT) | ||
797 | 313 | AC_SUBST(DATADIRNAME) | ||
798 | 314 | AC_SUBST(GMOFILES) | ||
799 | 315 | AC_SUBST(INSTOBJEXT) | ||
800 | 316 | AC_SUBST(INTLLIBS) | ||
801 | 317 | AC_SUBST(PO_IN_DATADIR_TRUE) | ||
802 | 318 | AC_SUBST(PO_IN_DATADIR_FALSE) | ||
803 | 319 | AC_SUBST(POFILES) | ||
804 | 320 | AC_SUBST(POSUB) | ||
805 | 321 | ]) | ||
806 | 322 | |||
807 | 323 | # AM_GLIB_GNU_GETTEXT | ||
808 | 324 | # ------------------- | ||
809 | 325 | # Do checks necessary for use of gettext. If a suitable implementation | ||
810 | 326 | # of gettext is found in either in libintl or in the C library, | ||
811 | 327 | # it will set INTLLIBS to the libraries needed for use of gettext | ||
812 | 328 | # and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable | ||
813 | 329 | # gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() | ||
814 | 330 | # on various variables needed by the Makefile.in.in installed by | ||
815 | 331 | # glib-gettextize. | ||
816 | 332 | dnl | ||
817 | 333 | glib_DEFUN([GLIB_GNU_GETTEXT], | ||
818 | 334 | [AC_REQUIRE([AC_PROG_CC])dnl | ||
819 | 335 | AC_REQUIRE([AC_HEADER_STDC])dnl | ||
820 | 336 | |||
821 | 337 | GLIB_LC_MESSAGES | ||
822 | 338 | GLIB_WITH_NLS | ||
823 | 339 | |||
824 | 340 | if test "$gt_cv_have_gettext" = "yes"; then | ||
825 | 341 | if test "x$ALL_LINGUAS" = "x"; then | ||
826 | 342 | LINGUAS= | ||
827 | 343 | else | ||
828 | 344 | AC_MSG_CHECKING(for catalogs to be installed) | ||
829 | 345 | NEW_LINGUAS= | ||
830 | 346 | for presentlang in $ALL_LINGUAS; do | ||
831 | 347 | useit=no | ||
832 | 348 | if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then | ||
833 | 349 | desiredlanguages="$LINGUAS" | ||
834 | 350 | else | ||
835 | 351 | desiredlanguages="$ALL_LINGUAS" | ||
836 | 352 | fi | ||
837 | 353 | for desiredlang in $desiredlanguages; do | ||
838 | 354 | # Use the presentlang catalog if desiredlang is | ||
839 | 355 | # a. equal to presentlang, or | ||
840 | 356 | # b. a variant of presentlang (because in this case, | ||
841 | 357 | # presentlang can be used as a fallback for messages | ||
842 | 358 | # which are not translated in the desiredlang catalog). | ||
843 | 359 | case "$desiredlang" in | ||
844 | 360 | "$presentlang"*) useit=yes;; | ||
845 | 361 | esac | ||
846 | 362 | done | ||
847 | 363 | if test $useit = yes; then | ||
848 | 364 | NEW_LINGUAS="$NEW_LINGUAS $presentlang" | ||
849 | 365 | fi | ||
850 | 366 | done | ||
851 | 367 | LINGUAS=$NEW_LINGUAS | ||
852 | 368 | AC_MSG_RESULT($LINGUAS) | ||
853 | 369 | fi | ||
854 | 370 | |||
855 | 371 | dnl Construct list of names of catalog files to be constructed. | ||
856 | 372 | if test -n "$LINGUAS"; then | ||
857 | 373 | for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done | ||
858 | 374 | fi | ||
859 | 375 | fi | ||
860 | 376 | |||
861 | 377 | dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly | ||
862 | 378 | dnl find the mkinstalldirs script in another subdir but ($top_srcdir). | ||
863 | 379 | dnl Try to locate is. | ||
864 | 380 | MKINSTALLDIRS= | ||
865 | 381 | if test -n "$ac_aux_dir"; then | ||
866 | 382 | MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" | ||
867 | 383 | fi | ||
868 | 384 | if test -z "$MKINSTALLDIRS"; then | ||
869 | 385 | MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" | ||
870 | 386 | fi | ||
871 | 387 | AC_SUBST(MKINSTALLDIRS) | ||
872 | 388 | |||
873 | 389 | dnl Generate list of files to be processed by xgettext which will | ||
874 | 390 | dnl be included in po/Makefile. | ||
875 | 391 | test -d po || mkdir po | ||
876 | 392 | if test "x$srcdir" != "x."; then | ||
877 | 393 | if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then | ||
878 | 394 | posrcprefix="$srcdir/" | ||
879 | 395 | else | ||
880 | 396 | posrcprefix="../$srcdir/" | ||
881 | 397 | fi | ||
882 | 398 | else | ||
883 | 399 | posrcprefix="../" | ||
884 | 400 | fi | ||
885 | 401 | rm -f po/POTFILES | ||
886 | 402 | sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ | ||
887 | 403 | < $srcdir/po/POTFILES.in > po/POTFILES | ||
888 | 404 | ]) | ||
889 | 405 | |||
890 | 406 | # AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) | ||
891 | 407 | # ------------------------------- | ||
892 | 408 | # Define VARIABLE to the location where catalog files will | ||
893 | 409 | # be installed by po/Makefile. | ||
894 | 410 | glib_DEFUN([GLIB_DEFINE_LOCALEDIR], | ||
895 | 411 | [glib_REQUIRE([GLIB_GNU_GETTEXT])dnl | ||
896 | 412 | glib_save_prefix="$prefix" | ||
897 | 413 | glib_save_exec_prefix="$exec_prefix" | ||
898 | 414 | glib_save_datarootdir="$datarootdir" | ||
899 | 415 | test "x$prefix" = xNONE && prefix=$ac_default_prefix | ||
900 | 416 | test "x$exec_prefix" = xNONE && exec_prefix=$prefix | ||
901 | 417 | datarootdir=`eval echo "${datarootdir}"` | ||
902 | 418 | if test "x$CATOBJEXT" = "x.mo" ; then | ||
903 | 419 | localedir=`eval echo "${libdir}/locale"` | ||
904 | 420 | else | ||
905 | 421 | localedir=`eval echo "${datadir}/locale"` | ||
906 | 422 | fi | ||
907 | 423 | prefix="$glib_save_prefix" | ||
908 | 424 | exec_prefix="$glib_save_exec_prefix" | ||
909 | 425 | datarootdir="$glib_save_datarootdir" | ||
910 | 426 | AC_DEFINE_UNQUOTED($1, "$localedir", | ||
911 | 427 | [Define the location where the catalogs will be installed]) | ||
912 | 428 | ]) | ||
913 | 429 | |||
914 | 430 | dnl | ||
915 | 431 | dnl Now the definitions that aclocal will find | ||
916 | 432 | dnl | ||
917 | 433 | ifdef(glib_configure_in,[],[ | ||
918 | 434 | AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) | ||
919 | 435 | AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) | ||
920 | 436 | ])dnl | ||
921 | 437 | |||
922 | 438 | # GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) | ||
923 | 439 | # | ||
924 | 440 | # Create a temporary file with TEST-FILE as its contents and pass the | ||
925 | 441 | # file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with | ||
926 | 442 | # 0 and perform ACTION-IF-FAIL for any other exit status. | ||
927 | 443 | AC_DEFUN([GLIB_RUN_PROG], | ||
928 | 444 | [cat >conftest.foo <<_ACEOF | ||
929 | 445 | $2 | ||
930 | 446 | _ACEOF | ||
931 | 447 | if AC_RUN_LOG([$1 conftest.foo]); then | ||
932 | 448 | m4_ifval([$3], [$3], [:]) | ||
933 | 449 | m4_ifvaln([$4], [else $4])dnl | ||
934 | 450 | echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD | ||
935 | 451 | sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD | ||
936 | 452 | fi]) | ||
937 | 453 | |||
938 | 454 | |||
939 | 455 | dnl -*- mode: autoconf -*- | ||
940 | 456 | |||
941 | 457 | # serial 1 | ||
942 | 458 | |||
943 | 459 | dnl Usage: | ||
944 | 460 | dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) | ||
945 | 461 | AC_DEFUN([GTK_DOC_CHECK], | ||
946 | 462 | [ | ||
947 | 463 | AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first | ||
948 | 464 | AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first | ||
949 | 465 | |||
950 | 466 | dnl check for tools we added during development | ||
951 | 467 | AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check]) | ||
952 | 468 | AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) | ||
953 | 469 | AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) | ||
954 | 470 | |||
955 | 471 | dnl for overriding the documentation installation directory | ||
956 | 472 | AC_ARG_WITH([html-dir], | ||
957 | 473 | AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, | ||
958 | 474 | [with_html_dir='${datadir}/gtk-doc/html']) | ||
959 | 475 | HTML_DIR="$with_html_dir" | ||
960 | 476 | AC_SUBST([HTML_DIR]) | ||
961 | 477 | |||
962 | 478 | dnl enable/disable documentation building | ||
963 | 479 | AC_ARG_ENABLE([gtk-doc], | ||
964 | 480 | AS_HELP_STRING([--enable-gtk-doc], | ||
965 | 481 | [use gtk-doc to build documentation [[default=no]]]),, | ||
966 | 482 | [enable_gtk_doc=no]) | ||
967 | 483 | |||
968 | 484 | if test x$enable_gtk_doc = xyes; then | ||
969 | 485 | ifelse([$1],[], | ||
970 | 486 | [PKG_CHECK_EXISTS([gtk-doc],, | ||
971 | 487 | AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], | ||
972 | 488 | [PKG_CHECK_EXISTS([gtk-doc >= $1],, | ||
973 | 489 | AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))]) | ||
974 | 490 | fi | ||
975 | 491 | |||
976 | 492 | AC_MSG_CHECKING([whether to build gtk-doc documentation]) | ||
977 | 493 | AC_MSG_RESULT($enable_gtk_doc) | ||
978 | 494 | |||
979 | 495 | dnl enable/disable output formats | ||
980 | 496 | AC_ARG_ENABLE([gtk-doc-html], | ||
981 | 497 | AS_HELP_STRING([--enable-gtk-doc-html], | ||
982 | 498 | [build documentation in html format [[default=yes]]]),, | ||
983 | 499 | [enable_gtk_doc_html=yes]) | ||
984 | 500 | AC_ARG_ENABLE([gtk-doc-pdf], | ||
985 | 501 | AS_HELP_STRING([--enable-gtk-doc-pdf], | ||
986 | 502 | [build documentation in pdf format [[default=no]]]),, | ||
987 | 503 | [enable_gtk_doc_pdf=no]) | ||
988 | 504 | |||
989 | 505 | if test -z "$GTKDOC_MKPDF"; then | ||
990 | 506 | enable_gtk_doc_pdf=no | ||
991 | 507 | fi | ||
992 | 508 | |||
993 | 509 | |||
994 | 510 | AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) | ||
995 | 511 | AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) | ||
996 | 512 | AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) | ||
997 | 513 | AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) | ||
998 | 514 | AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) | ||
999 | 515 | ]) | ||
1000 | 516 | |||
1001 | 517 | dnl -*- mode: autoconf -*- | ||
1002 | 518 | dnl Copyright 2009 Johan Dahlin | ||
1003 | 519 | dnl | ||
1004 | 520 | dnl This file is free software; the author(s) gives unlimited | ||
1005 | 521 | dnl permission to copy and/or distribute it, with or without | ||
1006 | 522 | dnl modifications, as long as this notice is preserved. | ||
1007 | 523 | dnl | ||
1008 | 524 | |||
1009 | 525 | # serial 1 | ||
1010 | 526 | |||
1011 | 527 | m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], | ||
1012 | 528 | [ | ||
1013 | 529 | AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first | ||
1014 | 530 | AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first | ||
1015 | 531 | AC_BEFORE([LT_INIT],[$0])dnl setup libtool first | ||
1016 | 532 | |||
1017 | 533 | dnl enable/disable introspection | ||
1018 | 534 | m4_if([$2], [require], | ||
1019 | 535 | [dnl | ||
1020 | 536 | enable_introspection=yes | ||
1021 | 537 | ],[dnl | ||
1022 | 538 | AC_ARG_ENABLE(introspection, | ||
1023 | 539 | AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], | ||
1024 | 540 | [Enable introspection for this build]),, | ||
1025 | 541 | [enable_introspection=auto]) | ||
1026 | 542 | ])dnl | ||
1027 | 543 | |||
1028 | 544 | AC_MSG_CHECKING([for gobject-introspection]) | ||
1029 | 545 | |||
1030 | 546 | dnl presence/version checking | ||
1031 | 547 | AS_CASE([$enable_introspection], | ||
1032 | 548 | [no], [dnl | ||
1033 | 549 | found_introspection="no (disabled, use --enable-introspection to enable)" | ||
1034 | 550 | ],dnl | ||
1035 | 551 | [yes],[dnl | ||
1036 | 552 | PKG_CHECK_EXISTS([gobject-introspection-1.0],, | ||
1037 | 553 | AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) | ||
1038 | 554 | PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], | ||
1039 | 555 | found_introspection=yes, | ||
1040 | 556 | AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) | ||
1041 | 557 | ],dnl | ||
1042 | 558 | [auto],[dnl | ||
1043 | 559 | PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) | ||
1044 | 560 | ],dnl | ||
1045 | 561 | [dnl | ||
1046 | 562 | AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) | ||
1047 | 563 | ])dnl | ||
1048 | 564 | |||
1049 | 565 | AC_MSG_RESULT([$found_introspection]) | ||
1050 | 566 | |||
1051 | 567 | INTROSPECTION_SCANNER= | ||
1052 | 568 | INTROSPECTION_COMPILER= | ||
1053 | 569 | INTROSPECTION_GENERATE= | ||
1054 | 570 | INTROSPECTION_GIRDIR= | ||
1055 | 571 | INTROSPECTION_TYPELIBDIR= | ||
1056 | 572 | if test "x$found_introspection" = "xyes"; then | ||
1057 | 573 | INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` | ||
1058 | 574 | INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` | ||
1059 | 575 | INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` | ||
1060 | 576 | INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` | ||
1061 | 577 | INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" | ||
1062 | 578 | INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` | ||
1063 | 579 | INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` | ||
1064 | 580 | INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection | ||
1065 | 581 | fi | ||
1066 | 582 | AC_SUBST(INTROSPECTION_SCANNER) | ||
1067 | 583 | AC_SUBST(INTROSPECTION_COMPILER) | ||
1068 | 584 | AC_SUBST(INTROSPECTION_GENERATE) | ||
1069 | 585 | AC_SUBST(INTROSPECTION_GIRDIR) | ||
1070 | 586 | AC_SUBST(INTROSPECTION_TYPELIBDIR) | ||
1071 | 587 | AC_SUBST(INTROSPECTION_CFLAGS) | ||
1072 | 588 | AC_SUBST(INTROSPECTION_LIBS) | ||
1073 | 589 | AC_SUBST(INTROSPECTION_MAKEFILE) | ||
1074 | 590 | |||
1075 | 591 | AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") | ||
1076 | 592 | ]) | ||
1077 | 593 | |||
1078 | 594 | |||
1079 | 595 | dnl Usage: | ||
1080 | 596 | dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) | ||
1081 | 597 | |||
1082 | 598 | AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], | ||
1083 | 599 | [ | ||
1084 | 600 | _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) | ||
1085 | 601 | ]) | ||
1086 | 602 | |||
1087 | 603 | dnl Usage: | ||
1088 | 604 | dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) | ||
1089 | 605 | |||
1090 | 606 | |||
1091 | 607 | AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], | ||
1092 | 608 | [ | ||
1093 | 609 | _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) | ||
1094 | 610 | ]) | ||
1095 | 611 | |||
1096 | 612 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- | 23 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
1097 | 613 | # | 24 | # |
1098 | 614 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 25 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
1100 | 615 | # 2006, 2007, 2008 Free Software Foundation, Inc. | 26 | # 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
1101 | 27 | # Foundation, Inc. | ||
1102 | 616 | # Written by Gordon Matzigkeit, 1996 | 28 | # Written by Gordon Matzigkeit, 1996 |
1103 | 617 | # | 29 | # |
1104 | 618 | # This file is free software; the Free Software Foundation gives | 30 | # This file is free software; the Free Software Foundation gives |
1105 | @@ -621,7 +33,8 @@ | |||
1106 | 621 | 33 | ||
1107 | 622 | m4_define([_LT_COPYING], [dnl | 34 | m4_define([_LT_COPYING], [dnl |
1108 | 623 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 35 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
1110 | 624 | # 2006, 2007, 2008 Free Software Foundation, Inc. | 36 | # 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
1111 | 37 | # Foundation, Inc. | ||
1112 | 625 | # Written by Gordon Matzigkeit, 1996 | 38 | # Written by Gordon Matzigkeit, 1996 |
1113 | 626 | # | 39 | # |
1114 | 627 | # This file is part of GNU Libtool. | 40 | # This file is part of GNU Libtool. |
1115 | @@ -648,7 +61,7 @@ | |||
1116 | 648 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | 61 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
1117 | 649 | ]) | 62 | ]) |
1118 | 650 | 63 | ||
1120 | 651 | # serial 56 LT_INIT | 64 | # serial 57 LT_INIT |
1121 | 652 | 65 | ||
1122 | 653 | 66 | ||
1123 | 654 | # LT_PREREQ(VERSION) | 67 | # LT_PREREQ(VERSION) |
1124 | @@ -677,6 +90,7 @@ | |||
1125 | 677 | # ------------------ | 90 | # ------------------ |
1126 | 678 | AC_DEFUN([LT_INIT], | 91 | AC_DEFUN([LT_INIT], |
1127 | 679 | [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT | 92 | [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT |
1128 | 93 | AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl | ||
1129 | 680 | AC_BEFORE([$0], [LT_LANG])dnl | 94 | AC_BEFORE([$0], [LT_LANG])dnl |
1130 | 681 | AC_BEFORE([$0], [LT_OUTPUT])dnl | 95 | AC_BEFORE([$0], [LT_OUTPUT])dnl |
1131 | 682 | AC_BEFORE([$0], [LTDL_INIT])dnl | 96 | AC_BEFORE([$0], [LTDL_INIT])dnl |
1132 | @@ -693,6 +107,8 @@ | |||
1133 | 693 | AC_REQUIRE([LTOBSOLETE_VERSION])dnl | 107 | AC_REQUIRE([LTOBSOLETE_VERSION])dnl |
1134 | 694 | m4_require([_LT_PROG_LTMAIN])dnl | 108 | m4_require([_LT_PROG_LTMAIN])dnl |
1135 | 695 | 109 | ||
1136 | 110 | _LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) | ||
1137 | 111 | |||
1138 | 696 | dnl Parse OPTIONS | 112 | dnl Parse OPTIONS |
1139 | 697 | _LT_SET_OPTIONS([$0], [$1]) | 113 | _LT_SET_OPTIONS([$0], [$1]) |
1140 | 698 | 114 | ||
1141 | @@ -729,7 +145,7 @@ | |||
1142 | 729 | *) break;; | 145 | *) break;; |
1143 | 730 | esac | 146 | esac |
1144 | 731 | done | 147 | done |
1146 | 732 | cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` | 148 | cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` |
1147 | 733 | ]) | 149 | ]) |
1148 | 734 | 150 | ||
1149 | 735 | 151 | ||
1150 | @@ -749,6 +165,11 @@ | |||
1151 | 749 | m4_defun([_LT_SETUP], | 165 | m4_defun([_LT_SETUP], |
1152 | 750 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl | 166 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl |
1153 | 751 | AC_REQUIRE([AC_CANONICAL_BUILD])dnl | 167 | AC_REQUIRE([AC_CANONICAL_BUILD])dnl |
1154 | 168 | AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl | ||
1155 | 169 | AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl | ||
1156 | 170 | |||
1157 | 171 | _LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl | ||
1158 | 172 | dnl | ||
1159 | 752 | _LT_DECL([], [host_alias], [0], [The host system])dnl | 173 | _LT_DECL([], [host_alias], [0], [The host system])dnl |
1160 | 753 | _LT_DECL([], [host], [0])dnl | 174 | _LT_DECL([], [host], [0])dnl |
1161 | 754 | _LT_DECL([], [host_os], [0])dnl | 175 | _LT_DECL([], [host_os], [0])dnl |
1162 | @@ -771,10 +192,13 @@ | |||
1163 | 771 | dnl | 192 | dnl |
1164 | 772 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl | 193 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
1165 | 773 | m4_require([_LT_CHECK_SHELL_FEATURES])dnl | 194 | m4_require([_LT_CHECK_SHELL_FEATURES])dnl |
1166 | 195 | m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl | ||
1167 | 774 | m4_require([_LT_CMD_RELOAD])dnl | 196 | m4_require([_LT_CMD_RELOAD])dnl |
1168 | 775 | m4_require([_LT_CHECK_MAGIC_METHOD])dnl | 197 | m4_require([_LT_CHECK_MAGIC_METHOD])dnl |
1169 | 198 | m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl | ||
1170 | 776 | m4_require([_LT_CMD_OLD_ARCHIVE])dnl | 199 | m4_require([_LT_CMD_OLD_ARCHIVE])dnl |
1171 | 777 | m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl | 200 | m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl |
1172 | 201 | m4_require([_LT_WITH_SYSROOT])dnl | ||
1173 | 778 | 202 | ||
1174 | 779 | _LT_CONFIG_LIBTOOL_INIT([ | 203 | _LT_CONFIG_LIBTOOL_INIT([ |
1175 | 780 | # See if we are running on zsh, and set the options which allow our | 204 | # See if we are running on zsh, and set the options which allow our |
1176 | @@ -790,7 +214,6 @@ | |||
1177 | 790 | _LT_CHECK_OBJDIR | 214 | _LT_CHECK_OBJDIR |
1178 | 791 | 215 | ||
1179 | 792 | m4_require([_LT_TAG_COMPILER])dnl | 216 | m4_require([_LT_TAG_COMPILER])dnl |
1180 | 793 | _LT_PROG_ECHO_BACKSLASH | ||
1181 | 794 | 217 | ||
1182 | 795 | case $host_os in | 218 | case $host_os in |
1183 | 796 | aix3*) | 219 | aix3*) |
1184 | @@ -804,23 +227,6 @@ | |||
1185 | 804 | ;; | 227 | ;; |
1186 | 805 | esac | 228 | esac |
1187 | 806 | 229 | ||
1188 | 807 | # Sed substitution that helps us do robust quoting. It backslashifies | ||
1189 | 808 | # metacharacters that are still active within double-quoted strings. | ||
1190 | 809 | sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' | ||
1191 | 810 | |||
1192 | 811 | # Same as above, but do not quote variable references. | ||
1193 | 812 | double_quote_subst='s/\([["`\\]]\)/\\\1/g' | ||
1194 | 813 | |||
1195 | 814 | # Sed substitution to delay expansion of an escaped shell variable in a | ||
1196 | 815 | # double_quote_subst'ed string. | ||
1197 | 816 | delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' | ||
1198 | 817 | |||
1199 | 818 | # Sed substitution to delay expansion of an escaped single quote. | ||
1200 | 819 | delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' | ||
1201 | 820 | |||
1202 | 821 | # Sed substitution to avoid accidental globbing in evaled expressions | ||
1203 | 822 | no_glob_subst='s/\*/\\\*/g' | ||
1204 | 823 | |||
1205 | 824 | # Global variables: | 230 | # Global variables: |
1206 | 825 | ofile=libtool | 231 | ofile=libtool |
1207 | 826 | can_build_shared=yes | 232 | can_build_shared=yes |
1208 | @@ -861,6 +267,28 @@ | |||
1209 | 861 | ])# _LT_SETUP | 267 | ])# _LT_SETUP |
1210 | 862 | 268 | ||
1211 | 863 | 269 | ||
1212 | 270 | # _LT_PREPARE_SED_QUOTE_VARS | ||
1213 | 271 | # -------------------------- | ||
1214 | 272 | # Define a few sed substitution that help us do robust quoting. | ||
1215 | 273 | m4_defun([_LT_PREPARE_SED_QUOTE_VARS], | ||
1216 | 274 | [# Backslashify metacharacters that are still active within | ||
1217 | 275 | # double-quoted strings. | ||
1218 | 276 | sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' | ||
1219 | 277 | |||
1220 | 278 | # Same as above, but do not quote variable references. | ||
1221 | 279 | double_quote_subst='s/\([["`\\]]\)/\\\1/g' | ||
1222 | 280 | |||
1223 | 281 | # Sed substitution to delay expansion of an escaped shell variable in a | ||
1224 | 282 | # double_quote_subst'ed string. | ||
1225 | 283 | delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' | ||
1226 | 284 | |||
1227 | 285 | # Sed substitution to delay expansion of an escaped single quote. | ||
1228 | 286 | delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' | ||
1229 | 287 | |||
1230 | 288 | # Sed substitution to avoid accidental globbing in evaled expressions | ||
1231 | 289 | no_glob_subst='s/\*/\\\*/g' | ||
1232 | 290 | ]) | ||
1233 | 291 | |||
1234 | 864 | # _LT_PROG_LTMAIN | 292 | # _LT_PROG_LTMAIN |
1235 | 865 | # --------------- | 293 | # --------------- |
1236 | 866 | # Note that this code is called both from `configure', and `config.status' | 294 | # Note that this code is called both from `configure', and `config.status' |
1237 | @@ -1013,7 +441,7 @@ | |||
1238 | 1013 | # declaration there will have the same value as in `configure'. VARNAME | 441 | # declaration there will have the same value as in `configure'. VARNAME |
1239 | 1014 | # must have a single quote delimited value for this to work. | 442 | # must have a single quote delimited value for this to work. |
1240 | 1015 | m4_define([_LT_CONFIG_STATUS_DECLARE], | 443 | m4_define([_LT_CONFIG_STATUS_DECLARE], |
1242 | 1016 | [$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) | 444 | [$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) |
1243 | 1017 | 445 | ||
1244 | 1018 | 446 | ||
1245 | 1019 | # _LT_CONFIG_STATUS_DECLARATIONS | 447 | # _LT_CONFIG_STATUS_DECLARATIONS |
1246 | @@ -1023,7 +451,7 @@ | |||
1247 | 1023 | # embedded single quotes properly. In configure, this macro expands | 451 | # embedded single quotes properly. In configure, this macro expands |
1248 | 1024 | # each variable declared with _LT_DECL (and _LT_TAGDECL) into: | 452 | # each variable declared with _LT_DECL (and _LT_TAGDECL) into: |
1249 | 1025 | # | 453 | # |
1251 | 1026 | # <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`' | 454 | # <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`' |
1252 | 1027 | m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], | 455 | m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], |
1253 | 1028 | [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), | 456 | [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), |
1254 | 1029 | [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) | 457 | [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) |
1255 | @@ -1122,12 +550,20 @@ | |||
1256 | 1122 | LTCFLAGS='$LTCFLAGS' | 550 | LTCFLAGS='$LTCFLAGS' |
1257 | 1123 | compiler='$compiler_DEFAULT' | 551 | compiler='$compiler_DEFAULT' |
1258 | 1124 | 552 | ||
1259 | 553 | # A function that is used when there is no print builtin or printf. | ||
1260 | 554 | func_fallback_echo () | ||
1261 | 555 | { | ||
1262 | 556 | eval 'cat <<_LTECHO_EOF | ||
1263 | 557 | \$[]1 | ||
1264 | 558 | _LTECHO_EOF' | ||
1265 | 559 | } | ||
1266 | 560 | |||
1267 | 1125 | # Quote evaled strings. | 561 | # Quote evaled strings. |
1268 | 1126 | for var in lt_decl_all_varnames([[ \ | 562 | for var in lt_decl_all_varnames([[ \ |
1269 | 1127 | ]], lt_decl_quote_varnames); do | 563 | ]], lt_decl_quote_varnames); do |
1271 | 1128 | case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in | 564 | case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in |
1272 | 1129 | *[[\\\\\\\`\\"\\\$]]*) | 565 | *[[\\\\\\\`\\"\\\$]]*) |
1274 | 1130 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" | 566 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" |
1275 | 1131 | ;; | 567 | ;; |
1276 | 1132 | *) | 568 | *) |
1277 | 1133 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" | 569 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" |
1278 | @@ -1138,9 +574,9 @@ | |||
1279 | 1138 | # Double-quote double-evaled strings. | 574 | # Double-quote double-evaled strings. |
1280 | 1139 | for var in lt_decl_all_varnames([[ \ | 575 | for var in lt_decl_all_varnames([[ \ |
1281 | 1140 | ]], lt_decl_dquote_varnames); do | 576 | ]], lt_decl_dquote_varnames); do |
1283 | 1141 | case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in | 577 | case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in |
1284 | 1142 | *[[\\\\\\\`\\"\\\$]]*) | 578 | *[[\\\\\\\`\\"\\\$]]*) |
1286 | 1143 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" | 579 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" |
1287 | 1144 | ;; | 580 | ;; |
1288 | 1145 | *) | 581 | *) |
1289 | 1146 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" | 582 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" |
1290 | @@ -1148,16 +584,38 @@ | |||
1291 | 1148 | esac | 584 | esac |
1292 | 1149 | done | 585 | done |
1293 | 1150 | 586 | ||
1294 | 1151 | # Fix-up fallback echo if it was mangled by the above quoting rules. | ||
1295 | 1152 | case \$lt_ECHO in | ||
1296 | 1153 | *'\\\[$]0 --fallback-echo"')dnl " | ||
1297 | 1154 | lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` | ||
1298 | 1155 | ;; | ||
1299 | 1156 | esac | ||
1300 | 1157 | |||
1301 | 1158 | _LT_OUTPUT_LIBTOOL_INIT | 587 | _LT_OUTPUT_LIBTOOL_INIT |
1302 | 1159 | ]) | 588 | ]) |
1303 | 1160 | 589 | ||
1304 | 590 | # _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) | ||
1305 | 591 | # ------------------------------------ | ||
1306 | 592 | # Generate a child script FILE with all initialization necessary to | ||
1307 | 593 | # reuse the environment learned by the parent script, and make the | ||
1308 | 594 | # file executable. If COMMENT is supplied, it is inserted after the | ||
1309 | 595 | # `#!' sequence but before initialization text begins. After this | ||
1310 | 596 | # macro, additional text can be appended to FILE to form the body of | ||
1311 | 597 | # the child script. The macro ends with non-zero status if the | ||
1312 | 598 | # file could not be fully written (such as if the disk is full). | ||
1313 | 599 | m4_ifdef([AS_INIT_GENERATED], | ||
1314 | 600 | [m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], | ||
1315 | 601 | [m4_defun([_LT_GENERATED_FILE_INIT], | ||
1316 | 602 | [m4_require([AS_PREPARE])]dnl | ||
1317 | 603 | [m4_pushdef([AS_MESSAGE_LOG_FD])]dnl | ||
1318 | 604 | [lt_write_fail=0 | ||
1319 | 605 | cat >$1 <<_ASEOF || lt_write_fail=1 | ||
1320 | 606 | #! $SHELL | ||
1321 | 607 | # Generated by $as_me. | ||
1322 | 608 | $2 | ||
1323 | 609 | SHELL=\${CONFIG_SHELL-$SHELL} | ||
1324 | 610 | export SHELL | ||
1325 | 611 | _ASEOF | ||
1326 | 612 | cat >>$1 <<\_ASEOF || lt_write_fail=1 | ||
1327 | 613 | AS_SHELL_SANITIZE | ||
1328 | 614 | _AS_PREPARE | ||
1329 | 615 | exec AS_MESSAGE_FD>&1 | ||
1330 | 616 | _ASEOF | ||
1331 | 617 | test $lt_write_fail = 0 && chmod +x $1[]dnl | ||
1332 | 618 | m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT | ||
1333 | 1161 | 619 | ||
1334 | 1162 | # LT_OUTPUT | 620 | # LT_OUTPUT |
1335 | 1163 | # --------- | 621 | # --------- |
1336 | @@ -1167,20 +625,11 @@ | |||
1337 | 1167 | AC_DEFUN([LT_OUTPUT], | 625 | AC_DEFUN([LT_OUTPUT], |
1338 | 1168 | [: ${CONFIG_LT=./config.lt} | 626 | [: ${CONFIG_LT=./config.lt} |
1339 | 1169 | AC_MSG_NOTICE([creating $CONFIG_LT]) | 627 | AC_MSG_NOTICE([creating $CONFIG_LT]) |
1344 | 1170 | cat >"$CONFIG_LT" <<_LTEOF | 628 | _LT_GENERATED_FILE_INIT(["$CONFIG_LT"], |
1345 | 1171 | #! $SHELL | 629 | [# Run this file to recreate a libtool stub with the current configuration.]) |
1342 | 1172 | # Generated by $as_me. | ||
1343 | 1173 | # Run this file to recreate a libtool stub with the current configuration. | ||
1346 | 1174 | 630 | ||
1347 | 631 | cat >>"$CONFIG_LT" <<\_LTEOF | ||
1348 | 1175 | lt_cl_silent=false | 632 | lt_cl_silent=false |
1349 | 1176 | SHELL=\${CONFIG_SHELL-$SHELL} | ||
1350 | 1177 | _LTEOF | ||
1351 | 1178 | |||
1352 | 1179 | cat >>"$CONFIG_LT" <<\_LTEOF | ||
1353 | 1180 | AS_SHELL_SANITIZE | ||
1354 | 1181 | _AS_PREPARE | ||
1355 | 1182 | |||
1356 | 1183 | exec AS_MESSAGE_FD>&1 | ||
1357 | 1184 | exec AS_MESSAGE_LOG_FD>>config.log | 633 | exec AS_MESSAGE_LOG_FD>>config.log |
1358 | 1185 | { | 634 | { |
1359 | 1186 | echo | 635 | echo |
1360 | @@ -1206,7 +655,7 @@ | |||
1361 | 1206 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) | 655 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) |
1362 | 1207 | configured by $[0], generated by m4_PACKAGE_STRING. | 656 | configured by $[0], generated by m4_PACKAGE_STRING. |
1363 | 1208 | 657 | ||
1365 | 1209 | Copyright (C) 2008 Free Software Foundation, Inc. | 658 | Copyright (C) 2011 Free Software Foundation, Inc. |
1366 | 1210 | This config.lt script is free software; the Free Software Foundation | 659 | This config.lt script is free software; the Free Software Foundation |
1367 | 1211 | gives unlimited permision to copy, distribute and modify it." | 660 | gives unlimited permision to copy, distribute and modify it." |
1368 | 1212 | 661 | ||
1369 | @@ -1251,15 +700,13 @@ | |||
1370 | 1251 | # appending to config.log, which fails on DOS, as config.log is still kept | 700 | # appending to config.log, which fails on DOS, as config.log is still kept |
1371 | 1252 | # open by configure. Here we exec the FD to /dev/null, effectively closing | 701 | # open by configure. Here we exec the FD to /dev/null, effectively closing |
1372 | 1253 | # config.log, so it can be properly (re)opened and appended to by config.lt. | 702 | # config.log, so it can be properly (re)opened and appended to by config.lt. |
1382 | 1254 | if test "$no_create" != yes; then | 703 | lt_cl_success=: |
1383 | 1255 | lt_cl_success=: | 704 | test "$silent" = yes && |
1384 | 1256 | test "$silent" = yes && | 705 | lt_config_lt_args="$lt_config_lt_args --quiet" |
1385 | 1257 | lt_config_lt_args="$lt_config_lt_args --quiet" | 706 | exec AS_MESSAGE_LOG_FD>/dev/null |
1386 | 1258 | exec AS_MESSAGE_LOG_FD>/dev/null | 707 | $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false |
1387 | 1259 | $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false | 708 | exec AS_MESSAGE_LOG_FD>>config.log |
1388 | 1260 | exec AS_MESSAGE_LOG_FD>>config.log | 709 | $lt_cl_success || AS_EXIT(1) |
1380 | 1261 | $lt_cl_success || AS_EXIT(1) | ||
1381 | 1262 | fi | ||
1389 | 1263 | ])# LT_OUTPUT | 710 | ])# LT_OUTPUT |
1390 | 1264 | 711 | ||
1391 | 1265 | 712 | ||
1392 | @@ -1322,15 +769,12 @@ | |||
1393 | 1322 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 769 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
1394 | 1323 | # text mode, it properly converts lines to CR/LF. This bash problem | 770 | # text mode, it properly converts lines to CR/LF. This bash problem |
1395 | 1324 | # is reportedly fixed, but why not run on old versions too? | 771 | # is reportedly fixed, but why not run on old versions too? |
1405 | 1325 | sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ | 772 | sed '$q' "$ltmain" >> "$cfgfile" \ |
1406 | 1326 | || (rm -f "$cfgfile"; exit 1) | 773 | || (rm -f "$cfgfile"; exit 1) |
1407 | 1327 | 774 | ||
1408 | 1328 | _LT_PROG_XSI_SHELLFNS | 775 | _LT_PROG_REPLACE_SHELLFNS |
1409 | 1329 | 776 | ||
1410 | 1330 | sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | 777 | mv -f "$cfgfile" "$ofile" || |
1402 | 1331 | || (rm -f "$cfgfile"; exit 1) | ||
1403 | 1332 | |||
1404 | 1333 | mv -f "$cfgfile" "$ofile" || | ||
1411 | 1334 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | 778 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
1412 | 1335 | chmod +x "$ofile" | 779 | chmod +x "$ofile" |
1413 | 1336 | ], | 780 | ], |
1414 | @@ -1375,6 +819,7 @@ | |||
1415 | 1375 | m4_case([$1], | 819 | m4_case([$1], |
1416 | 1376 | [C], [_LT_LANG(C)], | 820 | [C], [_LT_LANG(C)], |
1417 | 1377 | [C++], [_LT_LANG(CXX)], | 821 | [C++], [_LT_LANG(CXX)], |
1418 | 822 | [Go], [_LT_LANG(GO)], | ||
1419 | 1378 | [Java], [_LT_LANG(GCJ)], | 823 | [Java], [_LT_LANG(GCJ)], |
1420 | 1379 | [Fortran 77], [_LT_LANG(F77)], | 824 | [Fortran 77], [_LT_LANG(F77)], |
1421 | 1380 | [Fortran], [_LT_LANG(FC)], | 825 | [Fortran], [_LT_LANG(FC)], |
1422 | @@ -1396,6 +841,29 @@ | |||
1423 | 1396 | ])# _LT_LANG | 841 | ])# _LT_LANG |
1424 | 1397 | 842 | ||
1425 | 1398 | 843 | ||
1426 | 844 | m4_ifndef([AC_PROG_GO], [ | ||
1427 | 845 | # NOTE: This macro has been submitted for inclusion into # | ||
1428 | 846 | # GNU Autoconf as AC_PROG_GO. When it is available in # | ||
1429 | 847 | # a released version of Autoconf we should remove this # | ||
1430 | 848 | # macro and use it instead. # | ||
1431 | 849 | m4_defun([AC_PROG_GO], | ||
1432 | 850 | [AC_LANG_PUSH(Go)dnl | ||
1433 | 851 | AC_ARG_VAR([GOC], [Go compiler command])dnl | ||
1434 | 852 | AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl | ||
1435 | 853 | _AC_ARG_VAR_LDFLAGS()dnl | ||
1436 | 854 | AC_CHECK_TOOL(GOC, gccgo) | ||
1437 | 855 | if test -z "$GOC"; then | ||
1438 | 856 | if test -n "$ac_tool_prefix"; then | ||
1439 | 857 | AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) | ||
1440 | 858 | fi | ||
1441 | 859 | fi | ||
1442 | 860 | if test -z "$GOC"; then | ||
1443 | 861 | AC_CHECK_PROG(GOC, gccgo, gccgo, false) | ||
1444 | 862 | fi | ||
1445 | 863 | ])#m4_defun | ||
1446 | 864 | ])#m4_ifndef | ||
1447 | 865 | |||
1448 | 866 | |||
1449 | 1399 | # _LT_LANG_DEFAULT_CONFIG | 867 | # _LT_LANG_DEFAULT_CONFIG |
1450 | 1400 | # ----------------------- | 868 | # ----------------------- |
1451 | 1401 | m4_defun([_LT_LANG_DEFAULT_CONFIG], | 869 | m4_defun([_LT_LANG_DEFAULT_CONFIG], |
1452 | @@ -1426,6 +894,10 @@ | |||
1453 | 1426 | m4_ifdef([LT_PROG_GCJ], | 894 | m4_ifdef([LT_PROG_GCJ], |
1454 | 1427 | [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) | 895 | [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) |
1455 | 1428 | 896 | ||
1456 | 897 | AC_PROVIDE_IFELSE([AC_PROG_GO], | ||
1457 | 898 | [LT_LANG(GO)], | ||
1458 | 899 | [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) | ||
1459 | 900 | |||
1460 | 1429 | AC_PROVIDE_IFELSE([LT_PROG_RC], | 901 | AC_PROVIDE_IFELSE([LT_PROG_RC], |
1461 | 1430 | [LT_LANG(RC)], | 902 | [LT_LANG(RC)], |
1462 | 1431 | [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) | 903 | [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) |
1463 | @@ -1436,11 +908,13 @@ | |||
1464 | 1436 | AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) | 908 | AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) |
1465 | 1437 | AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) | 909 | AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) |
1466 | 1438 | AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) | 910 | AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) |
1467 | 911 | AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) | ||
1468 | 1439 | dnl aclocal-1.4 backwards compatibility: | 912 | dnl aclocal-1.4 backwards compatibility: |
1469 | 1440 | dnl AC_DEFUN([AC_LIBTOOL_CXX], []) | 913 | dnl AC_DEFUN([AC_LIBTOOL_CXX], []) |
1470 | 1441 | dnl AC_DEFUN([AC_LIBTOOL_F77], []) | 914 | dnl AC_DEFUN([AC_LIBTOOL_F77], []) |
1471 | 1442 | dnl AC_DEFUN([AC_LIBTOOL_FC], []) | 915 | dnl AC_DEFUN([AC_LIBTOOL_FC], []) |
1472 | 1443 | dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) | 916 | dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) |
1473 | 917 | dnl AC_DEFUN([AC_LIBTOOL_RC], []) | ||
1474 | 1444 | 918 | ||
1475 | 1445 | 919 | ||
1476 | 1446 | # _LT_TAG_COMPILER | 920 | # _LT_TAG_COMPILER |
1477 | @@ -1526,7 +1000,13 @@ | |||
1478 | 1526 | $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ | 1000 | $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ |
1479 | 1527 | -dynamiclib -Wl,-single_module conftest.c 2>conftest.err | 1001 | -dynamiclib -Wl,-single_module conftest.c 2>conftest.err |
1480 | 1528 | _lt_result=$? | 1002 | _lt_result=$? |
1482 | 1529 | if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then | 1003 | # If there is a non-empty error log, and "single_module" |
1483 | 1004 | # appears in it, assume the flag caused a linker warning | ||
1484 | 1005 | if test -s conftest.err && $GREP single_module conftest.err; then | ||
1485 | 1006 | cat conftest.err >&AS_MESSAGE_LOG_FD | ||
1486 | 1007 | # Otherwise, if the output was created with a 0 exit code from | ||
1487 | 1008 | # the compiler, it worked. | ||
1488 | 1009 | elif test -f libconftest.dylib && test $_lt_result -eq 0; then | ||
1489 | 1530 | lt_cv_apple_cc_single_mod=yes | 1010 | lt_cv_apple_cc_single_mod=yes |
1490 | 1531 | else | 1011 | else |
1491 | 1532 | cat conftest.err >&AS_MESSAGE_LOG_FD | 1012 | cat conftest.err >&AS_MESSAGE_LOG_FD |
1492 | @@ -1534,6 +1014,7 @@ | |||
1493 | 1534 | rm -rf libconftest.dylib* | 1014 | rm -rf libconftest.dylib* |
1494 | 1535 | rm -f conftest.* | 1015 | rm -f conftest.* |
1495 | 1536 | fi]) | 1016 | fi]) |
1496 | 1017 | |||
1497 | 1537 | AC_CACHE_CHECK([for -exported_symbols_list linker flag], | 1018 | AC_CACHE_CHECK([for -exported_symbols_list linker flag], |
1498 | 1538 | [lt_cv_ld_exported_symbols_list], | 1019 | [lt_cv_ld_exported_symbols_list], |
1499 | 1539 | [lt_cv_ld_exported_symbols_list=no | 1020 | [lt_cv_ld_exported_symbols_list=no |
1500 | @@ -1545,6 +1026,34 @@ | |||
1501 | 1545 | [lt_cv_ld_exported_symbols_list=no]) | 1026 | [lt_cv_ld_exported_symbols_list=no]) |
1502 | 1546 | LDFLAGS="$save_LDFLAGS" | 1027 | LDFLAGS="$save_LDFLAGS" |
1503 | 1547 | ]) | 1028 | ]) |
1504 | 1029 | |||
1505 | 1030 | AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], | ||
1506 | 1031 | [lt_cv_ld_force_load=no | ||
1507 | 1032 | cat > conftest.c << _LT_EOF | ||
1508 | 1033 | int forced_loaded() { return 2;} | ||
1509 | 1034 | _LT_EOF | ||
1510 | 1035 | echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD | ||
1511 | 1036 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD | ||
1512 | 1037 | echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD | ||
1513 | 1038 | $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD | ||
1514 | 1039 | echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD | ||
1515 | 1040 | $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD | ||
1516 | 1041 | cat > conftest.c << _LT_EOF | ||
1517 | 1042 | int main() { return 0;} | ||
1518 | 1043 | _LT_EOF | ||
1519 | 1044 | echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD | ||
1520 | 1045 | $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err | ||
1521 | 1046 | _lt_result=$? | ||
1522 | 1047 | if test -s conftest.err && $GREP force_load conftest.err; then | ||
1523 | 1048 | cat conftest.err >&AS_MESSAGE_LOG_FD | ||
1524 | 1049 | elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then | ||
1525 | 1050 | lt_cv_ld_force_load=yes | ||
1526 | 1051 | else | ||
1527 | 1052 | cat conftest.err >&AS_MESSAGE_LOG_FD | ||
1528 | 1053 | fi | ||
1529 | 1054 | rm -f conftest.err libconftest.a conftest conftest.c | ||
1530 | 1055 | rm -rf conftest.dSYM | ||
1531 | 1056 | ]) | ||
1532 | 1548 | case $host_os in | 1057 | case $host_os in |
1533 | 1549 | rhapsody* | darwin1.[[012]]) | 1058 | rhapsody* | darwin1.[[012]]) |
1534 | 1550 | _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; | 1059 | _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; |
1535 | @@ -1572,7 +1081,7 @@ | |||
1536 | 1572 | else | 1081 | else |
1537 | 1573 | _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' | 1082 | _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' |
1538 | 1574 | fi | 1083 | fi |
1540 | 1575 | if test "$DSYMUTIL" != ":"; then | 1084 | if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then |
1541 | 1576 | _lt_dsymutil='~$DSYMUTIL $lib || :' | 1085 | _lt_dsymutil='~$DSYMUTIL $lib || :' |
1542 | 1577 | else | 1086 | else |
1543 | 1578 | _lt_dsymutil= | 1087 | _lt_dsymutil= |
1544 | @@ -1582,8 +1091,8 @@ | |||
1545 | 1582 | ]) | 1091 | ]) |
1546 | 1583 | 1092 | ||
1547 | 1584 | 1093 | ||
1550 | 1585 | # _LT_DARWIN_LINKER_FEATURES | 1094 | # _LT_DARWIN_LINKER_FEATURES([TAG]) |
1551 | 1586 | # -------------------------- | 1095 | # --------------------------------- |
1552 | 1587 | # Checks for linker and compiler features on darwin | 1096 | # Checks for linker and compiler features on darwin |
1553 | 1588 | m4_defun([_LT_DARWIN_LINKER_FEATURES], | 1097 | m4_defun([_LT_DARWIN_LINKER_FEATURES], |
1554 | 1589 | [ | 1098 | [ |
1555 | @@ -1592,7 +1101,13 @@ | |||
1556 | 1592 | _LT_TAGVAR(hardcode_direct, $1)=no | 1101 | _LT_TAGVAR(hardcode_direct, $1)=no |
1557 | 1593 | _LT_TAGVAR(hardcode_automatic, $1)=yes | 1102 | _LT_TAGVAR(hardcode_automatic, $1)=yes |
1558 | 1594 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported | 1103 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
1560 | 1595 | _LT_TAGVAR(whole_archive_flag_spec, $1)='' | 1104 | if test "$lt_cv_ld_force_load" = "yes"; then |
1561 | 1105 | _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 | 1106 | m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], | ||
1563 | 1107 | [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) | ||
1564 | 1108 | else | ||
1565 | 1109 | _LT_TAGVAR(whole_archive_flag_spec, $1)='' | ||
1566 | 1110 | fi | ||
1567 | 1596 | _LT_TAGVAR(link_all_deplibs, $1)=yes | 1111 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
1568 | 1597 | _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" | 1112 | _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" |
1569 | 1598 | case $cc_basename in | 1113 | case $cc_basename in |
1570 | @@ -1600,7 +1115,7 @@ | |||
1571 | 1600 | *) _lt_dar_can_shared=$GCC ;; | 1115 | *) _lt_dar_can_shared=$GCC ;; |
1572 | 1601 | esac | 1116 | esac |
1573 | 1602 | if test "$_lt_dar_can_shared" = "yes"; then | 1117 | if test "$_lt_dar_can_shared" = "yes"; then |
1575 | 1603 | output_verbose_link_cmd=echo | 1118 | output_verbose_link_cmd=func_echo_all |
1576 | 1604 | _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}" | 1119 | _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 | 1605 | _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" | 1120 | _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" |
1578 | 1606 | _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}" | 1121 | _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 | 1616 | fi | 1131 | fi |
1581 | 1617 | ]) | 1132 | ]) |
1582 | 1618 | 1133 | ||
1585 | 1619 | # _LT_SYS_MODULE_PATH_AIX | 1134 | # _LT_SYS_MODULE_PATH_AIX([TAGNAME]) |
1586 | 1620 | # ----------------------- | 1135 | # ---------------------------------- |
1587 | 1621 | # Links a minimal program and checks the executable | 1136 | # Links a minimal program and checks the executable |
1588 | 1622 | # for the system default hardcoded library path. In most cases, | 1137 | # for the system default hardcoded library path. In most cases, |
1589 | 1623 | # this is /usr/lib:/lib, but when the MPI compilers are used | 1138 | # this is /usr/lib:/lib, but when the MPI compilers are used |
1590 | 1624 | # the location of the communication and MPI libs are included too. | 1139 | # the location of the communication and MPI libs are included too. |
1591 | 1625 | # If we don't find anything, use the default library path according | 1140 | # If we don't find anything, use the default library path according |
1592 | 1626 | # to the aix ld manual. | 1141 | # to the aix ld manual. |
1593 | 1142 | # Store the results from the different compilers for each TAGNAME. | ||
1594 | 1143 | # Allow to override them for all tags through lt_cv_aix_libpath. | ||
1595 | 1627 | m4_defun([_LT_SYS_MODULE_PATH_AIX], | 1144 | m4_defun([_LT_SYS_MODULE_PATH_AIX], |
1596 | 1628 | [m4_require([_LT_DECL_SED])dnl | 1145 | [m4_require([_LT_DECL_SED])dnl |
1611 | 1629 | AC_LINK_IFELSE(AC_LANG_PROGRAM,[ | 1146 | if test "${lt_cv_aix_libpath+set}" = set; then |
1612 | 1630 | lt_aix_libpath_sed=' | 1147 | aix_libpath=$lt_cv_aix_libpath |
1613 | 1631 | /Import File Strings/,/^$/ { | 1148 | else |
1614 | 1632 | /^0/ { | 1149 | AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], |
1615 | 1633 | s/^0 *\(.*\)$/\1/ | 1150 | [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ |
1616 | 1634 | p | 1151 | lt_aix_libpath_sed='[ |
1617 | 1635 | } | 1152 | /Import File Strings/,/^$/ { |
1618 | 1636 | }' | 1153 | /^0/ { |
1619 | 1637 | aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | 1154 | s/^0 *\([^ ]*\) *$/\1/ |
1620 | 1638 | # Check for a 64-bit object if we didn't find anything. | 1155 | p |
1621 | 1639 | if test -z "$aix_libpath"; then | 1156 | } |
1622 | 1640 | aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | 1157 | }]' |
1623 | 1641 | fi],[]) | 1158 | _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
1624 | 1642 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 1159 | # Check for a 64-bit object if we didn't find anything. |
1625 | 1160 | if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then | ||
1626 | 1161 | _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
1627 | 1162 | fi],[]) | ||
1628 | 1163 | if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then | ||
1629 | 1164 | _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" | ||
1630 | 1165 | fi | ||
1631 | 1166 | ]) | ||
1632 | 1167 | aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) | ||
1633 | 1168 | fi | ||
1634 | 1643 | ])# _LT_SYS_MODULE_PATH_AIX | 1169 | ])# _LT_SYS_MODULE_PATH_AIX |
1635 | 1644 | 1170 | ||
1636 | 1645 | 1171 | ||
1637 | 1646 | # _LT_SHELL_INIT(ARG) | 1172 | # _LT_SHELL_INIT(ARG) |
1638 | 1647 | # ------------------- | 1173 | # ------------------- |
1639 | 1648 | m4_define([_LT_SHELL_INIT], | 1174 | m4_define([_LT_SHELL_INIT], |
1646 | 1649 | [ifdef([AC_DIVERSION_NOTICE], | 1175 | [m4_divert_text([M4SH-INIT], [$1 |
1647 | 1650 | [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], | 1176 | ])])# _LT_SHELL_INIT |
1648 | 1651 | [AC_DIVERT_PUSH(NOTICE)]) | 1177 | |
1643 | 1652 | $1 | ||
1644 | 1653 | AC_DIVERT_POP | ||
1645 | 1654 | ])# _LT_SHELL_INIT | ||
1649 | 1655 | 1178 | ||
1650 | 1656 | 1179 | ||
1651 | 1657 | # _LT_PROG_ECHO_BACKSLASH | 1180 | # _LT_PROG_ECHO_BACKSLASH |
1652 | 1658 | # ----------------------- | 1181 | # ----------------------- |
1655 | 1659 | # Add some code to the start of the generated configure script which | 1182 | # Find how we can fake an echo command that does not interpret backslash. |
1656 | 1660 | # will find an echo command which doesn't interpret backslashes. | 1183 | # In particular, with Autoconf 2.60 or later we add some code to the start |
1657 | 1184 | # of the generated configure script which will find a shell with a builtin | ||
1658 | 1185 | # printf (which we can use as an echo command). | ||
1659 | 1661 | m4_defun([_LT_PROG_ECHO_BACKSLASH], | 1186 | m4_defun([_LT_PROG_ECHO_BACKSLASH], |
1669 | 1662 | [_LT_SHELL_INIT([ | 1187 | [ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' |
1670 | 1663 | # Check that we are running under the correct shell. | 1188 | ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO |
1671 | 1664 | SHELL=${CONFIG_SHELL-/bin/sh} | 1189 | ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
1672 | 1665 | 1190 | ||
1673 | 1666 | case X$lt_ECHO in | 1191 | AC_MSG_CHECKING([how to print strings]) |
1674 | 1667 | X*--fallback-echo) | 1192 | # Test print first, because it will be a builtin if present. |
1675 | 1668 | # Remove one level of quotation (which was required for Make). | 1193 | if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
1676 | 1669 | ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` | 1194 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
1677 | 1670 | ;; | 1195 | ECHO='print -r --' |
1678 | 1196 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | ||
1679 | 1197 | ECHO='printf %s\n' | ||
1680 | 1198 | else | ||
1681 | 1199 | # Use this function as a fallback that always works. | ||
1682 | 1200 | func_fallback_echo () | ||
1683 | 1201 | { | ||
1684 | 1202 | eval 'cat <<_LTECHO_EOF | ||
1685 | 1203 | $[]1 | ||
1686 | 1204 | _LTECHO_EOF' | ||
1687 | 1205 | } | ||
1688 | 1206 | ECHO='func_fallback_echo' | ||
1689 | 1207 | fi | ||
1690 | 1208 | |||
1691 | 1209 | # func_echo_all arg... | ||
1692 | 1210 | # Invoke $ECHO with all args, space-separated. | ||
1693 | 1211 | func_echo_all () | ||
1694 | 1212 | { | ||
1695 | 1213 | $ECHO "$*" | ||
1696 | 1214 | } | ||
1697 | 1215 | |||
1698 | 1216 | case "$ECHO" in | ||
1699 | 1217 | printf*) AC_MSG_RESULT([printf]) ;; | ||
1700 | 1218 | print*) AC_MSG_RESULT([print -r]) ;; | ||
1701 | 1219 | *) AC_MSG_RESULT([cat]) ;; | ||
1702 | 1671 | esac | 1220 | esac |
1703 | 1672 | 1221 | ||
1841 | 1673 | ECHO=${lt_ECHO-echo} | 1222 | m4_ifdef([_AS_DETECT_SUGGESTED], |
1842 | 1674 | if test "X[$]1" = X--no-reexec; then | 1223 | [_AS_DETECT_SUGGESTED([ |
1843 | 1675 | # Discard the --no-reexec flag, and continue. | 1224 | test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( |
1844 | 1676 | shift | 1225 | ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' |
1845 | 1677 | elif test "X[$]1" = X--fallback-echo; then | 1226 | ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO |
1846 | 1678 | # Avoid inline document here, it may be left over | 1227 | ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
1847 | 1679 | : | 1228 | PATH=/empty FPATH=/empty; export PATH FPATH |
1848 | 1680 | elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then | 1229 | test "X`printf %s $ECHO`" = "X$ECHO" \ |
1849 | 1681 | # Yippee, $ECHO works! | 1230 | || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) |
1850 | 1682 | : | 1231 | |
1714 | 1683 | else | ||
1715 | 1684 | # Restart under the correct shell. | ||
1716 | 1685 | exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} | ||
1717 | 1686 | fi | ||
1718 | 1687 | |||
1719 | 1688 | if test "X[$]1" = X--fallback-echo; then | ||
1720 | 1689 | # used as fallback echo | ||
1721 | 1690 | shift | ||
1722 | 1691 | cat <<_LT_EOF | ||
1723 | 1692 | [$]* | ||
1724 | 1693 | _LT_EOF | ||
1725 | 1694 | exit 0 | ||
1726 | 1695 | fi | ||
1727 | 1696 | |||
1728 | 1697 | # The HP-UX ksh and POSIX shell print the target directory to stdout | ||
1729 | 1698 | # if CDPATH is set. | ||
1730 | 1699 | (unset CDPATH) >/dev/null 2>&1 && unset CDPATH | ||
1731 | 1700 | |||
1732 | 1701 | if test -z "$lt_ECHO"; then | ||
1733 | 1702 | if test "X${echo_test_string+set}" != Xset; then | ||
1734 | 1703 | # find a string as large as possible, as long as the shell can cope with it | ||
1735 | 1704 | for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do | ||
1736 | 1705 | # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... | ||
1737 | 1706 | if { echo_test_string=`eval $cmd`; } 2>/dev/null && | ||
1738 | 1707 | { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null | ||
1739 | 1708 | then | ||
1740 | 1709 | break | ||
1741 | 1710 | fi | ||
1742 | 1711 | done | ||
1743 | 1712 | fi | ||
1744 | 1713 | |||
1745 | 1714 | if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && | ||
1746 | 1715 | echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && | ||
1747 | 1716 | test "X$echo_testing_string" = "X$echo_test_string"; then | ||
1748 | 1717 | : | ||
1749 | 1718 | else | ||
1750 | 1719 | # The Solaris, AIX, and Digital Unix default echo programs unquote | ||
1751 | 1720 | # backslashes. This makes it impossible to quote backslashes using | ||
1752 | 1721 | # echo "$something" | sed 's/\\/\\\\/g' | ||
1753 | 1722 | # | ||
1754 | 1723 | # So, first we look for a working echo in the user's PATH. | ||
1755 | 1724 | |||
1756 | 1725 | lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR | ||
1757 | 1726 | for dir in $PATH /usr/ucb; do | ||
1758 | 1727 | IFS="$lt_save_ifs" | ||
1759 | 1728 | if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && | ||
1760 | 1729 | test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && | ||
1761 | 1730 | echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && | ||
1762 | 1731 | test "X$echo_testing_string" = "X$echo_test_string"; then | ||
1763 | 1732 | ECHO="$dir/echo" | ||
1764 | 1733 | break | ||
1765 | 1734 | fi | ||
1766 | 1735 | done | ||
1767 | 1736 | IFS="$lt_save_ifs" | ||
1768 | 1737 | |||
1769 | 1738 | if test "X$ECHO" = Xecho; then | ||
1770 | 1739 | # We didn't find a better echo, so look for alternatives. | ||
1771 | 1740 | if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && | ||
1772 | 1741 | echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && | ||
1773 | 1742 | test "X$echo_testing_string" = "X$echo_test_string"; then | ||
1774 | 1743 | # This shell has a builtin print -r that does the trick. | ||
1775 | 1744 | ECHO='print -r' | ||
1776 | 1745 | elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && | ||
1777 | 1746 | test "X$CONFIG_SHELL" != X/bin/ksh; then | ||
1778 | 1747 | # If we have ksh, try running configure again with it. | ||
1779 | 1748 | ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} | ||
1780 | 1749 | export ORIGINAL_CONFIG_SHELL | ||
1781 | 1750 | CONFIG_SHELL=/bin/ksh | ||
1782 | 1751 | export CONFIG_SHELL | ||
1783 | 1752 | exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} | ||
1784 | 1753 | else | ||
1785 | 1754 | # Try using printf. | ||
1786 | 1755 | ECHO='printf %s\n' | ||
1787 | 1756 | if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && | ||
1788 | 1757 | echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && | ||
1789 | 1758 | test "X$echo_testing_string" = "X$echo_test_string"; then | ||
1790 | 1759 | # Cool, printf works | ||
1791 | 1760 | : | ||
1792 | 1761 | elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && | ||
1793 | 1762 | test "X$echo_testing_string" = 'X\t' && | ||
1794 | 1763 | echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && | ||
1795 | 1764 | test "X$echo_testing_string" = "X$echo_test_string"; then | ||
1796 | 1765 | CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL | ||
1797 | 1766 | export CONFIG_SHELL | ||
1798 | 1767 | SHELL="$CONFIG_SHELL" | ||
1799 | 1768 | export SHELL | ||
1800 | 1769 | ECHO="$CONFIG_SHELL [$]0 --fallback-echo" | ||
1801 | 1770 | elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && | ||
1802 | 1771 | test "X$echo_testing_string" = 'X\t' && | ||
1803 | 1772 | echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && | ||
1804 | 1773 | test "X$echo_testing_string" = "X$echo_test_string"; then | ||
1805 | 1774 | ECHO="$CONFIG_SHELL [$]0 --fallback-echo" | ||
1806 | 1775 | else | ||
1807 | 1776 | # maybe with a smaller string... | ||
1808 | 1777 | prev=: | ||
1809 | 1778 | |||
1810 | 1779 | for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do | ||
1811 | 1780 | if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null | ||
1812 | 1781 | then | ||
1813 | 1782 | break | ||
1814 | 1783 | fi | ||
1815 | 1784 | prev="$cmd" | ||
1816 | 1785 | done | ||
1817 | 1786 | |||
1818 | 1787 | if test "$prev" != 'sed 50q "[$]0"'; then | ||
1819 | 1788 | echo_test_string=`eval $prev` | ||
1820 | 1789 | export echo_test_string | ||
1821 | 1790 | exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} | ||
1822 | 1791 | else | ||
1823 | 1792 | # Oops. We lost completely, so just stick with echo. | ||
1824 | 1793 | ECHO=echo | ||
1825 | 1794 | fi | ||
1826 | 1795 | fi | ||
1827 | 1796 | fi | ||
1828 | 1797 | fi | ||
1829 | 1798 | fi | ||
1830 | 1799 | fi | ||
1831 | 1800 | |||
1832 | 1801 | # Copy echo and quote the copy suitably for passing to libtool from | ||
1833 | 1802 | # the Makefile, instead of quoting the original, which is used later. | ||
1834 | 1803 | lt_ECHO=$ECHO | ||
1835 | 1804 | if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then | ||
1836 | 1805 | lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" | ||
1837 | 1806 | fi | ||
1838 | 1807 | |||
1839 | 1808 | AC_SUBST(lt_ECHO) | ||
1840 | 1809 | ]) | ||
1851 | 1810 | _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) | 1232 | _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) |
1854 | 1811 | _LT_DECL([], [ECHO], [1], | 1233 | _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) |
1853 | 1812 | [An echo program that does not interpret backslashes]) | ||
1855 | 1813 | ])# _LT_PROG_ECHO_BACKSLASH | 1234 | ])# _LT_PROG_ECHO_BACKSLASH |
1856 | 1814 | 1235 | ||
1857 | 1815 | 1236 | ||
1858 | 1237 | # _LT_WITH_SYSROOT | ||
1859 | 1238 | # ---------------- | ||
1860 | 1239 | AC_DEFUN([_LT_WITH_SYSROOT], | ||
1861 | 1240 | [AC_MSG_CHECKING([for sysroot]) | ||
1862 | 1241 | AC_ARG_WITH([sysroot], | ||
1863 | 1242 | [ --with-sysroot[=DIR] Search for dependent libraries within DIR | ||
1864 | 1243 | (or the compiler's sysroot if not specified).], | ||
1865 | 1244 | [], [with_sysroot=no]) | ||
1866 | 1245 | |||
1867 | 1246 | dnl lt_sysroot will always be passed unquoted. We quote it here | ||
1868 | 1247 | dnl in case the user passed a directory name. | ||
1869 | 1248 | lt_sysroot= | ||
1870 | 1249 | case ${with_sysroot} in #( | ||
1871 | 1250 | yes) | ||
1872 | 1251 | if test "$GCC" = yes; then | ||
1873 | 1252 | lt_sysroot=`$CC --print-sysroot 2>/dev/null` | ||
1874 | 1253 | fi | ||
1875 | 1254 | ;; #( | ||
1876 | 1255 | /*) | ||
1877 | 1256 | lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` | ||
1878 | 1257 | ;; #( | ||
1879 | 1258 | no|'') | ||
1880 | 1259 | ;; #( | ||
1881 | 1260 | *) | ||
1882 | 1261 | AC_MSG_RESULT([${with_sysroot}]) | ||
1883 | 1262 | AC_MSG_ERROR([The sysroot must be an absolute path.]) | ||
1884 | 1263 | ;; | ||
1885 | 1264 | esac | ||
1886 | 1265 | |||
1887 | 1266 | AC_MSG_RESULT([${lt_sysroot:-no}]) | ||
1888 | 1267 | _LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl | ||
1889 | 1268 | [dependent libraries, and in which our libraries should be installed.])]) | ||
1890 | 1269 | |||
1891 | 1816 | # _LT_ENABLE_LOCK | 1270 | # _LT_ENABLE_LOCK |
1892 | 1817 | # --------------- | 1271 | # --------------- |
1893 | 1818 | m4_defun([_LT_ENABLE_LOCK], | 1272 | m4_defun([_LT_ENABLE_LOCK], |
1894 | @@ -1841,7 +1295,7 @@ | |||
1895 | 1841 | ;; | 1295 | ;; |
1896 | 1842 | *-*-irix6*) | 1296 | *-*-irix6*) |
1897 | 1843 | # Find out which ABI we are using. | 1297 | # Find out which ABI we are using. |
1899 | 1844 | echo '[#]line __oline__ "configure"' > conftest.$ac_ext | 1298 | echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext |
1900 | 1845 | if AC_TRY_EVAL(ac_compile); then | 1299 | if AC_TRY_EVAL(ac_compile); then |
1901 | 1846 | if test "$lt_cv_prog_gnu_ld" = yes; then | 1300 | if test "$lt_cv_prog_gnu_ld" = yes; then |
1902 | 1847 | case `/usr/bin/file conftest.$ac_objext` in | 1301 | case `/usr/bin/file conftest.$ac_objext` in |
1903 | @@ -1934,14 +1388,27 @@ | |||
1904 | 1934 | CFLAGS="$SAVE_CFLAGS" | 1388 | CFLAGS="$SAVE_CFLAGS" |
1905 | 1935 | fi | 1389 | fi |
1906 | 1936 | ;; | 1390 | ;; |
1908 | 1937 | sparc*-*solaris*) | 1391 | *-*solaris*) |
1909 | 1938 | # Find out which ABI we are using. | 1392 | # Find out which ABI we are using. |
1910 | 1939 | echo 'int i;' > conftest.$ac_ext | 1393 | echo 'int i;' > conftest.$ac_ext |
1911 | 1940 | if AC_TRY_EVAL(ac_compile); then | 1394 | if AC_TRY_EVAL(ac_compile); then |
1912 | 1941 | case `/usr/bin/file conftest.o` in | 1395 | case `/usr/bin/file conftest.o` in |
1913 | 1942 | *64-bit*) | 1396 | *64-bit*) |
1914 | 1943 | case $lt_cv_prog_gnu_ld in | 1397 | case $lt_cv_prog_gnu_ld in |
1916 | 1944 | yes*) LD="${LD-ld} -m elf64_sparc" ;; | 1398 | yes*) |
1917 | 1399 | case $host in | ||
1918 | 1400 | i?86-*-solaris*) | ||
1919 | 1401 | LD="${LD-ld} -m elf_x86_64" | ||
1920 | 1402 | ;; | ||
1921 | 1403 | sparc*-*-solaris*) | ||
1922 | 1404 | LD="${LD-ld} -m elf64_sparc" | ||
1923 | 1405 | ;; | ||
1924 | 1406 | esac | ||
1925 | 1407 | # GNU ld 2.21 introduced _sol2 emulations. Use them if available. | ||
1926 | 1408 | if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then | ||
1927 | 1409 | LD="${LD-ld}_sol2" | ||
1928 | 1410 | fi | ||
1929 | 1411 | ;; | ||
1930 | 1945 | *) | 1412 | *) |
1931 | 1946 | if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then | 1413 | if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then |
1932 | 1947 | LD="${LD-ld} -64" | 1414 | LD="${LD-ld} -64" |
1933 | @@ -1959,14 +1426,47 @@ | |||
1934 | 1959 | ])# _LT_ENABLE_LOCK | 1426 | ])# _LT_ENABLE_LOCK |
1935 | 1960 | 1427 | ||
1936 | 1961 | 1428 | ||
1937 | 1429 | # _LT_PROG_AR | ||
1938 | 1430 | # ----------- | ||
1939 | 1431 | m4_defun([_LT_PROG_AR], | ||
1940 | 1432 | [AC_CHECK_TOOLS(AR, [ar], false) | ||
1941 | 1433 | : ${AR=ar} | ||
1942 | 1434 | : ${AR_FLAGS=cru} | ||
1943 | 1435 | _LT_DECL([], [AR], [1], [The archiver]) | ||
1944 | 1436 | _LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) | ||
1945 | 1437 | |||
1946 | 1438 | AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], | ||
1947 | 1439 | [lt_cv_ar_at_file=no | ||
1948 | 1440 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM], | ||
1949 | 1441 | [echo conftest.$ac_objext > conftest.lst | ||
1950 | 1442 | lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' | ||
1951 | 1443 | AC_TRY_EVAL([lt_ar_try]) | ||
1952 | 1444 | if test "$ac_status" -eq 0; then | ||
1953 | 1445 | # Ensure the archiver fails upon bogus file names. | ||
1954 | 1446 | rm -f conftest.$ac_objext libconftest.a | ||
1955 | 1447 | AC_TRY_EVAL([lt_ar_try]) | ||
1956 | 1448 | if test "$ac_status" -ne 0; then | ||
1957 | 1449 | lt_cv_ar_at_file=@ | ||
1958 | 1450 | fi | ||
1959 | 1451 | fi | ||
1960 | 1452 | rm -f conftest.* libconftest.a | ||
1961 | 1453 | ]) | ||
1962 | 1454 | ]) | ||
1963 | 1455 | |||
1964 | 1456 | if test "x$lt_cv_ar_at_file" = xno; then | ||
1965 | 1457 | archiver_list_spec= | ||
1966 | 1458 | else | ||
1967 | 1459 | archiver_list_spec=$lt_cv_ar_at_file | ||
1968 | 1460 | fi | ||
1969 | 1461 | _LT_DECL([], [archiver_list_spec], [1], | ||
1970 | 1462 | [How to feed a file listing to the archiver]) | ||
1971 | 1463 | ])# _LT_PROG_AR | ||
1972 | 1464 | |||
1973 | 1465 | |||
1974 | 1962 | # _LT_CMD_OLD_ARCHIVE | 1466 | # _LT_CMD_OLD_ARCHIVE |
1975 | 1963 | # ------------------- | 1467 | # ------------------- |
1976 | 1964 | m4_defun([_LT_CMD_OLD_ARCHIVE], | 1468 | m4_defun([_LT_CMD_OLD_ARCHIVE], |
1982 | 1965 | [AC_CHECK_TOOL(AR, ar, false) | 1469 | [_LT_PROG_AR |
1978 | 1966 | test -z "$AR" && AR=ar | ||
1979 | 1967 | test -z "$AR_FLAGS" && AR_FLAGS=cru | ||
1980 | 1968 | _LT_DECL([], [AR], [1], [The archiver]) | ||
1981 | 1969 | _LT_DECL([], [AR_FLAGS], [1]) | ||
1983 | 1970 | 1470 | ||
1984 | 1971 | AC_CHECK_TOOL(STRIP, strip, :) | 1471 | AC_CHECK_TOOL(STRIP, strip, :) |
1985 | 1972 | test -z "$STRIP" && STRIP=: | 1472 | test -z "$STRIP" && STRIP=: |
1986 | @@ -1985,18 +1485,27 @@ | |||
1987 | 1985 | if test -n "$RANLIB"; then | 1485 | if test -n "$RANLIB"; then |
1988 | 1986 | case $host_os in | 1486 | case $host_os in |
1989 | 1987 | openbsd*) | 1487 | openbsd*) |
1991 | 1988 | old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" | 1488 | old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" |
1992 | 1989 | ;; | 1489 | ;; |
1993 | 1990 | *) | 1490 | *) |
1995 | 1991 | old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" | 1491 | old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" |
1996 | 1992 | ;; | 1492 | ;; |
1997 | 1993 | esac | 1493 | esac |
1999 | 1994 | old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" | 1494 | old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" |
2000 | 1995 | fi | 1495 | fi |
2001 | 1496 | |||
2002 | 1497 | case $host_os in | ||
2003 | 1498 | darwin*) | ||
2004 | 1499 | lock_old_archive_extraction=yes ;; | ||
2005 | 1500 | *) | ||
2006 | 1501 | lock_old_archive_extraction=no ;; | ||
2007 | 1502 | esac | ||
2008 | 1996 | _LT_DECL([], [old_postinstall_cmds], [2]) | 1503 | _LT_DECL([], [old_postinstall_cmds], [2]) |
2009 | 1997 | _LT_DECL([], [old_postuninstall_cmds], [2]) | 1504 | _LT_DECL([], [old_postuninstall_cmds], [2]) |
2010 | 1998 | _LT_TAGDECL([], [old_archive_cmds], [2], | 1505 | _LT_TAGDECL([], [old_archive_cmds], [2], |
2011 | 1999 | [Commands used to build an old-style archive]) | 1506 | [Commands used to build an old-style archive]) |
2012 | 1507 | _LT_DECL([], [lock_old_archive_extraction], [0], | ||
2013 | 1508 | [Whether to use a lock for old archive extraction]) | ||
2014 | 2000 | ])# _LT_CMD_OLD_ARCHIVE | 1509 | ])# _LT_CMD_OLD_ARCHIVE |
2015 | 2001 | 1510 | ||
2016 | 2002 | 1511 | ||
2017 | @@ -2021,15 +1530,15 @@ | |||
2018 | 2021 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 1530 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
2019 | 2022 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ | 1531 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ |
2020 | 2023 | -e 's:$: $lt_compiler_flag:'` | 1532 | -e 's:$: $lt_compiler_flag:'` |
2022 | 2024 | (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) | 1533 | (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
2023 | 2025 | (eval "$lt_compile" 2>conftest.err) | 1534 | (eval "$lt_compile" 2>conftest.err) |
2024 | 2026 | ac_status=$? | 1535 | ac_status=$? |
2025 | 2027 | cat conftest.err >&AS_MESSAGE_LOG_FD | 1536 | cat conftest.err >&AS_MESSAGE_LOG_FD |
2027 | 2028 | echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD | 1537 | echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
2028 | 2029 | if (exit $ac_status) && test -s "$ac_outfile"; then | 1538 | if (exit $ac_status) && test -s "$ac_outfile"; then |
2029 | 2030 | # The compiler can only warn and ignore the option if not recognized | 1539 | # The compiler can only warn and ignore the option if not recognized |
2030 | 2031 | # So say no if there are warnings other than the usual output. | 1540 | # So say no if there are warnings other than the usual output. |
2032 | 2032 | $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp | 1541 | $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp |
2033 | 2033 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 | 1542 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
2034 | 2034 | if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then | 1543 | if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then |
2035 | 2035 | $2=yes | 1544 | $2=yes |
2036 | @@ -2069,7 +1578,7 @@ | |||
2037 | 2069 | if test -s conftest.err; then | 1578 | if test -s conftest.err; then |
2038 | 2070 | # Append any errors to the config.log. | 1579 | # Append any errors to the config.log. |
2039 | 2071 | cat conftest.err 1>&AS_MESSAGE_LOG_FD | 1580 | cat conftest.err 1>&AS_MESSAGE_LOG_FD |
2041 | 2072 | $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp | 1581 | $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp |
2042 | 2073 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 | 1582 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
2043 | 2074 | if diff conftest.exp conftest.er2 >/dev/null; then | 1583 | if diff conftest.exp conftest.er2 >/dev/null; then |
2044 | 2075 | $2=yes | 1584 | $2=yes |
2045 | @@ -2132,6 +1641,11 @@ | |||
2046 | 2132 | lt_cv_sys_max_cmd_len=8192; | 1641 | lt_cv_sys_max_cmd_len=8192; |
2047 | 2133 | ;; | 1642 | ;; |
2048 | 2134 | 1643 | ||
2049 | 1644 | mint*) | ||
2050 | 1645 | # On MiNT this can take a long time and run out of memory. | ||
2051 | 1646 | lt_cv_sys_max_cmd_len=8192; | ||
2052 | 1647 | ;; | ||
2053 | 1648 | |||
2054 | 2135 | amigaos*) | 1649 | amigaos*) |
2055 | 2136 | # On AmigaOS with pdksh, this test takes hours, literally. | 1650 | # On AmigaOS with pdksh, this test takes hours, literally. |
2056 | 2137 | # So we just punt and use a minimum line length of 8192. | 1651 | # So we just punt and use a minimum line length of 8192. |
2057 | @@ -2157,6 +1671,11 @@ | |||
2058 | 2157 | lt_cv_sys_max_cmd_len=196608 | 1671 | lt_cv_sys_max_cmd_len=196608 |
2059 | 2158 | ;; | 1672 | ;; |
2060 | 2159 | 1673 | ||
2061 | 1674 | os2*) | ||
2062 | 1675 | # The test takes a long time on OS/2. | ||
2063 | 1676 | lt_cv_sys_max_cmd_len=8192 | ||
2064 | 1677 | ;; | ||
2065 | 1678 | |||
2066 | 2160 | osf*) | 1679 | osf*) |
2067 | 2161 | # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure | 1680 | # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure |
2068 | 2162 | # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not | 1681 | # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not |
2069 | @@ -2196,8 +1715,8 @@ | |||
2070 | 2196 | # If test is not a shell built-in, we'll probably end up computing a | 1715 | # If test is not a shell built-in, we'll probably end up computing a |
2071 | 2197 | # maximum length that is only half of the actual maximum length, but | 1716 | # maximum length that is only half of the actual maximum length, but |
2072 | 2198 | # we can't tell. | 1717 | # we can't tell. |
2075 | 2199 | while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ | 1718 | while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ |
2076 | 2200 | = "XX$teststring$teststring"; } >/dev/null 2>&1 && | 1719 | = "X$teststring$teststring"; } >/dev/null 2>&1 && |
2077 | 2201 | test $i != 17 # 1/2 MB should be enough | 1720 | test $i != 17 # 1/2 MB should be enough |
2078 | 2202 | do | 1721 | do |
2079 | 2203 | i=`expr $i + 1` | 1722 | i=`expr $i + 1` |
2080 | @@ -2248,7 +1767,7 @@ | |||
2081 | 2248 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 1767 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
2082 | 2249 | lt_status=$lt_dlunknown | 1768 | lt_status=$lt_dlunknown |
2083 | 2250 | cat > conftest.$ac_ext <<_LT_EOF | 1769 | cat > conftest.$ac_ext <<_LT_EOF |
2085 | 2251 | [#line __oline__ "configure" | 1770 | [#line $LINENO "configure" |
2086 | 2252 | #include "confdefs.h" | 1771 | #include "confdefs.h" |
2087 | 2253 | 1772 | ||
2088 | 2254 | #if HAVE_DLFCN_H | 1773 | #if HAVE_DLFCN_H |
2089 | @@ -2289,7 +1808,13 @@ | |||
2090 | 2289 | # endif | 1808 | # endif |
2091 | 2290 | #endif | 1809 | #endif |
2092 | 2291 | 1810 | ||
2094 | 2292 | void fnord() { int i=42;} | 1811 | /* When -fvisbility=hidden is used, assume the code has been annotated |
2095 | 1812 | correspondingly for the symbols needed. */ | ||
2096 | 1813 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
2097 | 1814 | int fnord () __attribute__((visibility("default"))); | ||
2098 | 1815 | #endif | ||
2099 | 1816 | |||
2100 | 1817 | int fnord () { return 42; } | ||
2101 | 2293 | int main () | 1818 | int main () |
2102 | 2294 | { | 1819 | { |
2103 | 2295 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 1820 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
2104 | @@ -2298,7 +1823,11 @@ | |||
2105 | 2298 | if (self) | 1823 | if (self) |
2106 | 2299 | { | 1824 | { |
2107 | 2300 | if (dlsym (self,"fnord")) status = $lt_dlno_uscore; | 1825 | if (dlsym (self,"fnord")) status = $lt_dlno_uscore; |
2109 | 2301 | else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; | 1826 | else |
2110 | 1827 | { | ||
2111 | 1828 | if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; | ||
2112 | 1829 | else puts (dlerror ()); | ||
2113 | 1830 | } | ||
2114 | 2302 | /* dlclose (self); */ | 1831 | /* dlclose (self); */ |
2115 | 2303 | } | 1832 | } |
2116 | 2304 | else | 1833 | else |
2117 | @@ -2474,16 +2003,16 @@ | |||
2118 | 2474 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 2003 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
2119 | 2475 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ | 2004 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ |
2120 | 2476 | -e 's:$: $lt_compiler_flag:'` | 2005 | -e 's:$: $lt_compiler_flag:'` |
2122 | 2477 | (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) | 2006 | (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
2123 | 2478 | (eval "$lt_compile" 2>out/conftest.err) | 2007 | (eval "$lt_compile" 2>out/conftest.err) |
2124 | 2479 | ac_status=$? | 2008 | ac_status=$? |
2125 | 2480 | cat out/conftest.err >&AS_MESSAGE_LOG_FD | 2009 | cat out/conftest.err >&AS_MESSAGE_LOG_FD |
2127 | 2481 | echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD | 2010 | echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
2128 | 2482 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | 2011 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
2129 | 2483 | then | 2012 | then |
2130 | 2484 | # The compiler can only warn and ignore the option if not recognized | 2013 | # The compiler can only warn and ignore the option if not recognized |
2131 | 2485 | # So say no if there are warnings | 2014 | # So say no if there are warnings |
2133 | 2486 | $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp | 2015 | $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp |
2134 | 2487 | $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 | 2016 | $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 |
2135 | 2488 | if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then | 2017 | if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then |
2136 | 2489 | _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes | 2018 | _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes |
2137 | @@ -2642,6 +2171,7 @@ | |||
2138 | 2642 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl | 2171 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
2139 | 2643 | m4_require([_LT_DECL_OBJDUMP])dnl | 2172 | m4_require([_LT_DECL_OBJDUMP])dnl |
2140 | 2644 | m4_require([_LT_DECL_SED])dnl | 2173 | m4_require([_LT_DECL_SED])dnl |
2141 | 2174 | m4_require([_LT_CHECK_SHELL_FEATURES])dnl | ||
2142 | 2645 | AC_MSG_CHECKING([dynamic linker characteristics]) | 2175 | AC_MSG_CHECKING([dynamic linker characteristics]) |
2143 | 2646 | m4_if([$1], | 2176 | m4_if([$1], |
2144 | 2647 | [], [ | 2177 | [], [ |
2145 | @@ -2650,16 +2180,23 @@ | |||
2146 | 2650 | darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; | 2180 | darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; |
2147 | 2651 | *) lt_awk_arg="/^libraries:/" ;; | 2181 | *) lt_awk_arg="/^libraries:/" ;; |
2148 | 2652 | esac | 2182 | esac |
2151 | 2653 | lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` | 2183 | case $host_os in |
2152 | 2654 | if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then | 2184 | mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; |
2153 | 2185 | *) lt_sed_strip_eq="s,=/,/,g" ;; | ||
2154 | 2186 | esac | ||
2155 | 2187 | lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` | ||
2156 | 2188 | case $lt_search_path_spec in | ||
2157 | 2189 | *\;*) | ||
2158 | 2655 | # if the path contains ";" then we assume it to be the separator | 2190 | # if the path contains ";" then we assume it to be the separator |
2159 | 2656 | # otherwise default to the standard path separator (i.e. ":") - it is | 2191 | # otherwise default to the standard path separator (i.e. ":") - it is |
2160 | 2657 | # assumed that no part of a normal pathname contains ";" but that should | 2192 | # assumed that no part of a normal pathname contains ";" but that should |
2161 | 2658 | # okay in the real world where ";" in dirpaths is itself problematic. | 2193 | # okay in the real world where ";" in dirpaths is itself problematic. |
2166 | 2659 | lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` | 2194 | lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` |
2167 | 2660 | else | 2195 | ;; |
2168 | 2661 | lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | 2196 | *) |
2169 | 2662 | fi | 2197 | lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` |
2170 | 2198 | ;; | ||
2171 | 2199 | esac | ||
2172 | 2663 | # Ok, now we have the path, separated by spaces, we can step through it | 2200 | # Ok, now we have the path, separated by spaces, we can step through it |
2173 | 2664 | # and add multilib dir if necessary. | 2201 | # and add multilib dir if necessary. |
2174 | 2665 | lt_tmp_lt_search_path_spec= | 2202 | lt_tmp_lt_search_path_spec= |
2175 | @@ -2672,7 +2209,7 @@ | |||
2176 | 2672 | lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" | 2209 | lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" |
2177 | 2673 | fi | 2210 | fi |
2178 | 2674 | done | 2211 | done |
2180 | 2675 | lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' | 2212 | lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' |
2181 | 2676 | BEGIN {RS=" "; FS="/|\n";} { | 2213 | BEGIN {RS=" "; FS="/|\n";} { |
2182 | 2677 | lt_foo=""; | 2214 | lt_foo=""; |
2183 | 2678 | lt_count=0; | 2215 | lt_count=0; |
2184 | @@ -2692,7 +2229,13 @@ | |||
2185 | 2692 | if (lt_foo != "") { lt_freq[[lt_foo]]++; } | 2229 | if (lt_foo != "") { lt_freq[[lt_foo]]++; } |
2186 | 2693 | if (lt_freq[[lt_foo]] == 1) { print lt_foo; } | 2230 | if (lt_freq[[lt_foo]] == 1) { print lt_foo; } |
2187 | 2694 | }'` | 2231 | }'` |
2189 | 2695 | sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` | 2232 | # AWK program above erroneously prepends '/' to C:/dos/paths |
2190 | 2233 | # for these hosts. | ||
2191 | 2234 | case $host_os in | ||
2192 | 2235 | mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ | ||
2193 | 2236 | $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; | ||
2194 | 2237 | esac | ||
2195 | 2238 | sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` | ||
2196 | 2696 | else | 2239 | else |
2197 | 2697 | sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" | 2240 | sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" |
2198 | 2698 | fi]) | 2241 | fi]) |
2199 | @@ -2718,7 +2261,7 @@ | |||
2200 | 2718 | 2261 | ||
2201 | 2719 | case $host_os in | 2262 | case $host_os in |
2202 | 2720 | aix3*) | 2263 | aix3*) |
2204 | 2721 | version_type=linux | 2264 | version_type=linux # correct to gnu/linux during the next big refactor |
2205 | 2722 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' | 2265 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' |
2206 | 2723 | shlibpath_var=LIBPATH | 2266 | shlibpath_var=LIBPATH |
2207 | 2724 | 2267 | ||
2208 | @@ -2727,7 +2270,7 @@ | |||
2209 | 2727 | ;; | 2270 | ;; |
2210 | 2728 | 2271 | ||
2211 | 2729 | aix[[4-9]]*) | 2272 | aix[[4-9]]*) |
2213 | 2730 | version_type=linux | 2273 | version_type=linux # correct to gnu/linux during the next big refactor |
2214 | 2731 | need_lib_prefix=no | 2274 | need_lib_prefix=no |
2215 | 2732 | need_version=no | 2275 | need_version=no |
2216 | 2733 | hardcode_into_libs=yes | 2276 | hardcode_into_libs=yes |
2217 | @@ -2780,7 +2323,7 @@ | |||
2218 | 2780 | m68k) | 2323 | m68k) |
2219 | 2781 | library_names_spec='$libname.ixlibrary $libname.a' | 2324 | library_names_spec='$libname.ixlibrary $libname.a' |
2220 | 2782 | # Create ${libname}_ixlibrary.a entries in /sys/libs. | 2325 | # Create ${libname}_ixlibrary.a entries in /sys/libs. |
2222 | 2783 | 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' | 2326 | 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 | 2784 | ;; | 2327 | ;; |
2224 | 2785 | esac | 2328 | esac |
2225 | 2786 | ;; | 2329 | ;; |
2226 | @@ -2792,7 +2335,7 @@ | |||
2227 | 2792 | ;; | 2335 | ;; |
2228 | 2793 | 2336 | ||
2229 | 2794 | bsdi[[45]]*) | 2337 | bsdi[[45]]*) |
2231 | 2795 | version_type=linux | 2338 | version_type=linux # correct to gnu/linux during the next big refactor |
2232 | 2796 | need_version=no | 2339 | need_version=no |
2233 | 2797 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2340 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2234 | 2798 | soname_spec='${libname}${release}${shared_ext}$major' | 2341 | soname_spec='${libname}${release}${shared_ext}$major' |
2235 | @@ -2811,8 +2354,9 @@ | |||
2236 | 2811 | need_version=no | 2354 | need_version=no |
2237 | 2812 | need_lib_prefix=no | 2355 | need_lib_prefix=no |
2238 | 2813 | 2356 | ||
2241 | 2814 | case $GCC,$host_os in | 2357 | case $GCC,$cc_basename in |
2242 | 2815 | yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) | 2358 | yes,*) |
2243 | 2359 | # gcc | ||
2244 | 2816 | library_names_spec='$libname.dll.a' | 2360 | library_names_spec='$libname.dll.a' |
2245 | 2817 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 2361 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
2246 | 2818 | postinstall_cmds='base_file=`basename \${file}`~ | 2362 | postinstall_cmds='base_file=`basename \${file}`~ |
2247 | @@ -2833,36 +2377,83 @@ | |||
2248 | 2833 | cygwin*) | 2377 | cygwin*) |
2249 | 2834 | # Cygwin DLLs use 'cyg' prefix rather than 'lib' | 2378 | # Cygwin DLLs use 'cyg' prefix rather than 'lib' |
2250 | 2835 | soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' | 2379 | soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
2252 | 2836 | sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" | 2380 | m4_if([$1], [],[ |
2253 | 2381 | sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) | ||
2254 | 2837 | ;; | 2382 | ;; |
2255 | 2838 | mingw* | cegcc*) | 2383 | mingw* | cegcc*) |
2256 | 2839 | # MinGW DLLs use traditional 'lib' prefix | 2384 | # MinGW DLLs use traditional 'lib' prefix |
2257 | 2840 | soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' | 2385 | soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
2258 | 2841 | sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` | ||
2259 | 2842 | if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then | ||
2260 | 2843 | # It is most probably a Windows format PATH printed by | ||
2261 | 2844 | # mingw gcc, but we are running on Cygwin. Gcc prints its search | ||
2262 | 2845 | # path with ; separators, and with drive letters. We can handle the | ||
2263 | 2846 | # drive letters (cygwin fileutils understands them), so leave them, | ||
2264 | 2847 | # especially as we might pass files found there to a mingw objdump, | ||
2265 | 2848 | # which wouldn't understand a cygwinified path. Ahh. | ||
2266 | 2849 | sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | ||
2267 | 2850 | else | ||
2268 | 2851 | sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
2269 | 2852 | fi | ||
2270 | 2853 | ;; | 2386 | ;; |
2271 | 2854 | pw32*) | 2387 | pw32*) |
2272 | 2855 | # pw32 DLLs use 'pw' prefix rather than 'lib' | 2388 | # pw32 DLLs use 'pw' prefix rather than 'lib' |
2273 | 2856 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' | 2389 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
2274 | 2857 | ;; | 2390 | ;; |
2275 | 2858 | esac | 2391 | esac |
2276 | 2392 | dynamic_linker='Win32 ld.exe' | ||
2277 | 2393 | ;; | ||
2278 | 2394 | |||
2279 | 2395 | *,cl*) | ||
2280 | 2396 | # Native MSVC | ||
2281 | 2397 | libname_spec='$name' | ||
2282 | 2398 | soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' | ||
2283 | 2399 | library_names_spec='${libname}.dll.lib' | ||
2284 | 2400 | |||
2285 | 2401 | case $build_os in | ||
2286 | 2402 | mingw*) | ||
2287 | 2403 | sys_lib_search_path_spec= | ||
2288 | 2404 | lt_save_ifs=$IFS | ||
2289 | 2405 | IFS=';' | ||
2290 | 2406 | for lt_path in $LIB | ||
2291 | 2407 | do | ||
2292 | 2408 | IFS=$lt_save_ifs | ||
2293 | 2409 | # Let DOS variable expansion print the short 8.3 style file name. | ||
2294 | 2410 | lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` | ||
2295 | 2411 | sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" | ||
2296 | 2412 | done | ||
2297 | 2413 | IFS=$lt_save_ifs | ||
2298 | 2414 | # Convert to MSYS style. | ||
2299 | 2415 | 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 | 2416 | ;; | ||
2301 | 2417 | cygwin*) | ||
2302 | 2418 | # Convert to unix form, then to dos form, then back to unix form | ||
2303 | 2419 | # but this time dos style (no spaces!) so that the unix form looks | ||
2304 | 2420 | # like /cygdrive/c/PROGRA~1:/cygdr... | ||
2305 | 2421 | sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` | ||
2306 | 2422 | sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` | ||
2307 | 2423 | sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
2308 | 2424 | ;; | ||
2309 | 2425 | *) | ||
2310 | 2426 | sys_lib_search_path_spec="$LIB" | ||
2311 | 2427 | if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then | ||
2312 | 2428 | # It is most probably a Windows format PATH. | ||
2313 | 2429 | sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | ||
2314 | 2430 | else | ||
2315 | 2431 | sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
2316 | 2432 | fi | ||
2317 | 2433 | # FIXME: find the short name or the path components, as spaces are | ||
2318 | 2434 | # common. (e.g. "Program Files" -> "PROGRA~1") | ||
2319 | 2435 | ;; | ||
2320 | 2436 | esac | ||
2321 | 2437 | |||
2322 | 2438 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
2323 | 2439 | postinstall_cmds='base_file=`basename \${file}`~ | ||
2324 | 2440 | dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ | ||
2325 | 2441 | dldir=$destdir/`dirname \$dlpath`~ | ||
2326 | 2442 | test -d \$dldir || mkdir -p \$dldir~ | ||
2327 | 2443 | $install_prog $dir/$dlname \$dldir/$dlname' | ||
2328 | 2444 | postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ | ||
2329 | 2445 | dlpath=$dir/\$dldll~ | ||
2330 | 2446 | $RM \$dlpath' | ||
2331 | 2447 | shlibpath_overrides_runpath=yes | ||
2332 | 2448 | dynamic_linker='Win32 link.exe' | ||
2333 | 2859 | ;; | 2449 | ;; |
2334 | 2860 | 2450 | ||
2335 | 2861 | *) | 2451 | *) |
2336 | 2452 | # Assume MSVC wrapper | ||
2337 | 2862 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' | 2453 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' |
2338 | 2454 | dynamic_linker='Win32 ld.exe' | ||
2339 | 2863 | ;; | 2455 | ;; |
2340 | 2864 | esac | 2456 | esac |
2341 | 2865 | dynamic_linker='Win32 ld.exe' | ||
2342 | 2866 | # FIXME: first we should search . and the directory the executable is in | 2457 | # FIXME: first we should search . and the directory the executable is in |
2343 | 2867 | shlibpath_var=PATH | 2458 | shlibpath_var=PATH |
2344 | 2868 | ;; | 2459 | ;; |
2345 | @@ -2883,7 +2474,7 @@ | |||
2346 | 2883 | ;; | 2474 | ;; |
2347 | 2884 | 2475 | ||
2348 | 2885 | dgux*) | 2476 | dgux*) |
2350 | 2886 | version_type=linux | 2477 | version_type=linux # correct to gnu/linux during the next big refactor |
2351 | 2887 | need_lib_prefix=no | 2478 | need_lib_prefix=no |
2352 | 2888 | need_version=no | 2479 | need_version=no |
2353 | 2889 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' | 2480 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' |
2354 | @@ -2891,10 +2482,6 @@ | |||
2355 | 2891 | shlibpath_var=LD_LIBRARY_PATH | 2482 | shlibpath_var=LD_LIBRARY_PATH |
2356 | 2892 | ;; | 2483 | ;; |
2357 | 2893 | 2484 | ||
2358 | 2894 | freebsd1*) | ||
2359 | 2895 | dynamic_linker=no | ||
2360 | 2896 | ;; | ||
2361 | 2897 | |||
2362 | 2898 | freebsd* | dragonfly*) | 2485 | freebsd* | dragonfly*) |
2363 | 2899 | # DragonFly does not have aout. When/if they implement a new | 2486 | # DragonFly does not have aout. When/if they implement a new |
2364 | 2900 | # versioning mechanism, adjust this. | 2487 | # versioning mechanism, adjust this. |
2365 | @@ -2902,7 +2489,7 @@ | |||
2366 | 2902 | objformat=`/usr/bin/objformat` | 2489 | objformat=`/usr/bin/objformat` |
2367 | 2903 | else | 2490 | else |
2368 | 2904 | case $host_os in | 2491 | case $host_os in |
2370 | 2905 | freebsd[[123]]*) objformat=aout ;; | 2492 | freebsd[[23]].*) objformat=aout ;; |
2371 | 2906 | *) objformat=elf ;; | 2493 | *) objformat=elf ;; |
2372 | 2907 | esac | 2494 | esac |
2373 | 2908 | fi | 2495 | fi |
2374 | @@ -2920,7 +2507,7 @@ | |||
2375 | 2920 | esac | 2507 | esac |
2376 | 2921 | shlibpath_var=LD_LIBRARY_PATH | 2508 | shlibpath_var=LD_LIBRARY_PATH |
2377 | 2922 | case $host_os in | 2509 | case $host_os in |
2379 | 2923 | freebsd2*) | 2510 | freebsd2.*) |
2380 | 2924 | shlibpath_overrides_runpath=yes | 2511 | shlibpath_overrides_runpath=yes |
2381 | 2925 | ;; | 2512 | ;; |
2382 | 2926 | freebsd3.[[01]]* | freebsdelf3.[[01]]*) | 2513 | freebsd3.[[01]]* | freebsdelf3.[[01]]*) |
2383 | @@ -2940,12 +2527,26 @@ | |||
2384 | 2940 | ;; | 2527 | ;; |
2385 | 2941 | 2528 | ||
2386 | 2942 | gnu*) | 2529 | gnu*) |
2388 | 2943 | version_type=linux | 2530 | version_type=linux # correct to gnu/linux during the next big refactor |
2389 | 2944 | need_lib_prefix=no | 2531 | need_lib_prefix=no |
2390 | 2945 | need_version=no | 2532 | need_version=no |
2391 | 2946 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' | 2533 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
2392 | 2947 | soname_spec='${libname}${release}${shared_ext}$major' | 2534 | soname_spec='${libname}${release}${shared_ext}$major' |
2393 | 2948 | shlibpath_var=LD_LIBRARY_PATH | 2535 | shlibpath_var=LD_LIBRARY_PATH |
2394 | 2536 | shlibpath_overrides_runpath=no | ||
2395 | 2537 | hardcode_into_libs=yes | ||
2396 | 2538 | ;; | ||
2397 | 2539 | |||
2398 | 2540 | haiku*) | ||
2399 | 2541 | version_type=linux # correct to gnu/linux during the next big refactor | ||
2400 | 2542 | need_lib_prefix=no | ||
2401 | 2543 | need_version=no | ||
2402 | 2544 | dynamic_linker="$host_os runtime_loader" | ||
2403 | 2545 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' | ||
2404 | 2546 | soname_spec='${libname}${release}${shared_ext}$major' | ||
2405 | 2547 | shlibpath_var=LIBRARY_PATH | ||
2406 | 2548 | shlibpath_overrides_runpath=yes | ||
2407 | 2549 | sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' | ||
2408 | 2949 | hardcode_into_libs=yes | 2550 | hardcode_into_libs=yes |
2409 | 2950 | ;; | 2551 | ;; |
2410 | 2951 | 2552 | ||
2411 | @@ -2991,12 +2592,14 @@ | |||
2412 | 2991 | soname_spec='${libname}${release}${shared_ext}$major' | 2592 | soname_spec='${libname}${release}${shared_ext}$major' |
2413 | 2992 | ;; | 2593 | ;; |
2414 | 2993 | esac | 2594 | esac |
2416 | 2994 | # HP-UX runs *really* slowly unless shared libraries are mode 555. | 2595 | # HP-UX runs *really* slowly unless shared libraries are mode 555, ... |
2417 | 2995 | postinstall_cmds='chmod 555 $lib' | 2596 | postinstall_cmds='chmod 555 $lib' |
2418 | 2597 | # or fails outright, so override atomically: | ||
2419 | 2598 | install_override_mode=555 | ||
2420 | 2996 | ;; | 2599 | ;; |
2421 | 2997 | 2600 | ||
2422 | 2998 | interix[[3-9]]*) | 2601 | interix[[3-9]]*) |
2424 | 2999 | version_type=linux | 2602 | version_type=linux # correct to gnu/linux during the next big refactor |
2425 | 3000 | need_lib_prefix=no | 2603 | need_lib_prefix=no |
2426 | 3001 | need_version=no | 2604 | need_version=no |
2427 | 3002 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | 2605 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
2428 | @@ -3012,7 +2615,7 @@ | |||
2429 | 3012 | nonstopux*) version_type=nonstopux ;; | 2615 | nonstopux*) version_type=nonstopux ;; |
2430 | 3013 | *) | 2616 | *) |
2431 | 3014 | if test "$lt_cv_prog_gnu_ld" = yes; then | 2617 | if test "$lt_cv_prog_gnu_ld" = yes; then |
2433 | 3015 | version_type=linux | 2618 | version_type=linux # correct to gnu/linux during the next big refactor |
2434 | 3016 | else | 2619 | else |
2435 | 3017 | version_type=irix | 2620 | version_type=irix |
2436 | 3018 | fi ;; | 2621 | fi ;; |
2437 | @@ -3049,9 +2652,9 @@ | |||
2438 | 3049 | dynamic_linker=no | 2652 | dynamic_linker=no |
2439 | 3050 | ;; | 2653 | ;; |
2440 | 3051 | 2654 | ||
2444 | 3052 | # This must be Linux ELF. | 2655 | # This must be glibc/ELF. |
2445 | 3053 | linux* | k*bsd*-gnu) | 2656 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
2446 | 3054 | version_type=linux | 2657 | version_type=linux # correct to gnu/linux during the next big refactor |
2447 | 3055 | need_lib_prefix=no | 2658 | need_lib_prefix=no |
2448 | 3056 | need_version=no | 2659 | need_version=no |
2449 | 3057 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2660 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2450 | @@ -3059,16 +2662,21 @@ | |||
2451 | 3059 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' | 2662 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' |
2452 | 3060 | shlibpath_var=LD_LIBRARY_PATH | 2663 | shlibpath_var=LD_LIBRARY_PATH |
2453 | 3061 | shlibpath_overrides_runpath=no | 2664 | shlibpath_overrides_runpath=no |
2454 | 2665 | |||
2455 | 3062 | # Some binutils ld are patched to set DT_RUNPATH | 2666 | # Some binutils ld are patched to set DT_RUNPATH |
2465 | 3063 | save_LDFLAGS=$LDFLAGS | 2667 | AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], |
2466 | 3064 | save_libdir=$libdir | 2668 | [lt_cv_shlibpath_overrides_runpath=no |
2467 | 3065 | eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ | 2669 | save_LDFLAGS=$LDFLAGS |
2468 | 3066 | LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" | 2670 | save_libdir=$libdir |
2469 | 3067 | AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], | 2671 | eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ |
2470 | 3068 | [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], | 2672 | LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" |
2471 | 3069 | [shlibpath_overrides_runpath=yes])]) | 2673 | AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], |
2472 | 3070 | LDFLAGS=$save_LDFLAGS | 2674 | [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], |
2473 | 3071 | libdir=$save_libdir | 2675 | [lt_cv_shlibpath_overrides_runpath=yes])]) |
2474 | 2676 | LDFLAGS=$save_LDFLAGS | ||
2475 | 2677 | libdir=$save_libdir | ||
2476 | 2678 | ]) | ||
2477 | 2679 | shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath | ||
2478 | 3072 | 2680 | ||
2479 | 3073 | # This implies no fast_install, which is unacceptable. | 2681 | # This implies no fast_install, which is unacceptable. |
2480 | 3074 | # Some rework will be needed to allow for fast_install | 2682 | # Some rework will be needed to allow for fast_install |
2481 | @@ -3080,8 +2688,9 @@ | |||
2482 | 3080 | 2688 | ||
2483 | 3081 | # Append ld.so.conf contents to the search path | 2689 | # Append ld.so.conf contents to the search path |
2484 | 3082 | if test -f /etc/ld.so.conf; then | 2690 | if test -f /etc/ld.so.conf; then |
2486 | 3083 | 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' ' '` | 2691 | 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 | 3084 | sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" | 2692 | sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" |
2488 | 2693 | |||
2489 | 3085 | fi | 2694 | fi |
2490 | 3086 | 2695 | ||
2491 | 3087 | # We used to test for /lib/ld.so.1 and disable shared libraries on | 2696 | # We used to test for /lib/ld.so.1 and disable shared libraries on |
2492 | @@ -3112,7 +2721,7 @@ | |||
2493 | 3112 | ;; | 2721 | ;; |
2494 | 3113 | 2722 | ||
2495 | 3114 | newsos6) | 2723 | newsos6) |
2497 | 3115 | version_type=linux | 2724 | version_type=linux # correct to gnu/linux during the next big refactor |
2498 | 3116 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2725 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2499 | 3117 | shlibpath_var=LD_LIBRARY_PATH | 2726 | shlibpath_var=LD_LIBRARY_PATH |
2500 | 3118 | shlibpath_overrides_runpath=yes | 2727 | shlibpath_overrides_runpath=yes |
2501 | @@ -3181,7 +2790,7 @@ | |||
2502 | 3181 | ;; | 2790 | ;; |
2503 | 3182 | 2791 | ||
2504 | 3183 | solaris*) | 2792 | solaris*) |
2506 | 3184 | version_type=linux | 2793 | version_type=linux # correct to gnu/linux during the next big refactor |
2507 | 3185 | need_lib_prefix=no | 2794 | need_lib_prefix=no |
2508 | 3186 | need_version=no | 2795 | need_version=no |
2509 | 3187 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2796 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2510 | @@ -3206,7 +2815,7 @@ | |||
2511 | 3206 | ;; | 2815 | ;; |
2512 | 3207 | 2816 | ||
2513 | 3208 | sysv4 | sysv4.3*) | 2817 | sysv4 | sysv4.3*) |
2515 | 3209 | version_type=linux | 2818 | version_type=linux # correct to gnu/linux during the next big refactor |
2516 | 3210 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2819 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2517 | 3211 | soname_spec='${libname}${release}${shared_ext}$major' | 2820 | soname_spec='${libname}${release}${shared_ext}$major' |
2518 | 3212 | shlibpath_var=LD_LIBRARY_PATH | 2821 | shlibpath_var=LD_LIBRARY_PATH |
2519 | @@ -3230,7 +2839,7 @@ | |||
2520 | 3230 | 2839 | ||
2521 | 3231 | sysv4*MP*) | 2840 | sysv4*MP*) |
2522 | 3232 | if test -d /usr/nec ;then | 2841 | if test -d /usr/nec ;then |
2524 | 3233 | version_type=linux | 2842 | version_type=linux # correct to gnu/linux during the next big refactor |
2525 | 3234 | library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' | 2843 | library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' |
2526 | 3235 | soname_spec='$libname${shared_ext}.$major' | 2844 | soname_spec='$libname${shared_ext}.$major' |
2527 | 3236 | shlibpath_var=LD_LIBRARY_PATH | 2845 | shlibpath_var=LD_LIBRARY_PATH |
2528 | @@ -3261,7 +2870,7 @@ | |||
2529 | 3261 | 2870 | ||
2530 | 3262 | tpf*) | 2871 | tpf*) |
2531 | 3263 | # TPF is a cross-target only. Preferred cross-host = GNU/Linux. | 2872 | # TPF is a cross-target only. Preferred cross-host = GNU/Linux. |
2533 | 3264 | version_type=linux | 2873 | version_type=linux # correct to gnu/linux during the next big refactor |
2534 | 3265 | need_lib_prefix=no | 2874 | need_lib_prefix=no |
2535 | 3266 | need_version=no | 2875 | need_version=no |
2536 | 3267 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2876 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2537 | @@ -3271,7 +2880,7 @@ | |||
2538 | 3271 | ;; | 2880 | ;; |
2539 | 3272 | 2881 | ||
2540 | 3273 | uts4*) | 2882 | uts4*) |
2542 | 3274 | version_type=linux | 2883 | version_type=linux # correct to gnu/linux during the next big refactor |
2543 | 3275 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2884 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2544 | 3276 | soname_spec='${libname}${release}${shared_ext}$major' | 2885 | soname_spec='${libname}${release}${shared_ext}$major' |
2545 | 3277 | shlibpath_var=LD_LIBRARY_PATH | 2886 | shlibpath_var=LD_LIBRARY_PATH |
2546 | @@ -3313,6 +2922,8 @@ | |||
2547 | 3313 | The last name is the one that the linker finds with -lNAME]]) | 2922 | The last name is the one that the linker finds with -lNAME]]) |
2548 | 3314 | _LT_DECL([], [soname_spec], [1], | 2923 | _LT_DECL([], [soname_spec], [1], |
2549 | 3315 | [[The coded name of the library, if different from the real name]]) | 2924 | [[The coded name of the library, if different from the real name]]) |
2550 | 2925 | _LT_DECL([], [install_override_mode], [1], | ||
2551 | 2926 | [Permission mode override for installation of shared libraries]) | ||
2552 | 3316 | _LT_DECL([], [postinstall_cmds], [2], | 2927 | _LT_DECL([], [postinstall_cmds], [2], |
2553 | 3317 | [Command to use after installation of a shared archive]) | 2928 | [Command to use after installation of a shared archive]) |
2554 | 3318 | _LT_DECL([], [postuninstall_cmds], [2], | 2929 | _LT_DECL([], [postuninstall_cmds], [2], |
2555 | @@ -3425,6 +3036,7 @@ | |||
2556 | 3425 | AC_REQUIRE([AC_CANONICAL_BUILD])dnl | 3036 | AC_REQUIRE([AC_CANONICAL_BUILD])dnl |
2557 | 3426 | m4_require([_LT_DECL_SED])dnl | 3037 | m4_require([_LT_DECL_SED])dnl |
2558 | 3427 | m4_require([_LT_DECL_EGREP])dnl | 3038 | m4_require([_LT_DECL_EGREP])dnl |
2559 | 3039 | m4_require([_LT_PROG_ECHO_BACKSLASH])dnl | ||
2560 | 3428 | 3040 | ||
2561 | 3429 | AC_ARG_WITH([gnu-ld], | 3041 | AC_ARG_WITH([gnu-ld], |
2562 | 3430 | [AS_HELP_STRING([--with-gnu-ld], | 3042 | [AS_HELP_STRING([--with-gnu-ld], |
2563 | @@ -3546,6 +3158,11 @@ | |||
2564 | 3546 | esac | 3158 | esac |
2565 | 3547 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 3159 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
2566 | 3548 | case $host_os in | 3160 | case $host_os in |
2567 | 3161 | cygwin* | mingw* | pw32* | cegcc*) | ||
2568 | 3162 | if test "$GCC" != yes; then | ||
2569 | 3163 | reload_cmds=false | ||
2570 | 3164 | fi | ||
2571 | 3165 | ;; | ||
2572 | 3549 | darwin*) | 3166 | darwin*) |
2573 | 3550 | if test "$GCC" = yes; then | 3167 | if test "$GCC" = yes; then |
2574 | 3551 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 3168 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
2575 | @@ -3554,8 +3171,8 @@ | |||
2576 | 3554 | fi | 3171 | fi |
2577 | 3555 | ;; | 3172 | ;; |
2578 | 3556 | esac | 3173 | esac |
2581 | 3557 | _LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl | 3174 | _LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl |
2582 | 3558 | _LT_DECL([], [reload_cmds], [2])dnl | 3175 | _LT_TAGDECL([], [reload_cmds], [2])dnl |
2583 | 3559 | ])# _LT_CMD_RELOAD | 3176 | ])# _LT_CMD_RELOAD |
2584 | 3560 | 3177 | ||
2585 | 3561 | 3178 | ||
2586 | @@ -3607,16 +3224,18 @@ | |||
2587 | 3607 | # Base MSYS/MinGW do not provide the 'file' command needed by | 3224 | # Base MSYS/MinGW do not provide the 'file' command needed by |
2588 | 3608 | # func_win32_libid shell function, so use a weaker test based on 'objdump', | 3225 | # func_win32_libid shell function, so use a weaker test based on 'objdump', |
2589 | 3609 | # unless we find 'file', for example because we are cross-compiling. | 3226 | # unless we find 'file', for example because we are cross-compiling. |
2591 | 3610 | if ( file / ) >/dev/null 2>&1; then | 3227 | # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. |
2592 | 3228 | if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then | ||
2593 | 3611 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 3229 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
2594 | 3612 | lt_cv_file_magic_cmd='func_win32_libid' | 3230 | lt_cv_file_magic_cmd='func_win32_libid' |
2595 | 3613 | else | 3231 | else |
2597 | 3614 | lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' | 3232 | # Keep this pattern in sync with the one in func_win32_libid. |
2598 | 3233 | lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' | ||
2599 | 3615 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 3234 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
2600 | 3616 | fi | 3235 | fi |
2601 | 3617 | ;; | 3236 | ;; |
2602 | 3618 | 3237 | ||
2604 | 3619 | cegcc) | 3238 | cegcc*) |
2605 | 3620 | # use the weaker test based on 'objdump'. See mingw*. | 3239 | # use the weaker test based on 'objdump'. See mingw*. |
2606 | 3621 | lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' | 3240 | lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' |
2607 | 3622 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 3241 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
2608 | @@ -3646,6 +3265,10 @@ | |||
2609 | 3646 | lt_cv_deplibs_check_method=pass_all | 3265 | lt_cv_deplibs_check_method=pass_all |
2610 | 3647 | ;; | 3266 | ;; |
2611 | 3648 | 3267 | ||
2612 | 3268 | haiku*) | ||
2613 | 3269 | lt_cv_deplibs_check_method=pass_all | ||
2614 | 3270 | ;; | ||
2615 | 3271 | |||
2616 | 3649 | hpux10.20* | hpux11*) | 3272 | hpux10.20* | hpux11*) |
2617 | 3650 | lt_cv_file_magic_cmd=/usr/bin/file | 3273 | lt_cv_file_magic_cmd=/usr/bin/file |
2618 | 3651 | case $host_cpu in | 3274 | case $host_cpu in |
2619 | @@ -3654,11 +3277,11 @@ | |||
2620 | 3654 | lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so | 3277 | lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so |
2621 | 3655 | ;; | 3278 | ;; |
2622 | 3656 | hppa*64*) | 3279 | hppa*64*) |
2624 | 3657 | [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]'] | 3280 | [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 | 3658 | lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl | 3281 | lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl |
2626 | 3659 | ;; | 3282 | ;; |
2627 | 3660 | *) | 3283 | *) |
2629 | 3661 | lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' | 3284 | lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' |
2630 | 3662 | lt_cv_file_magic_test_file=/usr/lib/libc.sl | 3285 | lt_cv_file_magic_test_file=/usr/lib/libc.sl |
2631 | 3663 | ;; | 3286 | ;; |
2632 | 3664 | esac | 3287 | esac |
2633 | @@ -3679,8 +3302,8 @@ | |||
2634 | 3679 | lt_cv_deplibs_check_method=pass_all | 3302 | lt_cv_deplibs_check_method=pass_all |
2635 | 3680 | ;; | 3303 | ;; |
2636 | 3681 | 3304 | ||
2639 | 3682 | # This must be Linux ELF. | 3305 | # This must be glibc/ELF. |
2640 | 3683 | linux* | k*bsd*-gnu) | 3306 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
2641 | 3684 | lt_cv_deplibs_check_method=pass_all | 3307 | lt_cv_deplibs_check_method=pass_all |
2642 | 3685 | ;; | 3308 | ;; |
2643 | 3686 | 3309 | ||
2644 | @@ -3758,6 +3381,21 @@ | |||
2645 | 3758 | ;; | 3381 | ;; |
2646 | 3759 | esac | 3382 | esac |
2647 | 3760 | ]) | 3383 | ]) |
2648 | 3384 | |||
2649 | 3385 | file_magic_glob= | ||
2650 | 3386 | want_nocaseglob=no | ||
2651 | 3387 | if test "$build" = "$host"; then | ||
2652 | 3388 | case $host_os in | ||
2653 | 3389 | mingw* | pw32*) | ||
2654 | 3390 | if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then | ||
2655 | 3391 | want_nocaseglob=yes | ||
2656 | 3392 | else | ||
2657 | 3393 | file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` | ||
2658 | 3394 | fi | ||
2659 | 3395 | ;; | ||
2660 | 3396 | esac | ||
2661 | 3397 | fi | ||
2662 | 3398 | |||
2663 | 3761 | file_magic_cmd=$lt_cv_file_magic_cmd | 3399 | file_magic_cmd=$lt_cv_file_magic_cmd |
2664 | 3762 | deplibs_check_method=$lt_cv_deplibs_check_method | 3400 | deplibs_check_method=$lt_cv_deplibs_check_method |
2665 | 3763 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 3401 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
2666 | @@ -3765,7 +3403,11 @@ | |||
2667 | 3765 | _LT_DECL([], [deplibs_check_method], [1], | 3403 | _LT_DECL([], [deplibs_check_method], [1], |
2668 | 3766 | [Method to check whether dependent libraries are shared objects]) | 3404 | [Method to check whether dependent libraries are shared objects]) |
2669 | 3767 | _LT_DECL([], [file_magic_cmd], [1], | 3405 | _LT_DECL([], [file_magic_cmd], [1], |
2671 | 3768 | [Command to use when deplibs_check_method == "file_magic"]) | 3406 | [Command to use when deplibs_check_method = "file_magic"]) |
2672 | 3407 | _LT_DECL([], [file_magic_glob], [1], | ||
2673 | 3408 | [How to find potential files when deplibs_check_method = "file_magic"]) | ||
2674 | 3409 | _LT_DECL([], [want_nocaseglob], [1], | ||
2675 | 3410 | [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) | ||
2676 | 3769 | ])# _LT_CHECK_MAGIC_METHOD | 3411 | ])# _LT_CHECK_MAGIC_METHOD |
2677 | 3770 | 3412 | ||
2678 | 3771 | 3413 | ||
2679 | @@ -3822,7 +3464,19 @@ | |||
2680 | 3822 | NM="$lt_cv_path_NM" | 3464 | NM="$lt_cv_path_NM" |
2681 | 3823 | else | 3465 | else |
2682 | 3824 | # Didn't find any BSD compatible name lister, look for dumpbin. | 3466 | # Didn't find any BSD compatible name lister, look for dumpbin. |
2684 | 3825 | AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) | 3467 | if test -n "$DUMPBIN"; then : |
2685 | 3468 | # Let the user override the test. | ||
2686 | 3469 | else | ||
2687 | 3470 | AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) | ||
2688 | 3471 | case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in | ||
2689 | 3472 | *COFF*) | ||
2690 | 3473 | DUMPBIN="$DUMPBIN -symbols" | ||
2691 | 3474 | ;; | ||
2692 | 3475 | *) | ||
2693 | 3476 | DUMPBIN=: | ||
2694 | 3477 | ;; | ||
2695 | 3478 | esac | ||
2696 | 3479 | fi | ||
2697 | 3826 | AC_SUBST([DUMPBIN]) | 3480 | AC_SUBST([DUMPBIN]) |
2698 | 3827 | if test "$DUMPBIN" != ":"; then | 3481 | if test "$DUMPBIN" != ":"; then |
2699 | 3828 | NM="$DUMPBIN" | 3482 | NM="$DUMPBIN" |
2700 | @@ -3835,13 +3489,13 @@ | |||
2701 | 3835 | AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], | 3489 | AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], |
2702 | 3836 | [lt_cv_nm_interface="BSD nm" | 3490 | [lt_cv_nm_interface="BSD nm" |
2703 | 3837 | echo "int some_variable = 0;" > conftest.$ac_ext | 3491 | echo "int some_variable = 0;" > conftest.$ac_ext |
2705 | 3838 | (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) | 3492 | (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) |
2706 | 3839 | (eval "$ac_compile" 2>conftest.err) | 3493 | (eval "$ac_compile" 2>conftest.err) |
2707 | 3840 | cat conftest.err >&AS_MESSAGE_LOG_FD | 3494 | cat conftest.err >&AS_MESSAGE_LOG_FD |
2709 | 3841 | (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) | 3495 | (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) |
2710 | 3842 | (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) | 3496 | (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) |
2711 | 3843 | cat conftest.err >&AS_MESSAGE_LOG_FD | 3497 | cat conftest.err >&AS_MESSAGE_LOG_FD |
2713 | 3844 | (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) | 3498 | (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) |
2714 | 3845 | cat conftest.out >&AS_MESSAGE_LOG_FD | 3499 | cat conftest.out >&AS_MESSAGE_LOG_FD |
2715 | 3846 | if $GREP 'External.*some_variable' conftest.out > /dev/null; then | 3500 | if $GREP 'External.*some_variable' conftest.out > /dev/null; then |
2716 | 3847 | lt_cv_nm_interface="MS dumpbin" | 3501 | lt_cv_nm_interface="MS dumpbin" |
2717 | @@ -3856,6 +3510,67 @@ | |||
2718 | 3856 | dnl AC_DEFUN([AM_PROG_NM], []) | 3510 | dnl AC_DEFUN([AM_PROG_NM], []) |
2719 | 3857 | dnl AC_DEFUN([AC_PROG_NM], []) | 3511 | dnl AC_DEFUN([AC_PROG_NM], []) |
2720 | 3858 | 3512 | ||
2721 | 3513 | # _LT_CHECK_SHAREDLIB_FROM_LINKLIB | ||
2722 | 3514 | # -------------------------------- | ||
2723 | 3515 | # how to determine the name of the shared library | ||
2724 | 3516 | # associated with a specific link library. | ||
2725 | 3517 | # -- PORTME fill in with the dynamic library characteristics | ||
2726 | 3518 | m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], | ||
2727 | 3519 | [m4_require([_LT_DECL_EGREP]) | ||
2728 | 3520 | m4_require([_LT_DECL_OBJDUMP]) | ||
2729 | 3521 | m4_require([_LT_DECL_DLLTOOL]) | ||
2730 | 3522 | AC_CACHE_CHECK([how to associate runtime and link libraries], | ||
2731 | 3523 | lt_cv_sharedlib_from_linklib_cmd, | ||
2732 | 3524 | [lt_cv_sharedlib_from_linklib_cmd='unknown' | ||
2733 | 3525 | |||
2734 | 3526 | case $host_os in | ||
2735 | 3527 | cygwin* | mingw* | pw32* | cegcc*) | ||
2736 | 3528 | # two different shell functions defined in ltmain.sh | ||
2737 | 3529 | # decide which to use based on capabilities of $DLLTOOL | ||
2738 | 3530 | case `$DLLTOOL --help 2>&1` in | ||
2739 | 3531 | *--identify-strict*) | ||
2740 | 3532 | lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib | ||
2741 | 3533 | ;; | ||
2742 | 3534 | *) | ||
2743 | 3535 | lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback | ||
2744 | 3536 | ;; | ||
2745 | 3537 | esac | ||
2746 | 3538 | ;; | ||
2747 | 3539 | *) | ||
2748 | 3540 | # fallback: assume linklib IS sharedlib | ||
2749 | 3541 | lt_cv_sharedlib_from_linklib_cmd="$ECHO" | ||
2750 | 3542 | ;; | ||
2751 | 3543 | esac | ||
2752 | 3544 | ]) | ||
2753 | 3545 | sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd | ||
2754 | 3546 | test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO | ||
2755 | 3547 | |||
2756 | 3548 | _LT_DECL([], [sharedlib_from_linklib_cmd], [1], | ||
2757 | 3549 | [Command to associate shared and link libraries]) | ||
2758 | 3550 | ])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB | ||
2759 | 3551 | |||
2760 | 3552 | |||
2761 | 3553 | # _LT_PATH_MANIFEST_TOOL | ||
2762 | 3554 | # ---------------------- | ||
2763 | 3555 | # locate the manifest tool | ||
2764 | 3556 | m4_defun([_LT_PATH_MANIFEST_TOOL], | ||
2765 | 3557 | [AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) | ||
2766 | 3558 | test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt | ||
2767 | 3559 | AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], | ||
2768 | 3560 | [lt_cv_path_mainfest_tool=no | ||
2769 | 3561 | echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD | ||
2770 | 3562 | $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out | ||
2771 | 3563 | cat conftest.err >&AS_MESSAGE_LOG_FD | ||
2772 | 3564 | if $GREP 'Manifest Tool' conftest.out > /dev/null; then | ||
2773 | 3565 | lt_cv_path_mainfest_tool=yes | ||
2774 | 3566 | fi | ||
2775 | 3567 | rm -f conftest*]) | ||
2776 | 3568 | if test "x$lt_cv_path_mainfest_tool" != xyes; then | ||
2777 | 3569 | MANIFEST_TOOL=: | ||
2778 | 3570 | fi | ||
2779 | 3571 | _LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl | ||
2780 | 3572 | ])# _LT_PATH_MANIFEST_TOOL | ||
2781 | 3573 | |||
2782 | 3859 | 3574 | ||
2783 | 3860 | # LT_LIB_M | 3575 | # LT_LIB_M |
2784 | 3861 | # -------- | 3576 | # -------- |
2785 | @@ -3864,7 +3579,7 @@ | |||
2786 | 3864 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl | 3579 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl |
2787 | 3865 | LIBM= | 3580 | LIBM= |
2788 | 3866 | case $host in | 3581 | case $host in |
2790 | 3867 | *-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) | 3582 | *-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) |
2791 | 3868 | # These system don't have libm, or don't need it | 3583 | # These system don't have libm, or don't need it |
2792 | 3869 | ;; | 3584 | ;; |
2793 | 3870 | *-ncr-sysv4.3*) | 3585 | *-ncr-sysv4.3*) |
2794 | @@ -3892,7 +3607,12 @@ | |||
2795 | 3892 | _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= | 3607 | _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= |
2796 | 3893 | 3608 | ||
2797 | 3894 | if test "$GCC" = yes; then | 3609 | if test "$GCC" = yes; then |
2799 | 3895 | _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' | 3610 | case $cc_basename in |
2800 | 3611 | nvcc*) | ||
2801 | 3612 | _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; | ||
2802 | 3613 | *) | ||
2803 | 3614 | _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; | ||
2804 | 3615 | esac | ||
2805 | 3896 | 3616 | ||
2806 | 3897 | _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], | 3617 | _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], |
2807 | 3898 | lt_cv_prog_compiler_rtti_exceptions, | 3618 | lt_cv_prog_compiler_rtti_exceptions, |
2808 | @@ -3909,6 +3629,7 @@ | |||
2809 | 3909 | m4_defun([_LT_CMD_GLOBAL_SYMBOLS], | 3629 | m4_defun([_LT_CMD_GLOBAL_SYMBOLS], |
2810 | 3910 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl | 3630 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl |
2811 | 3911 | AC_REQUIRE([AC_PROG_CC])dnl | 3631 | AC_REQUIRE([AC_PROG_CC])dnl |
2812 | 3632 | AC_REQUIRE([AC_PROG_AWK])dnl | ||
2813 | 3912 | AC_REQUIRE([LT_PATH_NM])dnl | 3633 | AC_REQUIRE([LT_PATH_NM])dnl |
2814 | 3913 | AC_REQUIRE([LT_PATH_LD])dnl | 3634 | AC_REQUIRE([LT_PATH_LD])dnl |
2815 | 3914 | m4_require([_LT_DECL_SED])dnl | 3635 | m4_require([_LT_DECL_SED])dnl |
2816 | @@ -3976,8 +3697,8 @@ | |||
2817 | 3976 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 3697 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
2818 | 3977 | 3698 | ||
2819 | 3978 | # Transform an extracted symbol line into symbol name and symbol address | 3699 | # Transform an extracted symbol line into symbol name and symbol address |
2822 | 3979 | lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" | 3700 | 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 | 3980 | 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'" | 3701 | 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 | 3981 | 3702 | ||
2825 | 3982 | # Handle CRLF in mingw tool chain | 3703 | # Handle CRLF in mingw tool chain |
2826 | 3983 | opt_cr= | 3704 | opt_cr= |
2827 | @@ -4001,6 +3722,7 @@ | |||
2828 | 4001 | # which start with @ or ?. | 3722 | # which start with @ or ?. |
2829 | 4002 | lt_cv_sys_global_symbol_pipe="$AWK ['"\ | 3723 | lt_cv_sys_global_symbol_pipe="$AWK ['"\ |
2830 | 4003 | " {last_section=section; section=\$ 3};"\ | 3724 | " {last_section=section; section=\$ 3};"\ |
2831 | 3725 | " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ | ||
2832 | 4004 | " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ | 3726 | " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ |
2833 | 4005 | " \$ 0!~/External *\|/{next};"\ | 3727 | " \$ 0!~/External *\|/{next};"\ |
2834 | 4006 | " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ | 3728 | " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ |
2835 | @@ -4013,6 +3735,7 @@ | |||
2836 | 4013 | else | 3735 | else |
2837 | 4014 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | 3736 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
2838 | 4015 | fi | 3737 | fi |
2839 | 3738 | lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" | ||
2840 | 4016 | 3739 | ||
2841 | 4017 | # Check to see that the pipe works correctly. | 3740 | # Check to see that the pipe works correctly. |
2842 | 4018 | pipe_works=no | 3741 | pipe_works=no |
2843 | @@ -4034,7 +3757,7 @@ | |||
2844 | 4034 | if AC_TRY_EVAL(ac_compile); then | 3757 | if AC_TRY_EVAL(ac_compile); then |
2845 | 4035 | # Now try to grab the symbols. | 3758 | # Now try to grab the symbols. |
2846 | 4036 | nlist=conftest.nm | 3759 | nlist=conftest.nm |
2848 | 4037 | if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then | 3760 | if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then |
2849 | 4038 | # Try sorting and uniquifying the output. | 3761 | # Try sorting and uniquifying the output. |
2850 | 4039 | if sort "$nlist" | uniq > "$nlist"T; then | 3762 | if sort "$nlist" | uniq > "$nlist"T; then |
2851 | 4040 | mv -f "$nlist"T "$nlist" | 3763 | mv -f "$nlist"T "$nlist" |
2852 | @@ -4046,6 +3769,18 @@ | |||
2853 | 4046 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | 3769 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
2854 | 4047 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 3770 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
2855 | 4048 | cat <<_LT_EOF > conftest.$ac_ext | 3771 | cat <<_LT_EOF > conftest.$ac_ext |
2856 | 3772 | /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ | ||
2857 | 3773 | #if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) | ||
2858 | 3774 | /* DATA imports from DLLs on WIN32 con't be const, because runtime | ||
2859 | 3775 | relocations are performed -- see ld's documentation on pseudo-relocs. */ | ||
2860 | 3776 | # define LT@&t@_DLSYM_CONST | ||
2861 | 3777 | #elif defined(__osf__) | ||
2862 | 3778 | /* This system does not cope well with relocations in const data. */ | ||
2863 | 3779 | # define LT@&t@_DLSYM_CONST | ||
2864 | 3780 | #else | ||
2865 | 3781 | # define LT@&t@_DLSYM_CONST const | ||
2866 | 3782 | #endif | ||
2867 | 3783 | |||
2868 | 4049 | #ifdef __cplusplus | 3784 | #ifdef __cplusplus |
2869 | 4050 | extern "C" { | 3785 | extern "C" { |
2870 | 4051 | #endif | 3786 | #endif |
2871 | @@ -4057,7 +3792,7 @@ | |||
2872 | 4057 | cat <<_LT_EOF >> conftest.$ac_ext | 3792 | cat <<_LT_EOF >> conftest.$ac_ext |
2873 | 4058 | 3793 | ||
2874 | 4059 | /* The mapping between symbol names and symbols. */ | 3794 | /* The mapping between symbol names and symbols. */ |
2876 | 4060 | const struct { | 3795 | LT@&t@_DLSYM_CONST struct { |
2877 | 4061 | const char *name; | 3796 | const char *name; |
2878 | 4062 | void *address; | 3797 | void *address; |
2879 | 4063 | } | 3798 | } |
2880 | @@ -4083,15 +3818,15 @@ | |||
2881 | 4083 | _LT_EOF | 3818 | _LT_EOF |
2882 | 4084 | # Now try linking the two files. | 3819 | # Now try linking the two files. |
2883 | 4085 | mv conftest.$ac_objext conftstm.$ac_objext | 3820 | mv conftest.$ac_objext conftstm.$ac_objext |
2886 | 4086 | lt_save_LIBS="$LIBS" | 3821 | lt_globsym_save_LIBS=$LIBS |
2887 | 4087 | lt_save_CFLAGS="$CFLAGS" | 3822 | lt_globsym_save_CFLAGS=$CFLAGS |
2888 | 4088 | LIBS="conftstm.$ac_objext" | 3823 | LIBS="conftstm.$ac_objext" |
2889 | 4089 | CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" | 3824 | CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" |
2890 | 4090 | if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then | 3825 | if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then |
2891 | 4091 | pipe_works=yes | 3826 | pipe_works=yes |
2892 | 4092 | fi | 3827 | fi |
2895 | 4093 | LIBS="$lt_save_LIBS" | 3828 | LIBS=$lt_globsym_save_LIBS |
2896 | 4094 | CFLAGS="$lt_save_CFLAGS" | 3829 | CFLAGS=$lt_globsym_save_CFLAGS |
2897 | 4095 | else | 3830 | else |
2898 | 4096 | echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD | 3831 | echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD |
2899 | 4097 | fi | 3832 | fi |
2900 | @@ -4124,6 +3859,13 @@ | |||
2901 | 4124 | AC_MSG_RESULT(ok) | 3859 | AC_MSG_RESULT(ok) |
2902 | 4125 | fi | 3860 | fi |
2903 | 4126 | 3861 | ||
2904 | 3862 | # Response file support. | ||
2905 | 3863 | if test "$lt_cv_nm_interface" = "MS dumpbin"; then | ||
2906 | 3864 | nm_file_list_spec='@' | ||
2907 | 3865 | elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then | ||
2908 | 3866 | nm_file_list_spec='@' | ||
2909 | 3867 | fi | ||
2910 | 3868 | |||
2911 | 4127 | _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], | 3869 | _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], |
2912 | 4128 | [Take the output of nm and produce a listing of raw symbols and C names]) | 3870 | [Take the output of nm and produce a listing of raw symbols and C names]) |
2913 | 4129 | _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], | 3871 | _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], |
2914 | @@ -4134,6 +3876,8 @@ | |||
2915 | 4134 | _LT_DECL([global_symbol_to_c_name_address_lib_prefix], | 3876 | _LT_DECL([global_symbol_to_c_name_address_lib_prefix], |
2916 | 4135 | [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], | 3877 | [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], |
2917 | 4136 | [Transform the output of nm in a C name address pair when lib prefix is needed]) | 3878 | [Transform the output of nm in a C name address pair when lib prefix is needed]) |
2918 | 3879 | _LT_DECL([], [nm_file_list_spec], [1], | ||
2919 | 3880 | [Specify filename containing input files for $NM]) | ||
2920 | 4137 | ]) # _LT_CMD_GLOBAL_SYMBOLS | 3881 | ]) # _LT_CMD_GLOBAL_SYMBOLS |
2921 | 4138 | 3882 | ||
2922 | 4139 | 3883 | ||
2923 | @@ -4145,7 +3889,6 @@ | |||
2924 | 4145 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= | 3889 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
2925 | 4146 | _LT_TAGVAR(lt_prog_compiler_static, $1)= | 3890 | _LT_TAGVAR(lt_prog_compiler_static, $1)= |
2926 | 4147 | 3891 | ||
2927 | 4148 | AC_MSG_CHECKING([for $compiler option to produce PIC]) | ||
2928 | 4149 | m4_if([$1], [CXX], [ | 3892 | m4_if([$1], [CXX], [ |
2929 | 4150 | # C++ specific cases for pic, static, wl, etc. | 3893 | # C++ specific cases for pic, static, wl, etc. |
2930 | 4151 | if test "$GXX" = yes; then | 3894 | if test "$GXX" = yes; then |
2931 | @@ -4196,6 +3939,11 @@ | |||
2932 | 4196 | # DJGPP does not support shared libraries at all | 3939 | # DJGPP does not support shared libraries at all |
2933 | 4197 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= | 3940 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
2934 | 4198 | ;; | 3941 | ;; |
2935 | 3942 | haiku*) | ||
2936 | 3943 | # PIC is the default for Haiku. | ||
2937 | 3944 | # The "-static" flag exists, but is broken. | ||
2938 | 3945 | _LT_TAGVAR(lt_prog_compiler_static, $1)= | ||
2939 | 3946 | ;; | ||
2940 | 4199 | interix[[3-9]]*) | 3947 | interix[[3-9]]*) |
2941 | 4200 | # Interix 3.x gcc -fpic/-fPIC options generate broken code. | 3948 | # Interix 3.x gcc -fpic/-fPIC options generate broken code. |
2942 | 4201 | # Instead, we relocate shared libraries at runtime. | 3949 | # Instead, we relocate shared libraries at runtime. |
2943 | @@ -4245,6 +3993,12 @@ | |||
2944 | 4245 | ;; | 3993 | ;; |
2945 | 4246 | esac | 3994 | esac |
2946 | 4247 | ;; | 3995 | ;; |
2947 | 3996 | mingw* | cygwin* | os2* | pw32* | cegcc*) | ||
2948 | 3997 | # This hack is so that the source file can tell whether it is being | ||
2949 | 3998 | # built for inclusion in a dll (and should export symbols for example). | ||
2950 | 3999 | m4_if([$1], [GCJ], [], | ||
2951 | 4000 | [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) | ||
2952 | 4001 | ;; | ||
2953 | 4248 | dgux*) | 4002 | dgux*) |
2954 | 4249 | case $cc_basename in | 4003 | case $cc_basename in |
2955 | 4250 | ec++*) | 4004 | ec++*) |
2956 | @@ -4301,7 +4055,7 @@ | |||
2957 | 4301 | ;; | 4055 | ;; |
2958 | 4302 | esac | 4056 | esac |
2959 | 4303 | ;; | 4057 | ;; |
2961 | 4304 | linux* | k*bsd*-gnu) | 4058 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
2962 | 4305 | case $cc_basename in | 4059 | case $cc_basename in |
2963 | 4306 | KCC*) | 4060 | KCC*) |
2964 | 4307 | # KAI C++ Compiler | 4061 | # KAI C++ Compiler |
2965 | @@ -4334,8 +4088,8 @@ | |||
2966 | 4334 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= | 4088 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
2967 | 4335 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' | 4089 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
2968 | 4336 | ;; | 4090 | ;; |
2971 | 4337 | xlc* | xlC*) | 4091 | xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) |
2972 | 4338 | # IBM XL 8.0 on PPC | 4092 | # IBM XL 8.0, 9.0 on PPC and BlueGene |
2973 | 4339 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | 4093 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
2974 | 4340 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' | 4094 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' |
2975 | 4341 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' | 4095 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' |
2976 | @@ -4397,7 +4151,7 @@ | |||
2977 | 4397 | ;; | 4151 | ;; |
2978 | 4398 | solaris*) | 4152 | solaris*) |
2979 | 4399 | case $cc_basename in | 4153 | case $cc_basename in |
2981 | 4400 | CC*) | 4154 | CC* | sunCC*) |
2982 | 4401 | # Sun C++ 4.2, 5.x and Centerline C++ | 4155 | # Sun C++ 4.2, 5.x and Centerline C++ |
2983 | 4402 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | 4156 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
2984 | 4403 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | 4157 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
2985 | @@ -4501,6 +4255,12 @@ | |||
2986 | 4501 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' | 4255 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' |
2987 | 4502 | ;; | 4256 | ;; |
2988 | 4503 | 4257 | ||
2989 | 4258 | haiku*) | ||
2990 | 4259 | # PIC is the default for Haiku. | ||
2991 | 4260 | # The "-static" flag exists, but is broken. | ||
2992 | 4261 | _LT_TAGVAR(lt_prog_compiler_static, $1)= | ||
2993 | 4262 | ;; | ||
2994 | 4263 | |||
2995 | 4504 | hpux*) | 4264 | hpux*) |
2996 | 4505 | # PIC is the default for 64-bit PA HP-UX, but not for 32-bit | 4265 | # PIC is the default for 64-bit PA HP-UX, but not for 32-bit |
2997 | 4506 | # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag | 4266 | # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag |
2998 | @@ -4543,6 +4303,15 @@ | |||
2999 | 4543 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' | 4303 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
3000 | 4544 | ;; | 4304 | ;; |
3001 | 4545 | esac | 4305 | esac |
3002 | 4306 | |||
3003 | 4307 | case $cc_basename in | ||
3004 | 4308 | nvcc*) # Cuda Compiler Driver 2.2 | ||
3005 | 4309 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' | ||
3006 | 4310 | if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then | ||
3007 | 4311 | _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" | ||
3008 | 4312 | fi | ||
3009 | 4313 | ;; | ||
3010 | 4314 | esac | ||
3011 | 4546 | else | 4315 | else |
3012 | 4547 | # PORTME Check for flag to pass linker flags through the system compiler. | 4316 | # PORTME Check for flag to pass linker flags through the system compiler. |
3013 | 4548 | case $host_os in | 4317 | case $host_os in |
3014 | @@ -4585,7 +4354,7 @@ | |||
3015 | 4585 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' | 4354 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
3016 | 4586 | ;; | 4355 | ;; |
3017 | 4587 | 4356 | ||
3019 | 4588 | linux* | k*bsd*-gnu) | 4357 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
3020 | 4589 | case $cc_basename in | 4358 | case $cc_basename in |
3021 | 4590 | # old Intel for x86_64 which still supported -KPIC. | 4359 | # old Intel for x86_64 which still supported -KPIC. |
3022 | 4591 | ecc*) | 4360 | ecc*) |
3023 | @@ -4606,7 +4375,13 @@ | |||
3024 | 4606 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' | 4375 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' |
3025 | 4607 | _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' | 4376 | _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' |
3026 | 4608 | ;; | 4377 | ;; |
3028 | 4609 | pgcc* | pgf77* | pgf90* | pgf95*) | 4378 | nagfor*) |
3029 | 4379 | # NAG Fortran compiler | ||
3030 | 4380 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' | ||
3031 | 4381 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' | ||
3032 | 4382 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | ||
3033 | 4383 | ;; | ||
3034 | 4384 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | ||
3035 | 4610 | # Portland Group compilers (*not* the Pentium gcc compiler, | 4385 | # Portland Group compilers (*not* the Pentium gcc compiler, |
3036 | 4611 | # which looks to be a dead project) | 4386 | # which looks to be a dead project) |
3037 | 4612 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | 4387 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
3038 | @@ -4618,25 +4393,40 @@ | |||
3039 | 4618 | # All Alpha code is PIC. | 4393 | # All Alpha code is PIC. |
3040 | 4619 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' | 4394 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
3041 | 4620 | ;; | 4395 | ;; |
3044 | 4621 | xl*) | 4396 | xl* | bgxl* | bgf* | mpixl*) |
3045 | 4622 | # IBM XL C 8.0/Fortran 10.1 on PPC | 4397 | # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene |
3046 | 4623 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | 4398 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
3047 | 4624 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' | 4399 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' |
3048 | 4625 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' | 4400 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' |
3049 | 4626 | ;; | 4401 | ;; |
3050 | 4627 | *) | 4402 | *) |
3051 | 4628 | case `$CC -V 2>&1 | sed 5q` in | 4403 | case `$CC -V 2>&1 | sed 5q` in |
3052 | 4404 | *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) | ||
3053 | 4405 | # Sun Fortran 8.3 passes all unrecognized flags to the linker | ||
3054 | 4406 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | ||
3055 | 4407 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | ||
3056 | 4408 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='' | ||
3057 | 4409 | ;; | ||
3058 | 4410 | *Sun\ F* | *Sun*Fortran*) | ||
3059 | 4411 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | ||
3060 | 4412 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | ||
3061 | 4413 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' | ||
3062 | 4414 | ;; | ||
3063 | 4629 | *Sun\ C*) | 4415 | *Sun\ C*) |
3064 | 4630 | # Sun C 5.9 | 4416 | # Sun C 5.9 |
3065 | 4631 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | 4417 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
3066 | 4632 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | 4418 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
3067 | 4633 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | 4419 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
3068 | 4634 | ;; | 4420 | ;; |
3072 | 4635 | *Sun\ F*) | 4421 | *Intel*\ [[CF]]*Compiler*) |
3073 | 4636 | # Sun Fortran 8.3 passes all unrecognized flags to the linker | 4422 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
3074 | 4637 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | 4423 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
3075 | 4424 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' | ||
3076 | 4425 | ;; | ||
3077 | 4426 | *Portland\ Group*) | ||
3078 | 4427 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | ||
3079 | 4428 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' | ||
3080 | 4638 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | 4429 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
3081 | 4639 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='' | ||
3082 | 4640 | ;; | 4430 | ;; |
3083 | 4641 | esac | 4431 | esac |
3084 | 4642 | ;; | 4432 | ;; |
3085 | @@ -4668,7 +4458,7 @@ | |||
3086 | 4668 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | 4458 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
3087 | 4669 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | 4459 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
3088 | 4670 | case $cc_basename in | 4460 | case $cc_basename in |
3090 | 4671 | f77* | f90* | f95*) | 4461 | f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
3091 | 4672 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; | 4462 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; |
3092 | 4673 | *) | 4463 | *) |
3093 | 4674 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; | 4464 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; |
3094 | @@ -4725,9 +4515,11 @@ | |||
3095 | 4725 | _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" | 4515 | _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 | 4726 | ;; | 4516 | ;; |
3097 | 4727 | esac | 4517 | esac |
3101 | 4728 | AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) | 4518 | |
3102 | 4729 | _LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], | 4519 | AC_CACHE_CHECK([for $compiler option to produce PIC], |
3103 | 4730 | [How to pass a linker flag through the compiler]) | 4520 | [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], |
3104 | 4521 | [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) | ||
3105 | 4522 | _LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) | ||
3106 | 4731 | 4523 | ||
3107 | 4732 | # | 4524 | # |
3108 | 4733 | # Check to make sure the PIC flag actually works. | 4525 | # Check to make sure the PIC flag actually works. |
3109 | @@ -4746,6 +4538,8 @@ | |||
3110 | 4746 | _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], | 4538 | _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], |
3111 | 4747 | [Additional compiler flags for building library objects]) | 4539 | [Additional compiler flags for building library objects]) |
3112 | 4748 | 4540 | ||
3113 | 4541 | _LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], | ||
3114 | 4542 | [How to pass a linker flag through the compiler]) | ||
3115 | 4749 | # | 4543 | # |
3116 | 4750 | # Check to make sure the static flag actually works. | 4544 | # Check to make sure the static flag actually works. |
3117 | 4751 | # | 4545 | # |
3118 | @@ -4766,6 +4560,7 @@ | |||
3119 | 4766 | m4_defun([_LT_LINKER_SHLIBS], | 4560 | m4_defun([_LT_LINKER_SHLIBS], |
3120 | 4767 | [AC_REQUIRE([LT_PATH_LD])dnl | 4561 | [AC_REQUIRE([LT_PATH_LD])dnl |
3121 | 4768 | AC_REQUIRE([LT_PATH_NM])dnl | 4562 | AC_REQUIRE([LT_PATH_NM])dnl |
3122 | 4563 | m4_require([_LT_PATH_MANIFEST_TOOL])dnl | ||
3123 | 4769 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl | 4564 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
3124 | 4770 | m4_require([_LT_DECL_EGREP])dnl | 4565 | m4_require([_LT_DECL_EGREP])dnl |
3125 | 4771 | m4_require([_LT_DECL_SED])dnl | 4566 | m4_require([_LT_DECL_SED])dnl |
3126 | @@ -4774,27 +4569,37 @@ | |||
3127 | 4774 | AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) | 4569 | AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) |
3128 | 4775 | m4_if([$1], [CXX], [ | 4570 | m4_if([$1], [CXX], [ |
3129 | 4776 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | 4571 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
3130 | 4572 | _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] | ||
3131 | 4777 | case $host_os in | 4573 | case $host_os in |
3132 | 4778 | aix[[4-9]]*) | 4574 | aix[[4-9]]*) |
3133 | 4779 | # If we're using GNU nm, then we don't want the "-C" option. | 4575 | # If we're using GNU nm, then we don't want the "-C" option. |
3134 | 4780 | # -C means demangle to AIX nm, but means don't demangle with GNU nm | 4576 | # -C means demangle to AIX nm, but means don't demangle with GNU nm |
3135 | 4577 | # Also, AIX nm treats weak defined symbols like other global defined | ||
3136 | 4578 | # symbols, whereas GNU nm marks them as "W". | ||
3137 | 4781 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then | 4579 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then |
3139 | 4782 | _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' | 4580 | _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 | 4783 | else | 4581 | else |
3141 | 4784 | _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' | 4582 | _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 | 4785 | fi | 4583 | fi |
3143 | 4786 | ;; | 4584 | ;; |
3144 | 4787 | pw32*) | 4585 | pw32*) |
3145 | 4788 | _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" | 4586 | _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" |
3147 | 4789 | ;; | 4587 | ;; |
3148 | 4790 | cygwin* | mingw* | cegcc*) | 4588 | cygwin* | mingw* | cegcc*) |
3151 | 4791 | _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' | 4589 | case $cc_basename in |
3152 | 4792 | ;; | 4590 | cl*) |
3153 | 4591 | _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' | ||
3154 | 4592 | ;; | ||
3155 | 4593 | *) | ||
3156 | 4594 | _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 | 4595 | _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] | ||
3158 | 4596 | ;; | ||
3159 | 4597 | esac | ||
3160 | 4598 | ;; | ||
3161 | 4793 | *) | 4599 | *) |
3162 | 4794 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | 4600 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
3164 | 4795 | ;; | 4601 | ;; |
3165 | 4796 | esac | 4602 | esac |
3166 | 4797 | _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] | ||
3167 | 4798 | ], [ | 4603 | ], [ |
3168 | 4799 | runpath_var= | 4604 | runpath_var= |
3169 | 4800 | _LT_TAGVAR(allow_undefined_flag, $1)= | 4605 | _LT_TAGVAR(allow_undefined_flag, $1)= |
3170 | @@ -4809,7 +4614,6 @@ | |||
3171 | 4809 | _LT_TAGVAR(hardcode_direct, $1)=no | 4614 | _LT_TAGVAR(hardcode_direct, $1)=no |
3172 | 4810 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no | 4615 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
3173 | 4811 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | 4616 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
3174 | 4812 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= | ||
3175 | 4813 | _LT_TAGVAR(hardcode_libdir_separator, $1)= | 4617 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
3176 | 4814 | _LT_TAGVAR(hardcode_minus_L, $1)=no | 4618 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
3177 | 4815 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported | 4619 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
3178 | @@ -4857,7 +4661,33 @@ | |||
3179 | 4857 | esac | 4661 | esac |
3180 | 4858 | 4662 | ||
3181 | 4859 | _LT_TAGVAR(ld_shlibs, $1)=yes | 4663 | _LT_TAGVAR(ld_shlibs, $1)=yes |
3182 | 4664 | |||
3183 | 4665 | # On some targets, GNU ld is compatible enough with the native linker | ||
3184 | 4666 | # that we're better off using the native interface for both. | ||
3185 | 4667 | lt_use_gnu_ld_interface=no | ||
3186 | 4860 | if test "$with_gnu_ld" = yes; then | 4668 | if test "$with_gnu_ld" = yes; then |
3187 | 4669 | case $host_os in | ||
3188 | 4670 | aix*) | ||
3189 | 4671 | # The AIX port of GNU ld has always aspired to compatibility | ||
3190 | 4672 | # with the native linker. However, as the warning in the GNU ld | ||
3191 | 4673 | # block says, versions before 2.19.5* couldn't really create working | ||
3192 | 4674 | # shared libraries, regardless of the interface used. | ||
3193 | 4675 | case `$LD -v 2>&1` in | ||
3194 | 4676 | *\ \(GNU\ Binutils\)\ 2.19.5*) ;; | ||
3195 | 4677 | *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; | ||
3196 | 4678 | *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; | ||
3197 | 4679 | *) | ||
3198 | 4680 | lt_use_gnu_ld_interface=yes | ||
3199 | 4681 | ;; | ||
3200 | 4682 | esac | ||
3201 | 4683 | ;; | ||
3202 | 4684 | *) | ||
3203 | 4685 | lt_use_gnu_ld_interface=yes | ||
3204 | 4686 | ;; | ||
3205 | 4687 | esac | ||
3206 | 4688 | fi | ||
3207 | 4689 | |||
3208 | 4690 | if test "$lt_use_gnu_ld_interface" = yes; then | ||
3209 | 4861 | # If archive_cmds runs LD, not CC, wlarc should be empty | 4691 | # If archive_cmds runs LD, not CC, wlarc should be empty |
3210 | 4862 | wlarc='${wl}' | 4692 | wlarc='${wl}' |
3211 | 4863 | 4693 | ||
3212 | @@ -4875,6 +4705,7 @@ | |||
3213 | 4875 | fi | 4705 | fi |
3214 | 4876 | supports_anon_versioning=no | 4706 | supports_anon_versioning=no |
3215 | 4877 | case `$LD -v 2>&1` in | 4707 | case `$LD -v 2>&1` in |
3216 | 4708 | *GNU\ gold*) supports_anon_versioning=yes ;; | ||
3217 | 4878 | *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 | 4709 | *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 |
3218 | 4879 | *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... | 4710 | *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... |
3219 | 4880 | *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... | 4711 | *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... |
3220 | @@ -4890,11 +4721,12 @@ | |||
3221 | 4890 | _LT_TAGVAR(ld_shlibs, $1)=no | 4721 | _LT_TAGVAR(ld_shlibs, $1)=no |
3222 | 4891 | cat <<_LT_EOF 1>&2 | 4722 | cat <<_LT_EOF 1>&2 |
3223 | 4892 | 4723 | ||
3225 | 4893 | *** Warning: the GNU linker, at least up to release 2.9.1, is reported | 4724 | *** Warning: the GNU linker, at least up to release 2.19, is reported |
3226 | 4894 | *** to be unable to reliably create shared libraries on AIX. | 4725 | *** to be unable to reliably create shared libraries on AIX. |
3227 | 4895 | *** Therefore, libtool is disabling shared libraries support. If you | 4726 | *** Therefore, libtool is disabling shared libraries support. If you |
3230 | 4896 | *** really care for shared libraries, you may want to modify your PATH | 4727 | *** really care for shared libraries, you may want to install binutils |
3231 | 4897 | *** so that a non-GNU linker is found, and then restart. | 4728 | *** 2.20 or above, or modify your PATH so that a non-GNU linker is found. |
3232 | 4729 | *** You will then need to restart the configuration process. | ||
3233 | 4898 | 4730 | ||
3234 | 4899 | _LT_EOF | 4731 | _LT_EOF |
3235 | 4900 | fi | 4732 | fi |
3236 | @@ -4930,10 +4762,12 @@ | |||
3237 | 4930 | # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, | 4762 | # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, |
3238 | 4931 | # as there is no search path for DLLs. | 4763 | # as there is no search path for DLLs. |
3239 | 4932 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' | 4764 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
3240 | 4765 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' | ||
3241 | 4933 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | 4766 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
3242 | 4934 | _LT_TAGVAR(always_export_symbols, $1)=no | 4767 | _LT_TAGVAR(always_export_symbols, $1)=no |
3243 | 4935 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | 4768 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
3245 | 4936 | _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' | 4769 | _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 | 4770 | _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] | ||
3247 | 4937 | 4771 | ||
3248 | 4938 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 4772 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
3249 | 4939 | _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' | 4773 | _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 | 4951 | fi | 4785 | fi |
3252 | 4952 | ;; | 4786 | ;; |
3253 | 4953 | 4787 | ||
3254 | 4788 | haiku*) | ||
3255 | 4789 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
3256 | 4790 | _LT_TAGVAR(link_all_deplibs, $1)=yes | ||
3257 | 4791 | ;; | ||
3258 | 4792 | |||
3259 | 4954 | interix[[3-9]]*) | 4793 | interix[[3-9]]*) |
3260 | 4955 | _LT_TAGVAR(hardcode_direct, $1)=no | 4794 | _LT_TAGVAR(hardcode_direct, $1)=no |
3261 | 4956 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no | 4795 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
3262 | @@ -4966,7 +4805,7 @@ | |||
3263 | 4966 | _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' | 4805 | _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 | 4967 | ;; | 4806 | ;; |
3265 | 4968 | 4807 | ||
3267 | 4969 | gnu* | linux* | tpf* | k*bsd*-gnu) | 4808 | gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) |
3268 | 4970 | tmp_diet=no | 4809 | tmp_diet=no |
3269 | 4971 | if test "$host_os" = linux-dietlibc; then | 4810 | if test "$host_os" = linux-dietlibc; then |
3270 | 4972 | case $cc_basename in | 4811 | case $cc_basename in |
3271 | @@ -4976,15 +4815,16 @@ | |||
3272 | 4976 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ | 4815 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ |
3273 | 4977 | && test "$tmp_diet" = no | 4816 | && test "$tmp_diet" = no |
3274 | 4978 | then | 4817 | then |
3276 | 4979 | tmp_addflag= | 4818 | tmp_addflag=' $pic_flag' |
3277 | 4980 | tmp_sharedflag='-shared' | 4819 | tmp_sharedflag='-shared' |
3278 | 4981 | case $cc_basename,$host_cpu in | 4820 | case $cc_basename,$host_cpu in |
3279 | 4982 | pgcc*) # Portland Group C compiler | 4821 | pgcc*) # Portland Group C compiler |
3281 | 4983 | _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' | 4822 | _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 | 4984 | tmp_addflag=' $pic_flag' | 4823 | tmp_addflag=' $pic_flag' |
3283 | 4985 | ;; | 4824 | ;; |
3286 | 4986 | pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers | 4825 | pgf77* | pgf90* | pgf95* | pgfortran*) |
3287 | 4987 | _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' | 4826 | # Portland Group f77 and f90 compilers |
3288 | 4827 | _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 | 4988 | tmp_addflag=' $pic_flag -Mnomain' ;; | 4828 | tmp_addflag=' $pic_flag -Mnomain' ;; |
3290 | 4989 | ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 | 4829 | ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 |
3291 | 4990 | tmp_addflag=' -i_dynamic' ;; | 4830 | tmp_addflag=' -i_dynamic' ;; |
3292 | @@ -4995,13 +4835,17 @@ | |||
3293 | 4995 | lf95*) # Lahey Fortran 8.1 | 4835 | lf95*) # Lahey Fortran 8.1 |
3294 | 4996 | _LT_TAGVAR(whole_archive_flag_spec, $1)= | 4836 | _LT_TAGVAR(whole_archive_flag_spec, $1)= |
3295 | 4997 | tmp_sharedflag='--shared' ;; | 4837 | tmp_sharedflag='--shared' ;; |
3297 | 4998 | xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) | 4838 | xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) |
3298 | 4999 | tmp_sharedflag='-qmkshrobj' | 4839 | tmp_sharedflag='-qmkshrobj' |
3299 | 5000 | tmp_addflag= ;; | 4840 | tmp_addflag= ;; |
3300 | 4841 | nvcc*) # Cuda Compiler Driver 2.2 | ||
3301 | 4842 | _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 | 4843 | _LT_TAGVAR(compiler_needs_object, $1)=yes | ||
3303 | 4844 | ;; | ||
3304 | 5001 | esac | 4845 | esac |
3305 | 5002 | case `$CC -V 2>&1 | sed 5q` in | 4846 | case `$CC -V 2>&1 | sed 5q` in |
3306 | 5003 | *Sun\ C*) # Sun C 5.9 | 4847 | *Sun\ C*) # Sun C 5.9 |
3308 | 5004 | _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' | 4848 | _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 | 5005 | _LT_TAGVAR(compiler_needs_object, $1)=yes | 4849 | _LT_TAGVAR(compiler_needs_object, $1)=yes |
3310 | 5006 | tmp_sharedflag='-G' ;; | 4850 | tmp_sharedflag='-G' ;; |
3311 | 5007 | *Sun\ F*) # Sun Fortran 8.3 | 4851 | *Sun\ F*) # Sun Fortran 8.3 |
3312 | @@ -5017,17 +4861,16 @@ | |||
3313 | 5017 | fi | 4861 | fi |
3314 | 5018 | 4862 | ||
3315 | 5019 | case $cc_basename in | 4863 | case $cc_basename in |
3317 | 5020 | xlf*) | 4864 | xlf* | bgf* | bgxlf* | mpixlf*) |
3318 | 5021 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself | 4865 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself |
3319 | 5022 | _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' | 4866 | _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' |
3323 | 5023 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | 4867 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
3324 | 5024 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' | 4868 | _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
3322 | 5025 | _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' | ||
3325 | 5026 | if test "x$supports_anon_versioning" = xyes; then | 4869 | if test "x$supports_anon_versioning" = xyes; then |
3326 | 5027 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ | 4870 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ |
3327 | 5028 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ | 4871 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
3328 | 5029 | echo "local: *; };" >> $output_objdir/$libname.ver~ | 4872 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
3330 | 5030 | $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | 4873 | $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
3331 | 5031 | fi | 4874 | fi |
3332 | 5032 | ;; | 4875 | ;; |
3333 | 5033 | esac | 4876 | esac |
3334 | @@ -5041,8 +4884,8 @@ | |||
3335 | 5041 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 4884 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
3336 | 5042 | wlarc= | 4885 | wlarc= |
3337 | 5043 | else | 4886 | else |
3340 | 5044 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | 4887 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
3341 | 5045 | _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' | 4888 | _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 | 5046 | fi | 4889 | fi |
3343 | 5047 | ;; | 4890 | ;; |
3344 | 5048 | 4891 | ||
3345 | @@ -5060,8 +4903,8 @@ | |||
3346 | 5060 | 4903 | ||
3347 | 5061 | _LT_EOF | 4904 | _LT_EOF |
3348 | 5062 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 4905 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
3351 | 5063 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | 4906 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
3352 | 5064 | _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' | 4907 | _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 | 5065 | else | 4908 | else |
3354 | 5066 | _LT_TAGVAR(ld_shlibs, $1)=no | 4909 | _LT_TAGVAR(ld_shlibs, $1)=no |
3355 | 5067 | fi | 4910 | fi |
3356 | @@ -5107,8 +4950,8 @@ | |||
3357 | 5107 | 4950 | ||
3358 | 5108 | *) | 4951 | *) |
3359 | 5109 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 4952 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
3362 | 5110 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | 4953 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
3363 | 5111 | _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' | 4954 | _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 | 5112 | else | 4955 | else |
3365 | 5113 | _LT_TAGVAR(ld_shlibs, $1)=no | 4956 | _LT_TAGVAR(ld_shlibs, $1)=no |
3366 | 5114 | fi | 4957 | fi |
3367 | @@ -5148,8 +4991,10 @@ | |||
3368 | 5148 | else | 4991 | else |
3369 | 5149 | # If we're using GNU nm, then we don't want the "-C" option. | 4992 | # If we're using GNU nm, then we don't want the "-C" option. |
3370 | 5150 | # -C means demangle to AIX nm, but means don't demangle with GNU nm | 4993 | # -C means demangle to AIX nm, but means don't demangle with GNU nm |
3371 | 4994 | # Also, AIX nm treats weak defined symbols like other global | ||
3372 | 4995 | # defined symbols, whereas GNU nm marks them as "W". | ||
3373 | 5151 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then | 4996 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then |
3375 | 5152 | _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' | 4997 | _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 | 5153 | else | 4998 | else |
3377 | 5154 | _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' | 4999 | _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 | 5155 | fi | 5000 | fi |
3379 | @@ -5236,9 +5081,9 @@ | |||
3380 | 5236 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' | 5081 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' |
3381 | 5237 | # Determine the default libpath from the value encoded in an | 5082 | # Determine the default libpath from the value encoded in an |
3382 | 5238 | # empty executable. | 5083 | # empty executable. |
3384 | 5239 | _LT_SYS_MODULE_PATH_AIX | 5084 | _LT_SYS_MODULE_PATH_AIX([$1]) |
3385 | 5240 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" | 5085 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
3387 | 5241 | _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" | 5086 | _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 | 5242 | else | 5087 | else |
3389 | 5243 | if test "$host_cpu" = ia64; then | 5088 | if test "$host_cpu" = ia64; then |
3390 | 5244 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' | 5089 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' |
3391 | @@ -5247,14 +5092,19 @@ | |||
3392 | 5247 | else | 5092 | else |
3393 | 5248 | # Determine the default libpath from the value encoded in an | 5093 | # Determine the default libpath from the value encoded in an |
3394 | 5249 | # empty executable. | 5094 | # empty executable. |
3396 | 5250 | _LT_SYS_MODULE_PATH_AIX | 5095 | _LT_SYS_MODULE_PATH_AIX([$1]) |
3397 | 5251 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" | 5096 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
3398 | 5252 | # Warning - without using the other run time loading flags, | 5097 | # Warning - without using the other run time loading flags, |
3399 | 5253 | # -berok will link without error, but may produce a broken library. | 5098 | # -berok will link without error, but may produce a broken library. |
3400 | 5254 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' | 5099 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' |
3401 | 5255 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' | 5100 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' |
3404 | 5256 | # Exported symbols can be pulled into shared objects from archives | 5101 | if test "$with_gnu_ld" = yes; then |
3405 | 5257 | _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' | 5102 | # We only use this code for GNU lds that support --whole-archive. |
3406 | 5103 | _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' | ||
3407 | 5104 | else | ||
3408 | 5105 | # Exported symbols can be pulled into shared objects from archives | ||
3409 | 5106 | _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' | ||
3410 | 5107 | fi | ||
3411 | 5258 | _LT_TAGVAR(archive_cmds_need_lc, $1)=yes | 5108 | _LT_TAGVAR(archive_cmds_need_lc, $1)=yes |
3412 | 5259 | # This is similar to how AIX traditionally builds its shared libraries. | 5109 | # This is similar to how AIX traditionally builds its shared libraries. |
3413 | 5260 | _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' | 5110 | _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 | 5286 | # Microsoft Visual C++. | 5136 | # Microsoft Visual C++. |
3416 | 5287 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 5137 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
3417 | 5288 | # no search path for DLLs. | 5138 | # no search path for DLLs. |
3432 | 5289 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' | 5139 | case $cc_basename in |
3433 | 5290 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | 5140 | cl*) |
3434 | 5291 | # Tell ltmain to make .lib files, not .a files. | 5141 | # Native MSVC |
3435 | 5292 | libext=lib | 5142 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
3436 | 5293 | # Tell ltmain to make .dll files, not .so files. | 5143 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
3437 | 5294 | shrext_cmds=".dll" | 5144 | _LT_TAGVAR(always_export_symbols, $1)=yes |
3438 | 5295 | # FIXME: Setting linknames here is a bad hack. | 5145 | _LT_TAGVAR(file_list_spec, $1)='@' |
3439 | 5296 | _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' | 5146 | # Tell ltmain to make .lib files, not .a files. |
3440 | 5297 | # The linker will automatically build a .lib file if we build a DLL. | 5147 | libext=lib |
3441 | 5298 | _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' | 5148 | # Tell ltmain to make .dll files, not .so files. |
3442 | 5299 | # FIXME: Should let the user specify the lib program. | 5149 | shrext_cmds=".dll" |
3443 | 5300 | _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' | 5150 | # FIXME: Setting linknames here is a bad hack. |
3444 | 5301 | _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' | 5151 | _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
3445 | 5302 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | 5152 | _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
3446 | 5153 | sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; | ||
3447 | 5154 | else | ||
3448 | 5155 | sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; | ||
3449 | 5156 | fi~ | ||
3450 | 5157 | $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 | 5158 | linknames=' | ||
3452 | 5159 | # The linker will not automatically build a static lib if we build a DLL. | ||
3453 | 5160 | # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' | ||
3454 | 5161 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | ||
3455 | 5162 | _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' | ||
3456 | 5163 | _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 | 5164 | # Don't use ranlib | ||
3458 | 5165 | _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' | ||
3459 | 5166 | _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ | ||
3460 | 5167 | lt_tool_outputfile="@TOOL_OUTPUT@"~ | ||
3461 | 5168 | case $lt_outputfile in | ||
3462 | 5169 | *.exe|*.EXE) ;; | ||
3463 | 5170 | *) | ||
3464 | 5171 | lt_outputfile="$lt_outputfile.exe" | ||
3465 | 5172 | lt_tool_outputfile="$lt_tool_outputfile.exe" | ||
3466 | 5173 | ;; | ||
3467 | 5174 | esac~ | ||
3468 | 5175 | if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then | ||
3469 | 5176 | $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; | ||
3470 | 5177 | $RM "$lt_outputfile.manifest"; | ||
3471 | 5178 | fi' | ||
3472 | 5179 | ;; | ||
3473 | 5180 | *) | ||
3474 | 5181 | # Assume MSVC wrapper | ||
3475 | 5182 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' | ||
3476 | 5183 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | ||
3477 | 5184 | # Tell ltmain to make .lib files, not .a files. | ||
3478 | 5185 | libext=lib | ||
3479 | 5186 | # Tell ltmain to make .dll files, not .so files. | ||
3480 | 5187 | shrext_cmds=".dll" | ||
3481 | 5188 | # FIXME: Setting linknames here is a bad hack. | ||
3482 | 5189 | _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
3483 | 5190 | # The linker will automatically build a .lib file if we build a DLL. | ||
3484 | 5191 | _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' | ||
3485 | 5192 | # FIXME: Should let the user specify the lib program. | ||
3486 | 5193 | _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
3487 | 5194 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | ||
3488 | 5195 | ;; | ||
3489 | 5196 | esac | ||
3490 | 5303 | ;; | 5197 | ;; |
3491 | 5304 | 5198 | ||
3492 | 5305 | darwin* | rhapsody*) | 5199 | darwin* | rhapsody*) |
3493 | @@ -5312,10 +5206,6 @@ | |||
3494 | 5312 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no | 5206 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
3495 | 5313 | ;; | 5207 | ;; |
3496 | 5314 | 5208 | ||
3497 | 5315 | freebsd1*) | ||
3498 | 5316 | _LT_TAGVAR(ld_shlibs, $1)=no | ||
3499 | 5317 | ;; | ||
3500 | 5318 | |||
3501 | 5319 | # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor | 5209 | # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor |
3502 | 5320 | # support. Future versions do this automatically, but an explicit c++rt0.o | 5210 | # support. Future versions do this automatically, but an explicit c++rt0.o |
3503 | 5321 | # does not break anything, and helps significantly (at the cost of a little | 5211 | # does not break anything, and helps significantly (at the cost of a little |
3504 | @@ -5328,7 +5218,7 @@ | |||
3505 | 5328 | ;; | 5218 | ;; |
3506 | 5329 | 5219 | ||
3507 | 5330 | # Unfortunately, older versions of FreeBSD 2 do not have this feature. | 5220 | # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
3509 | 5331 | freebsd2*) | 5221 | freebsd2.*) |
3510 | 5332 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' | 5222 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
3511 | 5333 | _LT_TAGVAR(hardcode_direct, $1)=yes | 5223 | _LT_TAGVAR(hardcode_direct, $1)=yes |
3512 | 5334 | _LT_TAGVAR(hardcode_minus_L, $1)=yes | 5224 | _LT_TAGVAR(hardcode_minus_L, $1)=yes |
3513 | @@ -5337,7 +5227,7 @@ | |||
3514 | 5337 | 5227 | ||
3515 | 5338 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 5228 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
3516 | 5339 | freebsd* | dragonfly*) | 5229 | freebsd* | dragonfly*) |
3518 | 5340 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | 5230 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
3519 | 5341 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' | 5231 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' |
3520 | 5342 | _LT_TAGVAR(hardcode_direct, $1)=yes | 5232 | _LT_TAGVAR(hardcode_direct, $1)=yes |
3521 | 5343 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no | 5233 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
3522 | @@ -5345,7 +5235,7 @@ | |||
3523 | 5345 | 5235 | ||
3524 | 5346 | hpux9*) | 5236 | hpux9*) |
3525 | 5347 | if test "$GCC" = yes; then | 5237 | if test "$GCC" = yes; then |
3527 | 5348 | _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' | 5238 | _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 | 5349 | else | 5239 | else |
3529 | 5350 | _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' | 5240 | _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 | 5351 | fi | 5241 | fi |
3531 | @@ -5360,14 +5250,13 @@ | |||
3532 | 5360 | ;; | 5250 | ;; |
3533 | 5361 | 5251 | ||
3534 | 5362 | hpux10*) | 5252 | hpux10*) |
3537 | 5363 | if test "$GCC" = yes -a "$with_gnu_ld" = no; then | 5253 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
3538 | 5364 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | 5254 | _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 | 5365 | else | 5255 | else |
3540 | 5366 | _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 5256 | _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
3541 | 5367 | fi | 5257 | fi |
3542 | 5368 | if test "$with_gnu_ld" = no; then | 5258 | if test "$with_gnu_ld" = no; then |
3543 | 5369 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' | 5259 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' |
3544 | 5370 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' | ||
3545 | 5371 | _LT_TAGVAR(hardcode_libdir_separator, $1)=: | 5260 | _LT_TAGVAR(hardcode_libdir_separator, $1)=: |
3546 | 5372 | _LT_TAGVAR(hardcode_direct, $1)=yes | 5261 | _LT_TAGVAR(hardcode_direct, $1)=yes |
3547 | 5373 | _LT_TAGVAR(hardcode_direct_absolute, $1)=yes | 5262 | _LT_TAGVAR(hardcode_direct_absolute, $1)=yes |
3548 | @@ -5379,16 +5268,16 @@ | |||
3549 | 5379 | ;; | 5268 | ;; |
3550 | 5380 | 5269 | ||
3551 | 5381 | hpux11*) | 5270 | hpux11*) |
3553 | 5382 | if test "$GCC" = yes -a "$with_gnu_ld" = no; then | 5271 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
3554 | 5383 | case $host_cpu in | 5272 | case $host_cpu in |
3555 | 5384 | hppa*64*) | 5273 | hppa*64*) |
3556 | 5385 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 5274 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
3557 | 5386 | ;; | 5275 | ;; |
3558 | 5387 | ia64*) | 5276 | ia64*) |
3560 | 5388 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | 5277 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
3561 | 5389 | ;; | 5278 | ;; |
3562 | 5390 | *) | 5279 | *) |
3564 | 5391 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | 5280 | _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 | 5392 | ;; | 5281 | ;; |
3566 | 5393 | esac | 5282 | esac |
3567 | 5394 | else | 5283 | else |
3568 | @@ -5400,7 +5289,14 @@ | |||
3569 | 5400 | _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | 5289 | _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
3570 | 5401 | ;; | 5290 | ;; |
3571 | 5402 | *) | 5291 | *) |
3573 | 5403 | _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | 5292 | m4_if($1, [], [ |
3574 | 5293 | # Older versions of the 11.00 compiler do not understand -b yet | ||
3575 | 5294 | # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) | ||
3576 | 5295 | _LT_LINKER_OPTION([if $CC understands -b], | ||
3577 | 5296 | _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], | ||
3578 | 5297 | [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], | ||
3579 | 5298 | [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], | ||
3580 | 5299 | [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) | ||
3581 | 5404 | ;; | 5300 | ;; |
3582 | 5405 | esac | 5301 | esac |
3583 | 5406 | fi | 5302 | fi |
3584 | @@ -5428,19 +5324,34 @@ | |||
3585 | 5428 | 5324 | ||
3586 | 5429 | irix5* | irix6* | nonstopux*) | 5325 | irix5* | irix6* | nonstopux*) |
3587 | 5430 | if test "$GCC" = yes; then | 5326 | if test "$GCC" = yes; then |
3589 | 5431 | _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' | 5327 | _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 | 5432 | # Try to use the -exported_symbol ld option, if it does not | 5328 | # Try to use the -exported_symbol ld option, if it does not |
3591 | 5433 | # work, assume that -exports_file does not work either and | 5329 | # work, assume that -exports_file does not work either and |
3592 | 5434 | # implicitly export all symbols. | 5330 | # implicitly export all symbols. |
3599 | 5435 | save_LDFLAGS="$LDFLAGS" | 5331 | # This should be the same for all languages, so no per-tag cache variable. |
3600 | 5436 | LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | 5332 | AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], |
3601 | 5437 | AC_LINK_IFELSE(int foo(void) {}, | 5333 | [lt_cv_irix_exported_symbol], |
3602 | 5438 | _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' | 5334 | [save_LDFLAGS="$LDFLAGS" |
3603 | 5439 | ) | 5335 | LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
3604 | 5440 | LDFLAGS="$save_LDFLAGS" | 5336 | AC_LINK_IFELSE( |
3605 | 5337 | [AC_LANG_SOURCE( | ||
3606 | 5338 | [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], | ||
3607 | 5339 | [C++], [[int foo (void) { return 0; }]], | ||
3608 | 5340 | [Fortran 77], [[ | ||
3609 | 5341 | subroutine foo | ||
3610 | 5342 | end]], | ||
3611 | 5343 | [Fortran], [[ | ||
3612 | 5344 | subroutine foo | ||
3613 | 5345 | end]])])], | ||
3614 | 5346 | [lt_cv_irix_exported_symbol=yes], | ||
3615 | 5347 | [lt_cv_irix_exported_symbol=no]) | ||
3616 | 5348 | LDFLAGS="$save_LDFLAGS"]) | ||
3617 | 5349 | if test "$lt_cv_irix_exported_symbol" = yes; then | ||
3618 | 5350 | _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 | 5351 | fi | ||
3620 | 5441 | else | 5352 | else |
3623 | 5442 | _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' | 5353 | _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 | 5443 | _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' | 5354 | _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 | 5444 | fi | 5355 | fi |
3626 | 5445 | _LT_TAGVAR(archive_cmds_need_lc, $1)='no' | 5356 | _LT_TAGVAR(archive_cmds_need_lc, $1)='no' |
3627 | 5446 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | 5357 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
3628 | @@ -5502,17 +5413,17 @@ | |||
3629 | 5502 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' | 5413 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
3630 | 5503 | _LT_TAGVAR(hardcode_minus_L, $1)=yes | 5414 | _LT_TAGVAR(hardcode_minus_L, $1)=yes |
3631 | 5504 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | 5415 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
3633 | 5505 | _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' | 5416 | _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 | 5506 | _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' | 5417 | _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' |
3635 | 5507 | ;; | 5418 | ;; |
3636 | 5508 | 5419 | ||
3637 | 5509 | osf3*) | 5420 | osf3*) |
3638 | 5510 | if test "$GCC" = yes; then | 5421 | if test "$GCC" = yes; then |
3639 | 5511 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' | 5422 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
3641 | 5512 | _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' | 5423 | _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 | 5513 | else | 5424 | else |
3643 | 5514 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' | 5425 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
3645 | 5515 | _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' | 5426 | _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 | 5516 | fi | 5427 | fi |
3647 | 5517 | _LT_TAGVAR(archive_cmds_need_lc, $1)='no' | 5428 | _LT_TAGVAR(archive_cmds_need_lc, $1)='no' |
3648 | 5518 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | 5429 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
3649 | @@ -5522,13 +5433,13 @@ | |||
3650 | 5522 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 5433 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
3651 | 5523 | if test "$GCC" = yes; then | 5434 | if test "$GCC" = yes; then |
3652 | 5524 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' | 5435 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
3654 | 5525 | _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' | 5436 | _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 | 5526 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | 5437 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
3656 | 5527 | else | 5438 | else |
3657 | 5528 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' | 5439 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
3659 | 5529 | _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' | 5440 | _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 | 5530 | _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~ | 5441 | _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~ |
3662 | 5531 | $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' | 5442 | $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 | 5532 | 5443 | ||
3664 | 5533 | # Both c and cxx compiler support -rpath directly | 5444 | # Both c and cxx compiler support -rpath directly |
3665 | 5534 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' | 5445 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' |
3666 | @@ -5541,9 +5452,9 @@ | |||
3667 | 5541 | _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' | 5452 | _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' |
3668 | 5542 | if test "$GCC" = yes; then | 5453 | if test "$GCC" = yes; then |
3669 | 5543 | wlarc='${wl}' | 5454 | wlarc='${wl}' |
3671 | 5544 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 5455 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
3672 | 5545 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ | 5456 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
3674 | 5546 | $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' | 5457 | $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 | 5547 | else | 5458 | else |
3676 | 5548 | case `$CC -V 2>&1` in | 5459 | case `$CC -V 2>&1` in |
3677 | 5549 | *"Compilers 5.0"*) | 5460 | *"Compilers 5.0"*) |
3678 | @@ -5719,36 +5630,38 @@ | |||
3679 | 5719 | # Test whether the compiler implicitly links with -lc since on some | 5630 | # Test whether the compiler implicitly links with -lc since on some |
3680 | 5720 | # systems, -lgcc has to come before -lc. If gcc already passes -lc | 5631 | # systems, -lgcc has to come before -lc. If gcc already passes -lc |
3681 | 5721 | # to ld, don't add -lc before -lgcc. | 5632 | # to ld, don't add -lc before -lgcc. |
3685 | 5722 | AC_MSG_CHECKING([whether -lc should be explicitly linked in]) | 5633 | AC_CACHE_CHECK([whether -lc should be explicitly linked in], |
3686 | 5723 | $RM conftest* | 5634 | [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), |
3687 | 5724 | echo "$lt_simple_compile_test_code" > conftest.$ac_ext | 5635 | [$RM conftest* |
3688 | 5636 | echo "$lt_simple_compile_test_code" > conftest.$ac_ext | ||
3689 | 5725 | 5637 | ||
3716 | 5726 | if AC_TRY_EVAL(ac_compile) 2>conftest.err; then | 5638 | if AC_TRY_EVAL(ac_compile) 2>conftest.err; then |
3717 | 5727 | soname=conftest | 5639 | soname=conftest |
3718 | 5728 | lib=conftest | 5640 | lib=conftest |
3719 | 5729 | libobjs=conftest.$ac_objext | 5641 | libobjs=conftest.$ac_objext |
3720 | 5730 | deplibs= | 5642 | deplibs= |
3721 | 5731 | wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) | 5643 | wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) |
3722 | 5732 | pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) | 5644 | pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) |
3723 | 5733 | compiler_flags=-v | 5645 | compiler_flags=-v |
3724 | 5734 | linker_flags=-v | 5646 | linker_flags=-v |
3725 | 5735 | verstring= | 5647 | verstring= |
3726 | 5736 | output_objdir=. | 5648 | output_objdir=. |
3727 | 5737 | libname=conftest | 5649 | libname=conftest |
3728 | 5738 | lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) | 5650 | lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) |
3729 | 5739 | _LT_TAGVAR(allow_undefined_flag, $1)= | 5651 | _LT_TAGVAR(allow_undefined_flag, $1)= |
3730 | 5740 | if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) | 5652 | if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) |
3731 | 5741 | then | 5653 | then |
3732 | 5742 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no | 5654 | lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no |
3733 | 5743 | else | 5655 | else |
3734 | 5744 | _LT_TAGVAR(archive_cmds_need_lc, $1)=yes | 5656 | lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes |
3735 | 5745 | fi | 5657 | fi |
3736 | 5746 | _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag | 5658 | _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag |
3737 | 5747 | else | 5659 | else |
3738 | 5748 | cat conftest.err 1>&5 | 5660 | cat conftest.err 1>&5 |
3739 | 5749 | fi | 5661 | fi |
3740 | 5750 | $RM conftest* | 5662 | $RM conftest* |
3741 | 5751 | AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) | 5663 | ]) |
3742 | 5664 | _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) | ||
3743 | 5752 | ;; | 5665 | ;; |
3744 | 5753 | esac | 5666 | esac |
3745 | 5754 | fi | 5667 | fi |
3746 | @@ -5785,9 +5698,6 @@ | |||
3747 | 5785 | _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], | 5698 | _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], |
3748 | 5786 | [Flag to hardcode $libdir into a binary during linking. | 5699 | [Flag to hardcode $libdir into a binary during linking. |
3749 | 5787 | This must work even if $libdir does not exist]) | 5700 | This must work even if $libdir does not exist]) |
3750 | 5788 | _LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], | ||
3751 | 5789 | [[If ld is used when linking, flag to hardcode $libdir into a binary | ||
3752 | 5790 | during linking. This must work even if $libdir does not exist]]) | ||
3753 | 5791 | _LT_TAGDECL([], [hardcode_libdir_separator], [1], | 5701 | _LT_TAGDECL([], [hardcode_libdir_separator], [1], |
3754 | 5792 | [Whether we need a single "-rpath" flag with a separated argument]) | 5702 | [Whether we need a single "-rpath" flag with a separated argument]) |
3755 | 5793 | _LT_TAGDECL([], [hardcode_direct], [0], | 5703 | _LT_TAGDECL([], [hardcode_direct], [0], |
3756 | @@ -5813,8 +5723,6 @@ | |||
3757 | 5813 | to runtime path list]) | 5723 | to runtime path list]) |
3758 | 5814 | _LT_TAGDECL([], [link_all_deplibs], [0], | 5724 | _LT_TAGDECL([], [link_all_deplibs], [0], |
3759 | 5815 | [Whether libtool must link a program against all its dependency libraries]) | 5725 | [Whether libtool must link a program against all its dependency libraries]) |
3760 | 5816 | _LT_TAGDECL([], [fix_srcfile_path], [1], | ||
3761 | 5817 | [Fix the shell variable $srcfile for the compiler]) | ||
3762 | 5818 | _LT_TAGDECL([], [always_export_symbols], [0], | 5726 | _LT_TAGDECL([], [always_export_symbols], [0], |
3763 | 5819 | [Set to "yes" if exported symbols are required]) | 5727 | [Set to "yes" if exported symbols are required]) |
3764 | 5820 | _LT_TAGDECL([], [export_symbols_cmds], [2], | 5728 | _LT_TAGDECL([], [export_symbols_cmds], [2], |
3765 | @@ -5825,6 +5733,8 @@ | |||
3766 | 5825 | [Symbols that must always be exported]) | 5733 | [Symbols that must always be exported]) |
3767 | 5826 | _LT_TAGDECL([], [prelink_cmds], [2], | 5734 | _LT_TAGDECL([], [prelink_cmds], [2], |
3768 | 5827 | [Commands necessary for linking programs (against libraries) with templates]) | 5735 | [Commands necessary for linking programs (against libraries) with templates]) |
3769 | 5736 | _LT_TAGDECL([], [postlink_cmds], [2], | ||
3770 | 5737 | [Commands necessary for finishing linking programs]) | ||
3771 | 5828 | _LT_TAGDECL([], [file_list_spec], [1], | 5738 | _LT_TAGDECL([], [file_list_spec], [1], |
3772 | 5829 | [Specify filename containing input files]) | 5739 | [Specify filename containing input files]) |
3773 | 5830 | dnl FIXME: Not yet implemented | 5740 | dnl FIXME: Not yet implemented |
3774 | @@ -5914,14 +5824,15 @@ | |||
3775 | 5914 | ])# _LT_LANG_C_CONFIG | 5824 | ])# _LT_LANG_C_CONFIG |
3776 | 5915 | 5825 | ||
3777 | 5916 | 5826 | ||
3786 | 5917 | # _LT_PROG_CXX | 5827 | # _LT_LANG_CXX_CONFIG([TAG]) |
3787 | 5918 | # ------------ | 5828 | # -------------------------- |
3788 | 5919 | # Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ | 5829 | # Ensure that the configuration variables for a C++ compiler are suitably |
3789 | 5920 | # compiler, we have our own version here. | 5830 | # defined. These variables are subsequently used by _LT_CONFIG to write |
3790 | 5921 | m4_defun([_LT_PROG_CXX], | 5831 | # the compiler configuration to `libtool'. |
3791 | 5922 | [ | 5832 | m4_defun([_LT_LANG_CXX_CONFIG], |
3792 | 5923 | pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) | 5833 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
3793 | 5924 | AC_PROG_CXX | 5834 | m4_require([_LT_DECL_EGREP])dnl |
3794 | 5835 | m4_require([_LT_PATH_MANIFEST_TOOL])dnl | ||
3795 | 5925 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && | 5836 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && |
3796 | 5926 | ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || | 5837 | ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || |
3797 | 5927 | (test "X$CXX" != "Xg++"))) ; then | 5838 | (test "X$CXX" != "Xg++"))) ; then |
3798 | @@ -5929,22 +5840,6 @@ | |||
3799 | 5929 | else | 5840 | else |
3800 | 5930 | _lt_caught_CXX_error=yes | 5841 | _lt_caught_CXX_error=yes |
3801 | 5931 | fi | 5842 | fi |
3802 | 5932 | popdef([AC_MSG_ERROR]) | ||
3803 | 5933 | ])# _LT_PROG_CXX | ||
3804 | 5934 | |||
3805 | 5935 | dnl aclocal-1.4 backwards compatibility: | ||
3806 | 5936 | dnl AC_DEFUN([_LT_PROG_CXX], []) | ||
3807 | 5937 | |||
3808 | 5938 | |||
3809 | 5939 | # _LT_LANG_CXX_CONFIG([TAG]) | ||
3810 | 5940 | # -------------------------- | ||
3811 | 5941 | # Ensure that the configuration variables for a C++ compiler are suitably | ||
3812 | 5942 | # defined. These variables are subsequently used by _LT_CONFIG to write | ||
3813 | 5943 | # the compiler configuration to `libtool'. | ||
3814 | 5944 | m4_defun([_LT_LANG_CXX_CONFIG], | ||
3815 | 5945 | [AC_REQUIRE([_LT_PROG_CXX])dnl | ||
3816 | 5946 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl | ||
3817 | 5947 | m4_require([_LT_DECL_EGREP])dnl | ||
3818 | 5948 | 5843 | ||
3819 | 5949 | AC_LANG_PUSH(C++) | 5844 | AC_LANG_PUSH(C++) |
3820 | 5950 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no | 5845 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
3821 | @@ -5956,7 +5851,6 @@ | |||
3822 | 5956 | _LT_TAGVAR(hardcode_direct, $1)=no | 5851 | _LT_TAGVAR(hardcode_direct, $1)=no |
3823 | 5957 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no | 5852 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
3824 | 5958 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | 5853 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
3825 | 5959 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= | ||
3826 | 5960 | _LT_TAGVAR(hardcode_libdir_separator, $1)= | 5854 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
3827 | 5961 | _LT_TAGVAR(hardcode_minus_L, $1)=no | 5855 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
3828 | 5962 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported | 5856 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
3829 | @@ -5966,6 +5860,8 @@ | |||
3830 | 5966 | _LT_TAGVAR(module_expsym_cmds, $1)= | 5860 | _LT_TAGVAR(module_expsym_cmds, $1)= |
3831 | 5967 | _LT_TAGVAR(link_all_deplibs, $1)=unknown | 5861 | _LT_TAGVAR(link_all_deplibs, $1)=unknown |
3832 | 5968 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds | 5862 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
3833 | 5863 | _LT_TAGVAR(reload_flag, $1)=$reload_flag | ||
3834 | 5864 | _LT_TAGVAR(reload_cmds, $1)=$reload_cmds | ||
3835 | 5969 | _LT_TAGVAR(no_undefined_flag, $1)= | 5865 | _LT_TAGVAR(no_undefined_flag, $1)= |
3836 | 5970 | _LT_TAGVAR(whole_archive_flag_spec, $1)= | 5866 | _LT_TAGVAR(whole_archive_flag_spec, $1)= |
3837 | 5971 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no | 5867 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no |
3838 | @@ -5997,6 +5893,7 @@ | |||
3839 | 5997 | 5893 | ||
3840 | 5998 | # Allow CC to be a program name with arguments. | 5894 | # Allow CC to be a program name with arguments. |
3841 | 5999 | lt_save_CC=$CC | 5895 | lt_save_CC=$CC |
3842 | 5896 | lt_save_CFLAGS=$CFLAGS | ||
3843 | 6000 | lt_save_LD=$LD | 5897 | lt_save_LD=$LD |
3844 | 6001 | lt_save_GCC=$GCC | 5898 | lt_save_GCC=$GCC |
3845 | 6002 | GCC=$GXX | 5899 | GCC=$GXX |
3846 | @@ -6014,6 +5911,7 @@ | |||
3847 | 6014 | fi | 5911 | fi |
3848 | 6015 | test -z "${LDCXX+set}" || LD=$LDCXX | 5912 | test -z "${LDCXX+set}" || LD=$LDCXX |
3849 | 6016 | CC=${CXX-"c++"} | 5913 | CC=${CXX-"c++"} |
3850 | 5914 | CFLAGS=$CXXFLAGS | ||
3851 | 6017 | compiler=$CC | 5915 | compiler=$CC |
3852 | 6018 | _LT_TAGVAR(compiler, $1)=$CC | 5916 | _LT_TAGVAR(compiler, $1)=$CC |
3853 | 6019 | _LT_CC_BASENAME([$compiler]) | 5917 | _LT_CC_BASENAME([$compiler]) |
3854 | @@ -6035,8 +5933,8 @@ | |||
3855 | 6035 | # Check if GNU C++ uses GNU ld as the underlying linker, since the | 5933 | # Check if GNU C++ uses GNU ld as the underlying linker, since the |
3856 | 6036 | # archiving commands below assume that GNU ld is being used. | 5934 | # archiving commands below assume that GNU ld is being used. |
3857 | 6037 | if test "$with_gnu_ld" = yes; then | 5935 | if test "$with_gnu_ld" = yes; then |
3860 | 6038 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' | 5936 | _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 | 6039 | _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' | 5937 | _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 | 6040 | 5938 | ||
3863 | 6041 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | 5939 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
3864 | 6042 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' | 5940 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
3865 | @@ -6068,7 +5966,7 @@ | |||
3866 | 6068 | # Commands to make compiler produce verbose output that lists | 5966 | # Commands to make compiler produce verbose output that lists |
3867 | 6069 | # what "hidden" libraries, object files and flags are used when | 5967 | # what "hidden" libraries, object files and flags are used when |
3868 | 6070 | # linking a shared library. | 5968 | # linking a shared library. |
3870 | 6071 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' | 5969 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
3871 | 6072 | 5970 | ||
3872 | 6073 | else | 5971 | else |
3873 | 6074 | GXX=no | 5972 | GXX=no |
3874 | @@ -6177,10 +6075,10 @@ | |||
3875 | 6177 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' | 6075 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' |
3876 | 6178 | # Determine the default libpath from the value encoded in an empty | 6076 | # Determine the default libpath from the value encoded in an empty |
3877 | 6179 | # executable. | 6077 | # executable. |
3879 | 6180 | _LT_SYS_MODULE_PATH_AIX | 6078 | _LT_SYS_MODULE_PATH_AIX([$1]) |
3880 | 6181 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" | 6079 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
3881 | 6182 | 6080 | ||
3883 | 6183 | _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" | 6081 | _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 | 6184 | else | 6082 | else |
3885 | 6185 | if test "$host_cpu" = ia64; then | 6083 | if test "$host_cpu" = ia64; then |
3886 | 6186 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' | 6084 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' |
3887 | @@ -6189,14 +6087,19 @@ | |||
3888 | 6189 | else | 6087 | else |
3889 | 6190 | # Determine the default libpath from the value encoded in an | 6088 | # Determine the default libpath from the value encoded in an |
3890 | 6191 | # empty executable. | 6089 | # empty executable. |
3892 | 6192 | _LT_SYS_MODULE_PATH_AIX | 6090 | _LT_SYS_MODULE_PATH_AIX([$1]) |
3893 | 6193 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" | 6091 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
3894 | 6194 | # Warning - without using the other run time loading flags, | 6092 | # Warning - without using the other run time loading flags, |
3895 | 6195 | # -berok will link without error, but may produce a broken library. | 6093 | # -berok will link without error, but may produce a broken library. |
3896 | 6196 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' | 6094 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' |
3897 | 6197 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' | 6095 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' |
3900 | 6198 | # Exported symbols can be pulled into shared objects from archives | 6096 | if test "$with_gnu_ld" = yes; then |
3901 | 6199 | _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' | 6097 | # We only use this code for GNU lds that support --whole-archive. |
3902 | 6098 | _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' | ||
3903 | 6099 | else | ||
3904 | 6100 | # Exported symbols can be pulled into shared objects from archives | ||
3905 | 6101 | _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' | ||
3906 | 6102 | fi | ||
3907 | 6200 | _LT_TAGVAR(archive_cmds_need_lc, $1)=yes | 6103 | _LT_TAGVAR(archive_cmds_need_lc, $1)=yes |
3908 | 6201 | # This is similar to how AIX traditionally builds its shared | 6104 | # This is similar to how AIX traditionally builds its shared |
3909 | 6202 | # libraries. | 6105 | # libraries. |
3910 | @@ -6226,28 +6129,75 @@ | |||
3911 | 6226 | ;; | 6129 | ;; |
3912 | 6227 | 6130 | ||
3913 | 6228 | cygwin* | mingw* | pw32* | cegcc*) | 6131 | cygwin* | mingw* | pw32* | cegcc*) |
3920 | 6229 | # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, | 6132 | case $GXX,$cc_basename in |
3921 | 6230 | # as there is no search path for DLLs. | 6133 | ,cl* | no,cl*) |
3922 | 6231 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' | 6134 | # Native MSVC |
3923 | 6232 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | 6135 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
3924 | 6233 | _LT_TAGVAR(always_export_symbols, $1)=no | 6136 | # no search path for DLLs. |
3925 | 6234 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | 6137 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
3926 | 6138 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | ||
3927 | 6139 | _LT_TAGVAR(always_export_symbols, $1)=yes | ||
3928 | 6140 | _LT_TAGVAR(file_list_spec, $1)='@' | ||
3929 | 6141 | # Tell ltmain to make .lib files, not .a files. | ||
3930 | 6142 | libext=lib | ||
3931 | 6143 | # Tell ltmain to make .dll files, not .so files. | ||
3932 | 6144 | shrext_cmds=".dll" | ||
3933 | 6145 | # FIXME: Setting linknames here is a bad hack. | ||
3934 | 6146 | _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' | ||
3935 | 6147 | _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | ||
3936 | 6148 | $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; | ||
3937 | 6149 | else | ||
3938 | 6150 | $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; | ||
3939 | 6151 | fi~ | ||
3940 | 6152 | $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 | 6153 | linknames=' | ||
3942 | 6154 | # The linker will not automatically build a static lib if we build a DLL. | ||
3943 | 6155 | # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' | ||
3944 | 6156 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | ||
3945 | 6157 | # Don't use ranlib | ||
3946 | 6158 | _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' | ||
3947 | 6159 | _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ | ||
3948 | 6160 | lt_tool_outputfile="@TOOL_OUTPUT@"~ | ||
3949 | 6161 | case $lt_outputfile in | ||
3950 | 6162 | *.exe|*.EXE) ;; | ||
3951 | 6163 | *) | ||
3952 | 6164 | lt_outputfile="$lt_outputfile.exe" | ||
3953 | 6165 | lt_tool_outputfile="$lt_tool_outputfile.exe" | ||
3954 | 6166 | ;; | ||
3955 | 6167 | esac~ | ||
3956 | 6168 | func_to_tool_file "$lt_outputfile"~ | ||
3957 | 6169 | if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then | ||
3958 | 6170 | $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; | ||
3959 | 6171 | $RM "$lt_outputfile.manifest"; | ||
3960 | 6172 | fi' | ||
3961 | 6173 | ;; | ||
3962 | 6174 | *) | ||
3963 | 6175 | # g++ | ||
3964 | 6176 | # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, | ||
3965 | 6177 | # as there is no search path for DLLs. | ||
3966 | 6178 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' | ||
3967 | 6179 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' | ||
3968 | 6180 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | ||
3969 | 6181 | _LT_TAGVAR(always_export_symbols, $1)=no | ||
3970 | 6182 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | ||
3971 | 6235 | 6183 | ||
3987 | 6236 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 6184 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
3988 | 6237 | _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' | 6185 | _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 | 6238 | # If the export-symbols file already is a .def file (1st line | 6186 | # If the export-symbols file already is a .def file (1st line |
3990 | 6239 | # is EXPORTS), use it as is; otherwise, prepend... | 6187 | # is EXPORTS), use it as is; otherwise, prepend... |
3991 | 6240 | _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | 6188 | _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
3992 | 6241 | cp $export_symbols $output_objdir/$soname.def; | 6189 | cp $export_symbols $output_objdir/$soname.def; |
3993 | 6242 | else | 6190 | else |
3994 | 6243 | echo EXPORTS > $output_objdir/$soname.def; | 6191 | echo EXPORTS > $output_objdir/$soname.def; |
3995 | 6244 | cat $export_symbols >> $output_objdir/$soname.def; | 6192 | cat $export_symbols >> $output_objdir/$soname.def; |
3996 | 6245 | fi~ | 6193 | fi~ |
3997 | 6246 | $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' | 6194 | $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 | 6247 | else | 6195 | else |
3999 | 6248 | _LT_TAGVAR(ld_shlibs, $1)=no | 6196 | _LT_TAGVAR(ld_shlibs, $1)=no |
4000 | 6249 | fi | 6197 | fi |
4001 | 6250 | ;; | 6198 | ;; |
4002 | 6199 | esac | ||
4003 | 6200 | ;; | ||
4004 | 6251 | darwin* | rhapsody*) | 6201 | darwin* | rhapsody*) |
4005 | 6252 | _LT_DARWIN_LINKER_FEATURES($1) | 6202 | _LT_DARWIN_LINKER_FEATURES($1) |
4006 | 6253 | ;; | 6203 | ;; |
4007 | @@ -6270,7 +6220,7 @@ | |||
4008 | 6270 | esac | 6220 | esac |
4009 | 6271 | ;; | 6221 | ;; |
4010 | 6272 | 6222 | ||
4012 | 6273 | freebsd[[12]]*) | 6223 | freebsd2.*) |
4013 | 6274 | # C++ shared libraries reported to be fairly broken before | 6224 | # C++ shared libraries reported to be fairly broken before |
4014 | 6275 | # switch to ELF | 6225 | # switch to ELF |
4015 | 6276 | _LT_TAGVAR(ld_shlibs, $1)=no | 6226 | _LT_TAGVAR(ld_shlibs, $1)=no |
4016 | @@ -6289,6 +6239,11 @@ | |||
4017 | 6289 | gnu*) | 6239 | gnu*) |
4018 | 6290 | ;; | 6240 | ;; |
4019 | 6291 | 6241 | ||
4020 | 6242 | haiku*) | ||
4021 | 6243 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
4022 | 6244 | _LT_TAGVAR(link_all_deplibs, $1)=yes | ||
4023 | 6245 | ;; | ||
4024 | 6246 | |||
4025 | 6292 | hpux9*) | 6247 | hpux9*) |
4026 | 6293 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' | 6248 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' |
4027 | 6294 | _LT_TAGVAR(hardcode_libdir_separator, $1)=: | 6249 | _LT_TAGVAR(hardcode_libdir_separator, $1)=: |
4028 | @@ -6313,11 +6268,11 @@ | |||
4029 | 6313 | # explicitly linking system object files so we need to strip them | 6268 | # explicitly linking system object files so we need to strip them |
4030 | 6314 | # from the output so that they don't get included in the library | 6269 | # from the output so that they don't get included in the library |
4031 | 6315 | # dependencies. | 6270 | # dependencies. |
4033 | 6316 | 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' | 6271 | 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 | 6317 | ;; | 6272 | ;; |
4035 | 6318 | *) | 6273 | *) |
4036 | 6319 | if test "$GXX" = yes; then | 6274 | if test "$GXX" = yes; then |
4038 | 6320 | _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' | 6275 | _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 | 6321 | else | 6276 | else |
4040 | 6322 | # FIXME: insert proper C++ library support | 6277 | # FIXME: insert proper C++ library support |
4041 | 6323 | _LT_TAGVAR(ld_shlibs, $1)=no | 6278 | _LT_TAGVAR(ld_shlibs, $1)=no |
4042 | @@ -6378,7 +6333,7 @@ | |||
4043 | 6378 | # explicitly linking system object files so we need to strip them | 6333 | # explicitly linking system object files so we need to strip them |
4044 | 6379 | # from the output so that they don't get included in the library | 6334 | # from the output so that they don't get included in the library |
4045 | 6380 | # dependencies. | 6335 | # dependencies. |
4047 | 6381 | 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' | 6336 | 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 | 6382 | ;; | 6337 | ;; |
4049 | 6383 | *) | 6338 | *) |
4050 | 6384 | if test "$GXX" = yes; then | 6339 | if test "$GXX" = yes; then |
4051 | @@ -6388,10 +6343,10 @@ | |||
4052 | 6388 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | 6343 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
4053 | 6389 | ;; | 6344 | ;; |
4054 | 6390 | ia64*) | 6345 | ia64*) |
4056 | 6391 | _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' | 6346 | _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 | 6392 | ;; | 6347 | ;; |
4058 | 6393 | *) | 6348 | *) |
4060 | 6394 | _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' | 6349 | _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 | 6395 | ;; | 6350 | ;; |
4062 | 6396 | esac | 6351 | esac |
4063 | 6397 | fi | 6352 | fi |
4064 | @@ -6421,7 +6376,7 @@ | |||
4065 | 6421 | case $cc_basename in | 6376 | case $cc_basename in |
4066 | 6422 | CC*) | 6377 | CC*) |
4067 | 6423 | # SGI C++ | 6378 | # SGI C++ |
4069 | 6424 | _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' | 6379 | _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 | 6425 | 6380 | ||
4071 | 6426 | # Archives containing C++ object files must be created using | 6381 | # Archives containing C++ object files must be created using |
4072 | 6427 | # "CC -ar", where "CC" is the IRIX C++ compiler. This is | 6382 | # "CC -ar", where "CC" is the IRIX C++ compiler. This is |
4073 | @@ -6432,9 +6387,9 @@ | |||
4074 | 6432 | *) | 6387 | *) |
4075 | 6433 | if test "$GXX" = yes; then | 6388 | if test "$GXX" = yes; then |
4076 | 6434 | if test "$with_gnu_ld" = no; then | 6389 | if test "$with_gnu_ld" = no; then |
4078 | 6435 | _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' | 6390 | _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 | 6436 | else | 6391 | else |
4081 | 6437 | _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' | 6392 | _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 | 6438 | fi | 6393 | fi |
4083 | 6439 | fi | 6394 | fi |
4084 | 6440 | _LT_TAGVAR(link_all_deplibs, $1)=yes | 6395 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
4085 | @@ -6445,7 +6400,7 @@ | |||
4086 | 6445 | _LT_TAGVAR(inherit_rpath, $1)=yes | 6400 | _LT_TAGVAR(inherit_rpath, $1)=yes |
4087 | 6446 | ;; | 6401 | ;; |
4088 | 6447 | 6402 | ||
4090 | 6448 | linux* | k*bsd*-gnu) | 6403 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
4091 | 6449 | case $cc_basename in | 6404 | case $cc_basename in |
4092 | 6450 | KCC*) | 6405 | KCC*) |
4093 | 6451 | # Kuck and Associates, Inc. (KAI) C++ Compiler | 6406 | # Kuck and Associates, Inc. (KAI) C++ Compiler |
4094 | @@ -6463,7 +6418,7 @@ | |||
4095 | 6463 | # explicitly linking system object files so we need to strip them | 6418 | # explicitly linking system object files so we need to strip them |
4096 | 6464 | # from the output so that they don't get included in the library | 6419 | # from the output so that they don't get included in the library |
4097 | 6465 | # dependencies. | 6420 | # dependencies. |
4099 | 6466 | 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' | 6421 | 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 | 6467 | 6422 | ||
4101 | 6468 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' | 6423 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' |
4102 | 6469 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' | 6424 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
4103 | @@ -6500,26 +6455,26 @@ | |||
4104 | 6500 | pgCC* | pgcpp*) | 6455 | pgCC* | pgcpp*) |
4105 | 6501 | # Portland Group C++ compiler | 6456 | # Portland Group C++ compiler |
4106 | 6502 | case `$CC -V` in | 6457 | case `$CC -V` in |
4108 | 6503 | *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) | 6458 | *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) |
4109 | 6504 | _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ | 6459 | _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ |
4110 | 6505 | rm -rf $tpldir~ | 6460 | rm -rf $tpldir~ |
4111 | 6506 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ | 6461 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ |
4113 | 6507 | compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' | 6462 | compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' |
4114 | 6508 | _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ | 6463 | _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ |
4115 | 6509 | rm -rf $tpldir~ | 6464 | rm -rf $tpldir~ |
4116 | 6510 | $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ | 6465 | $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ |
4118 | 6511 | $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ | 6466 | $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ |
4119 | 6512 | $RANLIB $oldlib' | 6467 | $RANLIB $oldlib' |
4120 | 6513 | _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ | 6468 | _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ |
4121 | 6514 | rm -rf $tpldir~ | 6469 | rm -rf $tpldir~ |
4122 | 6515 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ | 6470 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
4124 | 6516 | $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' | 6471 | $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 | 6517 | _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ | 6472 | _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ |
4126 | 6518 | rm -rf $tpldir~ | 6473 | rm -rf $tpldir~ |
4127 | 6519 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ | 6474 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
4129 | 6520 | $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' | 6475 | $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 | 6521 | ;; | 6476 | ;; |
4132 | 6522 | *) # Version 6 will use weak symbols | 6477 | *) # Version 6 and above use weak symbols |
4133 | 6523 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' | 6478 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
4134 | 6524 | _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' | 6479 | _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 | 6525 | ;; | 6480 | ;; |
4136 | @@ -6527,7 +6482,7 @@ | |||
4137 | 6527 | 6482 | ||
4138 | 6528 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' | 6483 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' |
4139 | 6529 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' | 6484 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
4141 | 6530 | _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' | 6485 | _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 | 6531 | ;; | 6486 | ;; |
4143 | 6532 | cxx*) | 6487 | cxx*) |
4144 | 6533 | # Compaq C++ | 6488 | # Compaq C++ |
4145 | @@ -6546,9 +6501,9 @@ | |||
4146 | 6546 | # explicitly linking system object files so we need to strip them | 6501 | # explicitly linking system object files so we need to strip them |
4147 | 6547 | # from the output so that they don't get included in the library | 6502 | # from the output so that they don't get included in the library |
4148 | 6548 | # dependencies. | 6503 | # dependencies. |
4150 | 6549 | 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' | 6504 | 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 | 6550 | ;; | 6505 | ;; |
4153 | 6551 | xl*) | 6506 | xl* | mpixl* | bgxl*) |
4154 | 6552 | # IBM XL 8.0 on PPC, with GNU ld | 6507 | # IBM XL 8.0 on PPC, with GNU ld |
4155 | 6553 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | 6508 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
4156 | 6554 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' | 6509 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
4157 | @@ -6568,13 +6523,13 @@ | |||
4158 | 6568 | _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | 6523 | _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
4159 | 6569 | _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' | 6524 | _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 | 6570 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' | 6525 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' |
4162 | 6571 | _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' | 6526 | _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 | 6572 | _LT_TAGVAR(compiler_needs_object, $1)=yes | 6527 | _LT_TAGVAR(compiler_needs_object, $1)=yes |
4164 | 6573 | 6528 | ||
4165 | 6574 | # Not sure whether something based on | 6529 | # Not sure whether something based on |
4166 | 6575 | # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | 6530 | # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 |
4167 | 6576 | # would be better. | 6531 | # would be better. |
4169 | 6577 | output_verbose_link_cmd='echo' | 6532 | output_verbose_link_cmd='func_echo_all' |
4170 | 6578 | 6533 | ||
4171 | 6579 | # Archives containing C++ object files must be created using | 6534 | # Archives containing C++ object files must be created using |
4172 | 6580 | # "CC -xar", where "CC" is the Sun C++ compiler. This is | 6535 | # "CC -xar", where "CC" is the Sun C++ compiler. This is |
4173 | @@ -6643,7 +6598,7 @@ | |||
4174 | 6643 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' | 6598 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' |
4175 | 6644 | _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' | 6599 | _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' |
4176 | 6645 | fi | 6600 | fi |
4178 | 6646 | output_verbose_link_cmd=echo | 6601 | output_verbose_link_cmd=func_echo_all |
4179 | 6647 | else | 6602 | else |
4180 | 6648 | _LT_TAGVAR(ld_shlibs, $1)=no | 6603 | _LT_TAGVAR(ld_shlibs, $1)=no |
4181 | 6649 | fi | 6604 | fi |
4182 | @@ -6678,15 +6633,15 @@ | |||
4183 | 6678 | case $host in | 6633 | case $host in |
4184 | 6679 | osf3*) | 6634 | osf3*) |
4185 | 6680 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' | 6635 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
4187 | 6681 | _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' | 6636 | _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 | 6682 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | 6637 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
4189 | 6683 | ;; | 6638 | ;; |
4190 | 6684 | *) | 6639 | *) |
4191 | 6685 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' | 6640 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
4193 | 6686 | _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' | 6641 | _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 | 6687 | _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ | 6642 | _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ |
4195 | 6688 | echo "-hidden">> $lib.exp~ | 6643 | echo "-hidden">> $lib.exp~ |
4197 | 6689 | $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~ | 6644 | $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 | 6690 | $RM $lib.exp' | 6645 | $RM $lib.exp' |
4199 | 6691 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' | 6646 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' |
4200 | 6692 | ;; | 6647 | ;; |
4201 | @@ -6702,17 +6657,17 @@ | |||
4202 | 6702 | # explicitly linking system object files so we need to strip them | 6657 | # explicitly linking system object files so we need to strip them |
4203 | 6703 | # from the output so that they don't get included in the library | 6658 | # from the output so that they don't get included in the library |
4204 | 6704 | # dependencies. | 6659 | # dependencies. |
4206 | 6705 | 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' | 6660 | 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 | 6706 | ;; | 6661 | ;; |
4208 | 6707 | *) | 6662 | *) |
4209 | 6708 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then | 6663 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
4210 | 6709 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' | 6664 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
4211 | 6710 | case $host in | 6665 | case $host in |
4212 | 6711 | osf3*) | 6666 | osf3*) |
4214 | 6712 | _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' | 6667 | _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 | 6713 | ;; | 6668 | ;; |
4216 | 6714 | *) | 6669 | *) |
4218 | 6715 | _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' | 6670 | _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 | 6716 | ;; | 6671 | ;; |
4220 | 6717 | esac | 6672 | esac |
4221 | 6718 | 6673 | ||
4222 | @@ -6722,7 +6677,7 @@ | |||
4223 | 6722 | # Commands to make compiler produce verbose output that lists | 6677 | # Commands to make compiler produce verbose output that lists |
4224 | 6723 | # what "hidden" libraries, object files and flags are used when | 6678 | # what "hidden" libraries, object files and flags are used when |
4225 | 6724 | # linking a shared library. | 6679 | # linking a shared library. |
4227 | 6725 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' | 6680 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
4228 | 6726 | 6681 | ||
4229 | 6727 | else | 6682 | else |
4230 | 6728 | # FIXME: insert proper C++ library support | 6683 | # FIXME: insert proper C++ library support |
4231 | @@ -6758,7 +6713,7 @@ | |||
4232 | 6758 | 6713 | ||
4233 | 6759 | solaris*) | 6714 | solaris*) |
4234 | 6760 | case $cc_basename in | 6715 | case $cc_basename in |
4236 | 6761 | CC*) | 6716 | CC* | sunCC*) |
4237 | 6762 | # Sun C++ 4.2, 5.x and Centerline C++ | 6717 | # Sun C++ 4.2, 5.x and Centerline C++ |
4238 | 6763 | _LT_TAGVAR(archive_cmds_need_lc,$1)=yes | 6718 | _LT_TAGVAR(archive_cmds_need_lc,$1)=yes |
4239 | 6764 | _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' | 6719 | _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' |
4240 | @@ -6779,7 +6734,7 @@ | |||
4241 | 6779 | esac | 6734 | esac |
4242 | 6780 | _LT_TAGVAR(link_all_deplibs, $1)=yes | 6735 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
4243 | 6781 | 6736 | ||
4245 | 6782 | output_verbose_link_cmd='echo' | 6737 | output_verbose_link_cmd='func_echo_all' |
4246 | 6783 | 6738 | ||
4247 | 6784 | # Archives containing C++ object files must be created using | 6739 | # Archives containing C++ object files must be created using |
4248 | 6785 | # "CC -xar", where "CC" is the Sun C++ compiler. This is | 6740 | # "CC -xar", where "CC" is the Sun C++ compiler. This is |
4249 | @@ -6799,14 +6754,14 @@ | |||
4250 | 6799 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then | 6754 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
4251 | 6800 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' | 6755 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' |
4252 | 6801 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then | 6756 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then |
4254 | 6802 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' | 6757 | _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 | 6803 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ | 6758 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
4257 | 6804 | $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' | 6759 | $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' |
4258 | 6805 | 6760 | ||
4259 | 6806 | # Commands to make compiler produce verbose output that lists | 6761 | # Commands to make compiler produce verbose output that lists |
4260 | 6807 | # what "hidden" libraries, object files and flags are used when | 6762 | # what "hidden" libraries, object files and flags are used when |
4261 | 6808 | # linking a shared library. | 6763 | # linking a shared library. |
4263 | 6809 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' | 6764 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
4264 | 6810 | else | 6765 | else |
4265 | 6811 | # g++ 2.7 appears to require `-G' NOT `-shared' on this | 6766 | # g++ 2.7 appears to require `-G' NOT `-shared' on this |
4266 | 6812 | # platform. | 6767 | # platform. |
4267 | @@ -6817,7 +6772,7 @@ | |||
4268 | 6817 | # Commands to make compiler produce verbose output that lists | 6772 | # Commands to make compiler produce verbose output that lists |
4269 | 6818 | # what "hidden" libraries, object files and flags are used when | 6773 | # what "hidden" libraries, object files and flags are used when |
4270 | 6819 | # linking a shared library. | 6774 | # linking a shared library. |
4272 | 6820 | output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' | 6775 | output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
4273 | 6821 | fi | 6776 | fi |
4274 | 6822 | 6777 | ||
4275 | 6823 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' | 6778 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' |
4276 | @@ -6871,6 +6826,10 @@ | |||
4277 | 6871 | CC*) | 6826 | CC*) |
4278 | 6872 | _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | 6827 | _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
4279 | 6873 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | 6828 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
4280 | 6829 | _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ | ||
4281 | 6830 | '"$_LT_TAGVAR(old_archive_cmds, $1)" | ||
4282 | 6831 | _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ | ||
4283 | 6832 | '"$_LT_TAGVAR(reload_cmds, $1)" | ||
4284 | 6874 | ;; | 6833 | ;; |
4285 | 6875 | *) | 6834 | *) |
4286 | 6876 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | 6835 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
4287 | @@ -6926,6 +6885,7 @@ | |||
4288 | 6926 | fi # test -n "$compiler" | 6885 | fi # test -n "$compiler" |
4289 | 6927 | 6886 | ||
4290 | 6928 | CC=$lt_save_CC | 6887 | CC=$lt_save_CC |
4291 | 6888 | CFLAGS=$lt_save_CFLAGS | ||
4292 | 6929 | LDCXX=$LD | 6889 | LDCXX=$LD |
4293 | 6930 | LD=$lt_save_LD | 6890 | LD=$lt_save_LD |
4294 | 6931 | GCC=$lt_save_GCC | 6891 | GCC=$lt_save_GCC |
4295 | @@ -6940,6 +6900,29 @@ | |||
4296 | 6940 | ])# _LT_LANG_CXX_CONFIG | 6900 | ])# _LT_LANG_CXX_CONFIG |
4297 | 6941 | 6901 | ||
4298 | 6942 | 6902 | ||
4299 | 6903 | # _LT_FUNC_STRIPNAME_CNF | ||
4300 | 6904 | # ---------------------- | ||
4301 | 6905 | # func_stripname_cnf prefix suffix name | ||
4302 | 6906 | # strip PREFIX and SUFFIX off of NAME. | ||
4303 | 6907 | # PREFIX and SUFFIX must not contain globbing or regex special | ||
4304 | 6908 | # characters, hashes, percent signs, but SUFFIX may contain a leading | ||
4305 | 6909 | # dot (in which case that matches only a dot). | ||
4306 | 6910 | # | ||
4307 | 6911 | # This function is identical to the (non-XSI) version of func_stripname, | ||
4308 | 6912 | # except this one can be used by m4 code that may be executed by configure, | ||
4309 | 6913 | # rather than the libtool script. | ||
4310 | 6914 | m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl | ||
4311 | 6915 | AC_REQUIRE([_LT_DECL_SED]) | ||
4312 | 6916 | AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) | ||
4313 | 6917 | func_stripname_cnf () | ||
4314 | 6918 | { | ||
4315 | 6919 | case ${2} in | ||
4316 | 6920 | .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; | ||
4317 | 6921 | *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; | ||
4318 | 6922 | esac | ||
4319 | 6923 | } # func_stripname_cnf | ||
4320 | 6924 | ])# _LT_FUNC_STRIPNAME_CNF | ||
4321 | 6925 | |||
4322 | 6943 | # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) | 6926 | # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) |
4323 | 6944 | # --------------------------------- | 6927 | # --------------------------------- |
4324 | 6945 | # Figure out "hidden" library dependencies from verbose | 6928 | # Figure out "hidden" library dependencies from verbose |
4325 | @@ -6948,6 +6931,7 @@ | |||
4326 | 6948 | # objects, libraries and library flags. | 6931 | # objects, libraries and library flags. |
4327 | 6949 | m4_defun([_LT_SYS_HIDDEN_LIBDEPS], | 6932 | m4_defun([_LT_SYS_HIDDEN_LIBDEPS], |
4328 | 6950 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl | 6933 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
4329 | 6934 | AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl | ||
4330 | 6951 | # Dependencies to place before and after the object being linked: | 6935 | # Dependencies to place before and after the object being linked: |
4331 | 6952 | _LT_TAGVAR(predep_objects, $1)= | 6936 | _LT_TAGVAR(predep_objects, $1)= |
4332 | 6953 | _LT_TAGVAR(postdep_objects, $1)= | 6937 | _LT_TAGVAR(postdep_objects, $1)= |
4333 | @@ -6997,7 +6981,20 @@ | |||
4334 | 6997 | } | 6981 | } |
4335 | 6998 | }; | 6982 | }; |
4336 | 6999 | _LT_EOF | 6983 | _LT_EOF |
4337 | 6984 | ], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF | ||
4338 | 6985 | package foo | ||
4339 | 6986 | func foo() { | ||
4340 | 6987 | } | ||
4341 | 6988 | _LT_EOF | ||
4342 | 7000 | ]) | 6989 | ]) |
4343 | 6990 | |||
4344 | 6991 | _lt_libdeps_save_CFLAGS=$CFLAGS | ||
4345 | 6992 | case "$CC $CFLAGS " in #( | ||
4346 | 6993 | *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; | ||
4347 | 6994 | *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; | ||
4348 | 6995 | *\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; | ||
4349 | 6996 | esac | ||
4350 | 6997 | |||
4351 | 7001 | dnl Parse the compiler output and extract the necessary | 6998 | dnl Parse the compiler output and extract the necessary |
4352 | 7002 | dnl objects, libraries and library flags. | 6999 | dnl objects, libraries and library flags. |
4353 | 7003 | if AC_TRY_EVAL(ac_compile); then | 7000 | if AC_TRY_EVAL(ac_compile); then |
4354 | @@ -7009,7 +7006,7 @@ | |||
4355 | 7009 | pre_test_object_deps_done=no | 7006 | pre_test_object_deps_done=no |
4356 | 7010 | 7007 | ||
4357 | 7011 | for p in `eval "$output_verbose_link_cmd"`; do | 7008 | for p in `eval "$output_verbose_link_cmd"`; do |
4359 | 7012 | case $p in | 7009 | case ${prev}${p} in |
4360 | 7013 | 7010 | ||
4361 | 7014 | -L* | -R* | -l*) | 7011 | -L* | -R* | -l*) |
4362 | 7015 | # Some compilers place space between "-{L,R}" and the path. | 7012 | # Some compilers place space between "-{L,R}" and the path. |
4363 | @@ -7018,13 +7015,22 @@ | |||
4364 | 7018 | test $p = "-R"; then | 7015 | test $p = "-R"; then |
4365 | 7019 | prev=$p | 7016 | prev=$p |
4366 | 7020 | continue | 7017 | continue |
4367 | 7021 | else | ||
4368 | 7022 | prev= | ||
4369 | 7023 | fi | 7018 | fi |
4370 | 7024 | 7019 | ||
4371 | 7020 | # Expand the sysroot to ease extracting the directories later. | ||
4372 | 7021 | if test -z "$prev"; then | ||
4373 | 7022 | case $p in | ||
4374 | 7023 | -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; | ||
4375 | 7024 | -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; | ||
4376 | 7025 | -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; | ||
4377 | 7026 | esac | ||
4378 | 7027 | fi | ||
4379 | 7028 | case $p in | ||
4380 | 7029 | =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; | ||
4381 | 7030 | esac | ||
4382 | 7025 | if test "$pre_test_object_deps_done" = no; then | 7031 | if test "$pre_test_object_deps_done" = no; then |
4385 | 7026 | case $p in | 7032 | case ${prev} in |
4386 | 7027 | -L* | -R*) | 7033 | -L | -R) |
4387 | 7028 | # Internal compiler library paths should come after those | 7034 | # Internal compiler library paths should come after those |
4388 | 7029 | # provided the user. The postdeps already come after the | 7035 | # provided the user. The postdeps already come after the |
4389 | 7030 | # user supplied libs so there is no need to process them. | 7036 | # user supplied libs so there is no need to process them. |
4390 | @@ -7044,8 +7050,10 @@ | |||
4391 | 7044 | _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" | 7050 | _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" |
4392 | 7045 | fi | 7051 | fi |
4393 | 7046 | fi | 7052 | fi |
4394 | 7053 | prev= | ||
4395 | 7047 | ;; | 7054 | ;; |
4396 | 7048 | 7055 | ||
4397 | 7056 | *.lto.$objext) ;; # Ignore GCC LTO objects | ||
4398 | 7049 | *.$objext) | 7057 | *.$objext) |
4399 | 7050 | # This assumes that the test object file only shows up | 7058 | # This assumes that the test object file only shows up |
4400 | 7051 | # once in the compiler output. | 7059 | # once in the compiler output. |
4401 | @@ -7081,6 +7089,7 @@ | |||
4402 | 7081 | fi | 7089 | fi |
4403 | 7082 | 7090 | ||
4404 | 7083 | $RM -f confest.$objext | 7091 | $RM -f confest.$objext |
4405 | 7092 | CFLAGS=$_lt_libdeps_save_CFLAGS | ||
4406 | 7084 | 7093 | ||
4407 | 7085 | # PORTME: override above test on systems where it is broken | 7094 | # PORTME: override above test on systems where it is broken |
4408 | 7086 | m4_if([$1], [CXX], | 7095 | m4_if([$1], [CXX], |
4409 | @@ -7117,7 +7126,7 @@ | |||
4410 | 7117 | 7126 | ||
4411 | 7118 | solaris*) | 7127 | solaris*) |
4412 | 7119 | case $cc_basename in | 7128 | case $cc_basename in |
4414 | 7120 | CC*) | 7129 | CC* | sunCC*) |
4415 | 7121 | # The more standards-conforming stlport4 library is | 7130 | # The more standards-conforming stlport4 library is |
4416 | 7122 | # incompatible with the Cstd library. Avoid specifying | 7131 | # incompatible with the Cstd library. Avoid specifying |
4417 | 7123 | # it if it's in CXXFLAGS. Ignore libCrun as | 7132 | # it if it's in CXXFLAGS. Ignore libCrun as |
4418 | @@ -7161,32 +7170,16 @@ | |||
4419 | 7161 | ])# _LT_SYS_HIDDEN_LIBDEPS | 7170 | ])# _LT_SYS_HIDDEN_LIBDEPS |
4420 | 7162 | 7171 | ||
4421 | 7163 | 7172 | ||
4422 | 7164 | # _LT_PROG_F77 | ||
4423 | 7165 | # ------------ | ||
4424 | 7166 | # Since AC_PROG_F77 is broken, in that it returns the empty string | ||
4425 | 7167 | # if there is no fortran compiler, we have our own version here. | ||
4426 | 7168 | m4_defun([_LT_PROG_F77], | ||
4427 | 7169 | [ | ||
4428 | 7170 | pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) | ||
4429 | 7171 | AC_PROG_F77 | ||
4430 | 7172 | if test -z "$F77" || test "X$F77" = "Xno"; then | ||
4431 | 7173 | _lt_disable_F77=yes | ||
4432 | 7174 | fi | ||
4433 | 7175 | popdef([AC_MSG_ERROR]) | ||
4434 | 7176 | ])# _LT_PROG_F77 | ||
4435 | 7177 | |||
4436 | 7178 | dnl aclocal-1.4 backwards compatibility: | ||
4437 | 7179 | dnl AC_DEFUN([_LT_PROG_F77], []) | ||
4438 | 7180 | |||
4439 | 7181 | |||
4440 | 7182 | # _LT_LANG_F77_CONFIG([TAG]) | 7173 | # _LT_LANG_F77_CONFIG([TAG]) |
4441 | 7183 | # -------------------------- | 7174 | # -------------------------- |
4442 | 7184 | # Ensure that the configuration variables for a Fortran 77 compiler are | 7175 | # Ensure that the configuration variables for a Fortran 77 compiler are |
4443 | 7185 | # suitably defined. These variables are subsequently used by _LT_CONFIG | 7176 | # suitably defined. These variables are subsequently used by _LT_CONFIG |
4444 | 7186 | # to write the compiler configuration to `libtool'. | 7177 | # to write the compiler configuration to `libtool'. |
4445 | 7187 | m4_defun([_LT_LANG_F77_CONFIG], | 7178 | m4_defun([_LT_LANG_F77_CONFIG], |
4448 | 7188 | [AC_REQUIRE([_LT_PROG_F77])dnl | 7179 | [AC_LANG_PUSH(Fortran 77) |
4449 | 7189 | AC_LANG_PUSH(Fortran 77) | 7180 | if test -z "$F77" || test "X$F77" = "Xno"; then |
4450 | 7181 | _lt_disable_F77=yes | ||
4451 | 7182 | fi | ||
4452 | 7190 | 7183 | ||
4453 | 7191 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no | 7184 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
4454 | 7192 | _LT_TAGVAR(allow_undefined_flag, $1)= | 7185 | _LT_TAGVAR(allow_undefined_flag, $1)= |
4455 | @@ -7196,7 +7189,6 @@ | |||
4456 | 7196 | _LT_TAGVAR(hardcode_direct, $1)=no | 7189 | _LT_TAGVAR(hardcode_direct, $1)=no |
4457 | 7197 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no | 7190 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
4458 | 7198 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | 7191 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
4459 | 7199 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= | ||
4460 | 7200 | _LT_TAGVAR(hardcode_libdir_separator, $1)= | 7192 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
4461 | 7201 | _LT_TAGVAR(hardcode_minus_L, $1)=no | 7193 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
4462 | 7202 | _LT_TAGVAR(hardcode_automatic, $1)=no | 7194 | _LT_TAGVAR(hardcode_automatic, $1)=no |
4463 | @@ -7205,6 +7197,8 @@ | |||
4464 | 7205 | _LT_TAGVAR(module_expsym_cmds, $1)= | 7197 | _LT_TAGVAR(module_expsym_cmds, $1)= |
4465 | 7206 | _LT_TAGVAR(link_all_deplibs, $1)=unknown | 7198 | _LT_TAGVAR(link_all_deplibs, $1)=unknown |
4466 | 7207 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds | 7199 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
4467 | 7200 | _LT_TAGVAR(reload_flag, $1)=$reload_flag | ||
4468 | 7201 | _LT_TAGVAR(reload_cmds, $1)=$reload_cmds | ||
4469 | 7208 | _LT_TAGVAR(no_undefined_flag, $1)= | 7202 | _LT_TAGVAR(no_undefined_flag, $1)= |
4470 | 7209 | _LT_TAGVAR(whole_archive_flag_spec, $1)= | 7203 | _LT_TAGVAR(whole_archive_flag_spec, $1)= |
4471 | 7210 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no | 7204 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no |
4472 | @@ -7244,7 +7238,9 @@ | |||
4473 | 7244 | # Allow CC to be a program name with arguments. | 7238 | # Allow CC to be a program name with arguments. |
4474 | 7245 | lt_save_CC="$CC" | 7239 | lt_save_CC="$CC" |
4475 | 7246 | lt_save_GCC=$GCC | 7240 | lt_save_GCC=$GCC |
4476 | 7241 | lt_save_CFLAGS=$CFLAGS | ||
4477 | 7247 | CC=${F77-"f77"} | 7242 | CC=${F77-"f77"} |
4478 | 7243 | CFLAGS=$FFLAGS | ||
4479 | 7248 | compiler=$CC | 7244 | compiler=$CC |
4480 | 7249 | _LT_TAGVAR(compiler, $1)=$CC | 7245 | _LT_TAGVAR(compiler, $1)=$CC |
4481 | 7250 | _LT_CC_BASENAME([$compiler]) | 7246 | _LT_CC_BASENAME([$compiler]) |
4482 | @@ -7298,38 +7294,24 @@ | |||
4483 | 7298 | 7294 | ||
4484 | 7299 | GCC=$lt_save_GCC | 7295 | GCC=$lt_save_GCC |
4485 | 7300 | CC="$lt_save_CC" | 7296 | CC="$lt_save_CC" |
4486 | 7297 | CFLAGS="$lt_save_CFLAGS" | ||
4487 | 7301 | fi # test "$_lt_disable_F77" != yes | 7298 | fi # test "$_lt_disable_F77" != yes |
4488 | 7302 | 7299 | ||
4489 | 7303 | AC_LANG_POP | 7300 | AC_LANG_POP |
4490 | 7304 | ])# _LT_LANG_F77_CONFIG | 7301 | ])# _LT_LANG_F77_CONFIG |
4491 | 7305 | 7302 | ||
4492 | 7306 | 7303 | ||
4493 | 7307 | # _LT_PROG_FC | ||
4494 | 7308 | # ----------- | ||
4495 | 7309 | # Since AC_PROG_FC is broken, in that it returns the empty string | ||
4496 | 7310 | # if there is no fortran compiler, we have our own version here. | ||
4497 | 7311 | m4_defun([_LT_PROG_FC], | ||
4498 | 7312 | [ | ||
4499 | 7313 | pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) | ||
4500 | 7314 | AC_PROG_FC | ||
4501 | 7315 | if test -z "$FC" || test "X$FC" = "Xno"; then | ||
4502 | 7316 | _lt_disable_FC=yes | ||
4503 | 7317 | fi | ||
4504 | 7318 | popdef([AC_MSG_ERROR]) | ||
4505 | 7319 | ])# _LT_PROG_FC | ||
4506 | 7320 | |||
4507 | 7321 | dnl aclocal-1.4 backwards compatibility: | ||
4508 | 7322 | dnl AC_DEFUN([_LT_PROG_FC], []) | ||
4509 | 7323 | |||
4510 | 7324 | |||
4511 | 7325 | # _LT_LANG_FC_CONFIG([TAG]) | 7304 | # _LT_LANG_FC_CONFIG([TAG]) |
4512 | 7326 | # ------------------------- | 7305 | # ------------------------- |
4513 | 7327 | # Ensure that the configuration variables for a Fortran compiler are | 7306 | # Ensure that the configuration variables for a Fortran compiler are |
4514 | 7328 | # suitably defined. These variables are subsequently used by _LT_CONFIG | 7307 | # suitably defined. These variables are subsequently used by _LT_CONFIG |
4515 | 7329 | # to write the compiler configuration to `libtool'. | 7308 | # to write the compiler configuration to `libtool'. |
4516 | 7330 | m4_defun([_LT_LANG_FC_CONFIG], | 7309 | m4_defun([_LT_LANG_FC_CONFIG], |
4519 | 7331 | [AC_REQUIRE([_LT_PROG_FC])dnl | 7310 | [AC_LANG_PUSH(Fortran) |
4520 | 7332 | AC_LANG_PUSH(Fortran) | 7311 | |
4521 | 7312 | if test -z "$FC" || test "X$FC" = "Xno"; then | ||
4522 | 7313 | _lt_disable_FC=yes | ||
4523 | 7314 | fi | ||
4524 | 7333 | 7315 | ||
4525 | 7334 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no | 7316 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
4526 | 7335 | _LT_TAGVAR(allow_undefined_flag, $1)= | 7317 | _LT_TAGVAR(allow_undefined_flag, $1)= |
4527 | @@ -7339,7 +7321,6 @@ | |||
4528 | 7339 | _LT_TAGVAR(hardcode_direct, $1)=no | 7321 | _LT_TAGVAR(hardcode_direct, $1)=no |
4529 | 7340 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no | 7322 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
4530 | 7341 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | 7323 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
4531 | 7342 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= | ||
4532 | 7343 | _LT_TAGVAR(hardcode_libdir_separator, $1)= | 7324 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
4533 | 7344 | _LT_TAGVAR(hardcode_minus_L, $1)=no | 7325 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
4534 | 7345 | _LT_TAGVAR(hardcode_automatic, $1)=no | 7326 | _LT_TAGVAR(hardcode_automatic, $1)=no |
4535 | @@ -7348,6 +7329,8 @@ | |||
4536 | 7348 | _LT_TAGVAR(module_expsym_cmds, $1)= | 7329 | _LT_TAGVAR(module_expsym_cmds, $1)= |
4537 | 7349 | _LT_TAGVAR(link_all_deplibs, $1)=unknown | 7330 | _LT_TAGVAR(link_all_deplibs, $1)=unknown |
4538 | 7350 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds | 7331 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
4539 | 7332 | _LT_TAGVAR(reload_flag, $1)=$reload_flag | ||
4540 | 7333 | _LT_TAGVAR(reload_cmds, $1)=$reload_cmds | ||
4541 | 7351 | _LT_TAGVAR(no_undefined_flag, $1)= | 7334 | _LT_TAGVAR(no_undefined_flag, $1)= |
4542 | 7352 | _LT_TAGVAR(whole_archive_flag_spec, $1)= | 7335 | _LT_TAGVAR(whole_archive_flag_spec, $1)= |
4543 | 7353 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no | 7336 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no |
4544 | @@ -7387,7 +7370,9 @@ | |||
4545 | 7387 | # Allow CC to be a program name with arguments. | 7370 | # Allow CC to be a program name with arguments. |
4546 | 7388 | lt_save_CC="$CC" | 7371 | lt_save_CC="$CC" |
4547 | 7389 | lt_save_GCC=$GCC | 7372 | lt_save_GCC=$GCC |
4548 | 7373 | lt_save_CFLAGS=$CFLAGS | ||
4549 | 7390 | CC=${FC-"f95"} | 7374 | CC=${FC-"f95"} |
4550 | 7375 | CFLAGS=$FCFLAGS | ||
4551 | 7391 | compiler=$CC | 7376 | compiler=$CC |
4552 | 7392 | GCC=$ac_cv_fc_compiler_gnu | 7377 | GCC=$ac_cv_fc_compiler_gnu |
4553 | 7393 | 7378 | ||
4554 | @@ -7443,7 +7428,8 @@ | |||
4555 | 7443 | fi # test -n "$compiler" | 7428 | fi # test -n "$compiler" |
4556 | 7444 | 7429 | ||
4557 | 7445 | GCC=$lt_save_GCC | 7430 | GCC=$lt_save_GCC |
4559 | 7446 | CC="$lt_save_CC" | 7431 | CC=$lt_save_CC |
4560 | 7432 | CFLAGS=$lt_save_CFLAGS | ||
4561 | 7447 | fi # test "$_lt_disable_FC" != yes | 7433 | fi # test "$_lt_disable_FC" != yes |
4562 | 7448 | 7434 | ||
4563 | 7449 | AC_LANG_POP | 7435 | AC_LANG_POP |
4564 | @@ -7480,10 +7466,12 @@ | |||
4565 | 7480 | _LT_LINKER_BOILERPLATE | 7466 | _LT_LINKER_BOILERPLATE |
4566 | 7481 | 7467 | ||
4567 | 7482 | # Allow CC to be a program name with arguments. | 7468 | # Allow CC to be a program name with arguments. |
4569 | 7483 | lt_save_CC="$CC" | 7469 | lt_save_CC=$CC |
4570 | 7470 | lt_save_CFLAGS=$CFLAGS | ||
4571 | 7484 | lt_save_GCC=$GCC | 7471 | lt_save_GCC=$GCC |
4572 | 7485 | GCC=yes | 7472 | GCC=yes |
4573 | 7486 | CC=${GCJ-"gcj"} | 7473 | CC=${GCJ-"gcj"} |
4574 | 7474 | CFLAGS=$GCJFLAGS | ||
4575 | 7487 | compiler=$CC | 7475 | compiler=$CC |
4576 | 7488 | _LT_TAGVAR(compiler, $1)=$CC | 7476 | _LT_TAGVAR(compiler, $1)=$CC |
4577 | 7489 | _LT_TAGVAR(LD, $1)="$LD" | 7477 | _LT_TAGVAR(LD, $1)="$LD" |
4578 | @@ -7493,6 +7481,8 @@ | |||
4579 | 7493 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no | 7481 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
4580 | 7494 | 7482 | ||
4581 | 7495 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds | 7483 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
4582 | 7484 | _LT_TAGVAR(reload_flag, $1)=$reload_flag | ||
4583 | 7485 | _LT_TAGVAR(reload_cmds, $1)=$reload_cmds | ||
4584 | 7496 | 7486 | ||
4585 | 7497 | if test -n "$compiler"; then | 7487 | if test -n "$compiler"; then |
4586 | 7498 | _LT_COMPILER_NO_RTTI($1) | 7488 | _LT_COMPILER_NO_RTTI($1) |
4587 | @@ -7508,10 +7498,78 @@ | |||
4588 | 7508 | AC_LANG_RESTORE | 7498 | AC_LANG_RESTORE |
4589 | 7509 | 7499 | ||
4590 | 7510 | GCC=$lt_save_GCC | 7500 | GCC=$lt_save_GCC |
4592 | 7511 | CC="$lt_save_CC" | 7501 | CC=$lt_save_CC |
4593 | 7502 | CFLAGS=$lt_save_CFLAGS | ||
4594 | 7512 | ])# _LT_LANG_GCJ_CONFIG | 7503 | ])# _LT_LANG_GCJ_CONFIG |
4595 | 7513 | 7504 | ||
4596 | 7514 | 7505 | ||
4597 | 7506 | # _LT_LANG_GO_CONFIG([TAG]) | ||
4598 | 7507 | # -------------------------- | ||
4599 | 7508 | # Ensure that the configuration variables for the GNU Go compiler | ||
4600 | 7509 | # are suitably defined. These variables are subsequently used by _LT_CONFIG | ||
4601 | 7510 | # to write the compiler configuration to `libtool'. | ||
4602 | 7511 | m4_defun([_LT_LANG_GO_CONFIG], | ||
4603 | 7512 | [AC_REQUIRE([LT_PROG_GO])dnl | ||
4604 | 7513 | AC_LANG_SAVE | ||
4605 | 7514 | |||
4606 | 7515 | # Source file extension for Go test sources. | ||
4607 | 7516 | ac_ext=go | ||
4608 | 7517 | |||
4609 | 7518 | # Object file extension for compiled Go test sources. | ||
4610 | 7519 | objext=o | ||
4611 | 7520 | _LT_TAGVAR(objext, $1)=$objext | ||
4612 | 7521 | |||
4613 | 7522 | # Code to be used in simple compile tests | ||
4614 | 7523 | lt_simple_compile_test_code="package main; func main() { }" | ||
4615 | 7524 | |||
4616 | 7525 | # Code to be used in simple link tests | ||
4617 | 7526 | lt_simple_link_test_code='package main; func main() { }' | ||
4618 | 7527 | |||
4619 | 7528 | # ltmain only uses $CC for tagged configurations so make sure $CC is set. | ||
4620 | 7529 | _LT_TAG_COMPILER | ||
4621 | 7530 | |||
4622 | 7531 | # save warnings/boilerplate of simple test code | ||
4623 | 7532 | _LT_COMPILER_BOILERPLATE | ||
4624 | 7533 | _LT_LINKER_BOILERPLATE | ||
4625 | 7534 | |||
4626 | 7535 | # Allow CC to be a program name with arguments. | ||
4627 | 7536 | lt_save_CC=$CC | ||
4628 | 7537 | lt_save_CFLAGS=$CFLAGS | ||
4629 | 7538 | lt_save_GCC=$GCC | ||
4630 | 7539 | GCC=yes | ||
4631 | 7540 | CC=${GOC-"gccgo"} | ||
4632 | 7541 | CFLAGS=$GOFLAGS | ||
4633 | 7542 | compiler=$CC | ||
4634 | 7543 | _LT_TAGVAR(compiler, $1)=$CC | ||
4635 | 7544 | _LT_TAGVAR(LD, $1)="$LD" | ||
4636 | 7545 | _LT_CC_BASENAME([$compiler]) | ||
4637 | 7546 | |||
4638 | 7547 | # Go did not exist at the time GCC didn't implicitly link libc in. | ||
4639 | 7548 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no | ||
4640 | 7549 | |||
4641 | 7550 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds | ||
4642 | 7551 | _LT_TAGVAR(reload_flag, $1)=$reload_flag | ||
4643 | 7552 | _LT_TAGVAR(reload_cmds, $1)=$reload_cmds | ||
4644 | 7553 | |||
4645 | 7554 | if test -n "$compiler"; then | ||
4646 | 7555 | _LT_COMPILER_NO_RTTI($1) | ||
4647 | 7556 | _LT_COMPILER_PIC($1) | ||
4648 | 7557 | _LT_COMPILER_C_O($1) | ||
4649 | 7558 | _LT_COMPILER_FILE_LOCKS($1) | ||
4650 | 7559 | _LT_LINKER_SHLIBS($1) | ||
4651 | 7560 | _LT_LINKER_HARDCODE_LIBPATH($1) | ||
4652 | 7561 | |||
4653 | 7562 | _LT_CONFIG($1) | ||
4654 | 7563 | fi | ||
4655 | 7564 | |||
4656 | 7565 | AC_LANG_RESTORE | ||
4657 | 7566 | |||
4658 | 7567 | GCC=$lt_save_GCC | ||
4659 | 7568 | CC=$lt_save_CC | ||
4660 | 7569 | CFLAGS=$lt_save_CFLAGS | ||
4661 | 7570 | ])# _LT_LANG_GO_CONFIG | ||
4662 | 7571 | |||
4663 | 7572 | |||
4664 | 7515 | # _LT_LANG_RC_CONFIG([TAG]) | 7573 | # _LT_LANG_RC_CONFIG([TAG]) |
4665 | 7516 | # ------------------------- | 7574 | # ------------------------- |
4666 | 7517 | # Ensure that the configuration variables for the Windows resource compiler | 7575 | # Ensure that the configuration variables for the Windows resource compiler |
4667 | @@ -7543,9 +7601,11 @@ | |||
4668 | 7543 | 7601 | ||
4669 | 7544 | # Allow CC to be a program name with arguments. | 7602 | # Allow CC to be a program name with arguments. |
4670 | 7545 | lt_save_CC="$CC" | 7603 | lt_save_CC="$CC" |
4671 | 7604 | lt_save_CFLAGS=$CFLAGS | ||
4672 | 7546 | lt_save_GCC=$GCC | 7605 | lt_save_GCC=$GCC |
4673 | 7547 | GCC= | 7606 | GCC= |
4674 | 7548 | CC=${RC-"windres"} | 7607 | CC=${RC-"windres"} |
4675 | 7608 | CFLAGS= | ||
4676 | 7549 | compiler=$CC | 7609 | compiler=$CC |
4677 | 7550 | _LT_TAGVAR(compiler, $1)=$CC | 7610 | _LT_TAGVAR(compiler, $1)=$CC |
4678 | 7551 | _LT_CC_BASENAME([$compiler]) | 7611 | _LT_CC_BASENAME([$compiler]) |
4679 | @@ -7558,7 +7618,8 @@ | |||
4680 | 7558 | 7618 | ||
4681 | 7559 | GCC=$lt_save_GCC | 7619 | GCC=$lt_save_GCC |
4682 | 7560 | AC_LANG_RESTORE | 7620 | AC_LANG_RESTORE |
4684 | 7561 | CC="$lt_save_CC" | 7621 | CC=$lt_save_CC |
4685 | 7622 | CFLAGS=$lt_save_CFLAGS | ||
4686 | 7562 | ])# _LT_LANG_RC_CONFIG | 7623 | ])# _LT_LANG_RC_CONFIG |
4687 | 7563 | 7624 | ||
4688 | 7564 | 7625 | ||
4689 | @@ -7578,6 +7639,13 @@ | |||
4690 | 7578 | dnl AC_DEFUN([LT_AC_PROG_GCJ], []) | 7639 | dnl AC_DEFUN([LT_AC_PROG_GCJ], []) |
4691 | 7579 | 7640 | ||
4692 | 7580 | 7641 | ||
4693 | 7642 | # LT_PROG_GO | ||
4694 | 7643 | # ---------- | ||
4695 | 7644 | AC_DEFUN([LT_PROG_GO], | ||
4696 | 7645 | [AC_CHECK_TOOL(GOC, gccgo,) | ||
4697 | 7646 | ]) | ||
4698 | 7647 | |||
4699 | 7648 | |||
4700 | 7581 | # LT_PROG_RC | 7649 | # LT_PROG_RC |
4701 | 7582 | # ---------- | 7650 | # ---------- |
4702 | 7583 | AC_DEFUN([LT_PROG_RC], | 7651 | AC_DEFUN([LT_PROG_RC], |
4703 | @@ -7617,6 +7685,15 @@ | |||
4704 | 7617 | AC_SUBST([OBJDUMP]) | 7685 | AC_SUBST([OBJDUMP]) |
4705 | 7618 | ]) | 7686 | ]) |
4706 | 7619 | 7687 | ||
4707 | 7688 | # _LT_DECL_DLLTOOL | ||
4708 | 7689 | # ---------------- | ||
4709 | 7690 | # Ensure DLLTOOL variable is set. | ||
4710 | 7691 | m4_defun([_LT_DECL_DLLTOOL], | ||
4711 | 7692 | [AC_CHECK_TOOL(DLLTOOL, dlltool, false) | ||
4712 | 7693 | test -z "$DLLTOOL" && DLLTOOL=dlltool | ||
4713 | 7694 | _LT_DECL([], [DLLTOOL], [1], [DLL creation program]) | ||
4714 | 7695 | AC_SUBST([DLLTOOL]) | ||
4715 | 7696 | ]) | ||
4716 | 7620 | 7697 | ||
4717 | 7621 | # _LT_DECL_SED | 7698 | # _LT_DECL_SED |
4718 | 7622 | # ------------ | 7699 | # ------------ |
4719 | @@ -7708,8 +7785,8 @@ | |||
4720 | 7708 | # Try some XSI features | 7785 | # Try some XSI features |
4721 | 7709 | xsi_shell=no | 7786 | xsi_shell=no |
4722 | 7710 | ( _lt_dummy="a/b/c" | 7787 | ( _lt_dummy="a/b/c" |
4725 | 7711 | test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ | 7788 | test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
4726 | 7712 | = c,a/b,, \ | 7789 | = c,a/b,b/c, \ |
4727 | 7713 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 7790 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
4728 | 7714 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 7791 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
4729 | 7715 | && xsi_shell=yes | 7792 | && xsi_shell=yes |
4730 | @@ -7748,222 +7825,177 @@ | |||
4731 | 7748 | ])# _LT_CHECK_SHELL_FEATURES | 7825 | ])# _LT_CHECK_SHELL_FEATURES |
4732 | 7749 | 7826 | ||
4733 | 7750 | 7827 | ||
4939 | 7751 | # _LT_PROG_XSI_SHELLFNS | 7828 | # _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) |
4940 | 7752 | # --------------------- | 7829 | # ------------------------------------------------------ |
4941 | 7753 | # Bourne and XSI compatible variants of some useful shell functions. | 7830 | # In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and |
4942 | 7754 | m4_defun([_LT_PROG_XSI_SHELLFNS], | 7831 | # '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. |
4943 | 7755 | [case $xsi_shell in | 7832 | m4_defun([_LT_PROG_FUNCTION_REPLACE], |
4944 | 7756 | yes) | 7833 | [dnl { |
4945 | 7757 | cat << \_LT_EOF >> "$cfgfile" | 7834 | sed -e '/^$1 ()$/,/^} # $1 /c\ |
4946 | 7758 | 7835 | $1 ()\ | |
4947 | 7759 | # func_dirname file append nondir_replacement | 7836 | {\ |
4948 | 7760 | # Compute the dirname of FILE. If nonempty, add APPEND to the result, | 7837 | m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) |
4949 | 7761 | # otherwise set result to NONDIR_REPLACEMENT. | 7838 | } # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ |
4950 | 7762 | func_dirname () | 7839 | && mv -f "$cfgfile.tmp" "$cfgfile" \ |
4951 | 7763 | { | 7840 | || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
4952 | 7764 | case ${1} in | 7841 | test 0 -eq $? || _lt_function_replace_fail=: |
4953 | 7765 | */*) func_dirname_result="${1%/*}${2}" ;; | 7842 | ]) |
4954 | 7766 | * ) func_dirname_result="${3}" ;; | 7843 | |
4955 | 7767 | esac | 7844 | |
4956 | 7768 | } | 7845 | # _LT_PROG_REPLACE_SHELLFNS |
4957 | 7769 | 7846 | # ------------------------- | |
4958 | 7770 | # func_basename file | 7847 | # Replace existing portable implementations of several shell functions with |
4959 | 7771 | func_basename () | 7848 | # equivalent extended shell implementations where those features are available.. |
4960 | 7772 | { | 7849 | m4_defun([_LT_PROG_REPLACE_SHELLFNS], |
4961 | 7773 | func_basename_result="${1##*/}" | 7850 | [if test x"$xsi_shell" = xyes; then |
4962 | 7774 | } | 7851 | _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl |
4963 | 7775 | 7852 | case ${1} in | |
4964 | 7776 | # func_dirname_and_basename file append nondir_replacement | 7853 | */*) func_dirname_result="${1%/*}${2}" ;; |
4965 | 7777 | # perform func_basename and func_dirname in a single function | 7854 | * ) func_dirname_result="${3}" ;; |
4966 | 7778 | # call: | 7855 | esac]) |
4967 | 7779 | # dirname: Compute the dirname of FILE. If nonempty, | 7856 | |
4968 | 7780 | # add APPEND to the result, otherwise set result | 7857 | _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl |
4969 | 7781 | # to NONDIR_REPLACEMENT. | 7858 | func_basename_result="${1##*/}"]) |
4970 | 7782 | # value returned in "$func_dirname_result" | 7859 | |
4971 | 7783 | # basename: Compute filename of FILE. | 7860 | _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl |
4972 | 7784 | # value retuned in "$func_basename_result" | 7861 | case ${1} in |
4973 | 7785 | # Implementation must be kept synchronized with func_dirname | 7862 | */*) func_dirname_result="${1%/*}${2}" ;; |
4974 | 7786 | # and func_basename. For efficiency, we do not delegate to | 7863 | * ) func_dirname_result="${3}" ;; |
4975 | 7787 | # those functions but instead duplicate the functionality here. | 7864 | esac |
4976 | 7788 | func_dirname_and_basename () | 7865 | func_basename_result="${1##*/}"]) |
4977 | 7789 | { | 7866 | |
4978 | 7790 | case ${1} in | 7867 | _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl |
4979 | 7791 | */*) func_dirname_result="${1%/*}${2}" ;; | 7868 | # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
4980 | 7792 | * ) func_dirname_result="${3}" ;; | 7869 | # positional parameters, so assign one to ordinary parameter first. |
4981 | 7793 | esac | 7870 | func_stripname_result=${3} |
4982 | 7794 | func_basename_result="${1##*/}" | 7871 | func_stripname_result=${func_stripname_result#"${1}"} |
4983 | 7795 | } | 7872 | func_stripname_result=${func_stripname_result%"${2}"}]) |
4984 | 7796 | 7873 | ||
4985 | 7797 | # func_stripname prefix suffix name | 7874 | _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl |
4986 | 7798 | # strip PREFIX and SUFFIX off of NAME. | 7875 | func_split_long_opt_name=${1%%=*} |
4987 | 7799 | # PREFIX and SUFFIX must not contain globbing or regex special | 7876 | func_split_long_opt_arg=${1#*=}]) |
4988 | 7800 | # characters, hashes, percent signs, but SUFFIX may contain a leading | 7877 | |
4989 | 7801 | # dot (in which case that matches only a dot). | 7878 | _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl |
4990 | 7802 | func_stripname () | 7879 | func_split_short_opt_arg=${1#??} |
4991 | 7803 | { | 7880 | func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) |
4992 | 7804 | # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are | 7881 | |
4993 | 7805 | # positional parameters, so assign one to ordinary parameter first. | 7882 | _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl |
4994 | 7806 | func_stripname_result=${3} | 7883 | case ${1} in |
4995 | 7807 | func_stripname_result=${func_stripname_result#"${1}"} | 7884 | *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
4996 | 7808 | func_stripname_result=${func_stripname_result%"${2}"} | 7885 | *) func_lo2o_result=${1} ;; |
4997 | 7809 | } | 7886 | esac]) |
4998 | 7810 | 7887 | ||
4999 | 7811 | # func_opt_split | 7888 | _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) |
5000 | 7812 | func_opt_split () | 7889 | |
4796 | 7813 | { | ||
4797 | 7814 | func_opt_split_opt=${1%%=*} | ||
4798 | 7815 | func_opt_split_arg=${1#*=} | ||
4799 | 7816 | } | ||
4800 | 7817 | |||
4801 | 7818 | # func_lo2o object | ||
4802 | 7819 | func_lo2o () | ||
4803 | 7820 | { | ||
4804 | 7821 | case ${1} in | ||
4805 | 7822 | *.lo) func_lo2o_result=${1%.lo}.${objext} ;; | ||
4806 | 7823 | *) func_lo2o_result=${1} ;; | ||
4807 | 7824 | esac | ||
4808 | 7825 | } | ||
4809 | 7826 | |||
4810 | 7827 | # func_xform libobj-or-source | ||
4811 | 7828 | func_xform () | ||
4812 | 7829 | { | ||
4813 | 7830 | func_xform_result=${1%.*}.lo | ||
4814 | 7831 | } | ||
4815 | 7832 | |||
4816 | 7833 | # func_arith arithmetic-term... | ||
4817 | 7834 | func_arith () | ||
4818 | 7835 | { | ||
4819 | 7836 | func_arith_result=$(( $[*] )) | ||
4820 | 7837 | } | ||
4821 | 7838 | |||
4822 | 7839 | # func_len string | ||
4823 | 7840 | # STRING may not start with a hyphen. | ||
4824 | 7841 | func_len () | ||
4825 | 7842 | { | ||
4826 | 7843 | func_len_result=${#1} | ||
4827 | 7844 | } | ||
4828 | 7845 | |||
4829 | 7846 | _LT_EOF | ||
4830 | 7847 | ;; | ||
4831 | 7848 | *) # Bourne compatible functions. | ||
4832 | 7849 | cat << \_LT_EOF >> "$cfgfile" | ||
4833 | 7850 | |||
4834 | 7851 | # func_dirname file append nondir_replacement | ||
4835 | 7852 | # Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
4836 | 7853 | # otherwise set result to NONDIR_REPLACEMENT. | ||
4837 | 7854 | func_dirname () | ||
4838 | 7855 | { | ||
4839 | 7856 | # Extract subdirectory from the argument. | ||
4840 | 7857 | func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` | ||
4841 | 7858 | if test "X$func_dirname_result" = "X${1}"; then | ||
4842 | 7859 | func_dirname_result="${3}" | ||
4843 | 7860 | else | ||
4844 | 7861 | func_dirname_result="$func_dirname_result${2}" | ||
4845 | 7862 | fi | ||
4846 | 7863 | } | ||
4847 | 7864 | |||
4848 | 7865 | # func_basename file | ||
4849 | 7866 | func_basename () | ||
4850 | 7867 | { | ||
4851 | 7868 | func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` | ||
4852 | 7869 | } | ||
4853 | 7870 | |||
4854 | 7871 | dnl func_dirname_and_basename | ||
4855 | 7872 | dnl A portable version of this function is already defined in general.m4sh | ||
4856 | 7873 | dnl so there is no need for it here. | ||
4857 | 7874 | |||
4858 | 7875 | # func_stripname prefix suffix name | ||
4859 | 7876 | # strip PREFIX and SUFFIX off of NAME. | ||
4860 | 7877 | # PREFIX and SUFFIX must not contain globbing or regex special | ||
4861 | 7878 | # characters, hashes, percent signs, but SUFFIX may contain a leading | ||
4862 | 7879 | # dot (in which case that matches only a dot). | ||
4863 | 7880 | # func_strip_suffix prefix name | ||
4864 | 7881 | func_stripname () | ||
4865 | 7882 | { | ||
4866 | 7883 | case ${2} in | ||
4867 | 7884 | .*) func_stripname_result=`$ECHO "X${3}" \ | ||
4868 | 7885 | | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; | ||
4869 | 7886 | *) func_stripname_result=`$ECHO "X${3}" \ | ||
4870 | 7887 | | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; | ||
4871 | 7888 | esac | ||
4872 | 7889 | } | ||
4873 | 7890 | |||
4874 | 7891 | # sed scripts: | ||
4875 | 7892 | my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' | ||
4876 | 7893 | my_sed_long_arg='1s/^-[[^=]]*=//' | ||
4877 | 7894 | |||
4878 | 7895 | # func_opt_split | ||
4879 | 7896 | func_opt_split () | ||
4880 | 7897 | { | ||
4881 | 7898 | func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` | ||
4882 | 7899 | func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` | ||
4883 | 7900 | } | ||
4884 | 7901 | |||
4885 | 7902 | # func_lo2o object | ||
4886 | 7903 | func_lo2o () | ||
4887 | 7904 | { | ||
4888 | 7905 | func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` | ||
4889 | 7906 | } | ||
4890 | 7907 | |||
4891 | 7908 | # func_xform libobj-or-source | ||
4892 | 7909 | func_xform () | ||
4893 | 7910 | { | ||
4894 | 7911 | func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` | ||
4895 | 7912 | } | ||
4896 | 7913 | |||
4897 | 7914 | # func_arith arithmetic-term... | ||
4898 | 7915 | func_arith () | ||
4899 | 7916 | { | ||
4900 | 7917 | func_arith_result=`expr "$[@]"` | ||
4901 | 7918 | } | ||
4902 | 7919 | |||
4903 | 7920 | # func_len string | ||
4904 | 7921 | # STRING may not start with a hyphen. | ||
4905 | 7922 | func_len () | ||
4906 | 7923 | { | ||
4907 | 7924 | func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` | ||
4908 | 7925 | } | ||
4909 | 7926 | |||
4910 | 7927 | _LT_EOF | ||
4911 | 7928 | esac | ||
4912 | 7929 | |||
4913 | 7930 | case $lt_shell_append in | ||
4914 | 7931 | yes) | ||
4915 | 7932 | cat << \_LT_EOF >> "$cfgfile" | ||
4916 | 7933 | |||
4917 | 7934 | # func_append var value | ||
4918 | 7935 | # Append VALUE to the end of shell variable VAR. | ||
4919 | 7936 | func_append () | ||
4920 | 7937 | { | ||
4921 | 7938 | eval "$[1]+=\$[2]" | ||
4922 | 7939 | } | ||
4923 | 7940 | _LT_EOF | ||
4924 | 7941 | ;; | ||
4925 | 7942 | *) | ||
4926 | 7943 | cat << \_LT_EOF >> "$cfgfile" | ||
4927 | 7944 | |||
4928 | 7945 | # func_append var value | ||
4929 | 7946 | # Append VALUE to the end of shell variable VAR. | ||
4930 | 7947 | func_append () | ||
4931 | 7948 | { | ||
4932 | 7949 | eval "$[1]=\$$[1]\$[2]" | ||
4933 | 7950 | } | ||
4934 | 7951 | |||
4935 | 7952 | _LT_EOF | ||
4936 | 7953 | ;; | ||
4937 | 7954 | esac | ||
4938 | 7955 | ]) |
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?)