Merge lp:~noskcaj/ubuntu/vivid/caribou/0.4.17 into lp:ubuntu/vivid/caribou
- Vivid (15.04)
- 0.4.17
- Merge into vivid
Proposed by
Jackson Doak
Status: | Needs review |
---|---|
Proposed branch: | lp:~noskcaj/ubuntu/vivid/caribou/0.4.17 |
Merge into: | lp:ubuntu/vivid/caribou |
Diff against target: |
25384 lines (+8774/-4958) 95 files modified
Makefile.in (+4/-0) NEWS (+22/-0) aclocal.m4 (+216/-217) bin/Makefile.in (+4/-0) bin/antler-keyboard.in (+1/-3) caribou/Makefile.in (+4/-0) caribou/antler/Makefile.in (+4/-0) caribou/antler/__init__.py (+1/-1) caribou/antler/keyboard_view.py (+12/-7) caribou/antler/main.py (+44/-7) caribou/antler/window.py (+1/-3) caribou/settings/Makefile.in (+4/-0) caribou/settings/__init__.py (+1/-1) caribou/settings/setting_types.py (+1/-1) config.sub (+7/-3) configure (+1267/-864) configure.ac (+16/-1) daemon/Makefile.am (+0/-3) daemon/Makefile.in (+4/-3) daemon/daemon.c (+97/-130) daemon/daemon.vala (+19/-21) data/Makefile.in (+4/-0) data/antler/Makefile.in (+4/-0) data/layouts/Makefile.in (+4/-0) data/layouts/fullscale/Makefile.in (+4/-0) data/layouts/fullscale/common/qwerty.xml (+2/-2) data/layouts/fullscale/common/symbols.xml (+2/-2) data/layouts/scan/Makefile.in (+4/-0) data/layouts/touch/Makefile.am (+2/-0) data/layouts/touch/Makefile.in (+6/-0) data/layouts/touch/common/azerty.xml (+175/-0) data/layouts/touch/fr.xml.in (+8/-0) debian/changelog (+7/-0) debian/control (+2/-1) debian/control.in (+2/-1) debian/libcaribou0.symbols (+2/-0) docs/Makefile.in (+4/-0) libcaribou/Makefile.am (+1/-0) libcaribou/Makefile.in (+5/-0) libcaribou/_Caribou-1.0.gir (+489/-35) libcaribou/caribou-1.0.vapi (+3/-2) libcaribou/caribou-internals-1.0.vapi (+4/-2) libcaribou/caribou-internals.h (+4/-1) libcaribou/caribou.h (+3/-1) libcaribou/column-model.c (+1/-1) libcaribou/display-adapter.c (+1/-1) libcaribou/group-model.c (+1/-1) libcaribou/ikeyboard-object.c (+1/-1) libcaribou/iscannable-group.c (+1/-1) libcaribou/iscannable-item.c (+1/-1) libcaribou/key-model.c (+94/-12) libcaribou/key-model.vala (+34/-7) libcaribou/keyboard-model.c (+96/-21) libcaribou/keyboard-model.vala (+23/-7) libcaribou/keyboard-service.c (+1/-1) libcaribou/level-model.c (+1/-1) libcaribou/libcaribou.symbols (+2/-0) libcaribou/row-model.c (+1/-1) libcaribou/scannable-group.c (+4/-1) libcaribou/scanner.c (+1/-1) libcaribou/xadapter.c (+1/-1) libcaribou/xml-deserializer.c (+327/-201) libcaribou/xml-deserializer.vala (+29/-7) ltmain.sh (+3569/-2090) m4/libtool.m4 (+1457/-1090) m4/ltoptions.m4 (+90/-37) m4/ltsugar.m4 (+4/-3) m4/ltversion.m4 (+6/-6) m4/lt~obsolete.m4 (+4/-3) modules/Makefile.in (+4/-0) modules/gtk2/Makefile.in (+4/-0) modules/gtk2/caribou-gtk-module.c (+1/-1) modules/gtk2/caribou-gtk-module.h (+1/-1) modules/gtk3/Makefile.in (+4/-0) modules/gtk3/caribou-gtk-module.c (+1/-1) modules/gtk3/caribou-gtk-module.h (+1/-1) po/LINGUAS (+1/-0) po/cs.po (+4/-4) po/de.po (+5/-5) po/es.po (+10/-10) po/fr.po (+6/-5) po/hu.po (+11/-8) po/id.po (+6/-8) po/lt.po (+7/-6) po/nb.po (+7/-7) po/ne.po (+272/-0) po/pa.po (+28/-34) po/pl.po (+11/-13) po/sk.po (+10/-3) po/sl.po (+5/-7) po/tr.po (+34/-36) tools/Makefile.am (+1/-0) tools/Makefile.in (+5/-0) tools/convert_cldr.py (+111/-0) vapi/Makefile.in (+4/-0) |
To merge this branch: | bzr merge lp:~noskcaj/ubuntu/vivid/caribou/0.4.17 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel Holbach (community) | Approve | ||
Review via email: mp+249882@code.launchpad.net |
Commit message
Description of the change
New upstream release
To post a comment you must log in.
Unmerged revisions
- 20. By Jackson Doak
-
Add new symbols
- 19. By Jackson Doak
-
New upstream release 0.4.17
- 18. By Jackson Doak
-
Add new symbol
- 17. By Jackson Doak
-
New upstream release.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'Makefile.in' | |||
2 | --- Makefile.in 2014-09-24 12:25:21 +0000 | |||
3 | +++ Makefile.in 2015-02-16 20:09:11 +0000 | |||
4 | @@ -276,6 +276,10 @@ | |||
5 | 276 | LIPO = @LIPO@ | 276 | LIPO = @LIPO@ |
6 | 277 | LN_S = @LN_S@ | 277 | LN_S = @LN_S@ |
7 | 278 | LTLIBOBJS = @LTLIBOBJS@ | 278 | LTLIBOBJS = @LTLIBOBJS@ |
8 | 279 | LT_AGE = @LT_AGE@ | ||
9 | 280 | LT_CURRENT = @LT_CURRENT@ | ||
10 | 281 | LT_REVISION = @LT_REVISION@ | ||
11 | 282 | LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ | ||
12 | 279 | MAINT = @MAINT@ | 283 | MAINT = @MAINT@ |
13 | 280 | MAKEINFO = @MAKEINFO@ | 284 | MAKEINFO = @MAKEINFO@ |
14 | 281 | MANIFEST_TOOL = @MANIFEST_TOOL@ | 285 | MANIFEST_TOOL = @MANIFEST_TOOL@ |
15 | 282 | 286 | ||
16 | === modified file 'NEWS' | |||
17 | --- NEWS 2014-09-24 12:25:21 +0000 | |||
18 | +++ NEWS 2015-02-16 20:09:11 +0000 | |||
19 | @@ -1,4 +1,26 @@ | |||
20 | 1 | ============= | 1 | ============= |
21 | 2 | Version 0.4.17 | ||
22 | 3 | ============= | ||
23 | 4 | - Bundle tools to generate and manipulate keyboard layout files. | ||
24 | 5 | See https://wiki.gnome.org/Projects/Caribou/NewLayout for details | ||
25 | 6 | - Bug 691811 - Add support for azerty layout as seen in french | ||
26 | 7 | - Bug 743267 - Caribou does 100-130 syscalls for each keypress | ||
27 | 8 | - Bug 743880 - String that is hard to understand | ||
28 | 9 | - Translation updates (Turkish, Czech, Polish, German, Lithuanian, | ||
29 | 10 | Hungarian, Spanish, Norwegian bokmål, French, Indonesian, Slovenian) | ||
30 | 11 | |||
31 | 12 | ============= | ||
32 | 13 | Version 0.4.16 | ||
33 | 14 | ============= | ||
34 | 15 | - Stop using deprecated accessibility events ("focus:*") | ||
35 | 16 | - Bug 739837 - Allow label overwrite in keyboard layout | ||
36 | 17 | - Bug 739716 - Add more keys to label_map | ||
37 | 18 | - Bug 739711 - Escape key does not work in us layout. | ||
38 | 19 | - Bug 739526 - Some buttons do not have a label. | ||
39 | 20 | - Bug 722634 - [regression] build failure: ImportError: No module named 'caribou_settings' | ||
40 | 21 | - Translation updates (Punjabi, Nepali, Slovak) | ||
41 | 22 | |||
42 | 23 | ============= | ||
43 | 2 | Version 0.4.15 | 24 | Version 0.4.15 |
44 | 3 | ============= | 25 | ============= |
45 | 4 | - Fix race condition when invoking OSK through D-Bus (see comment in | 26 | - Fix race condition when invoking OSK through D-Bus (see comment in |
46 | 5 | 27 | ||
47 | === modified file 'aclocal.m4' | |||
48 | --- aclocal.m4 2014-09-03 17:53:54 +0000 | |||
49 | +++ aclocal.m4 2015-02-16 20:09:11 +0000 | |||
50 | @@ -53,221 +53,6 @@ | |||
51 | 53 | AC_SUBST([USE_NLS]) | 53 | AC_SUBST([USE_NLS]) |
52 | 54 | ]) | 54 | ]) |
53 | 55 | 55 | ||
54 | 56 | # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- | ||
55 | 57 | # serial 1 (pkg-config-0.24) | ||
56 | 58 | # | ||
57 | 59 | # Copyright © 2004 Scott James Remnant <scott@netsplit.com>. | ||
58 | 60 | # | ||
59 | 61 | # This program is free software; you can redistribute it and/or modify | ||
60 | 62 | # it under the terms of the GNU General Public License as published by | ||
61 | 63 | # the Free Software Foundation; either version 2 of the License, or | ||
62 | 64 | # (at your option) any later version. | ||
63 | 65 | # | ||
64 | 66 | # This program is distributed in the hope that it will be useful, but | ||
65 | 67 | # WITHOUT ANY WARRANTY; without even the implied warranty of | ||
66 | 68 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
67 | 69 | # General Public License for more details. | ||
68 | 70 | # | ||
69 | 71 | # You should have received a copy of the GNU General Public License | ||
70 | 72 | # along with this program; if not, write to the Free Software | ||
71 | 73 | # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | ||
72 | 74 | # | ||
73 | 75 | # As a special exception to the GNU General Public License, if you | ||
74 | 76 | # distribute this file as part of a program that contains a | ||
75 | 77 | # configuration script generated by Autoconf, you may include it under | ||
76 | 78 | # the same distribution terms that you use for the rest of that program. | ||
77 | 79 | |||
78 | 80 | # PKG_PROG_PKG_CONFIG([MIN-VERSION]) | ||
79 | 81 | # ---------------------------------- | ||
80 | 82 | AC_DEFUN([PKG_PROG_PKG_CONFIG], | ||
81 | 83 | [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) | ||
82 | 84 | m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) | ||
83 | 85 | m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) | ||
84 | 86 | AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) | ||
85 | 87 | AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) | ||
86 | 88 | AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) | ||
87 | 89 | |||
88 | 90 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then | ||
89 | 91 | AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) | ||
90 | 92 | fi | ||
91 | 93 | if test -n "$PKG_CONFIG"; then | ||
92 | 94 | _pkg_min_version=m4_default([$1], [0.9.0]) | ||
93 | 95 | AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) | ||
94 | 96 | if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then | ||
95 | 97 | AC_MSG_RESULT([yes]) | ||
96 | 98 | else | ||
97 | 99 | AC_MSG_RESULT([no]) | ||
98 | 100 | PKG_CONFIG="" | ||
99 | 101 | fi | ||
100 | 102 | fi[]dnl | ||
101 | 103 | ])# PKG_PROG_PKG_CONFIG | ||
102 | 104 | |||
103 | 105 | # PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) | ||
104 | 106 | # | ||
105 | 107 | # Check to see whether a particular set of modules exists. Similar | ||
106 | 108 | # to PKG_CHECK_MODULES(), but does not set variables or print errors. | ||
107 | 109 | # | ||
108 | 110 | # Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) | ||
109 | 111 | # only at the first occurence in configure.ac, so if the first place | ||
110 | 112 | # it's called might be skipped (such as if it is within an "if", you | ||
111 | 113 | # have to call PKG_CHECK_EXISTS manually | ||
112 | 114 | # -------------------------------------------------------------- | ||
113 | 115 | AC_DEFUN([PKG_CHECK_EXISTS], | ||
114 | 116 | [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl | ||
115 | 117 | if test -n "$PKG_CONFIG" && \ | ||
116 | 118 | AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then | ||
117 | 119 | m4_default([$2], [:]) | ||
118 | 120 | m4_ifvaln([$3], [else | ||
119 | 121 | $3])dnl | ||
120 | 122 | fi]) | ||
121 | 123 | |||
122 | 124 | # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) | ||
123 | 125 | # --------------------------------------------- | ||
124 | 126 | m4_define([_PKG_CONFIG], | ||
125 | 127 | [if test -n "$$1"; then | ||
126 | 128 | pkg_cv_[]$1="$$1" | ||
127 | 129 | elif test -n "$PKG_CONFIG"; then | ||
128 | 130 | PKG_CHECK_EXISTS([$3], | ||
129 | 131 | [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` | ||
130 | 132 | test "x$?" != "x0" && pkg_failed=yes ], | ||
131 | 133 | [pkg_failed=yes]) | ||
132 | 134 | else | ||
133 | 135 | pkg_failed=untried | ||
134 | 136 | fi[]dnl | ||
135 | 137 | ])# _PKG_CONFIG | ||
136 | 138 | |||
137 | 139 | # _PKG_SHORT_ERRORS_SUPPORTED | ||
138 | 140 | # ----------------------------- | ||
139 | 141 | AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], | ||
140 | 142 | [AC_REQUIRE([PKG_PROG_PKG_CONFIG]) | ||
141 | 143 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | ||
142 | 144 | _pkg_short_errors_supported=yes | ||
143 | 145 | else | ||
144 | 146 | _pkg_short_errors_supported=no | ||
145 | 147 | fi[]dnl | ||
146 | 148 | ])# _PKG_SHORT_ERRORS_SUPPORTED | ||
147 | 149 | |||
148 | 150 | |||
149 | 151 | # PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], | ||
150 | 152 | # [ACTION-IF-NOT-FOUND]) | ||
151 | 153 | # | ||
152 | 154 | # | ||
153 | 155 | # Note that if there is a possibility the first call to | ||
154 | 156 | # PKG_CHECK_MODULES might not happen, you should be sure to include an | ||
155 | 157 | # explicit call to PKG_PROG_PKG_CONFIG in your configure.ac | ||
156 | 158 | # | ||
157 | 159 | # | ||
158 | 160 | # -------------------------------------------------------------- | ||
159 | 161 | AC_DEFUN([PKG_CHECK_MODULES], | ||
160 | 162 | [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl | ||
161 | 163 | AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl | ||
162 | 164 | AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl | ||
163 | 165 | |||
164 | 166 | pkg_failed=no | ||
165 | 167 | AC_MSG_CHECKING([for $1]) | ||
166 | 168 | |||
167 | 169 | _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) | ||
168 | 170 | _PKG_CONFIG([$1][_LIBS], [libs], [$2]) | ||
169 | 171 | |||
170 | 172 | m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS | ||
171 | 173 | and $1[]_LIBS to avoid the need to call pkg-config. | ||
172 | 174 | See the pkg-config man page for more details.]) | ||
173 | 175 | |||
174 | 176 | if test $pkg_failed = yes; then | ||
175 | 177 | AC_MSG_RESULT([no]) | ||
176 | 178 | _PKG_SHORT_ERRORS_SUPPORTED | ||
177 | 179 | if test $_pkg_short_errors_supported = yes; then | ||
178 | 180 | $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` | ||
179 | 181 | else | ||
180 | 182 | $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` | ||
181 | 183 | fi | ||
182 | 184 | # Put the nasty error message in config.log where it belongs | ||
183 | 185 | echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD | ||
184 | 186 | |||
185 | 187 | m4_default([$4], [AC_MSG_ERROR( | ||
186 | 188 | [Package requirements ($2) were not met: | ||
187 | 189 | |||
188 | 190 | $$1_PKG_ERRORS | ||
189 | 191 | |||
190 | 192 | Consider adjusting the PKG_CONFIG_PATH environment variable if you | ||
191 | 193 | installed software in a non-standard prefix. | ||
192 | 194 | |||
193 | 195 | _PKG_TEXT])[]dnl | ||
194 | 196 | ]) | ||
195 | 197 | elif test $pkg_failed = untried; then | ||
196 | 198 | AC_MSG_RESULT([no]) | ||
197 | 199 | m4_default([$4], [AC_MSG_FAILURE( | ||
198 | 200 | [The pkg-config script could not be found or is too old. Make sure it | ||
199 | 201 | is in your PATH or set the PKG_CONFIG environment variable to the full | ||
200 | 202 | path to pkg-config. | ||
201 | 203 | |||
202 | 204 | _PKG_TEXT | ||
203 | 205 | |||
204 | 206 | To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl | ||
205 | 207 | ]) | ||
206 | 208 | else | ||
207 | 209 | $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS | ||
208 | 210 | $1[]_LIBS=$pkg_cv_[]$1[]_LIBS | ||
209 | 211 | AC_MSG_RESULT([yes]) | ||
210 | 212 | $3 | ||
211 | 213 | fi[]dnl | ||
212 | 214 | ])# PKG_CHECK_MODULES | ||
213 | 215 | |||
214 | 216 | |||
215 | 217 | # PKG_INSTALLDIR(DIRECTORY) | ||
216 | 218 | # ------------------------- | ||
217 | 219 | # Substitutes the variable pkgconfigdir as the location where a module | ||
218 | 220 | # should install pkg-config .pc files. By default the directory is | ||
219 | 221 | # $libdir/pkgconfig, but the default can be changed by passing | ||
220 | 222 | # DIRECTORY. The user can override through the --with-pkgconfigdir | ||
221 | 223 | # parameter. | ||
222 | 224 | AC_DEFUN([PKG_INSTALLDIR], | ||
223 | 225 | [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) | ||
224 | 226 | m4_pushdef([pkg_description], | ||
225 | 227 | [pkg-config installation directory @<:@]pkg_default[@:>@]) | ||
226 | 228 | AC_ARG_WITH([pkgconfigdir], | ||
227 | 229 | [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, | ||
228 | 230 | [with_pkgconfigdir=]pkg_default) | ||
229 | 231 | AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) | ||
230 | 232 | m4_popdef([pkg_default]) | ||
231 | 233 | m4_popdef([pkg_description]) | ||
232 | 234 | ]) dnl PKG_INSTALLDIR | ||
233 | 235 | |||
234 | 236 | |||
235 | 237 | # PKG_NOARCH_INSTALLDIR(DIRECTORY) | ||
236 | 238 | # ------------------------- | ||
237 | 239 | # Substitutes the variable noarch_pkgconfigdir as the location where a | ||
238 | 240 | # module should install arch-independent pkg-config .pc files. By | ||
239 | 241 | # default the directory is $datadir/pkgconfig, but the default can be | ||
240 | 242 | # changed by passing DIRECTORY. The user can override through the | ||
241 | 243 | # --with-noarch-pkgconfigdir parameter. | ||
242 | 244 | AC_DEFUN([PKG_NOARCH_INSTALLDIR], | ||
243 | 245 | [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) | ||
244 | 246 | m4_pushdef([pkg_description], | ||
245 | 247 | [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) | ||
246 | 248 | AC_ARG_WITH([noarch-pkgconfigdir], | ||
247 | 249 | [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, | ||
248 | 250 | [with_noarch_pkgconfigdir=]pkg_default) | ||
249 | 251 | AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) | ||
250 | 252 | m4_popdef([pkg_default]) | ||
251 | 253 | m4_popdef([pkg_description]) | ||
252 | 254 | ]) dnl PKG_NOARCH_INSTALLDIR | ||
253 | 255 | |||
254 | 256 | |||
255 | 257 | # PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, | ||
256 | 258 | # [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) | ||
257 | 259 | # ------------------------------------------- | ||
258 | 260 | # Retrieves the value of the pkg-config variable for the given module. | ||
259 | 261 | AC_DEFUN([PKG_CHECK_VAR], | ||
260 | 262 | [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl | ||
261 | 263 | AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl | ||
262 | 264 | |||
263 | 265 | _PKG_CONFIG([$1], [variable="][$3]["], [$2]) | ||
264 | 266 | AS_VAR_COPY([$1], [pkg_cv_][$1]) | ||
265 | 267 | |||
266 | 268 | AS_VAR_IF([$1], [""], [$5], [$4])dnl | ||
267 | 269 | ])# PKG_CHECK_VAR | ||
268 | 270 | |||
269 | 271 | # Configure paths for GLIB | 56 | # Configure paths for GLIB |
270 | 272 | # Owen Taylor 1997-2001 | 57 | # Owen Taylor 1997-2001 |
271 | 273 | 58 | ||
272 | @@ -1097,6 +882,221 @@ | |||
273 | 1097 | _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) | 882 | _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) |
274 | 1098 | ]) | 883 | ]) |
275 | 1099 | 884 | ||
276 | 885 | # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- | ||
277 | 886 | # serial 1 (pkg-config-0.24) | ||
278 | 887 | # | ||
279 | 888 | # Copyright © 2004 Scott James Remnant <scott@netsplit.com>. | ||
280 | 889 | # | ||
281 | 890 | # This program is free software; you can redistribute it and/or modify | ||
282 | 891 | # it under the terms of the GNU General Public License as published by | ||
283 | 892 | # the Free Software Foundation; either version 2 of the License, or | ||
284 | 893 | # (at your option) any later version. | ||
285 | 894 | # | ||
286 | 895 | # This program is distributed in the hope that it will be useful, but | ||
287 | 896 | # WITHOUT ANY WARRANTY; without even the implied warranty of | ||
288 | 897 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
289 | 898 | # General Public License for more details. | ||
290 | 899 | # | ||
291 | 900 | # You should have received a copy of the GNU General Public License | ||
292 | 901 | # along with this program; if not, write to the Free Software | ||
293 | 902 | # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | ||
294 | 903 | # | ||
295 | 904 | # As a special exception to the GNU General Public License, if you | ||
296 | 905 | # distribute this file as part of a program that contains a | ||
297 | 906 | # configuration script generated by Autoconf, you may include it under | ||
298 | 907 | # the same distribution terms that you use for the rest of that program. | ||
299 | 908 | |||
300 | 909 | # PKG_PROG_PKG_CONFIG([MIN-VERSION]) | ||
301 | 910 | # ---------------------------------- | ||
302 | 911 | AC_DEFUN([PKG_PROG_PKG_CONFIG], | ||
303 | 912 | [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) | ||
304 | 913 | m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) | ||
305 | 914 | m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) | ||
306 | 915 | AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) | ||
307 | 916 | AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) | ||
308 | 917 | AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) | ||
309 | 918 | |||
310 | 919 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then | ||
311 | 920 | AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) | ||
312 | 921 | fi | ||
313 | 922 | if test -n "$PKG_CONFIG"; then | ||
314 | 923 | _pkg_min_version=m4_default([$1], [0.9.0]) | ||
315 | 924 | AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) | ||
316 | 925 | if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then | ||
317 | 926 | AC_MSG_RESULT([yes]) | ||
318 | 927 | else | ||
319 | 928 | AC_MSG_RESULT([no]) | ||
320 | 929 | PKG_CONFIG="" | ||
321 | 930 | fi | ||
322 | 931 | fi[]dnl | ||
323 | 932 | ])# PKG_PROG_PKG_CONFIG | ||
324 | 933 | |||
325 | 934 | # PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) | ||
326 | 935 | # | ||
327 | 936 | # Check to see whether a particular set of modules exists. Similar | ||
328 | 937 | # to PKG_CHECK_MODULES(), but does not set variables or print errors. | ||
329 | 938 | # | ||
330 | 939 | # Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) | ||
331 | 940 | # only at the first occurence in configure.ac, so if the first place | ||
332 | 941 | # it's called might be skipped (such as if it is within an "if", you | ||
333 | 942 | # have to call PKG_CHECK_EXISTS manually | ||
334 | 943 | # -------------------------------------------------------------- | ||
335 | 944 | AC_DEFUN([PKG_CHECK_EXISTS], | ||
336 | 945 | [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl | ||
337 | 946 | if test -n "$PKG_CONFIG" && \ | ||
338 | 947 | AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then | ||
339 | 948 | m4_default([$2], [:]) | ||
340 | 949 | m4_ifvaln([$3], [else | ||
341 | 950 | $3])dnl | ||
342 | 951 | fi]) | ||
343 | 952 | |||
344 | 953 | # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) | ||
345 | 954 | # --------------------------------------------- | ||
346 | 955 | m4_define([_PKG_CONFIG], | ||
347 | 956 | [if test -n "$$1"; then | ||
348 | 957 | pkg_cv_[]$1="$$1" | ||
349 | 958 | elif test -n "$PKG_CONFIG"; then | ||
350 | 959 | PKG_CHECK_EXISTS([$3], | ||
351 | 960 | [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` | ||
352 | 961 | test "x$?" != "x0" && pkg_failed=yes ], | ||
353 | 962 | [pkg_failed=yes]) | ||
354 | 963 | else | ||
355 | 964 | pkg_failed=untried | ||
356 | 965 | fi[]dnl | ||
357 | 966 | ])# _PKG_CONFIG | ||
358 | 967 | |||
359 | 968 | # _PKG_SHORT_ERRORS_SUPPORTED | ||
360 | 969 | # ----------------------------- | ||
361 | 970 | AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], | ||
362 | 971 | [AC_REQUIRE([PKG_PROG_PKG_CONFIG]) | ||
363 | 972 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | ||
364 | 973 | _pkg_short_errors_supported=yes | ||
365 | 974 | else | ||
366 | 975 | _pkg_short_errors_supported=no | ||
367 | 976 | fi[]dnl | ||
368 | 977 | ])# _PKG_SHORT_ERRORS_SUPPORTED | ||
369 | 978 | |||
370 | 979 | |||
371 | 980 | # PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], | ||
372 | 981 | # [ACTION-IF-NOT-FOUND]) | ||
373 | 982 | # | ||
374 | 983 | # | ||
375 | 984 | # Note that if there is a possibility the first call to | ||
376 | 985 | # PKG_CHECK_MODULES might not happen, you should be sure to include an | ||
377 | 986 | # explicit call to PKG_PROG_PKG_CONFIG in your configure.ac | ||
378 | 987 | # | ||
379 | 988 | # | ||
380 | 989 | # -------------------------------------------------------------- | ||
381 | 990 | AC_DEFUN([PKG_CHECK_MODULES], | ||
382 | 991 | [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl | ||
383 | 992 | AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl | ||
384 | 993 | AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl | ||
385 | 994 | |||
386 | 995 | pkg_failed=no | ||
387 | 996 | AC_MSG_CHECKING([for $1]) | ||
388 | 997 | |||
389 | 998 | _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) | ||
390 | 999 | _PKG_CONFIG([$1][_LIBS], [libs], [$2]) | ||
391 | 1000 | |||
392 | 1001 | m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS | ||
393 | 1002 | and $1[]_LIBS to avoid the need to call pkg-config. | ||
394 | 1003 | See the pkg-config man page for more details.]) | ||
395 | 1004 | |||
396 | 1005 | if test $pkg_failed = yes; then | ||
397 | 1006 | AC_MSG_RESULT([no]) | ||
398 | 1007 | _PKG_SHORT_ERRORS_SUPPORTED | ||
399 | 1008 | if test $_pkg_short_errors_supported = yes; then | ||
400 | 1009 | $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` | ||
401 | 1010 | else | ||
402 | 1011 | $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` | ||
403 | 1012 | fi | ||
404 | 1013 | # Put the nasty error message in config.log where it belongs | ||
405 | 1014 | echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD | ||
406 | 1015 | |||
407 | 1016 | m4_default([$4], [AC_MSG_ERROR( | ||
408 | 1017 | [Package requirements ($2) were not met: | ||
409 | 1018 | |||
410 | 1019 | $$1_PKG_ERRORS | ||
411 | 1020 | |||
412 | 1021 | Consider adjusting the PKG_CONFIG_PATH environment variable if you | ||
413 | 1022 | installed software in a non-standard prefix. | ||
414 | 1023 | |||
415 | 1024 | _PKG_TEXT])[]dnl | ||
416 | 1025 | ]) | ||
417 | 1026 | elif test $pkg_failed = untried; then | ||
418 | 1027 | AC_MSG_RESULT([no]) | ||
419 | 1028 | m4_default([$4], [AC_MSG_FAILURE( | ||
420 | 1029 | [The pkg-config script could not be found or is too old. Make sure it | ||
421 | 1030 | is in your PATH or set the PKG_CONFIG environment variable to the full | ||
422 | 1031 | path to pkg-config. | ||
423 | 1032 | |||
424 | 1033 | _PKG_TEXT | ||
425 | 1034 | |||
426 | 1035 | To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl | ||
427 | 1036 | ]) | ||
428 | 1037 | else | ||
429 | 1038 | $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS | ||
430 | 1039 | $1[]_LIBS=$pkg_cv_[]$1[]_LIBS | ||
431 | 1040 | AC_MSG_RESULT([yes]) | ||
432 | 1041 | $3 | ||
433 | 1042 | fi[]dnl | ||
434 | 1043 | ])# PKG_CHECK_MODULES | ||
435 | 1044 | |||
436 | 1045 | |||
437 | 1046 | # PKG_INSTALLDIR(DIRECTORY) | ||
438 | 1047 | # ------------------------- | ||
439 | 1048 | # Substitutes the variable pkgconfigdir as the location where a module | ||
440 | 1049 | # should install pkg-config .pc files. By default the directory is | ||
441 | 1050 | # $libdir/pkgconfig, but the default can be changed by passing | ||
442 | 1051 | # DIRECTORY. The user can override through the --with-pkgconfigdir | ||
443 | 1052 | # parameter. | ||
444 | 1053 | AC_DEFUN([PKG_INSTALLDIR], | ||
445 | 1054 | [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) | ||
446 | 1055 | m4_pushdef([pkg_description], | ||
447 | 1056 | [pkg-config installation directory @<:@]pkg_default[@:>@]) | ||
448 | 1057 | AC_ARG_WITH([pkgconfigdir], | ||
449 | 1058 | [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, | ||
450 | 1059 | [with_pkgconfigdir=]pkg_default) | ||
451 | 1060 | AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) | ||
452 | 1061 | m4_popdef([pkg_default]) | ||
453 | 1062 | m4_popdef([pkg_description]) | ||
454 | 1063 | ]) dnl PKG_INSTALLDIR | ||
455 | 1064 | |||
456 | 1065 | |||
457 | 1066 | # PKG_NOARCH_INSTALLDIR(DIRECTORY) | ||
458 | 1067 | # ------------------------- | ||
459 | 1068 | # Substitutes the variable noarch_pkgconfigdir as the location where a | ||
460 | 1069 | # module should install arch-independent pkg-config .pc files. By | ||
461 | 1070 | # default the directory is $datadir/pkgconfig, but the default can be | ||
462 | 1071 | # changed by passing DIRECTORY. The user can override through the | ||
463 | 1072 | # --with-noarch-pkgconfigdir parameter. | ||
464 | 1073 | AC_DEFUN([PKG_NOARCH_INSTALLDIR], | ||
465 | 1074 | [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) | ||
466 | 1075 | m4_pushdef([pkg_description], | ||
467 | 1076 | [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) | ||
468 | 1077 | AC_ARG_WITH([noarch-pkgconfigdir], | ||
469 | 1078 | [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, | ||
470 | 1079 | [with_noarch_pkgconfigdir=]pkg_default) | ||
471 | 1080 | AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) | ||
472 | 1081 | m4_popdef([pkg_default]) | ||
473 | 1082 | m4_popdef([pkg_description]) | ||
474 | 1083 | ]) dnl PKG_NOARCH_INSTALLDIR | ||
475 | 1084 | |||
476 | 1085 | |||
477 | 1086 | # PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, | ||
478 | 1087 | # [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) | ||
479 | 1088 | # ------------------------------------------- | ||
480 | 1089 | # Retrieves the value of the pkg-config variable for the given module. | ||
481 | 1090 | AC_DEFUN([PKG_CHECK_VAR], | ||
482 | 1091 | [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl | ||
483 | 1092 | AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl | ||
484 | 1093 | |||
485 | 1094 | _PKG_CONFIG([$1], [variable="][$3]["], [$2]) | ||
486 | 1095 | AS_VAR_COPY([$1], [pkg_cv_][$1]) | ||
487 | 1096 | |||
488 | 1097 | AS_VAR_IF([$1], [""], [$5], [$4])dnl | ||
489 | 1098 | ])# PKG_CHECK_VAR | ||
490 | 1099 | |||
491 | 1100 | # Copyright (C) 2002-2013 Free Software Foundation, Inc. | 1100 | # Copyright (C) 2002-2013 Free Software Foundation, Inc. |
492 | 1101 | # | 1101 | # |
493 | 1102 | # This file is free software; the Free Software Foundation | 1102 | # This file is free software; the Free Software Foundation |
494 | @@ -1650,8 +1650,7 @@ | |||
495 | 1650 | END | 1650 | END |
496 | 1651 | AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) | 1651 | AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) |
497 | 1652 | fi | 1652 | fi |
500 | 1653 | fi | 1653 | fi]) |
499 | 1654 | ]) | ||
501 | 1655 | 1654 | ||
502 | 1656 | dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not | 1655 | dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not |
503 | 1657 | dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further | 1656 | dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further |
504 | 1658 | 1657 | ||
505 | === modified file 'bin/Makefile.in' | |||
506 | --- bin/Makefile.in 2014-09-03 17:53:54 +0000 | |||
507 | +++ bin/Makefile.in 2015-02-16 20:09:11 +0000 | |||
508 | @@ -223,6 +223,10 @@ | |||
509 | 223 | LIPO = @LIPO@ | 223 | LIPO = @LIPO@ |
510 | 224 | LN_S = @LN_S@ | 224 | LN_S = @LN_S@ |
511 | 225 | LTLIBOBJS = @LTLIBOBJS@ | 225 | LTLIBOBJS = @LTLIBOBJS@ |
512 | 226 | LT_AGE = @LT_AGE@ | ||
513 | 227 | LT_CURRENT = @LT_CURRENT@ | ||
514 | 228 | LT_REVISION = @LT_REVISION@ | ||
515 | 229 | LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ | ||
516 | 226 | MAINT = @MAINT@ | 230 | MAINT = @MAINT@ |
517 | 227 | MAKEINFO = @MAKEINFO@ | 231 | MAKEINFO = @MAKEINFO@ |
518 | 228 | MANIFEST_TOOL = @MANIFEST_TOOL@ | 232 | MANIFEST_TOOL = @MANIFEST_TOOL@ |
519 | 229 | 233 | ||
520 | === modified file 'bin/antler-keyboard.in' | |||
521 | --- bin/antler-keyboard.in 2013-03-06 18:31:12 +0000 | |||
522 | +++ bin/antler-keyboard.in 2015-02-16 20:09:11 +0000 | |||
523 | @@ -38,6 +38,4 @@ | |||
524 | 38 | export ANTLER_THEME_PATH="$(dirname $script_dir)/data" | 38 | export ANTLER_THEME_PATH="$(dirname $script_dir)/data" |
525 | 39 | fi | 39 | fi |
526 | 40 | 40 | ||
530 | 41 | @PYTHON@ -c " | 41 | @PYTHON@ -m caribou.antler.main "$@" |
528 | 42 | from caribou.antler.main import AntlerKeyboardService | ||
529 | 43 | AntlerKeyboardService().run()" | ||
531 | 44 | 42 | ||
532 | === modified file 'caribou/Makefile.in' | |||
533 | --- caribou/Makefile.in 2014-09-03 17:53:54 +0000 | |||
534 | +++ caribou/Makefile.in 2015-02-16 20:09:11 +0000 | |||
535 | @@ -286,6 +286,10 @@ | |||
536 | 286 | LIPO = @LIPO@ | 286 | LIPO = @LIPO@ |
537 | 287 | LN_S = @LN_S@ | 287 | LN_S = @LN_S@ |
538 | 288 | LTLIBOBJS = @LTLIBOBJS@ | 288 | LTLIBOBJS = @LTLIBOBJS@ |
539 | 289 | LT_AGE = @LT_AGE@ | ||
540 | 290 | LT_CURRENT = @LT_CURRENT@ | ||
541 | 291 | LT_REVISION = @LT_REVISION@ | ||
542 | 292 | LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ | ||
543 | 289 | MAINT = @MAINT@ | 293 | MAINT = @MAINT@ |
544 | 290 | MAKEINFO = @MAKEINFO@ | 294 | MAKEINFO = @MAKEINFO@ |
545 | 291 | MANIFEST_TOOL = @MANIFEST_TOOL@ | 295 | MANIFEST_TOOL = @MANIFEST_TOOL@ |
546 | 292 | 296 | ||
547 | === modified file 'caribou/antler/Makefile.in' | |||
548 | --- caribou/antler/Makefile.in 2014-09-03 17:53:54 +0000 | |||
549 | +++ caribou/antler/Makefile.in 2015-02-16 20:09:11 +0000 | |||
550 | @@ -225,6 +225,10 @@ | |||
551 | 225 | LIPO = @LIPO@ | 225 | LIPO = @LIPO@ |
552 | 226 | LN_S = @LN_S@ | 226 | LN_S = @LN_S@ |
553 | 227 | LTLIBOBJS = @LTLIBOBJS@ | 227 | LTLIBOBJS = @LTLIBOBJS@ |
554 | 228 | LT_AGE = @LT_AGE@ | ||
555 | 229 | LT_CURRENT = @LT_CURRENT@ | ||
556 | 230 | LT_REVISION = @LT_REVISION@ | ||
557 | 231 | LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ | ||
558 | 228 | MAINT = @MAINT@ | 232 | MAINT = @MAINT@ |
559 | 229 | MAKEINFO = @MAKEINFO@ | 233 | MAKEINFO = @MAKEINFO@ |
560 | 230 | MANIFEST_TOOL = @MANIFEST_TOOL@ | 234 | MANIFEST_TOOL = @MANIFEST_TOOL@ |
561 | 231 | 235 | ||
562 | === modified file 'caribou/antler/__init__.py' | |||
563 | --- caribou/antler/__init__.py 2011-11-27 19:08:28 +0000 | |||
564 | +++ caribou/antler/__init__.py 2015-02-16 20:09:11 +0000 | |||
565 | @@ -1,1 +1,1 @@ | |||
567 | 1 | from antler_settings import AntlerSettings | 1 | from .antler_settings import AntlerSettings |
568 | 2 | 2 | ||
569 | === modified file 'caribou/antler/keyboard_view.py' | |||
570 | --- caribou/antler/keyboard_view.py 2013-03-06 18:31:12 +0000 | |||
571 | +++ caribou/antler/keyboard_view.py 2015-02-16 20:09:11 +0000 | |||
572 | @@ -215,7 +215,8 @@ | |||
573 | 215 | self.add_row([c.get_children() for c in row.get_columns()], row_num) | 215 | self.add_row([c.get_children() for c in row.get_columns()], row_num) |
574 | 216 | 216 | ||
575 | 217 | class AntlerKeyboardView(Gtk.Notebook): | 217 | class AntlerKeyboardView(Gtk.Notebook): |
577 | 218 | def __init__(self, keyboard_type): | 218 | def __init__(self, keyboard_type='touch', keyboard_file=None, |
578 | 219 | keyboard_level=None): | ||
579 | 219 | GObject.GObject.__init__(self) | 220 | GObject.GObject.__init__(self) |
580 | 220 | settings = AntlerSettings() | 221 | settings = AntlerSettings() |
581 | 221 | self.set_show_tabs(False) | 222 | self.set_show_tabs(False) |
582 | @@ -244,10 +245,11 @@ | |||
583 | 244 | Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION + 1) | 245 | Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION + 1) |
584 | 245 | 246 | ||
585 | 246 | self.scanner = Caribou.Scanner() | 247 | self.scanner = Caribou.Scanner() |
587 | 247 | self.set_keyboard_model(keyboard_type) | 248 | self.set_keyboard_model(keyboard_type, keyboard_file, keyboard_level) |
588 | 248 | 249 | ||
591 | 249 | def set_keyboard_model(self, keyboard_type): | 250 | def set_keyboard_model(self, keyboard_type, keyboard_file, keyboard_level): |
592 | 250 | self.keyboard_model = Caribou.KeyboardModel(keyboard_type=keyboard_type) | 251 | self.keyboard_model = Caribou.KeyboardModel(keyboard_type=keyboard_type, |
593 | 252 | keyboard_file=keyboard_file) | ||
594 | 251 | 253 | ||
595 | 252 | self.scanner.set_keyboard(self.keyboard_model) | 254 | self.scanner.set_keyboard(self.keyboard_model) |
596 | 253 | self.keyboard_model.connect("notify::active-group", self._on_group_changed) | 255 | self.keyboard_model.connect("notify::active-group", self._on_group_changed) |
597 | @@ -265,7 +267,7 @@ | |||
598 | 265 | layout.show() | 267 | layout.show() |
599 | 266 | self.layers[gname][lname] = self.append_page(layout, None) | 268 | self.layers[gname][lname] = self.append_page(layout, None) |
600 | 267 | 269 | ||
602 | 268 | self._set_to_active_layer() | 270 | self._set_to_active_layer(keyboard_level=keyboard_level) |
603 | 269 | 271 | ||
604 | 270 | def _on_key_clicked(self, model, key): | 272 | def _on_key_clicked(self, model, key): |
605 | 271 | if key.props.name == "Caribou_Prefs": | 273 | if key.props.name == "Caribou_Prefs": |
606 | @@ -301,10 +303,13 @@ | |||
607 | 301 | def _on_group_changed(self, kb, prop): | 303 | def _on_group_changed(self, kb, prop): |
608 | 302 | self._set_to_active_layer() | 304 | self._set_to_active_layer() |
609 | 303 | 305 | ||
611 | 304 | def _set_to_active_layer(self): | 306 | def _set_to_active_layer(self, keyboard_level=None): |
612 | 305 | active_group_name = self.keyboard_model.props.active_group | 307 | active_group_name = self.keyboard_model.props.active_group |
613 | 306 | active_group = self.keyboard_model.get_group(active_group_name) | 308 | active_group = self.keyboard_model.get_group(active_group_name) |
615 | 307 | active_level_name = active_group.props.active_level | 309 | if keyboard_level: |
616 | 310 | active_level_name = keyboard_level | ||
617 | 311 | else: | ||
618 | 312 | active_level_name = active_group.props.active_level | ||
619 | 308 | 313 | ||
620 | 309 | self.set_current_page(self.layers[active_group_name][active_level_name]) | 314 | self.set_current_page(self.layers[active_group_name][active_level_name]) |
621 | 310 | 315 | ||
622 | 311 | 316 | ||
623 | === modified file 'caribou/antler/main.py' | |||
624 | --- caribou/antler/main.py 2013-03-06 18:31:12 +0000 | |||
625 | +++ caribou/antler/main.py 2015-02-16 20:09:11 +0000 | |||
626 | @@ -1,10 +1,14 @@ | |||
630 | 1 | from gi.repository import Caribou, GObject | 1 | from gi.repository import Caribou, GLib, GObject, Gtk |
631 | 2 | from window import AntlerWindowEntry | 2 | from .window import AntlerWindowEntry |
632 | 3 | from keyboard_view import AntlerKeyboardView | 3 | from .keyboard_view import AntlerKeyboardView |
633 | 4 | import sys | 4 | import sys |
634 | 5 | 5 | ||
637 | 6 | class AntlerKeyboardService(Caribou.KeyboardService): | 6 | class AntlerKeyboardCommand(object): |
638 | 7 | def __init__(self): | 7 | def run(self): |
639 | 8 | pass | ||
640 | 9 | |||
641 | 10 | class AntlerKeyboardService(Caribou.KeyboardService, AntlerKeyboardCommand): | ||
642 | 11 | def __init__(self, args=None): | ||
643 | 8 | GObject.GObject.__init__(self) | 12 | GObject.GObject.__init__(self) |
644 | 9 | self.register_keyboard("Antler") | 13 | self.register_keyboard("Antler") |
645 | 10 | self.window = AntlerWindowEntry(AntlerKeyboardView) | 14 | self.window = AntlerWindowEntry(AntlerKeyboardView) |
646 | @@ -29,6 +33,39 @@ | |||
647 | 29 | sys.stderr.write("Another service acquired %s, quitting..\n" % name) | 33 | sys.stderr.write("Another service acquired %s, quitting..\n" % name) |
648 | 30 | sys.exit(0) | 34 | sys.exit(0) |
649 | 31 | 35 | ||
650 | 36 | class AntlerKeyboardPreview(Gtk.Window, AntlerKeyboardCommand): | ||
651 | 37 | def __init__(self, args=None): | ||
652 | 38 | GObject.GObject.__init__(self) | ||
653 | 39 | if not args or not args.file: | ||
654 | 40 | sys.stderr.write("Specify keyboard file with -f option.\n") | ||
655 | 41 | sys.exit(1) | ||
656 | 42 | self.window = Gtk.Window() | ||
657 | 43 | self.window.add(AntlerKeyboardView(keyboard_file=args.file, | ||
658 | 44 | keyboard_level=args.level)) | ||
659 | 45 | |||
660 | 46 | def run(self): | ||
661 | 47 | self.window.show_all() | ||
662 | 48 | Gtk.main() | ||
663 | 49 | |||
664 | 32 | if __name__ == "__main__": | 50 | if __name__ == "__main__": |
667 | 33 | antler_keyboard_service = AntlerKeyboardService() | 51 | import argparse |
668 | 34 | antler_keyboard_service.run() | 52 | import signal |
669 | 53 | signal.signal(signal.SIGINT, signal.SIG_DFL) | ||
670 | 54 | |||
671 | 55 | GLib.set_prgname('antler-keyboard') | ||
672 | 56 | |||
673 | 57 | parser = argparse.ArgumentParser(description='antler-keyboard') | ||
674 | 58 | parser.add_argument('-c', '--command', type=str, default='service', | ||
675 | 59 | help='command (service or preview, default: service)') | ||
676 | 60 | parser.add_argument('-f', '--file', type=str, | ||
677 | 61 | help='keyboard file') | ||
678 | 62 | parser.add_argument('-l', '--level', type=str, | ||
679 | 63 | help='shift level') | ||
680 | 64 | args = parser.parse_args() | ||
681 | 65 | |||
682 | 66 | command = globals().get('AntlerKeyboard%s' % args.command.capitalize()) | ||
683 | 67 | if command: | ||
684 | 68 | command(args).run() | ||
685 | 69 | else: | ||
686 | 70 | sys.stderr.write("Unknown command: %s\n" % args.command) | ||
687 | 71 | sys.exit(1) | ||
688 | 35 | 72 | ||
689 | === modified file 'caribou/antler/window.py' | |||
690 | --- caribou/antler/window.py 2011-11-27 19:08:28 +0000 | |||
691 | +++ caribou/antler/window.py 2015-02-16 20:09:11 +0000 | |||
692 | @@ -29,8 +29,6 @@ | |||
693 | 29 | import os | 29 | import os |
694 | 30 | import sys | 30 | import sys |
695 | 31 | 31 | ||
696 | 32 | Clutter.init("antler") | ||
697 | 33 | |||
698 | 34 | 32 | ||
699 | 35 | class AnimatedWindowBase(Gtk.Window, Clutter.Animatable): | 33 | class AnimatedWindowBase(Gtk.Window, Clutter.Animatable): |
700 | 36 | __gproperties__ = { | 34 | __gproperties__ = { |
701 | @@ -220,7 +218,7 @@ | |||
702 | 220 | self.add(self._vbox) | 218 | self.add(self._vbox) |
703 | 221 | 219 | ||
704 | 222 | self.keyboard_view_factory = keyboard_view_factory | 220 | self.keyboard_view_factory = keyboard_view_factory |
706 | 223 | self.keyboard_view = keyboard_view_factory (settings.keyboard_type.value) | 221 | self.keyboard_view = keyboard_view_factory (keyboard_type=settings.keyboard_type.value) |
707 | 224 | 222 | ||
708 | 225 | self._vbox.pack_start(self.keyboard_view, True, True, 0) | 223 | self._vbox.pack_start(self.keyboard_view, True, True, 0) |
709 | 226 | 224 | ||
710 | 227 | 225 | ||
711 | === modified file 'caribou/settings/Makefile.in' | |||
712 | --- caribou/settings/Makefile.in 2014-09-03 17:53:54 +0000 | |||
713 | +++ caribou/settings/Makefile.in 2015-02-16 20:09:11 +0000 | |||
714 | @@ -225,6 +225,10 @@ | |||
715 | 225 | LIPO = @LIPO@ | 225 | LIPO = @LIPO@ |
716 | 226 | LN_S = @LN_S@ | 226 | LN_S = @LN_S@ |
717 | 227 | LTLIBOBJS = @LTLIBOBJS@ | 227 | LTLIBOBJS = @LTLIBOBJS@ |
718 | 228 | LT_AGE = @LT_AGE@ | ||
719 | 229 | LT_CURRENT = @LT_CURRENT@ | ||
720 | 230 | LT_REVISION = @LT_REVISION@ | ||
721 | 231 | LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ | ||
722 | 228 | MAINT = @MAINT@ | 232 | MAINT = @MAINT@ |
723 | 229 | MAKEINFO = @MAKEINFO@ | 233 | MAKEINFO = @MAKEINFO@ |
724 | 230 | MANIFEST_TOOL = @MANIFEST_TOOL@ | 234 | MANIFEST_TOOL = @MANIFEST_TOOL@ |
725 | 231 | 235 | ||
726 | === modified file 'caribou/settings/__init__.py' | |||
727 | --- caribou/settings/__init__.py 2011-11-27 19:08:28 +0000 | |||
728 | +++ caribou/settings/__init__.py 2015-02-16 20:09:11 +0000 | |||
729 | @@ -1,5 +1,5 @@ | |||
730 | 1 | GSETTINGS_SCHEMA = "org.gnome.caribou" | 1 | GSETTINGS_SCHEMA = "org.gnome.caribou" |
731 | 2 | 2 | ||
733 | 3 | from caribou_settings import CaribouSettings | 3 | from .caribou_settings import CaribouSettings |
734 | 4 | 4 | ||
735 | 5 | AllSettings = [CaribouSettings] | 5 | AllSettings = [CaribouSettings] |
736 | 6 | 6 | ||
737 | === modified file 'caribou/settings/setting_types.py' | |||
738 | --- caribou/settings/setting_types.py 2011-11-27 19:08:28 +0000 | |||
739 | +++ caribou/settings/setting_types.py 2015-02-16 20:09:11 +0000 | |||
740 | @@ -93,7 +93,7 @@ | |||
741 | 93 | def value(self, val): | 93 | def value(self, val): |
742 | 94 | _val = self.convert_value(val) | 94 | _val = self.convert_value(val) |
743 | 95 | if self.allowed and _val not in [a for a, b in self.allowed]: | 95 | if self.allowed and _val not in [a for a, b in self.allowed]: |
745 | 96 | raise ValueError, "'%s' not a valid value" % _val | 96 | raise ValueError("'%s' not a valid value" % _val) |
746 | 97 | self._value = _val | 97 | self._value = _val |
747 | 98 | if not self.hush: | 98 | if not self.hush: |
748 | 99 | self.emit('value-changed', _val) | 99 | self.emit('value-changed', _val) |
749 | 100 | 100 | ||
750 | === modified file 'config.sub' | |||
751 | --- config.sub 2014-09-03 17:53:54 +0000 | |||
752 | +++ config.sub 2015-02-16 20:09:11 +0000 | |||
753 | @@ -2,7 +2,7 @@ | |||
754 | 2 | # Configuration validation subroutine script. | 2 | # Configuration validation subroutine script. |
755 | 3 | # Copyright 1992-2014 Free Software Foundation, Inc. | 3 | # Copyright 1992-2014 Free Software Foundation, Inc. |
756 | 4 | 4 | ||
758 | 5 | timestamp='2014-05-01' | 5 | timestamp='2014-07-28' |
759 | 6 | 6 | ||
760 | 7 | # This file is free software; you can redistribute it and/or modify it | 7 | # This file is free software; you can redistribute it and/or modify it |
761 | 8 | # under the terms of the GNU General Public License as published by | 8 | # under the terms of the GNU General Public License as published by |
762 | @@ -828,6 +828,10 @@ | |||
763 | 828 | basic_machine=powerpc-unknown | 828 | basic_machine=powerpc-unknown |
764 | 829 | os=-morphos | 829 | os=-morphos |
765 | 830 | ;; | 830 | ;; |
766 | 831 | moxiebox) | ||
767 | 832 | basic_machine=moxie-unknown | ||
768 | 833 | os=-moxiebox | ||
769 | 834 | ;; | ||
770 | 831 | msdos) | 835 | msdos) |
771 | 832 | basic_machine=i386-pc | 836 | basic_machine=i386-pc |
772 | 833 | os=-msdos | 837 | os=-msdos |
773 | @@ -1012,7 +1016,7 @@ | |||
774 | 1012 | ;; | 1016 | ;; |
775 | 1013 | ppc64) basic_machine=powerpc64-unknown | 1017 | ppc64) basic_machine=powerpc64-unknown |
776 | 1014 | ;; | 1018 | ;; |
778 | 1015 | ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` | 1019 | ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` |
779 | 1016 | ;; | 1020 | ;; |
780 | 1017 | ppc64le | powerpc64little | ppc64-le | powerpc64-little) | 1021 | ppc64le | powerpc64little | ppc64-le | powerpc64-little) |
781 | 1018 | basic_machine=powerpc64le-unknown | 1022 | basic_machine=powerpc64le-unknown |
782 | @@ -1373,7 +1377,7 @@ | |||
783 | 1373 | | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | 1377 | | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
784 | 1374 | | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | 1378 | | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ |
785 | 1375 | | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | 1379 | | -linux-newlib* | -linux-musl* | -linux-uclibc* \ |
787 | 1376 | | -uxpv* | -beos* | -mpeix* | -udk* \ | 1380 | | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ |
788 | 1377 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | 1381 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
789 | 1378 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | 1382 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
790 | 1379 | | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | 1383 | | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ |
791 | 1380 | 1384 | ||
792 | === modified file 'configure' | |||
793 | --- configure 2014-09-24 12:25:21 +0000 | |||
794 | +++ configure 2015-02-16 20:09:11 +0000 | |||
795 | @@ -1,6 +1,6 @@ | |||
796 | 1 | #! /bin/sh | 1 | #! /bin/sh |
797 | 2 | # Guess values for system-dependent variables and create Makefiles. | 2 | # Guess values for system-dependent variables and create Makefiles. |
799 | 3 | # Generated by GNU Autoconf 2.69 for caribou 0.4.15. | 3 | # Generated by GNU Autoconf 2.69 for caribou 0.4.17. |
800 | 4 | # | 4 | # |
801 | 5 | # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=caribou>. | 5 | # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=caribou>. |
802 | 6 | # | 6 | # |
803 | @@ -651,8 +651,8 @@ | |||
804 | 651 | # Identity of this package. | 651 | # Identity of this package. |
805 | 652 | PACKAGE_NAME='caribou' | 652 | PACKAGE_NAME='caribou' |
806 | 653 | PACKAGE_TARNAME='caribou' | 653 | PACKAGE_TARNAME='caribou' |
809 | 654 | PACKAGE_VERSION='0.4.15' | 654 | PACKAGE_VERSION='0.4.17' |
810 | 655 | PACKAGE_STRING='caribou 0.4.15' | 655 | PACKAGE_STRING='caribou 0.4.17' |
811 | 656 | PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=caribou' | 656 | PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=caribou' |
812 | 657 | PACKAGE_URL='' | 657 | PACKAGE_URL='' |
813 | 658 | 658 | ||
814 | @@ -839,7 +839,11 @@ | |||
815 | 839 | INSTALL_DATA | 839 | INSTALL_DATA |
816 | 840 | INSTALL_SCRIPT | 840 | INSTALL_SCRIPT |
817 | 841 | INSTALL_PROGRAM | 841 | INSTALL_PROGRAM |
818 | 842 | LT_AGE | ||
819 | 843 | LT_REVISION | ||
820 | 844 | LT_CURRENT | ||
821 | 842 | CPP | 845 | CPP |
822 | 846 | LT_SYS_LIBRARY_PATH | ||
823 | 843 | OTOOL64 | 847 | OTOOL64 |
824 | 844 | OTOOL | 848 | OTOOL |
825 | 845 | LIPO | 849 | LIPO |
826 | @@ -923,6 +927,7 @@ | |||
827 | 923 | enable_static | 927 | enable_static |
828 | 924 | with_pic | 928 | with_pic |
829 | 925 | enable_fast_install | 929 | enable_fast_install |
830 | 930 | with_aix_soname | ||
831 | 926 | with_gnu_ld | 931 | with_gnu_ld |
832 | 927 | with_sysroot | 932 | with_sysroot |
833 | 928 | enable_libtool_lock | 933 | enable_libtool_lock |
834 | @@ -944,6 +949,7 @@ | |||
835 | 944 | LDFLAGS | 949 | LDFLAGS |
836 | 945 | LIBS | 950 | LIBS |
837 | 946 | CPPFLAGS | 951 | CPPFLAGS |
838 | 952 | LT_SYS_LIBRARY_PATH | ||
839 | 947 | CPP | 953 | CPP |
840 | 948 | PKG_CONFIG | 954 | PKG_CONFIG |
841 | 949 | PKG_CONFIG_PATH | 955 | PKG_CONFIG_PATH |
842 | @@ -1499,7 +1505,7 @@ | |||
843 | 1499 | # Omit some internal or obsolete options to make the list less imposing. | 1505 | # Omit some internal or obsolete options to make the list less imposing. |
844 | 1500 | # This message is too long to be a string in the A/UX 3.1 sh. | 1506 | # This message is too long to be a string in the A/UX 3.1 sh. |
845 | 1501 | cat <<_ACEOF | 1507 | cat <<_ACEOF |
847 | 1502 | \`configure' configures caribou 0.4.15 to adapt to many kinds of systems. | 1508 | \`configure' configures caribou 0.4.17 to adapt to many kinds of systems. |
848 | 1503 | 1509 | ||
849 | 1504 | Usage: $0 [OPTION]... [VAR=VALUE]... | 1510 | Usage: $0 [OPTION]... [VAR=VALUE]... |
850 | 1505 | 1511 | ||
851 | @@ -1569,7 +1575,7 @@ | |||
852 | 1569 | 1575 | ||
853 | 1570 | if test -n "$ac_init_help"; then | 1576 | if test -n "$ac_init_help"; then |
854 | 1571 | case $ac_init_help in | 1577 | case $ac_init_help in |
856 | 1572 | short | recursive ) echo "Configuration of caribou 0.4.15:";; | 1578 | short | recursive ) echo "Configuration of caribou 0.4.17:";; |
857 | 1573 | esac | 1579 | esac |
858 | 1574 | cat <<\_ACEOF | 1580 | cat <<\_ACEOF |
859 | 1575 | 1581 | ||
860 | @@ -1604,9 +1610,12 @@ | |||
861 | 1604 | --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) | 1610 | --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) |
862 | 1605 | --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use | 1611 | --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use |
863 | 1606 | both] | 1612 | both] |
864 | 1613 | --with-aix-soname=aix|svr4|both | ||
865 | 1614 | shared library versioning (aka "SONAME") variant to | ||
866 | 1615 | provide on AIX, [default=aix]. | ||
867 | 1607 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | 1616 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
870 | 1608 | --with-sysroot=DIR Search for dependent libraries within DIR | 1617 | --with-sysroot[=DIR] Search for dependent libraries within DIR (or the |
871 | 1609 | (or the compiler's sysroot if not specified). | 1618 | compiler's sysroot if not specified). |
872 | 1610 | 1619 | ||
873 | 1611 | Some influential environment variables: | 1620 | Some influential environment variables: |
874 | 1612 | CC C compiler command | 1621 | CC C compiler command |
875 | @@ -1616,6 +1625,8 @@ | |||
876 | 1616 | LIBS libraries to pass to the linker, e.g. -l<library> | 1625 | LIBS libraries to pass to the linker, e.g. -l<library> |
877 | 1617 | CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if | 1626 | CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if |
878 | 1618 | you have headers in a nonstandard directory <include dir> | 1627 | you have headers in a nonstandard directory <include dir> |
879 | 1628 | LT_SYS_LIBRARY_PATH | ||
880 | 1629 | User-defined run-time library search path. | ||
881 | 1619 | CPP C preprocessor | 1630 | CPP C preprocessor |
882 | 1620 | PKG_CONFIG path to pkg-config utility | 1631 | PKG_CONFIG path to pkg-config utility |
883 | 1621 | PKG_CONFIG_PATH | 1632 | PKG_CONFIG_PATH |
884 | @@ -1706,7 +1717,7 @@ | |||
885 | 1706 | test -n "$ac_init_help" && exit $ac_status | 1717 | test -n "$ac_init_help" && exit $ac_status |
886 | 1707 | if $ac_init_version; then | 1718 | if $ac_init_version; then |
887 | 1708 | cat <<\_ACEOF | 1719 | cat <<\_ACEOF |
889 | 1709 | caribou configure 0.4.15 | 1720 | caribou configure 0.4.17 |
890 | 1710 | generated by GNU Autoconf 2.69 | 1721 | generated by GNU Autoconf 2.69 |
891 | 1711 | 1722 | ||
892 | 1712 | Copyright (C) 2012 Free Software Foundation, Inc. | 1723 | Copyright (C) 2012 Free Software Foundation, Inc. |
893 | @@ -2075,7 +2086,7 @@ | |||
894 | 2075 | This file contains any messages produced by compilers while | 2086 | This file contains any messages produced by compilers while |
895 | 2076 | running configure, to aid debugging if configure makes a mistake. | 2087 | running configure, to aid debugging if configure makes a mistake. |
896 | 2077 | 2088 | ||
898 | 2078 | It was created by caribou $as_me 0.4.15, which was | 2089 | It was created by caribou $as_me 0.4.17, which was |
899 | 2079 | generated by GNU Autoconf 2.69. Invocation command line was | 2090 | generated by GNU Autoconf 2.69. Invocation command line was |
900 | 2080 | 2091 | ||
901 | 2081 | $ $0 $@ | 2092 | $ $0 $@ |
902 | @@ -2463,22 +2474,22 @@ | |||
903 | 2463 | 2474 | ||
904 | 2464 | 2475 | ||
905 | 2465 | 2476 | ||
922 | 2466 | macro_version='2.4.2' | 2477 | macro_version='2.4.5' |
923 | 2467 | macro_revision='1.3337' | 2478 | macro_revision='2.4.5' |
924 | 2468 | 2479 | ||
925 | 2469 | 2480 | ||
926 | 2470 | 2481 | ||
927 | 2471 | 2482 | ||
928 | 2472 | 2483 | ||
929 | 2473 | 2484 | ||
930 | 2474 | 2485 | ||
931 | 2475 | 2486 | ||
932 | 2476 | 2487 | ||
933 | 2477 | 2488 | ||
934 | 2478 | 2489 | ||
935 | 2479 | 2490 | ||
936 | 2480 | 2491 | ||
937 | 2481 | ltmain="$ac_aux_dir/ltmain.sh" | 2492 | ltmain=$ac_aux_dir/ltmain.sh |
938 | 2482 | 2493 | ||
939 | 2483 | # Make sure we can run config.sub. | 2494 | # Make sure we can run config.sub. |
940 | 2484 | $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || | 2495 | $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || |
941 | @@ -2598,7 +2609,7 @@ | |||
942 | 2598 | $ECHO "" | 2609 | $ECHO "" |
943 | 2599 | } | 2610 | } |
944 | 2600 | 2611 | ||
946 | 2601 | case "$ECHO" in | 2612 | case $ECHO in |
947 | 2602 | printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 | 2613 | printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 |
948 | 2603 | $as_echo "printf" >&6; } ;; | 2614 | $as_echo "printf" >&6; } ;; |
949 | 2604 | print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 | 2615 | print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 |
950 | @@ -3772,19 +3783,19 @@ | |||
951 | 3772 | 3783 | ||
952 | 3773 | # Check whether --with-gnu-ld was given. | 3784 | # Check whether --with-gnu-ld was given. |
953 | 3774 | if test "${with_gnu_ld+set}" = set; then : | 3785 | if test "${with_gnu_ld+set}" = set; then : |
955 | 3775 | withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes | 3786 | withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes |
956 | 3776 | else | 3787 | else |
957 | 3777 | with_gnu_ld=no | 3788 | with_gnu_ld=no |
958 | 3778 | fi | 3789 | fi |
959 | 3779 | 3790 | ||
960 | 3780 | ac_prog=ld | 3791 | ac_prog=ld |
962 | 3781 | if test "$GCC" = yes; then | 3792 | if test yes = "$GCC"; then |
963 | 3782 | # Check if gcc -print-prog-name=ld gives a path. | 3793 | # Check if gcc -print-prog-name=ld gives a path. |
964 | 3783 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 | 3794 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 |
965 | 3784 | $as_echo_n "checking for ld used by $CC... " >&6; } | 3795 | $as_echo_n "checking for ld used by $CC... " >&6; } |
966 | 3785 | case $host in | 3796 | case $host in |
967 | 3786 | *-*-mingw*) | 3797 | *-*-mingw*) |
969 | 3787 | # gcc leaves a trailing carriage return which upsets mingw | 3798 | # gcc leaves a trailing carriage return, which upsets mingw |
970 | 3788 | ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; | 3799 | ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; |
971 | 3789 | *) | 3800 | *) |
972 | 3790 | ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; | 3801 | ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; |
973 | @@ -3798,7 +3809,7 @@ | |||
974 | 3798 | while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do | 3809 | while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do |
975 | 3799 | ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` | 3810 | ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` |
976 | 3800 | done | 3811 | done |
978 | 3801 | test -z "$LD" && LD="$ac_prog" | 3812 | test -z "$LD" && LD=$ac_prog |
979 | 3802 | ;; | 3813 | ;; |
980 | 3803 | "") | 3814 | "") |
981 | 3804 | # If it fails, then pretend we aren't using GCC. | 3815 | # If it fails, then pretend we aren't using GCC. |
982 | @@ -3809,7 +3820,7 @@ | |||
983 | 3809 | with_gnu_ld=unknown | 3820 | with_gnu_ld=unknown |
984 | 3810 | ;; | 3821 | ;; |
985 | 3811 | esac | 3822 | esac |
987 | 3812 | elif test "$with_gnu_ld" = yes; then | 3823 | elif test yes = "$with_gnu_ld"; then |
988 | 3813 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 | 3824 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 |
989 | 3814 | $as_echo_n "checking for GNU ld... " >&6; } | 3825 | $as_echo_n "checking for GNU ld... " >&6; } |
990 | 3815 | else | 3826 | else |
991 | @@ -3820,32 +3831,32 @@ | |||
992 | 3820 | $as_echo_n "(cached) " >&6 | 3831 | $as_echo_n "(cached) " >&6 |
993 | 3821 | else | 3832 | else |
994 | 3822 | if test -z "$LD"; then | 3833 | if test -z "$LD"; then |
996 | 3823 | lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR | 3834 | lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR |
997 | 3824 | for ac_dir in $PATH; do | 3835 | for ac_dir in $PATH; do |
999 | 3825 | IFS="$lt_save_ifs" | 3836 | IFS=$lt_save_ifs |
1000 | 3826 | test -z "$ac_dir" && ac_dir=. | 3837 | test -z "$ac_dir" && ac_dir=. |
1001 | 3827 | if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then | 3838 | if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then |
1003 | 3828 | lt_cv_path_LD="$ac_dir/$ac_prog" | 3839 | lt_cv_path_LD=$ac_dir/$ac_prog |
1004 | 3829 | # Check to see if the program is GNU ld. I'd rather use --version, | 3840 | # Check to see if the program is GNU ld. I'd rather use --version, |
1005 | 3830 | # but apparently some variants of GNU ld only accept -v. | 3841 | # but apparently some variants of GNU ld only accept -v. |
1006 | 3831 | # Break only if it was the GNU/non-GNU ld that we prefer. | 3842 | # Break only if it was the GNU/non-GNU ld that we prefer. |
1007 | 3832 | case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in | 3843 | case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in |
1008 | 3833 | *GNU* | *'with BFD'*) | 3844 | *GNU* | *'with BFD'*) |
1010 | 3834 | test "$with_gnu_ld" != no && break | 3845 | test no != "$with_gnu_ld" && break |
1011 | 3835 | ;; | 3846 | ;; |
1012 | 3836 | *) | 3847 | *) |
1014 | 3837 | test "$with_gnu_ld" != yes && break | 3848 | test yes != "$with_gnu_ld" && break |
1015 | 3838 | ;; | 3849 | ;; |
1016 | 3839 | esac | 3850 | esac |
1017 | 3840 | fi | 3851 | fi |
1018 | 3841 | done | 3852 | done |
1020 | 3842 | IFS="$lt_save_ifs" | 3853 | IFS=$lt_save_ifs |
1021 | 3843 | else | 3854 | else |
1023 | 3844 | lt_cv_path_LD="$LD" # Let the user override the test with a path. | 3855 | lt_cv_path_LD=$LD # Let the user override the test with a path. |
1024 | 3845 | fi | 3856 | fi |
1025 | 3846 | fi | 3857 | fi |
1026 | 3847 | 3858 | ||
1028 | 3848 | LD="$lt_cv_path_LD" | 3859 | LD=$lt_cv_path_LD |
1029 | 3849 | if test -n "$LD"; then | 3860 | if test -n "$LD"; then |
1030 | 3850 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 | 3861 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 |
1031 | 3851 | $as_echo "$LD" >&6; } | 3862 | $as_echo "$LD" >&6; } |
1032 | @@ -3888,33 +3899,38 @@ | |||
1033 | 3888 | else | 3899 | else |
1034 | 3889 | if test -n "$NM"; then | 3900 | if test -n "$NM"; then |
1035 | 3890 | # Let the user override the test. | 3901 | # Let the user override the test. |
1037 | 3891 | lt_cv_path_NM="$NM" | 3902 | lt_cv_path_NM=$NM |
1038 | 3892 | else | 3903 | else |
1040 | 3893 | lt_nm_to_check="${ac_tool_prefix}nm" | 3904 | lt_nm_to_check=${ac_tool_prefix}nm |
1041 | 3894 | if test -n "$ac_tool_prefix" && test "$build" = "$host"; then | 3905 | if test -n "$ac_tool_prefix" && test "$build" = "$host"; then |
1042 | 3895 | lt_nm_to_check="$lt_nm_to_check nm" | 3906 | lt_nm_to_check="$lt_nm_to_check nm" |
1043 | 3896 | fi | 3907 | fi |
1044 | 3897 | for lt_tmp_nm in $lt_nm_to_check; do | 3908 | for lt_tmp_nm in $lt_nm_to_check; do |
1046 | 3898 | lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR | 3909 | lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR |
1047 | 3899 | for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do | 3910 | for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do |
1049 | 3900 | IFS="$lt_save_ifs" | 3911 | IFS=$lt_save_ifs |
1050 | 3901 | test -z "$ac_dir" && ac_dir=. | 3912 | test -z "$ac_dir" && ac_dir=. |
1053 | 3902 | tmp_nm="$ac_dir/$lt_tmp_nm" | 3913 | tmp_nm=$ac_dir/$lt_tmp_nm |
1054 | 3903 | if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then | 3914 | if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then |
1055 | 3904 | # Check to see if the nm accepts a BSD-compat flag. | 3915 | # Check to see if the nm accepts a BSD-compat flag. |
1057 | 3905 | # Adding the `sed 1q' prevents false positives on HP-UX, which says: | 3916 | # Adding the 'sed 1q' prevents false positives on HP-UX, which says: |
1058 | 3906 | # nm: unknown option "B" ignored | 3917 | # nm: unknown option "B" ignored |
1059 | 3907 | # Tru64's nm complains that /dev/null is an invalid object file | 3918 | # Tru64's nm complains that /dev/null is an invalid object file |
1062 | 3908 | case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in | 3919 | # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty |
1063 | 3909 | */dev/null* | *'Invalid file or object type'*) | 3920 | case $build_os in |
1064 | 3921 | mingw*) lt_bad_file=conftest.nm/nofile ;; | ||
1065 | 3922 | *) lt_bad_file=/dev/null ;; | ||
1066 | 3923 | esac | ||
1067 | 3924 | case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in | ||
1068 | 3925 | *$lt_bad_file* | *'Invalid file or object type'*) | ||
1069 | 3910 | lt_cv_path_NM="$tmp_nm -B" | 3926 | lt_cv_path_NM="$tmp_nm -B" |
1071 | 3911 | break | 3927 | break 2 |
1072 | 3912 | ;; | 3928 | ;; |
1073 | 3913 | *) | 3929 | *) |
1074 | 3914 | case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in | 3930 | case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in |
1075 | 3915 | */dev/null*) | 3931 | */dev/null*) |
1076 | 3916 | lt_cv_path_NM="$tmp_nm -p" | 3932 | lt_cv_path_NM="$tmp_nm -p" |
1078 | 3917 | break | 3933 | break 2 |
1079 | 3918 | ;; | 3934 | ;; |
1080 | 3919 | *) | 3935 | *) |
1081 | 3920 | lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but | 3936 | lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but |
1082 | @@ -3925,15 +3941,15 @@ | |||
1083 | 3925 | esac | 3941 | esac |
1084 | 3926 | fi | 3942 | fi |
1085 | 3927 | done | 3943 | done |
1087 | 3928 | IFS="$lt_save_ifs" | 3944 | IFS=$lt_save_ifs |
1088 | 3929 | done | 3945 | done |
1089 | 3930 | : ${lt_cv_path_NM=no} | 3946 | : ${lt_cv_path_NM=no} |
1090 | 3931 | fi | 3947 | fi |
1091 | 3932 | fi | 3948 | fi |
1092 | 3933 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 | 3949 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 |
1093 | 3934 | $as_echo "$lt_cv_path_NM" >&6; } | 3950 | $as_echo "$lt_cv_path_NM" >&6; } |
1096 | 3935 | if test "$lt_cv_path_NM" != "no"; then | 3951 | if test no != "$lt_cv_path_NM"; then |
1097 | 3936 | NM="$lt_cv_path_NM" | 3952 | NM=$lt_cv_path_NM |
1098 | 3937 | else | 3953 | else |
1099 | 3938 | # Didn't find any BSD compatible name lister, look for dumpbin. | 3954 | # Didn't find any BSD compatible name lister, look for dumpbin. |
1100 | 3939 | if test -n "$DUMPBIN"; then : | 3955 | if test -n "$DUMPBIN"; then : |
1101 | @@ -4039,9 +4055,9 @@ | |||
1102 | 4039 | fi | 4055 | fi |
1103 | 4040 | fi | 4056 | fi |
1104 | 4041 | 4057 | ||
1106 | 4042 | case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in | 4058 | case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in |
1107 | 4043 | *COFF*) | 4059 | *COFF*) |
1109 | 4044 | DUMPBIN="$DUMPBIN -symbols" | 4060 | DUMPBIN="$DUMPBIN -symbols -headers" |
1110 | 4045 | ;; | 4061 | ;; |
1111 | 4046 | *) | 4062 | *) |
1112 | 4047 | DUMPBIN=: | 4063 | DUMPBIN=: |
1113 | @@ -4049,8 +4065,8 @@ | |||
1114 | 4049 | esac | 4065 | esac |
1115 | 4050 | fi | 4066 | fi |
1116 | 4051 | 4067 | ||
1119 | 4052 | if test "$DUMPBIN" != ":"; then | 4068 | if test : != "$DUMPBIN"; then |
1120 | 4053 | NM="$DUMPBIN" | 4069 | NM=$DUMPBIN |
1121 | 4054 | fi | 4070 | fi |
1122 | 4055 | fi | 4071 | fi |
1123 | 4056 | test -z "$NM" && NM=nm | 4072 | test -z "$NM" && NM=nm |
1124 | @@ -4101,7 +4117,7 @@ | |||
1125 | 4101 | $as_echo_n "(cached) " >&6 | 4117 | $as_echo_n "(cached) " >&6 |
1126 | 4102 | else | 4118 | else |
1127 | 4103 | i=0 | 4119 | i=0 |
1129 | 4104 | teststring="ABCD" | 4120 | teststring=ABCD |
1130 | 4105 | 4121 | ||
1131 | 4106 | case $build_os in | 4122 | case $build_os in |
1132 | 4107 | msdosdjgpp*) | 4123 | msdosdjgpp*) |
1133 | @@ -4141,7 +4157,7 @@ | |||
1134 | 4141 | lt_cv_sys_max_cmd_len=8192; | 4157 | lt_cv_sys_max_cmd_len=8192; |
1135 | 4142 | ;; | 4158 | ;; |
1136 | 4143 | 4159 | ||
1138 | 4144 | netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) | 4160 | bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) |
1139 | 4145 | # This has been around since 386BSD, at least. Likely further. | 4161 | # This has been around since 386BSD, at least. Likely further. |
1140 | 4146 | if test -x /sbin/sysctl; then | 4162 | if test -x /sbin/sysctl; then |
1141 | 4147 | lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` | 4163 | lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` |
1142 | @@ -4192,22 +4208,22 @@ | |||
1143 | 4192 | *) | 4208 | *) |
1144 | 4193 | lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` | 4209 | lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` |
1145 | 4194 | if test -n "$lt_cv_sys_max_cmd_len" && \ | 4210 | if test -n "$lt_cv_sys_max_cmd_len" && \ |
1147 | 4195 | test undefined != "$lt_cv_sys_max_cmd_len"; then | 4211 | test undefined != "$lt_cv_sys_max_cmd_len"; then |
1148 | 4196 | lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` | 4212 | lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` |
1149 | 4197 | lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` | 4213 | lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` |
1150 | 4198 | else | 4214 | else |
1151 | 4199 | # Make teststring a little bigger before we do anything with it. | 4215 | # Make teststring a little bigger before we do anything with it. |
1152 | 4200 | # a 1K string should be a reasonable start. | 4216 | # a 1K string should be a reasonable start. |
1154 | 4201 | for i in 1 2 3 4 5 6 7 8 ; do | 4217 | for i in 1 2 3 4 5 6 7 8; do |
1155 | 4202 | teststring=$teststring$teststring | 4218 | teststring=$teststring$teststring |
1156 | 4203 | done | 4219 | done |
1157 | 4204 | SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} | 4220 | SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} |
1158 | 4205 | # If test is not a shell built-in, we'll probably end up computing a | 4221 | # If test is not a shell built-in, we'll probably end up computing a |
1159 | 4206 | # maximum length that is only half of the actual maximum length, but | 4222 | # maximum length that is only half of the actual maximum length, but |
1160 | 4207 | # we can't tell. | 4223 | # we can't tell. |
1162 | 4208 | while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ | 4224 | while { test X`env echo "$teststring$teststring" 2>/dev/null` \ |
1163 | 4209 | = "X$teststring$teststring"; } >/dev/null 2>&1 && | 4225 | = "X$teststring$teststring"; } >/dev/null 2>&1 && |
1165 | 4210 | test $i != 17 # 1/2 MB should be enough | 4226 | test 17 != "$i" # 1/2 MB should be enough |
1166 | 4211 | do | 4227 | do |
1167 | 4212 | i=`expr $i + 1` | 4228 | i=`expr $i + 1` |
1168 | 4213 | teststring=$teststring$teststring | 4229 | teststring=$teststring$teststring |
1169 | @@ -4225,7 +4241,7 @@ | |||
1170 | 4225 | 4241 | ||
1171 | 4226 | fi | 4242 | fi |
1172 | 4227 | 4243 | ||
1174 | 4228 | if test -n $lt_cv_sys_max_cmd_len ; then | 4244 | if test -n "$lt_cv_sys_max_cmd_len"; then |
1175 | 4229 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 | 4245 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 |
1176 | 4230 | $as_echo "$lt_cv_sys_max_cmd_len" >&6; } | 4246 | $as_echo "$lt_cv_sys_max_cmd_len" >&6; } |
1177 | 4231 | else | 4247 | else |
1178 | @@ -4243,30 +4259,6 @@ | |||
1179 | 4243 | : ${MV="mv -f"} | 4259 | : ${MV="mv -f"} |
1180 | 4244 | : ${RM="rm -f"} | 4260 | : ${RM="rm -f"} |
1181 | 4245 | 4261 | ||
1182 | 4246 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 | ||
1183 | 4247 | $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } | ||
1184 | 4248 | # Try some XSI features | ||
1185 | 4249 | xsi_shell=no | ||
1186 | 4250 | ( _lt_dummy="a/b/c" | ||
1187 | 4251 | test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ | ||
1188 | 4252 | = c,a/b,b/c, \ | ||
1189 | 4253 | && eval 'test $(( 1 + 1 )) -eq 2 \ | ||
1190 | 4254 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | ||
1191 | 4255 | && xsi_shell=yes | ||
1192 | 4256 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 | ||
1193 | 4257 | $as_echo "$xsi_shell" >&6; } | ||
1194 | 4258 | |||
1195 | 4259 | |||
1196 | 4260 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 | ||
1197 | 4261 | $as_echo_n "checking whether the shell understands \"+=\"... " >&6; } | ||
1198 | 4262 | lt_shell_append=no | ||
1199 | 4263 | ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ | ||
1200 | 4264 | >/dev/null 2>&1 \ | ||
1201 | 4265 | && lt_shell_append=yes | ||
1202 | 4266 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 | ||
1203 | 4267 | $as_echo "$lt_shell_append" >&6; } | ||
1204 | 4268 | |||
1205 | 4269 | |||
1206 | 4270 | if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then | 4262 | if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then |
1207 | 4271 | lt_unset=unset | 4263 | lt_unset=unset |
1208 | 4272 | else | 4264 | else |
1209 | @@ -4389,13 +4381,13 @@ | |||
1210 | 4389 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 4381 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
1211 | 4390 | case $host_os in | 4382 | case $host_os in |
1212 | 4391 | cygwin* | mingw* | pw32* | cegcc*) | 4383 | cygwin* | mingw* | pw32* | cegcc*) |
1214 | 4392 | if test "$GCC" != yes; then | 4384 | if test yes != "$GCC"; then |
1215 | 4393 | reload_cmds=false | 4385 | reload_cmds=false |
1216 | 4394 | fi | 4386 | fi |
1217 | 4395 | ;; | 4387 | ;; |
1218 | 4396 | darwin*) | 4388 | darwin*) |
1221 | 4397 | if test "$GCC" = yes; then | 4389 | if test yes = "$GCC"; then |
1222 | 4398 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 4390 | reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs' |
1223 | 4399 | else | 4391 | else |
1224 | 4400 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 4392 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
1225 | 4401 | fi | 4393 | fi |
1226 | @@ -4523,13 +4515,13 @@ | |||
1227 | 4523 | # Need to set the preceding variable on all platforms that support | 4515 | # Need to set the preceding variable on all platforms that support |
1228 | 4524 | # interlibrary dependencies. | 4516 | # interlibrary dependencies. |
1229 | 4525 | # 'none' -- dependencies not supported. | 4517 | # 'none' -- dependencies not supported. |
1231 | 4526 | # `unknown' -- same as none, but documents that we really don't know. | 4518 | # 'unknown' -- same as none, but documents that we really don't know. |
1232 | 4527 | # 'pass_all' -- all dependencies passed with no checks. | 4519 | # 'pass_all' -- all dependencies passed with no checks. |
1233 | 4528 | # 'test_compile' -- check by making test program. | 4520 | # 'test_compile' -- check by making test program. |
1234 | 4529 | # 'file_magic [[regex]]' -- check by looking for files in library path | 4521 | # 'file_magic [[regex]]' -- check by looking for files in library path |
1238 | 4530 | # which responds to the $file_magic_cmd with a given extended regex. | 4522 | # that responds to the $file_magic_cmd with a given extended regex. |
1239 | 4531 | # If you have `file' or equivalent on your system and you're not sure | 4523 | # If you have 'file' or equivalent on your system and you're not sure |
1240 | 4532 | # whether `pass_all' will *always* work, you probably want this one. | 4524 | # whether 'pass_all' will *always* work, you probably want this one. |
1241 | 4533 | 4525 | ||
1242 | 4534 | case $host_os in | 4526 | case $host_os in |
1243 | 4535 | aix[4-9]*) | 4527 | aix[4-9]*) |
1244 | @@ -4556,8 +4548,7 @@ | |||
1245 | 4556 | # Base MSYS/MinGW do not provide the 'file' command needed by | 4548 | # Base MSYS/MinGW do not provide the 'file' command needed by |
1246 | 4557 | # func_win32_libid shell function, so use a weaker test based on 'objdump', | 4549 | # func_win32_libid shell function, so use a weaker test based on 'objdump', |
1247 | 4558 | # unless we find 'file', for example because we are cross-compiling. | 4550 | # unless we find 'file', for example because we are cross-compiling. |
1250 | 4559 | # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. | 4551 | if ( file / ) >/dev/null 2>&1; then |
1249 | 4560 | if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then | ||
1251 | 4561 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 4552 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
1252 | 4562 | lt_cv_file_magic_cmd='func_win32_libid' | 4553 | lt_cv_file_magic_cmd='func_win32_libid' |
1253 | 4563 | else | 4554 | else |
1254 | @@ -4635,7 +4626,7 @@ | |||
1255 | 4635 | lt_cv_deplibs_check_method=pass_all | 4626 | lt_cv_deplibs_check_method=pass_all |
1256 | 4636 | ;; | 4627 | ;; |
1257 | 4637 | 4628 | ||
1259 | 4638 | netbsd* | netbsdelf*-gnu) | 4629 | netbsd*) |
1260 | 4639 | if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then | 4630 | if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then |
1261 | 4640 | lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' | 4631 | lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' |
1262 | 4641 | else | 4632 | else |
1263 | @@ -4653,8 +4644,8 @@ | |||
1264 | 4653 | lt_cv_deplibs_check_method=pass_all | 4644 | lt_cv_deplibs_check_method=pass_all |
1265 | 4654 | ;; | 4645 | ;; |
1266 | 4655 | 4646 | ||
1269 | 4656 | openbsd*) | 4647 | openbsd* | bitrig*) |
1270 | 4657 | if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then | 4648 | if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then |
1271 | 4658 | lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' | 4649 | lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' |
1272 | 4659 | else | 4650 | else |
1273 | 4660 | lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' | 4651 | lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' |
1274 | @@ -4707,6 +4698,9 @@ | |||
1275 | 4707 | tpf*) | 4698 | tpf*) |
1276 | 4708 | lt_cv_deplibs_check_method=pass_all | 4699 | lt_cv_deplibs_check_method=pass_all |
1277 | 4709 | ;; | 4700 | ;; |
1278 | 4701 | os2*) | ||
1279 | 4702 | lt_cv_deplibs_check_method=pass_all | ||
1280 | 4703 | ;; | ||
1281 | 4710 | esac | 4704 | esac |
1282 | 4711 | 4705 | ||
1283 | 4712 | fi | 4706 | fi |
1284 | @@ -4864,8 +4858,8 @@ | |||
1285 | 4864 | 4858 | ||
1286 | 4865 | case $host_os in | 4859 | case $host_os in |
1287 | 4866 | cygwin* | mingw* | pw32* | cegcc*) | 4860 | cygwin* | mingw* | pw32* | cegcc*) |
1290 | 4867 | # two different shell functions defined in ltmain.sh | 4861 | # two different shell functions defined in ltmain.sh; |
1291 | 4868 | # decide which to use based on capabilities of $DLLTOOL | 4862 | # decide which one to use based on capabilities of $DLLTOOL |
1292 | 4869 | case `$DLLTOOL --help 2>&1` in | 4863 | case `$DLLTOOL --help 2>&1` in |
1293 | 4870 | *--identify-strict*) | 4864 | *--identify-strict*) |
1294 | 4871 | lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib | 4865 | lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
1295 | @@ -4877,7 +4871,7 @@ | |||
1296 | 4877 | ;; | 4871 | ;; |
1297 | 4878 | *) | 4872 | *) |
1298 | 4879 | # fallback: assume linklib IS sharedlib | 4873 | # fallback: assume linklib IS sharedlib |
1300 | 4880 | lt_cv_sharedlib_from_linklib_cmd="$ECHO" | 4874 | lt_cv_sharedlib_from_linklib_cmd=$ECHO |
1301 | 4881 | ;; | 4875 | ;; |
1302 | 4882 | esac | 4876 | esac |
1303 | 4883 | 4877 | ||
1304 | @@ -5032,7 +5026,7 @@ | |||
1305 | 5032 | ac_status=$? | 5026 | ac_status=$? |
1306 | 5033 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | 5027 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
1307 | 5034 | test $ac_status = 0; } | 5028 | test $ac_status = 0; } |
1309 | 5035 | if test "$ac_status" -eq 0; then | 5029 | if test 0 -eq "$ac_status"; then |
1310 | 5036 | # Ensure the archiver fails upon bogus file names. | 5030 | # Ensure the archiver fails upon bogus file names. |
1311 | 5037 | rm -f conftest.$ac_objext libconftest.a | 5031 | rm -f conftest.$ac_objext libconftest.a |
1312 | 5038 | { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | 5032 | { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
1313 | @@ -5040,7 +5034,7 @@ | |||
1314 | 5040 | ac_status=$? | 5034 | ac_status=$? |
1315 | 5041 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | 5035 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
1316 | 5042 | test $ac_status = 0; } | 5036 | test $ac_status = 0; } |
1318 | 5043 | if test "$ac_status" -ne 0; then | 5037 | if test 0 -ne "$ac_status"; then |
1319 | 5044 | lt_cv_ar_at_file=@ | 5038 | lt_cv_ar_at_file=@ |
1320 | 5045 | fi | 5039 | fi |
1321 | 5046 | fi | 5040 | fi |
1322 | @@ -5053,7 +5047,7 @@ | |||
1323 | 5053 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 | 5047 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
1324 | 5054 | $as_echo "$lt_cv_ar_at_file" >&6; } | 5048 | $as_echo "$lt_cv_ar_at_file" >&6; } |
1325 | 5055 | 5049 | ||
1327 | 5056 | if test "x$lt_cv_ar_at_file" = xno; then | 5050 | if test no = "$lt_cv_ar_at_file"; then |
1328 | 5057 | archiver_list_spec= | 5051 | archiver_list_spec= |
1329 | 5058 | else | 5052 | else |
1330 | 5059 | archiver_list_spec=$lt_cv_ar_at_file | 5053 | archiver_list_spec=$lt_cv_ar_at_file |
1331 | @@ -5270,7 +5264,7 @@ | |||
1332 | 5270 | 5264 | ||
1333 | 5271 | if test -n "$RANLIB"; then | 5265 | if test -n "$RANLIB"; then |
1334 | 5272 | case $host_os in | 5266 | case $host_os in |
1336 | 5273 | openbsd*) | 5267 | bitrig* | openbsd*) |
1337 | 5274 | old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" | 5268 | old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" |
1338 | 5275 | ;; | 5269 | ;; |
1339 | 5276 | *) | 5270 | *) |
1340 | @@ -5402,7 +5396,7 @@ | |||
1341 | 5402 | symcode='[ABCDGISTW]' | 5396 | symcode='[ABCDGISTW]' |
1342 | 5403 | ;; | 5397 | ;; |
1343 | 5404 | hpux*) | 5398 | hpux*) |
1345 | 5405 | if test "$host_cpu" = ia64; then | 5399 | if test ia64 = "$host_cpu"; then |
1346 | 5406 | symcode='[ABCDEGRST]' | 5400 | symcode='[ABCDEGRST]' |
1347 | 5407 | fi | 5401 | fi |
1348 | 5408 | ;; | 5402 | ;; |
1349 | @@ -5435,14 +5429,44 @@ | |||
1350 | 5435 | symcode='[ABCDGIRSTW]' ;; | 5429 | symcode='[ABCDGIRSTW]' ;; |
1351 | 5436 | esac | 5430 | esac |
1352 | 5437 | 5431 | ||
1353 | 5432 | if test "$lt_cv_nm_interface" = "MS dumpbin"; then | ||
1354 | 5433 | # Gets list of data symbols to import. | ||
1355 | 5434 | lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" | ||
1356 | 5435 | # Adjust the below global symbol transforms to fixup imported variables. | ||
1357 | 5436 | lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" | ||
1358 | 5437 | lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" | ||
1359 | 5438 | lt_c_name_lib_hook="\ | ||
1360 | 5439 | -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ | ||
1361 | 5440 | -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" | ||
1362 | 5441 | else | ||
1363 | 5442 | # Disable hooks by default. | ||
1364 | 5443 | lt_cv_sys_global_symbol_to_import= | ||
1365 | 5444 | lt_cdecl_hook= | ||
1366 | 5445 | lt_c_name_hook= | ||
1367 | 5446 | lt_c_name_lib_hook= | ||
1368 | 5447 | fi | ||
1369 | 5448 | |||
1370 | 5438 | # Transform an extracted symbol line into a proper C declaration. | 5449 | # Transform an extracted symbol line into a proper C declaration. |
1371 | 5439 | # Some systems (esp. on ia64) link data and code symbols differently, | 5450 | # Some systems (esp. on ia64) link data and code symbols differently, |
1372 | 5440 | # so use this general approach. | 5451 | # so use this general approach. |
1374 | 5441 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 5452 | lt_cv_sys_global_symbol_to_cdecl="sed -n"\ |
1375 | 5453 | $lt_cdecl_hook\ | ||
1376 | 5454 | " -e 's/^T .* \(.*\)$/extern int \1();/p'"\ | ||
1377 | 5455 | " -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" | ||
1378 | 5442 | 5456 | ||
1379 | 5443 | # Transform an extracted symbol line into symbol name and symbol address | 5457 | # Transform an extracted symbol line into symbol name and symbol address |
1382 | 5444 | lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" | 5458 | lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ |
1383 | 5445 | 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'" | 5459 | $lt_c_name_hook\ |
1384 | 5460 | " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ | ||
1385 | 5461 | " -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" | ||
1386 | 5462 | |||
1387 | 5463 | # Transform an extracted symbol line into symbol name with lib prefix and | ||
1388 | 5464 | # symbol address. | ||
1389 | 5465 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ | ||
1390 | 5466 | $lt_c_name_lib_hook\ | ||
1391 | 5467 | " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ | ||
1392 | 5468 | " -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ | ||
1393 | 5469 | " -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" | ||
1394 | 5446 | 5470 | ||
1395 | 5447 | # Handle CRLF in mingw tool chain | 5471 | # Handle CRLF in mingw tool chain |
1396 | 5448 | opt_cr= | 5472 | opt_cr= |
1397 | @@ -5460,21 +5484,24 @@ | |||
1398 | 5460 | 5484 | ||
1399 | 5461 | # Write the raw and C identifiers. | 5485 | # Write the raw and C identifiers. |
1400 | 5462 | if test "$lt_cv_nm_interface" = "MS dumpbin"; then | 5486 | if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
1403 | 5463 | # Fake it for dumpbin and say T for any non-static function | 5487 | # Fake it for dumpbin and say T for any non-static function, |
1404 | 5464 | # and D for any global variable. | 5488 | # D for any global variable and I for any imported variable. |
1405 | 5465 | # Also find C++ and __fastcall symbols from MSVC++, | 5489 | # Also find C++ and __fastcall symbols from MSVC++, |
1406 | 5466 | # which start with @ or ?. | 5490 | # which start with @ or ?. |
1407 | 5467 | lt_cv_sys_global_symbol_pipe="$AWK '"\ | 5491 | lt_cv_sys_global_symbol_pipe="$AWK '"\ |
1408 | 5468 | " {last_section=section; section=\$ 3};"\ | 5492 | " {last_section=section; section=\$ 3};"\ |
1409 | 5469 | " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ | 5493 | " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ |
1410 | 5470 | " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ | 5494 | " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ |
1411 | 5495 | " /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ | ||
1412 | 5496 | " /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ | ||
1413 | 5497 | " /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ | ||
1414 | 5471 | " \$ 0!~/External *\|/{next};"\ | 5498 | " \$ 0!~/External *\|/{next};"\ |
1415 | 5472 | " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ | 5499 | " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ |
1416 | 5473 | " {if(hide[section]) next};"\ | 5500 | " {if(hide[section]) next};"\ |
1421 | 5474 | " {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ | 5501 | " {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ |
1422 | 5475 | " {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ | 5502 | " {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ |
1423 | 5476 | " s[1]~/^[@?]/{print s[1], s[1]; next};"\ | 5503 | " s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ |
1424 | 5477 | " s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ | 5504 | " s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ |
1425 | 5478 | " ' prfx=^$ac_symprfx" | 5505 | " ' prfx=^$ac_symprfx" |
1426 | 5479 | else | 5506 | else |
1427 | 5480 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | 5507 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
1428 | @@ -5522,11 +5549,11 @@ | |||
1429 | 5522 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 5549 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
1430 | 5523 | cat <<_LT_EOF > conftest.$ac_ext | 5550 | cat <<_LT_EOF > conftest.$ac_ext |
1431 | 5524 | /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ | 5551 | /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
1434 | 5525 | #if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) | 5552 | #if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE |
1435 | 5526 | /* DATA imports from DLLs on WIN32 con't be const, because runtime | 5553 | /* DATA imports from DLLs on WIN32 can't be const, because runtime |
1436 | 5527 | relocations are performed -- see ld's documentation on pseudo-relocs. */ | 5554 | relocations are performed -- see ld's documentation on pseudo-relocs. */ |
1437 | 5528 | # define LT_DLSYM_CONST | 5555 | # define LT_DLSYM_CONST |
1439 | 5529 | #elif defined(__osf__) | 5556 | #elif defined __osf__ |
1440 | 5530 | /* This system does not cope well with relocations in const data. */ | 5557 | /* This system does not cope well with relocations in const data. */ |
1441 | 5531 | # define LT_DLSYM_CONST | 5558 | # define LT_DLSYM_CONST |
1442 | 5532 | #else | 5559 | #else |
1443 | @@ -5552,7 +5579,7 @@ | |||
1444 | 5552 | { | 5579 | { |
1445 | 5553 | { "@PROGRAM@", (void *) 0 }, | 5580 | { "@PROGRAM@", (void *) 0 }, |
1446 | 5554 | _LT_EOF | 5581 | _LT_EOF |
1448 | 5555 | $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext | 5582 | $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext |
1449 | 5556 | cat <<\_LT_EOF >> conftest.$ac_ext | 5583 | cat <<\_LT_EOF >> conftest.$ac_ext |
1450 | 5557 | {0, (void *) 0} | 5584 | {0, (void *) 0} |
1451 | 5558 | }; | 5585 | }; |
1452 | @@ -5572,13 +5599,13 @@ | |||
1453 | 5572 | mv conftest.$ac_objext conftstm.$ac_objext | 5599 | mv conftest.$ac_objext conftstm.$ac_objext |
1454 | 5573 | lt_globsym_save_LIBS=$LIBS | 5600 | lt_globsym_save_LIBS=$LIBS |
1455 | 5574 | lt_globsym_save_CFLAGS=$CFLAGS | 5601 | lt_globsym_save_CFLAGS=$CFLAGS |
1457 | 5575 | LIBS="conftstm.$ac_objext" | 5602 | LIBS=conftstm.$ac_objext |
1458 | 5576 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | 5603 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
1459 | 5577 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | 5604 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
1460 | 5578 | (eval $ac_link) 2>&5 | 5605 | (eval $ac_link) 2>&5 |
1461 | 5579 | ac_status=$? | 5606 | ac_status=$? |
1462 | 5580 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | 5607 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
1464 | 5581 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | 5608 | test $ac_status = 0; } && test -s conftest$ac_exeext; then |
1465 | 5582 | pipe_works=yes | 5609 | pipe_works=yes |
1466 | 5583 | fi | 5610 | fi |
1467 | 5584 | LIBS=$lt_globsym_save_LIBS | 5611 | LIBS=$lt_globsym_save_LIBS |
1468 | @@ -5599,7 +5626,7 @@ | |||
1469 | 5599 | rm -rf conftest* conftst* | 5626 | rm -rf conftest* conftst* |
1470 | 5600 | 5627 | ||
1471 | 5601 | # Do not use the global_symbol_pipe unless it works. | 5628 | # Do not use the global_symbol_pipe unless it works. |
1473 | 5602 | if test "$pipe_works" = yes; then | 5629 | if test yes = "$pipe_works"; then |
1474 | 5603 | break | 5630 | break |
1475 | 5604 | else | 5631 | else |
1476 | 5605 | lt_cv_sys_global_symbol_pipe= | 5632 | lt_cv_sys_global_symbol_pipe= |
1477 | @@ -5652,6 +5679,16 @@ | |||
1478 | 5652 | 5679 | ||
1479 | 5653 | 5680 | ||
1480 | 5654 | 5681 | ||
1481 | 5682 | |||
1482 | 5683 | |||
1483 | 5684 | |||
1484 | 5685 | |||
1485 | 5686 | |||
1486 | 5687 | |||
1487 | 5688 | |||
1488 | 5689 | |||
1489 | 5690 | |||
1490 | 5691 | |||
1491 | 5655 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | 5692 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
1492 | 5656 | $as_echo_n "checking for sysroot... " >&6; } | 5693 | $as_echo_n "checking for sysroot... " >&6; } |
1493 | 5657 | 5694 | ||
1494 | @@ -5664,9 +5701,9 @@ | |||
1495 | 5664 | 5701 | ||
1496 | 5665 | 5702 | ||
1497 | 5666 | lt_sysroot= | 5703 | lt_sysroot= |
1499 | 5667 | case ${with_sysroot} in #( | 5704 | case $with_sysroot in #( |
1500 | 5668 | yes) | 5705 | yes) |
1502 | 5669 | if test "$GCC" = yes; then | 5706 | if test yes = "$GCC"; then |
1503 | 5670 | lt_sysroot=`$CC --print-sysroot 2>/dev/null` | 5707 | lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
1504 | 5671 | fi | 5708 | fi |
1505 | 5672 | ;; #( | 5709 | ;; #( |
1506 | @@ -5676,8 +5713,8 @@ | |||
1507 | 5676 | no|'') | 5713 | no|'') |
1508 | 5677 | ;; #( | 5714 | ;; #( |
1509 | 5678 | *) | 5715 | *) |
1512 | 5679 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 | 5716 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 |
1513 | 5680 | $as_echo "${with_sysroot}" >&6; } | 5717 | $as_echo "$with_sysroot" >&6; } |
1514 | 5681 | as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 | 5718 | as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 |
1515 | 5682 | ;; | 5719 | ;; |
1516 | 5683 | esac | 5720 | esac |
1517 | @@ -5689,18 +5726,99 @@ | |||
1518 | 5689 | 5726 | ||
1519 | 5690 | 5727 | ||
1520 | 5691 | 5728 | ||
1521 | 5729 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 | ||
1522 | 5730 | $as_echo_n "checking for a working dd... " >&6; } | ||
1523 | 5731 | if ${ac_cv_path_lt_DD+:} false; then : | ||
1524 | 5732 | $as_echo_n "(cached) " >&6 | ||
1525 | 5733 | else | ||
1526 | 5734 | printf 0123456789abcdef0123456789abcdef >conftest.i | ||
1527 | 5735 | cat conftest.i conftest.i >conftest2.i | ||
1528 | 5736 | : ${lt_DD:=$DD} | ||
1529 | 5737 | if test -z "$lt_DD"; then | ||
1530 | 5738 | ac_path_lt_DD_found=false | ||
1531 | 5739 | # Loop through the user's path and test for each of PROGNAME-LIST | ||
1532 | 5740 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
1533 | 5741 | for as_dir in $PATH | ||
1534 | 5742 | do | ||
1535 | 5743 | IFS=$as_save_IFS | ||
1536 | 5744 | test -z "$as_dir" && as_dir=. | ||
1537 | 5745 | for ac_prog in dd; do | ||
1538 | 5746 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
1539 | 5747 | ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext" | ||
1540 | 5748 | as_fn_executable_p "$ac_path_lt_DD" || continue | ||
1541 | 5749 | if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then | ||
1542 | 5750 | cmp -s conftest.i conftest.out \ | ||
1543 | 5751 | && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: | ||
1544 | 5752 | fi | ||
1545 | 5753 | $ac_path_lt_DD_found && break 3 | ||
1546 | 5754 | done | ||
1547 | 5755 | done | ||
1548 | 5756 | done | ||
1549 | 5757 | IFS=$as_save_IFS | ||
1550 | 5758 | if test -z "$ac_cv_path_lt_DD"; then | ||
1551 | 5759 | : | ||
1552 | 5760 | fi | ||
1553 | 5761 | else | ||
1554 | 5762 | ac_cv_path_lt_DD=$lt_DD | ||
1555 | 5763 | fi | ||
1556 | 5764 | |||
1557 | 5765 | rm -f conftest.i conftest2.i conftest.out | ||
1558 | 5766 | fi | ||
1559 | 5767 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 | ||
1560 | 5768 | $as_echo "$ac_cv_path_lt_DD" >&6; } | ||
1561 | 5769 | |||
1562 | 5770 | |||
1563 | 5771 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 | ||
1564 | 5772 | $as_echo_n "checking how to truncate binary pipes... " >&6; } | ||
1565 | 5773 | if ${lt_cv_truncate_bin+:} false; then : | ||
1566 | 5774 | $as_echo_n "(cached) " >&6 | ||
1567 | 5775 | else | ||
1568 | 5776 | printf 0123456789abcdef0123456789abcdef >conftest.i | ||
1569 | 5777 | cat conftest.i conftest.i >conftest2.i | ||
1570 | 5778 | lt_cv_truncate_bin= | ||
1571 | 5779 | if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then | ||
1572 | 5780 | cmp -s conftest.i conftest.out \ | ||
1573 | 5781 | && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" | ||
1574 | 5782 | fi | ||
1575 | 5783 | rm -f conftest.i conftest2.i conftest.out | ||
1576 | 5784 | test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" | ||
1577 | 5785 | fi | ||
1578 | 5786 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 | ||
1579 | 5787 | $as_echo "$lt_cv_truncate_bin" >&6; } | ||
1580 | 5788 | |||
1581 | 5789 | |||
1582 | 5790 | |||
1583 | 5791 | |||
1584 | 5792 | |||
1585 | 5793 | |||
1586 | 5794 | |||
1587 | 5795 | # Calculate cc_basename. Skip known compiler wrappers and cross-prefix. | ||
1588 | 5796 | func_cc_basename () | ||
1589 | 5797 | { | ||
1590 | 5798 | for cc_temp in $*""; do | ||
1591 | 5799 | case $cc_temp in | ||
1592 | 5800 | compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; | ||
1593 | 5801 | distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; | ||
1594 | 5802 | \-*) ;; | ||
1595 | 5803 | *) break;; | ||
1596 | 5804 | esac | ||
1597 | 5805 | done | ||
1598 | 5806 | func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` | ||
1599 | 5807 | } | ||
1600 | 5808 | |||
1601 | 5692 | # Check whether --enable-libtool-lock was given. | 5809 | # Check whether --enable-libtool-lock was given. |
1602 | 5693 | if test "${enable_libtool_lock+set}" = set; then : | 5810 | if test "${enable_libtool_lock+set}" = set; then : |
1603 | 5694 | enableval=$enable_libtool_lock; | 5811 | enableval=$enable_libtool_lock; |
1604 | 5695 | fi | 5812 | fi |
1605 | 5696 | 5813 | ||
1607 | 5697 | test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes | 5814 | test no = "$enable_libtool_lock" || enable_libtool_lock=yes |
1608 | 5698 | 5815 | ||
1609 | 5699 | # Some flags need to be propagated to the compiler or linker for good | 5816 | # Some flags need to be propagated to the compiler or linker for good |
1610 | 5700 | # libtool support. | 5817 | # libtool support. |
1611 | 5701 | case $host in | 5818 | case $host in |
1612 | 5702 | ia64-*-hpux*) | 5819 | ia64-*-hpux*) |
1614 | 5703 | # Find out which ABI we are using. | 5820 | # Find out what ABI is being produced by ac_compile, and set mode |
1615 | 5821 | # options accordingly. | ||
1616 | 5704 | echo 'int i;' > conftest.$ac_ext | 5822 | echo 'int i;' > conftest.$ac_ext |
1617 | 5705 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | 5823 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
1618 | 5706 | (eval $ac_compile) 2>&5 | 5824 | (eval $ac_compile) 2>&5 |
1619 | @@ -5709,24 +5827,25 @@ | |||
1620 | 5709 | test $ac_status = 0; }; then | 5827 | test $ac_status = 0; }; then |
1621 | 5710 | case `/usr/bin/file conftest.$ac_objext` in | 5828 | case `/usr/bin/file conftest.$ac_objext` in |
1622 | 5711 | *ELF-32*) | 5829 | *ELF-32*) |
1624 | 5712 | HPUX_IA64_MODE="32" | 5830 | HPUX_IA64_MODE=32 |
1625 | 5713 | ;; | 5831 | ;; |
1626 | 5714 | *ELF-64*) | 5832 | *ELF-64*) |
1628 | 5715 | HPUX_IA64_MODE="64" | 5833 | HPUX_IA64_MODE=64 |
1629 | 5716 | ;; | 5834 | ;; |
1630 | 5717 | esac | 5835 | esac |
1631 | 5718 | fi | 5836 | fi |
1632 | 5719 | rm -rf conftest* | 5837 | rm -rf conftest* |
1633 | 5720 | ;; | 5838 | ;; |
1634 | 5721 | *-*-irix6*) | 5839 | *-*-irix6*) |
1636 | 5722 | # Find out which ABI we are using. | 5840 | # Find out what ABI is being produced by ac_compile, and set linker |
1637 | 5841 | # options accordingly. | ||
1638 | 5723 | echo '#line '$LINENO' "configure"' > conftest.$ac_ext | 5842 | echo '#line '$LINENO' "configure"' > conftest.$ac_ext |
1639 | 5724 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | 5843 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
1640 | 5725 | (eval $ac_compile) 2>&5 | 5844 | (eval $ac_compile) 2>&5 |
1641 | 5726 | ac_status=$? | 5845 | ac_status=$? |
1642 | 5727 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | 5846 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
1643 | 5728 | test $ac_status = 0; }; then | 5847 | test $ac_status = 0; }; then |
1645 | 5729 | if test "$lt_cv_prog_gnu_ld" = yes; then | 5848 | if test yes = "$lt_cv_prog_gnu_ld"; then |
1646 | 5730 | case `/usr/bin/file conftest.$ac_objext` in | 5849 | case `/usr/bin/file conftest.$ac_objext` in |
1647 | 5731 | *32-bit*) | 5850 | *32-bit*) |
1648 | 5732 | LD="${LD-ld} -melf32bsmip" | 5851 | LD="${LD-ld} -melf32bsmip" |
1649 | @@ -5755,9 +5874,50 @@ | |||
1650 | 5755 | rm -rf conftest* | 5874 | rm -rf conftest* |
1651 | 5756 | ;; | 5875 | ;; |
1652 | 5757 | 5876 | ||
1653 | 5877 | mips64*-*linux*) | ||
1654 | 5878 | # Find out what ABI is being produced by ac_compile, and set linker | ||
1655 | 5879 | # options accordingly. | ||
1656 | 5880 | echo '#line '$LINENO' "configure"' > conftest.$ac_ext | ||
1657 | 5881 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | ||
1658 | 5882 | (eval $ac_compile) 2>&5 | ||
1659 | 5883 | ac_status=$? | ||
1660 | 5884 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
1661 | 5885 | test $ac_status = 0; }; then | ||
1662 | 5886 | emul=elf | ||
1663 | 5887 | case `/usr/bin/file conftest.$ac_objext` in | ||
1664 | 5888 | *32-bit*) | ||
1665 | 5889 | emul="${emul}32" | ||
1666 | 5890 | ;; | ||
1667 | 5891 | *64-bit*) | ||
1668 | 5892 | emul="${emul}64" | ||
1669 | 5893 | ;; | ||
1670 | 5894 | esac | ||
1671 | 5895 | case `/usr/bin/file conftest.$ac_objext` in | ||
1672 | 5896 | *MSB*) | ||
1673 | 5897 | emul="${emul}btsmip" | ||
1674 | 5898 | ;; | ||
1675 | 5899 | *LSB*) | ||
1676 | 5900 | emul="${emul}ltsmip" | ||
1677 | 5901 | ;; | ||
1678 | 5902 | esac | ||
1679 | 5903 | case `/usr/bin/file conftest.$ac_objext` in | ||
1680 | 5904 | *N32*) | ||
1681 | 5905 | emul="${emul}n32" | ||
1682 | 5906 | ;; | ||
1683 | 5907 | esac | ||
1684 | 5908 | LD="${LD-ld} -m $emul" | ||
1685 | 5909 | fi | ||
1686 | 5910 | rm -rf conftest* | ||
1687 | 5911 | ;; | ||
1688 | 5912 | |||
1689 | 5758 | x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ | 5913 | x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ |
1690 | 5759 | s390*-*linux*|s390*-*tpf*|sparc*-*linux*) | 5914 | s390*-*linux*|s390*-*tpf*|sparc*-*linux*) |
1692 | 5760 | # Find out which ABI we are using. | 5915 | # Find out what ABI is being produced by ac_compile, and set linker |
1693 | 5916 | # options accordingly. Note that the listed cases only cover the | ||
1694 | 5917 | # situations where additional linker options are needed (such as when | ||
1695 | 5918 | # doing 32-bit compilation for a host where ld defaults to 64-bit, or | ||
1696 | 5919 | # vice versa); the common cases where no linker options are needed do | ||
1697 | 5920 | # not appear in the list. | ||
1698 | 5761 | echo 'int i;' > conftest.$ac_ext | 5921 | echo 'int i;' > conftest.$ac_ext |
1699 | 5762 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | 5922 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
1700 | 5763 | (eval $ac_compile) 2>&5 | 5923 | (eval $ac_compile) 2>&5 |
1701 | @@ -5780,10 +5940,10 @@ | |||
1702 | 5780 | ;; | 5940 | ;; |
1703 | 5781 | esac | 5941 | esac |
1704 | 5782 | ;; | 5942 | ;; |
1706 | 5783 | powerpc64le-*) | 5943 | powerpc64le-*linux*) |
1707 | 5784 | LD="${LD-ld} -m elf32lppclinux" | 5944 | LD="${LD-ld} -m elf32lppclinux" |
1708 | 5785 | ;; | 5945 | ;; |
1710 | 5786 | powerpc64-*) | 5946 | powerpc64-*linux*) |
1711 | 5787 | LD="${LD-ld} -m elf32ppclinux" | 5947 | LD="${LD-ld} -m elf32ppclinux" |
1712 | 5788 | ;; | 5948 | ;; |
1713 | 5789 | s390x-*linux*) | 5949 | s390x-*linux*) |
1714 | @@ -5802,10 +5962,10 @@ | |||
1715 | 5802 | x86_64-*linux*) | 5962 | x86_64-*linux*) |
1716 | 5803 | LD="${LD-ld} -m elf_x86_64" | 5963 | LD="${LD-ld} -m elf_x86_64" |
1717 | 5804 | ;; | 5964 | ;; |
1719 | 5805 | powerpcle-*) | 5965 | powerpcle-*linux*) |
1720 | 5806 | LD="${LD-ld} -m elf64lppc" | 5966 | LD="${LD-ld} -m elf64lppc" |
1721 | 5807 | ;; | 5967 | ;; |
1723 | 5808 | powerpc-*) | 5968 | powerpc-*linux*) |
1724 | 5809 | LD="${LD-ld} -m elf64ppc" | 5969 | LD="${LD-ld} -m elf64ppc" |
1725 | 5810 | ;; | 5970 | ;; |
1726 | 5811 | s390*-*linux*|s390*-*tpf*) | 5971 | s390*-*linux*|s390*-*tpf*) |
1727 | @@ -5823,7 +5983,7 @@ | |||
1728 | 5823 | 5983 | ||
1729 | 5824 | *-*-sco3.2v5*) | 5984 | *-*-sco3.2v5*) |
1730 | 5825 | # On SCO OpenServer 5, we need -belf to get full-featured binaries. | 5985 | # On SCO OpenServer 5, we need -belf to get full-featured binaries. |
1732 | 5826 | SAVE_CFLAGS="$CFLAGS" | 5986 | SAVE_CFLAGS=$CFLAGS |
1733 | 5827 | CFLAGS="$CFLAGS -belf" | 5987 | CFLAGS="$CFLAGS -belf" |
1734 | 5828 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 | 5988 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 |
1735 | 5829 | $as_echo_n "checking whether the C compiler needs -belf... " >&6; } | 5989 | $as_echo_n "checking whether the C compiler needs -belf... " >&6; } |
1736 | @@ -5863,13 +6023,14 @@ | |||
1737 | 5863 | fi | 6023 | fi |
1738 | 5864 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 | 6024 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 |
1739 | 5865 | $as_echo "$lt_cv_cc_needs_belf" >&6; } | 6025 | $as_echo "$lt_cv_cc_needs_belf" >&6; } |
1741 | 5866 | if test x"$lt_cv_cc_needs_belf" != x"yes"; then | 6026 | if test yes != "$lt_cv_cc_needs_belf"; then |
1742 | 5867 | # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf | 6027 | # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf |
1744 | 5868 | CFLAGS="$SAVE_CFLAGS" | 6028 | CFLAGS=$SAVE_CFLAGS |
1745 | 5869 | fi | 6029 | fi |
1746 | 5870 | ;; | 6030 | ;; |
1747 | 5871 | *-*solaris*) | 6031 | *-*solaris*) |
1749 | 5872 | # Find out which ABI we are using. | 6032 | # Find out what ABI is being produced by ac_compile, and set linker |
1750 | 6033 | # options accordingly. | ||
1751 | 5873 | echo 'int i;' > conftest.$ac_ext | 6034 | echo 'int i;' > conftest.$ac_ext |
1752 | 5874 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | 6035 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
1753 | 5875 | (eval $ac_compile) 2>&5 | 6036 | (eval $ac_compile) 2>&5 |
1754 | @@ -5881,7 +6042,7 @@ | |||
1755 | 5881 | case $lt_cv_prog_gnu_ld in | 6042 | case $lt_cv_prog_gnu_ld in |
1756 | 5882 | yes*) | 6043 | yes*) |
1757 | 5883 | case $host in | 6044 | case $host in |
1759 | 5884 | i?86-*-solaris*) | 6045 | i?86-*-solaris*|x86_64-*-solaris*) |
1760 | 5885 | LD="${LD-ld} -m elf_x86_64" | 6046 | LD="${LD-ld} -m elf_x86_64" |
1761 | 5886 | ;; | 6047 | ;; |
1762 | 5887 | sparc*-*-solaris*) | 6048 | sparc*-*-solaris*) |
1763 | @@ -5890,7 +6051,7 @@ | |||
1764 | 5890 | esac | 6051 | esac |
1765 | 5891 | # GNU ld 2.21 introduced _sol2 emulations. Use them if available. | 6052 | # GNU ld 2.21 introduced _sol2 emulations. Use them if available. |
1766 | 5892 | if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then | 6053 | if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then |
1768 | 5893 | LD="${LD-ld}_sol2" | 6054 | LD=${LD-ld}_sol2 |
1769 | 5894 | fi | 6055 | fi |
1770 | 5895 | ;; | 6056 | ;; |
1771 | 5896 | *) | 6057 | *) |
1772 | @@ -5906,7 +6067,7 @@ | |||
1773 | 5906 | ;; | 6067 | ;; |
1774 | 5907 | esac | 6068 | esac |
1775 | 5908 | 6069 | ||
1777 | 5909 | need_locks="$enable_libtool_lock" | 6070 | need_locks=$enable_libtool_lock |
1778 | 5910 | 6071 | ||
1779 | 5911 | if test -n "$ac_tool_prefix"; then | 6072 | if test -n "$ac_tool_prefix"; then |
1780 | 5912 | # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. | 6073 | # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. |
1781 | @@ -6017,7 +6178,7 @@ | |||
1782 | 6017 | fi | 6178 | fi |
1783 | 6018 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 | 6179 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 |
1784 | 6019 | $as_echo "$lt_cv_path_mainfest_tool" >&6; } | 6180 | $as_echo "$lt_cv_path_mainfest_tool" >&6; } |
1786 | 6020 | if test "x$lt_cv_path_mainfest_tool" != xyes; then | 6181 | if test yes != "$lt_cv_path_mainfest_tool"; then |
1787 | 6021 | MANIFEST_TOOL=: | 6182 | MANIFEST_TOOL=: |
1788 | 6022 | fi | 6183 | fi |
1789 | 6023 | 6184 | ||
1790 | @@ -6520,7 +6681,7 @@ | |||
1791 | 6520 | $as_echo_n "(cached) " >&6 | 6681 | $as_echo_n "(cached) " >&6 |
1792 | 6521 | else | 6682 | else |
1793 | 6522 | lt_cv_apple_cc_single_mod=no | 6683 | lt_cv_apple_cc_single_mod=no |
1795 | 6523 | if test -z "${LT_MULTI_MODULE}"; then | 6684 | if test -z "$LT_MULTI_MODULE"; then |
1796 | 6524 | # By default we will add the -single_module flag. You can override | 6685 | # By default we will add the -single_module flag. You can override |
1797 | 6525 | # by either setting the environment variable LT_MULTI_MODULE | 6686 | # by either setting the environment variable LT_MULTI_MODULE |
1798 | 6526 | # non-empty at configure time, or by adding -multi_module to the | 6687 | # non-empty at configure time, or by adding -multi_module to the |
1799 | @@ -6538,7 +6699,7 @@ | |||
1800 | 6538 | cat conftest.err >&5 | 6699 | cat conftest.err >&5 |
1801 | 6539 | # Otherwise, if the output was created with a 0 exit code from | 6700 | # Otherwise, if the output was created with a 0 exit code from |
1802 | 6540 | # the compiler, it worked. | 6701 | # the compiler, it worked. |
1804 | 6541 | elif test -f libconftest.dylib && test $_lt_result -eq 0; then | 6702 | elif test -f libconftest.dylib && test 0 = "$_lt_result"; then |
1805 | 6542 | lt_cv_apple_cc_single_mod=yes | 6703 | lt_cv_apple_cc_single_mod=yes |
1806 | 6543 | else | 6704 | else |
1807 | 6544 | cat conftest.err >&5 | 6705 | cat conftest.err >&5 |
1808 | @@ -6577,7 +6738,7 @@ | |||
1809 | 6577 | fi | 6738 | fi |
1810 | 6578 | rm -f core conftest.err conftest.$ac_objext \ | 6739 | rm -f core conftest.err conftest.$ac_objext \ |
1811 | 6579 | conftest$ac_exeext conftest.$ac_ext | 6740 | conftest$ac_exeext conftest.$ac_ext |
1813 | 6580 | LDFLAGS="$save_LDFLAGS" | 6741 | LDFLAGS=$save_LDFLAGS |
1814 | 6581 | 6742 | ||
1815 | 6582 | fi | 6743 | fi |
1816 | 6583 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 | 6744 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 |
1817 | @@ -6606,7 +6767,7 @@ | |||
1818 | 6606 | _lt_result=$? | 6767 | _lt_result=$? |
1819 | 6607 | if test -s conftest.err && $GREP force_load conftest.err; then | 6768 | if test -s conftest.err && $GREP force_load conftest.err; then |
1820 | 6608 | cat conftest.err >&5 | 6769 | cat conftest.err >&5 |
1822 | 6609 | elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then | 6770 | elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then |
1823 | 6610 | lt_cv_ld_force_load=yes | 6771 | lt_cv_ld_force_load=yes |
1824 | 6611 | else | 6772 | else |
1825 | 6612 | cat conftest.err >&5 | 6773 | cat conftest.err >&5 |
1826 | @@ -6619,32 +6780,32 @@ | |||
1827 | 6619 | $as_echo "$lt_cv_ld_force_load" >&6; } | 6780 | $as_echo "$lt_cv_ld_force_load" >&6; } |
1828 | 6620 | case $host_os in | 6781 | case $host_os in |
1829 | 6621 | rhapsody* | darwin1.[012]) | 6782 | rhapsody* | darwin1.[012]) |
1831 | 6622 | _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; | 6783 | _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; |
1832 | 6623 | darwin1.*) | 6784 | darwin1.*) |
1834 | 6624 | _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; | 6785 | _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; |
1835 | 6625 | darwin*) # darwin 5.x on | 6786 | darwin*) # darwin 5.x on |
1836 | 6626 | # if running on 10.5 or later, the deployment target defaults | 6787 | # if running on 10.5 or later, the deployment target defaults |
1837 | 6627 | # to the OS version, if on x86, and 10.4, the deployment | 6788 | # to the OS version, if on x86, and 10.4, the deployment |
1838 | 6628 | # target defaults to 10.4. Don't you love it? | 6789 | # target defaults to 10.4. Don't you love it? |
1839 | 6629 | case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in | 6790 | case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in |
1840 | 6630 | 10.0,*86*-darwin8*|10.0,*-darwin[91]*) | 6791 | 10.0,*86*-darwin8*|10.0,*-darwin[91]*) |
1844 | 6631 | _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; | 6792 | _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; |
1845 | 6632 | 10.[012]*) | 6793 | 10.[012][,.]*) |
1846 | 6633 | _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; | 6794 | _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; |
1847 | 6634 | 10.*) | 6795 | 10.*) |
1849 | 6635 | _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; | 6796 | _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; |
1850 | 6636 | esac | 6797 | esac |
1851 | 6637 | ;; | 6798 | ;; |
1852 | 6638 | esac | 6799 | esac |
1854 | 6639 | if test "$lt_cv_apple_cc_single_mod" = "yes"; then | 6800 | if test yes = "$lt_cv_apple_cc_single_mod"; then |
1855 | 6640 | _lt_dar_single_mod='$single_module' | 6801 | _lt_dar_single_mod='$single_module' |
1856 | 6641 | fi | 6802 | fi |
1859 | 6642 | if test "$lt_cv_ld_exported_symbols_list" = "yes"; then | 6803 | if test yes = "$lt_cv_ld_exported_symbols_list"; then |
1860 | 6643 | _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' | 6804 | _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' |
1861 | 6644 | else | 6805 | else |
1863 | 6645 | _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' | 6806 | _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' |
1864 | 6646 | fi | 6807 | fi |
1866 | 6647 | if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then | 6808 | if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then |
1867 | 6648 | _lt_dsymutil='~$DSYMUTIL $lib || :' | 6809 | _lt_dsymutil='~$DSYMUTIL $lib || :' |
1868 | 6649 | else | 6810 | else |
1869 | 6650 | _lt_dsymutil= | 6811 | _lt_dsymutil= |
1870 | @@ -6652,6 +6813,41 @@ | |||
1871 | 6652 | ;; | 6813 | ;; |
1872 | 6653 | esac | 6814 | esac |
1873 | 6654 | 6815 | ||
1874 | 6816 | # func_munge_path_list VARIABLE PATH | ||
1875 | 6817 | # ----------------------------------- | ||
1876 | 6818 | # VARIABLE is name of variable containing _space_ separated list of | ||
1877 | 6819 | # directories to be munged by the contents of PATH, which is string | ||
1878 | 6820 | # having a format: | ||
1879 | 6821 | # "DIR[:DIR]:" | ||
1880 | 6822 | # string "DIR[ DIR]" will be prepended to VARIABLE | ||
1881 | 6823 | # ":DIR[:DIR]" | ||
1882 | 6824 | # string "DIR[ DIR]" will be appended to VARIABLE | ||
1883 | 6825 | # "DIRP[:DIRP]::[DIRA:]DIRA" | ||
1884 | 6826 | # string "DIRP[ DIRP]" will be prepended to VARIABLE and string | ||
1885 | 6827 | # "DIRA[ DIRA]" will be appended to VARIABLE | ||
1886 | 6828 | # "DIR[:DIR]" | ||
1887 | 6829 | # VARIABLE will be replaced by "DIR[ DIR]" | ||
1888 | 6830 | func_munge_path_list () | ||
1889 | 6831 | { | ||
1890 | 6832 | case x$2 in | ||
1891 | 6833 | x) | ||
1892 | 6834 | ;; | ||
1893 | 6835 | *:) | ||
1894 | 6836 | eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \S|@1\" | ||
1895 | 6837 | ;; | ||
1896 | 6838 | x:*) | ||
1897 | 6839 | eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" | ||
1898 | 6840 | ;; | ||
1899 | 6841 | *::*) | ||
1900 | 6842 | eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" | ||
1901 | 6843 | eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" | ||
1902 | 6844 | ;; | ||
1903 | 6845 | *) | ||
1904 | 6846 | eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" | ||
1905 | 6847 | ;; | ||
1906 | 6848 | esac | ||
1907 | 6849 | } | ||
1908 | 6850 | |||
1909 | 6655 | ac_ext=c | 6851 | ac_ext=c |
1910 | 6656 | ac_cpp='$CPP $CPPFLAGS' | 6852 | ac_cpp='$CPP $CPPFLAGS' |
1911 | 6657 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 6853 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
1912 | @@ -6955,14 +7151,14 @@ | |||
1913 | 6955 | *) | 7151 | *) |
1914 | 6956 | enable_shared=no | 7152 | enable_shared=no |
1915 | 6957 | # Look at the argument we got. We use all the common list separators. | 7153 | # Look at the argument we got. We use all the common list separators. |
1917 | 6958 | lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," | 7154 | lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, |
1918 | 6959 | for pkg in $enableval; do | 7155 | for pkg in $enableval; do |
1920 | 6960 | IFS="$lt_save_ifs" | 7156 | IFS=$lt_save_ifs |
1921 | 6961 | if test "X$pkg" = "X$p"; then | 7157 | if test "X$pkg" = "X$p"; then |
1922 | 6962 | enable_shared=yes | 7158 | enable_shared=yes |
1923 | 6963 | fi | 7159 | fi |
1924 | 6964 | done | 7160 | done |
1926 | 6965 | IFS="$lt_save_ifs" | 7161 | IFS=$lt_save_ifs |
1927 | 6966 | ;; | 7162 | ;; |
1928 | 6967 | esac | 7163 | esac |
1929 | 6968 | else | 7164 | else |
1930 | @@ -6986,14 +7182,14 @@ | |||
1931 | 6986 | *) | 7182 | *) |
1932 | 6987 | enable_static=no | 7183 | enable_static=no |
1933 | 6988 | # Look at the argument we got. We use all the common list separators. | 7184 | # Look at the argument we got. We use all the common list separators. |
1935 | 6989 | lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," | 7185 | lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, |
1936 | 6990 | for pkg in $enableval; do | 7186 | for pkg in $enableval; do |
1938 | 6991 | IFS="$lt_save_ifs" | 7187 | IFS=$lt_save_ifs |
1939 | 6992 | if test "X$pkg" = "X$p"; then | 7188 | if test "X$pkg" = "X$p"; then |
1940 | 6993 | enable_static=yes | 7189 | enable_static=yes |
1941 | 6994 | fi | 7190 | fi |
1942 | 6995 | done | 7191 | done |
1944 | 6996 | IFS="$lt_save_ifs" | 7192 | IFS=$lt_save_ifs |
1945 | 6997 | ;; | 7193 | ;; |
1946 | 6998 | esac | 7194 | esac |
1947 | 6999 | else | 7195 | else |
1948 | @@ -7017,14 +7213,14 @@ | |||
1949 | 7017 | *) | 7213 | *) |
1950 | 7018 | pic_mode=default | 7214 | pic_mode=default |
1951 | 7019 | # Look at the argument we got. We use all the common list separators. | 7215 | # Look at the argument we got. We use all the common list separators. |
1953 | 7020 | lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," | 7216 | lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, |
1954 | 7021 | for lt_pkg in $withval; do | 7217 | for lt_pkg in $withval; do |
1956 | 7022 | IFS="$lt_save_ifs" | 7218 | IFS=$lt_save_ifs |
1957 | 7023 | if test "X$lt_pkg" = "X$lt_p"; then | 7219 | if test "X$lt_pkg" = "X$lt_p"; then |
1958 | 7024 | pic_mode=yes | 7220 | pic_mode=yes |
1959 | 7025 | fi | 7221 | fi |
1960 | 7026 | done | 7222 | done |
1962 | 7027 | IFS="$lt_save_ifs" | 7223 | IFS=$lt_save_ifs |
1963 | 7028 | ;; | 7224 | ;; |
1964 | 7029 | esac | 7225 | esac |
1965 | 7030 | else | 7226 | else |
1966 | @@ -7032,8 +7228,6 @@ | |||
1967 | 7032 | fi | 7228 | fi |
1968 | 7033 | 7229 | ||
1969 | 7034 | 7230 | ||
1970 | 7035 | test -z "$pic_mode" && pic_mode=default | ||
1971 | 7036 | |||
1972 | 7037 | 7231 | ||
1973 | 7038 | 7232 | ||
1974 | 7039 | 7233 | ||
1975 | @@ -7049,14 +7243,14 @@ | |||
1976 | 7049 | *) | 7243 | *) |
1977 | 7050 | enable_fast_install=no | 7244 | enable_fast_install=no |
1978 | 7051 | # Look at the argument we got. We use all the common list separators. | 7245 | # Look at the argument we got. We use all the common list separators. |
1980 | 7052 | lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," | 7246 | lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, |
1981 | 7053 | for pkg in $enableval; do | 7247 | for pkg in $enableval; do |
1983 | 7054 | IFS="$lt_save_ifs" | 7248 | IFS=$lt_save_ifs |
1984 | 7055 | if test "X$pkg" = "X$p"; then | 7249 | if test "X$pkg" = "X$p"; then |
1985 | 7056 | enable_fast_install=yes | 7250 | enable_fast_install=yes |
1986 | 7057 | fi | 7251 | fi |
1987 | 7058 | done | 7252 | done |
1989 | 7059 | IFS="$lt_save_ifs" | 7253 | IFS=$lt_save_ifs |
1990 | 7060 | ;; | 7254 | ;; |
1991 | 7061 | esac | 7255 | esac |
1992 | 7062 | else | 7256 | else |
1993 | @@ -7070,11 +7264,63 @@ | |||
1994 | 7070 | 7264 | ||
1995 | 7071 | 7265 | ||
1996 | 7072 | 7266 | ||
1997 | 7267 | shared_archive_member_spec= | ||
1998 | 7268 | case $host,$enable_shared in | ||
1999 | 7269 | power*-*-aix[5-9]*,yes) | ||
2000 | 7270 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 | ||
2001 | 7271 | $as_echo_n "checking which variant of shared library versioning to provide... " >&6; } | ||
2002 | 7272 | |||
2003 | 7273 | # Check whether --with-aix-soname was given. | ||
2004 | 7274 | if test "${with_aix_soname+set}" = set; then : | ||
2005 | 7275 | withval=$with_aix_soname; case $withval in | ||
2006 | 7276 | aix|svr4|both) | ||
2007 | 7277 | ;; | ||
2008 | 7278 | *) | ||
2009 | 7279 | as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5 | ||
2010 | 7280 | ;; | ||
2011 | 7281 | esac | ||
2012 | 7282 | lt_cv_with_aix_soname=$with_aix_soname | ||
2013 | 7283 | else | ||
2014 | 7284 | if ${lt_cv_with_aix_soname+:} false; then : | ||
2015 | 7285 | $as_echo_n "(cached) " >&6 | ||
2016 | 7286 | else | ||
2017 | 7287 | lt_cv_with_aix_soname=aix | ||
2018 | 7288 | fi | ||
2019 | 7289 | |||
2020 | 7290 | with_aix_soname=$lt_cv_with_aix_soname | ||
2021 | 7291 | fi | ||
2022 | 7292 | |||
2023 | 7293 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 | ||
2024 | 7294 | $as_echo "$with_aix_soname" >&6; } | ||
2025 | 7295 | if test aix != "$with_aix_soname"; then | ||
2026 | 7296 | # For the AIX way of multilib, we name the shared archive member | ||
2027 | 7297 | # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', | ||
2028 | 7298 | # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. | ||
2029 | 7299 | # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, | ||
2030 | 7300 | # the AIX toolchain works better with OBJECT_MODE set (default 32). | ||
2031 | 7301 | if test 64 = "${OBJECT_MODE-32}"; then | ||
2032 | 7302 | shared_archive_member_spec=shr_64 | ||
2033 | 7303 | else | ||
2034 | 7304 | shared_archive_member_spec=shr | ||
2035 | 7305 | fi | ||
2036 | 7306 | fi | ||
2037 | 7307 | ;; | ||
2038 | 7308 | *) | ||
2039 | 7309 | with_aix_soname=aix | ||
2040 | 7310 | ;; | ||
2041 | 7311 | esac | ||
2042 | 7312 | |||
2043 | 7313 | |||
2044 | 7314 | |||
2045 | 7315 | |||
2046 | 7316 | |||
2047 | 7317 | |||
2048 | 7318 | |||
2049 | 7073 | 7319 | ||
2050 | 7074 | 7320 | ||
2051 | 7075 | 7321 | ||
2052 | 7076 | # This can be used to rebuild libtool when needed | 7322 | # This can be used to rebuild libtool when needed |
2054 | 7077 | LIBTOOL_DEPS="$ltmain" | 7323 | LIBTOOL_DEPS=$ltmain |
2055 | 7078 | 7324 | ||
2056 | 7079 | # Always use our own libtool. | 7325 | # Always use our own libtool. |
2057 | 7080 | LIBTOOL='$(SHELL) $(top_builddir)/libtool' | 7326 | LIBTOOL='$(SHELL) $(top_builddir)/libtool' |
2058 | @@ -7123,7 +7369,7 @@ | |||
2059 | 7123 | 7369 | ||
2060 | 7124 | 7370 | ||
2061 | 7125 | 7371 | ||
2063 | 7126 | if test -n "${ZSH_VERSION+set}" ; then | 7372 | if test -n "${ZSH_VERSION+set}"; then |
2064 | 7127 | setopt NO_GLOB_SUBST | 7373 | setopt NO_GLOB_SUBST |
2065 | 7128 | fi | 7374 | fi |
2066 | 7129 | 7375 | ||
2067 | @@ -7162,7 +7408,7 @@ | |||
2068 | 7162 | # AIX sometimes has problems with the GCC collect2 program. For some | 7408 | # AIX sometimes has problems with the GCC collect2 program. For some |
2069 | 7163 | # reason, if we set the COLLECT_NAMES environment variable, the problems | 7409 | # reason, if we set the COLLECT_NAMES environment variable, the problems |
2070 | 7164 | # vanish in a puff of smoke. | 7410 | # vanish in a puff of smoke. |
2072 | 7165 | if test "X${COLLECT_NAMES+set}" != Xset; then | 7411 | if test set != "${COLLECT_NAMES+set}"; then |
2073 | 7166 | COLLECT_NAMES= | 7412 | COLLECT_NAMES= |
2074 | 7167 | export COLLECT_NAMES | 7413 | export COLLECT_NAMES |
2075 | 7168 | fi | 7414 | fi |
2076 | @@ -7173,14 +7419,14 @@ | |||
2077 | 7173 | ofile=libtool | 7419 | ofile=libtool |
2078 | 7174 | can_build_shared=yes | 7420 | can_build_shared=yes |
2079 | 7175 | 7421 | ||
2081 | 7176 | # All known linkers require a `.a' archive for static linking (except MSVC, | 7422 | # All known linkers require a '.a' archive for static linking (except MSVC, |
2082 | 7177 | # which needs '.lib'). | 7423 | # which needs '.lib'). |
2083 | 7178 | libext=a | 7424 | libext=a |
2084 | 7179 | 7425 | ||
2086 | 7180 | with_gnu_ld="$lt_cv_prog_gnu_ld" | 7426 | with_gnu_ld=$lt_cv_prog_gnu_ld |
2087 | 7181 | 7427 | ||
2090 | 7182 | old_CC="$CC" | 7428 | old_CC=$CC |
2091 | 7183 | old_CFLAGS="$CFLAGS" | 7429 | old_CFLAGS=$CFLAGS |
2092 | 7184 | 7430 | ||
2093 | 7185 | # Set sane defaults for various variables | 7431 | # Set sane defaults for various variables |
2094 | 7186 | test -z "$CC" && CC=cc | 7432 | test -z "$CC" && CC=cc |
2095 | @@ -7189,15 +7435,8 @@ | |||
2096 | 7189 | test -z "$LD" && LD=ld | 7435 | test -z "$LD" && LD=ld |
2097 | 7190 | test -z "$ac_objext" && ac_objext=o | 7436 | test -z "$ac_objext" && ac_objext=o |
2098 | 7191 | 7437 | ||
2108 | 7192 | for cc_temp in $compiler""; do | 7438 | func_cc_basename $compiler |
2109 | 7193 | case $cc_temp in | 7439 | cc_basename=$func_cc_basename_result |
2101 | 7194 | compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; | ||
2102 | 7195 | distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; | ||
2103 | 7196 | \-*) ;; | ||
2104 | 7197 | *) break;; | ||
2105 | 7198 | esac | ||
2106 | 7199 | done | ||
2107 | 7200 | cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` | ||
2110 | 7201 | 7440 | ||
2111 | 7202 | 7441 | ||
2112 | 7203 | # Only perform the check for file, if the check method requires it | 7442 | # Only perform the check for file, if the check method requires it |
2113 | @@ -7212,22 +7451,22 @@ | |||
2114 | 7212 | else | 7451 | else |
2115 | 7213 | case $MAGIC_CMD in | 7452 | case $MAGIC_CMD in |
2116 | 7214 | [\\/*] | ?:[\\/]*) | 7453 | [\\/*] | ?:[\\/]*) |
2118 | 7215 | lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. | 7454 | lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. |
2119 | 7216 | ;; | 7455 | ;; |
2120 | 7217 | *) | 7456 | *) |
2123 | 7218 | lt_save_MAGIC_CMD="$MAGIC_CMD" | 7457 | lt_save_MAGIC_CMD=$MAGIC_CMD |
2124 | 7219 | lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR | 7458 | lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR |
2125 | 7220 | ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" | 7459 | ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" |
2126 | 7221 | for ac_dir in $ac_dummy; do | 7460 | for ac_dir in $ac_dummy; do |
2128 | 7222 | IFS="$lt_save_ifs" | 7461 | IFS=$lt_save_ifs |
2129 | 7223 | test -z "$ac_dir" && ac_dir=. | 7462 | test -z "$ac_dir" && ac_dir=. |
2132 | 7224 | if test -f $ac_dir/${ac_tool_prefix}file; then | 7463 | if test -f "$ac_dir/${ac_tool_prefix}file"; then |
2133 | 7225 | lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" | 7464 | lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file" |
2134 | 7226 | if test -n "$file_magic_test_file"; then | 7465 | if test -n "$file_magic_test_file"; then |
2135 | 7227 | case $deplibs_check_method in | 7466 | case $deplibs_check_method in |
2136 | 7228 | "file_magic "*) | 7467 | "file_magic "*) |
2137 | 7229 | file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` | 7468 | file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` |
2139 | 7230 | MAGIC_CMD="$lt_cv_path_MAGIC_CMD" | 7469 | MAGIC_CMD=$lt_cv_path_MAGIC_CMD |
2140 | 7231 | if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | | 7470 | if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | |
2141 | 7232 | $EGREP "$file_magic_regex" > /dev/null; then | 7471 | $EGREP "$file_magic_regex" > /dev/null; then |
2142 | 7233 | : | 7472 | : |
2143 | @@ -7250,13 +7489,13 @@ | |||
2144 | 7250 | break | 7489 | break |
2145 | 7251 | fi | 7490 | fi |
2146 | 7252 | done | 7491 | done |
2149 | 7253 | IFS="$lt_save_ifs" | 7492 | IFS=$lt_save_ifs |
2150 | 7254 | MAGIC_CMD="$lt_save_MAGIC_CMD" | 7493 | MAGIC_CMD=$lt_save_MAGIC_CMD |
2151 | 7255 | ;; | 7494 | ;; |
2152 | 7256 | esac | 7495 | esac |
2153 | 7257 | fi | 7496 | fi |
2154 | 7258 | 7497 | ||
2156 | 7259 | MAGIC_CMD="$lt_cv_path_MAGIC_CMD" | 7498 | MAGIC_CMD=$lt_cv_path_MAGIC_CMD |
2157 | 7260 | if test -n "$MAGIC_CMD"; then | 7499 | if test -n "$MAGIC_CMD"; then |
2158 | 7261 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 | 7500 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 |
2159 | 7262 | $as_echo "$MAGIC_CMD" >&6; } | 7501 | $as_echo "$MAGIC_CMD" >&6; } |
2160 | @@ -7278,22 +7517,22 @@ | |||
2161 | 7278 | else | 7517 | else |
2162 | 7279 | case $MAGIC_CMD in | 7518 | case $MAGIC_CMD in |
2163 | 7280 | [\\/*] | ?:[\\/]*) | 7519 | [\\/*] | ?:[\\/]*) |
2165 | 7281 | lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. | 7520 | lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. |
2166 | 7282 | ;; | 7521 | ;; |
2167 | 7283 | *) | 7522 | *) |
2170 | 7284 | lt_save_MAGIC_CMD="$MAGIC_CMD" | 7523 | lt_save_MAGIC_CMD=$MAGIC_CMD |
2171 | 7285 | lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR | 7524 | lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR |
2172 | 7286 | ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" | 7525 | ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" |
2173 | 7287 | for ac_dir in $ac_dummy; do | 7526 | for ac_dir in $ac_dummy; do |
2175 | 7288 | IFS="$lt_save_ifs" | 7527 | IFS=$lt_save_ifs |
2176 | 7289 | test -z "$ac_dir" && ac_dir=. | 7528 | test -z "$ac_dir" && ac_dir=. |
2179 | 7290 | if test -f $ac_dir/file; then | 7529 | if test -f "$ac_dir/file"; then |
2180 | 7291 | lt_cv_path_MAGIC_CMD="$ac_dir/file" | 7530 | lt_cv_path_MAGIC_CMD=$ac_dir/"file" |
2181 | 7292 | if test -n "$file_magic_test_file"; then | 7531 | if test -n "$file_magic_test_file"; then |
2182 | 7293 | case $deplibs_check_method in | 7532 | case $deplibs_check_method in |
2183 | 7294 | "file_magic "*) | 7533 | "file_magic "*) |
2184 | 7295 | file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` | 7534 | file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` |
2186 | 7296 | MAGIC_CMD="$lt_cv_path_MAGIC_CMD" | 7535 | MAGIC_CMD=$lt_cv_path_MAGIC_CMD |
2187 | 7297 | if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | | 7536 | if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | |
2188 | 7298 | $EGREP "$file_magic_regex" > /dev/null; then | 7537 | $EGREP "$file_magic_regex" > /dev/null; then |
2189 | 7299 | : | 7538 | : |
2190 | @@ -7316,13 +7555,13 @@ | |||
2191 | 7316 | break | 7555 | break |
2192 | 7317 | fi | 7556 | fi |
2193 | 7318 | done | 7557 | done |
2196 | 7319 | IFS="$lt_save_ifs" | 7558 | IFS=$lt_save_ifs |
2197 | 7320 | MAGIC_CMD="$lt_save_MAGIC_CMD" | 7559 | MAGIC_CMD=$lt_save_MAGIC_CMD |
2198 | 7321 | ;; | 7560 | ;; |
2199 | 7322 | esac | 7561 | esac |
2200 | 7323 | fi | 7562 | fi |
2201 | 7324 | 7563 | ||
2203 | 7325 | MAGIC_CMD="$lt_cv_path_MAGIC_CMD" | 7564 | MAGIC_CMD=$lt_cv_path_MAGIC_CMD |
2204 | 7326 | if test -n "$MAGIC_CMD"; then | 7565 | if test -n "$MAGIC_CMD"; then |
2205 | 7327 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 | 7566 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 |
2206 | 7328 | $as_echo "$MAGIC_CMD" >&6; } | 7567 | $as_echo "$MAGIC_CMD" >&6; } |
2207 | @@ -7343,7 +7582,7 @@ | |||
2208 | 7343 | 7582 | ||
2209 | 7344 | # Use C for the default configuration in the libtool script | 7583 | # Use C for the default configuration in the libtool script |
2210 | 7345 | 7584 | ||
2212 | 7346 | lt_save_CC="$CC" | 7585 | lt_save_CC=$CC |
2213 | 7347 | ac_ext=c | 7586 | ac_ext=c |
2214 | 7348 | ac_cpp='$CPP $CPPFLAGS' | 7587 | ac_cpp='$CPP $CPPFLAGS' |
2215 | 7349 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 7588 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
2216 | @@ -7405,7 +7644,7 @@ | |||
2217 | 7405 | 7644 | ||
2218 | 7406 | lt_prog_compiler_no_builtin_flag= | 7645 | lt_prog_compiler_no_builtin_flag= |
2219 | 7407 | 7646 | ||
2221 | 7408 | if test "$GCC" = yes; then | 7647 | if test yes = "$GCC"; then |
2222 | 7409 | case $cc_basename in | 7648 | case $cc_basename in |
2223 | 7410 | nvcc*) | 7649 | nvcc*) |
2224 | 7411 | lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; | 7650 | lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; |
2225 | @@ -7421,7 +7660,7 @@ | |||
2226 | 7421 | lt_cv_prog_compiler_rtti_exceptions=no | 7660 | lt_cv_prog_compiler_rtti_exceptions=no |
2227 | 7422 | ac_outfile=conftest.$ac_objext | 7661 | ac_outfile=conftest.$ac_objext |
2228 | 7423 | echo "$lt_simple_compile_test_code" > conftest.$ac_ext | 7662 | echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
2230 | 7424 | lt_compiler_flag="-fno-rtti -fno-exceptions" | 7663 | lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment |
2231 | 7425 | # Insert the option either (1) after the last *FLAGS variable, or | 7664 | # Insert the option either (1) after the last *FLAGS variable, or |
2232 | 7426 | # (2) before a word containing "conftest.", or (3) at the end. | 7665 | # (2) before a word containing "conftest.", or (3) at the end. |
2233 | 7427 | # Note that $ac_compile itself does not contain backslashes and begins | 7666 | # Note that $ac_compile itself does not contain backslashes and begins |
2234 | @@ -7451,7 +7690,7 @@ | |||
2235 | 7451 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 | 7690 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 |
2236 | 7452 | $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } | 7691 | $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } |
2237 | 7453 | 7692 | ||
2239 | 7454 | if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then | 7693 | if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then |
2240 | 7455 | lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" | 7694 | lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" |
2241 | 7456 | else | 7695 | else |
2242 | 7457 | : | 7696 | : |
2243 | @@ -7469,17 +7708,18 @@ | |||
2244 | 7469 | lt_prog_compiler_static= | 7708 | lt_prog_compiler_static= |
2245 | 7470 | 7709 | ||
2246 | 7471 | 7710 | ||
2248 | 7472 | if test "$GCC" = yes; then | 7711 | if test yes = "$GCC"; then |
2249 | 7473 | lt_prog_compiler_wl='-Wl,' | 7712 | lt_prog_compiler_wl='-Wl,' |
2250 | 7474 | lt_prog_compiler_static='-static' | 7713 | lt_prog_compiler_static='-static' |
2251 | 7475 | 7714 | ||
2252 | 7476 | case $host_os in | 7715 | case $host_os in |
2253 | 7477 | aix*) | 7716 | aix*) |
2254 | 7478 | # All AIX code is PIC. | 7717 | # All AIX code is PIC. |
2256 | 7479 | if test "$host_cpu" = ia64; then | 7718 | if test ia64 = "$host_cpu"; then |
2257 | 7480 | # AIX 5 now supports IA64 processor | 7719 | # AIX 5 now supports IA64 processor |
2258 | 7481 | lt_prog_compiler_static='-Bstatic' | 7720 | lt_prog_compiler_static='-Bstatic' |
2259 | 7482 | fi | 7721 | fi |
2260 | 7722 | lt_prog_compiler_pic='-fPIC' | ||
2261 | 7483 | ;; | 7723 | ;; |
2262 | 7484 | 7724 | ||
2263 | 7485 | amigaos*) | 7725 | amigaos*) |
2264 | @@ -7490,8 +7730,8 @@ | |||
2265 | 7490 | ;; | 7730 | ;; |
2266 | 7491 | m68k) | 7731 | m68k) |
2267 | 7492 | # FIXME: we need at least 68020 code to build shared libraries, but | 7732 | # FIXME: we need at least 68020 code to build shared libraries, but |
2270 | 7493 | # adding the `-m68020' flag to GCC prevents building anything better, | 7733 | # adding the '-m68020' flag to GCC prevents building anything better, |
2271 | 7494 | # like `-m68040'. | 7734 | # like '-m68040'. |
2272 | 7495 | lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' | 7735 | lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' |
2273 | 7496 | ;; | 7736 | ;; |
2274 | 7497 | esac | 7737 | esac |
2275 | @@ -7507,6 +7747,11 @@ | |||
2276 | 7507 | # Although the cygwin gcc ignores -fPIC, still need this for old-style | 7747 | # Although the cygwin gcc ignores -fPIC, still need this for old-style |
2277 | 7508 | # (--disable-auto-import) libraries | 7748 | # (--disable-auto-import) libraries |
2278 | 7509 | lt_prog_compiler_pic='-DDLL_EXPORT' | 7749 | lt_prog_compiler_pic='-DDLL_EXPORT' |
2279 | 7750 | case $host_os in | ||
2280 | 7751 | os2*) | ||
2281 | 7752 | lt_prog_compiler_static='$wl-static' | ||
2282 | 7753 | ;; | ||
2283 | 7754 | esac | ||
2284 | 7510 | ;; | 7755 | ;; |
2285 | 7511 | 7756 | ||
2286 | 7512 | darwin* | rhapsody*) | 7757 | darwin* | rhapsody*) |
2287 | @@ -7577,7 +7822,7 @@ | |||
2288 | 7577 | case $host_os in | 7822 | case $host_os in |
2289 | 7578 | aix*) | 7823 | aix*) |
2290 | 7579 | lt_prog_compiler_wl='-Wl,' | 7824 | lt_prog_compiler_wl='-Wl,' |
2292 | 7580 | if test "$host_cpu" = ia64; then | 7825 | if test ia64 = "$host_cpu"; then |
2293 | 7581 | # AIX 5 now supports IA64 processor | 7826 | # AIX 5 now supports IA64 processor |
2294 | 7582 | lt_prog_compiler_static='-Bstatic' | 7827 | lt_prog_compiler_static='-Bstatic' |
2295 | 7583 | else | 7828 | else |
2296 | @@ -7585,10 +7830,29 @@ | |||
2297 | 7585 | fi | 7830 | fi |
2298 | 7586 | ;; | 7831 | ;; |
2299 | 7587 | 7832 | ||
2300 | 7833 | darwin* | rhapsody*) | ||
2301 | 7834 | # PIC is the default on this platform | ||
2302 | 7835 | # Common symbols not allowed in MH_DYLIB files | ||
2303 | 7836 | lt_prog_compiler_pic='-fno-common' | ||
2304 | 7837 | case $cc_basename in | ||
2305 | 7838 | nagfor*) | ||
2306 | 7839 | # NAG Fortran compiler | ||
2307 | 7840 | lt_prog_compiler_wl='-Wl,-Wl,,' | ||
2308 | 7841 | lt_prog_compiler_pic='-PIC' | ||
2309 | 7842 | lt_prog_compiler_static='-Bstatic' | ||
2310 | 7843 | ;; | ||
2311 | 7844 | esac | ||
2312 | 7845 | ;; | ||
2313 | 7846 | |||
2314 | 7588 | mingw* | cygwin* | pw32* | os2* | cegcc*) | 7847 | mingw* | cygwin* | pw32* | os2* | cegcc*) |
2315 | 7589 | # This hack is so that the source file can tell whether it is being | 7848 | # This hack is so that the source file can tell whether it is being |
2316 | 7590 | # built for inclusion in a dll (and should export symbols for example). | 7849 | # built for inclusion in a dll (and should export symbols for example). |
2317 | 7591 | lt_prog_compiler_pic='-DDLL_EXPORT' | 7850 | lt_prog_compiler_pic='-DDLL_EXPORT' |
2318 | 7851 | case $host_os in | ||
2319 | 7852 | os2*) | ||
2320 | 7853 | lt_prog_compiler_static='$wl-static' | ||
2321 | 7854 | ;; | ||
2322 | 7855 | esac | ||
2323 | 7592 | ;; | 7856 | ;; |
2324 | 7593 | 7857 | ||
2325 | 7594 | hpux9* | hpux10* | hpux11*) | 7858 | hpux9* | hpux10* | hpux11*) |
2326 | @@ -7604,7 +7868,7 @@ | |||
2327 | 7604 | ;; | 7868 | ;; |
2328 | 7605 | esac | 7869 | esac |
2329 | 7606 | # Is there a better lt_prog_compiler_static that works with the bundled CC? | 7870 | # Is there a better lt_prog_compiler_static that works with the bundled CC? |
2331 | 7607 | lt_prog_compiler_static='${wl}-a ${wl}archive' | 7871 | lt_prog_compiler_static='$wl-a ${wl}archive' |
2332 | 7608 | ;; | 7872 | ;; |
2333 | 7609 | 7873 | ||
2334 | 7610 | irix5* | irix6* | nonstopux*) | 7874 | irix5* | irix6* | nonstopux*) |
2335 | @@ -7615,7 +7879,7 @@ | |||
2336 | 7615 | 7879 | ||
2337 | 7616 | linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) | 7880 | linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) |
2338 | 7617 | case $cc_basename in | 7881 | case $cc_basename in |
2340 | 7618 | # old Intel for x86_64 which still supported -KPIC. | 7882 | # old Intel for x86_64, which still supported -KPIC. |
2341 | 7619 | ecc*) | 7883 | ecc*) |
2342 | 7620 | lt_prog_compiler_wl='-Wl,' | 7884 | lt_prog_compiler_wl='-Wl,' |
2343 | 7621 | lt_prog_compiler_pic='-KPIC' | 7885 | lt_prog_compiler_pic='-KPIC' |
2344 | @@ -7640,6 +7904,12 @@ | |||
2345 | 7640 | lt_prog_compiler_pic='-PIC' | 7904 | lt_prog_compiler_pic='-PIC' |
2346 | 7641 | lt_prog_compiler_static='-Bstatic' | 7905 | lt_prog_compiler_static='-Bstatic' |
2347 | 7642 | ;; | 7906 | ;; |
2348 | 7907 | tcc*) | ||
2349 | 7908 | # Fabrice Bellard et al's Tiny C Compiler | ||
2350 | 7909 | lt_prog_compiler_wl='-Wl,' | ||
2351 | 7910 | lt_prog_compiler_pic='-fPIC' | ||
2352 | 7911 | lt_prog_compiler_static='-static' | ||
2353 | 7912 | ;; | ||
2354 | 7643 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | 7913 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
2355 | 7644 | # Portland Group compilers (*not* the Pentium gcc compiler, | 7914 | # Portland Group compilers (*not* the Pentium gcc compiler, |
2356 | 7645 | # which looks to be a dead project) | 7915 | # which looks to be a dead project) |
2357 | @@ -7737,7 +8007,7 @@ | |||
2358 | 7737 | ;; | 8007 | ;; |
2359 | 7738 | 8008 | ||
2360 | 7739 | sysv4*MP*) | 8009 | sysv4*MP*) |
2362 | 7740 | if test -d /usr/nec ;then | 8010 | if test -d /usr/nec; then |
2363 | 7741 | lt_prog_compiler_pic='-Kconform_pic' | 8011 | lt_prog_compiler_pic='-Kconform_pic' |
2364 | 7742 | lt_prog_compiler_static='-Bstatic' | 8012 | lt_prog_compiler_static='-Bstatic' |
2365 | 7743 | fi | 8013 | fi |
2366 | @@ -7766,7 +8036,7 @@ | |||
2367 | 7766 | fi | 8036 | fi |
2368 | 7767 | 8037 | ||
2369 | 7768 | case $host_os in | 8038 | case $host_os in |
2371 | 7769 | # For platforms which do not support PIC, -DPIC is meaningless: | 8039 | # For platforms that do not support PIC, -DPIC is meaningless: |
2372 | 7770 | *djgpp*) | 8040 | *djgpp*) |
2373 | 7771 | lt_prog_compiler_pic= | 8041 | lt_prog_compiler_pic= |
2374 | 7772 | ;; | 8042 | ;; |
2375 | @@ -7798,7 +8068,7 @@ | |||
2376 | 7798 | lt_cv_prog_compiler_pic_works=no | 8068 | lt_cv_prog_compiler_pic_works=no |
2377 | 7799 | ac_outfile=conftest.$ac_objext | 8069 | ac_outfile=conftest.$ac_objext |
2378 | 7800 | echo "$lt_simple_compile_test_code" > conftest.$ac_ext | 8070 | echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
2380 | 7801 | lt_compiler_flag="$lt_prog_compiler_pic -DPIC" | 8071 | lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment |
2381 | 7802 | # Insert the option either (1) after the last *FLAGS variable, or | 8072 | # Insert the option either (1) after the last *FLAGS variable, or |
2382 | 7803 | # (2) before a word containing "conftest.", or (3) at the end. | 8073 | # (2) before a word containing "conftest.", or (3) at the end. |
2383 | 7804 | # Note that $ac_compile itself does not contain backslashes and begins | 8074 | # Note that $ac_compile itself does not contain backslashes and begins |
2384 | @@ -7828,7 +8098,7 @@ | |||
2385 | 7828 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 | 8098 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 |
2386 | 7829 | $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } | 8099 | $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } |
2387 | 7830 | 8100 | ||
2389 | 7831 | if test x"$lt_cv_prog_compiler_pic_works" = xyes; then | 8101 | if test yes = "$lt_cv_prog_compiler_pic_works"; then |
2390 | 7832 | case $lt_prog_compiler_pic in | 8102 | case $lt_prog_compiler_pic in |
2391 | 7833 | "" | " "*) ;; | 8103 | "" | " "*) ;; |
2392 | 7834 | *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; | 8104 | *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; |
2393 | @@ -7860,7 +8130,7 @@ | |||
2394 | 7860 | $as_echo_n "(cached) " >&6 | 8130 | $as_echo_n "(cached) " >&6 |
2395 | 7861 | else | 8131 | else |
2396 | 7862 | lt_cv_prog_compiler_static_works=no | 8132 | lt_cv_prog_compiler_static_works=no |
2398 | 7863 | save_LDFLAGS="$LDFLAGS" | 8133 | save_LDFLAGS=$LDFLAGS |
2399 | 7864 | LDFLAGS="$LDFLAGS $lt_tmp_static_flag" | 8134 | LDFLAGS="$LDFLAGS $lt_tmp_static_flag" |
2400 | 7865 | echo "$lt_simple_link_test_code" > conftest.$ac_ext | 8135 | echo "$lt_simple_link_test_code" > conftest.$ac_ext |
2401 | 7866 | if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then | 8136 | if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then |
2402 | @@ -7879,13 +8149,13 @@ | |||
2403 | 7879 | fi | 8149 | fi |
2404 | 7880 | fi | 8150 | fi |
2405 | 7881 | $RM -r conftest* | 8151 | $RM -r conftest* |
2407 | 7882 | LDFLAGS="$save_LDFLAGS" | 8152 | LDFLAGS=$save_LDFLAGS |
2408 | 7883 | 8153 | ||
2409 | 7884 | fi | 8154 | fi |
2410 | 7885 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 | 8155 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 |
2411 | 7886 | $as_echo "$lt_cv_prog_compiler_static_works" >&6; } | 8156 | $as_echo "$lt_cv_prog_compiler_static_works" >&6; } |
2412 | 7887 | 8157 | ||
2414 | 7888 | if test x"$lt_cv_prog_compiler_static_works" = xyes; then | 8158 | if test yes = "$lt_cv_prog_compiler_static_works"; then |
2415 | 7889 | : | 8159 | : |
2416 | 7890 | else | 8160 | else |
2417 | 7891 | lt_prog_compiler_static= | 8161 | lt_prog_compiler_static= |
2418 | @@ -8005,8 +8275,8 @@ | |||
2419 | 8005 | 8275 | ||
2420 | 8006 | 8276 | ||
2421 | 8007 | 8277 | ||
2424 | 8008 | hard_links="nottested" | 8278 | hard_links=nottested |
2425 | 8009 | if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then | 8279 | if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then |
2426 | 8010 | # do not overwrite the value of need_locks provided by the user | 8280 | # do not overwrite the value of need_locks provided by the user |
2427 | 8011 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 | 8281 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 |
2428 | 8012 | $as_echo_n "checking if we can lock with hard links... " >&6; } | 8282 | $as_echo_n "checking if we can lock with hard links... " >&6; } |
2429 | @@ -8018,9 +8288,9 @@ | |||
2430 | 8018 | ln conftest.a conftest.b 2>/dev/null && hard_links=no | 8288 | ln conftest.a conftest.b 2>/dev/null && hard_links=no |
2431 | 8019 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 | 8289 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 |
2432 | 8020 | $as_echo "$hard_links" >&6; } | 8290 | $as_echo "$hard_links" >&6; } |
2436 | 8021 | if test "$hard_links" = no; then | 8291 | if test no = "$hard_links"; then |
2437 | 8022 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 | 8292 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 |
2438 | 8023 | $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} | 8293 | $as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} |
2439 | 8024 | need_locks=warn | 8294 | need_locks=warn |
2440 | 8025 | fi | 8295 | fi |
2441 | 8026 | else | 8296 | else |
2442 | @@ -8063,9 +8333,9 @@ | |||
2443 | 8063 | # included in the symbol list | 8333 | # included in the symbol list |
2444 | 8064 | include_expsyms= | 8334 | include_expsyms= |
2445 | 8065 | # exclude_expsyms can be an extended regexp of symbols to exclude | 8335 | # exclude_expsyms can be an extended regexp of symbols to exclude |
2449 | 8066 | # it will be wrapped by ` (' and `)$', so one must not match beginning or | 8336 | # it will be wrapped by ' (' and ')$', so one must not match beginning or |
2450 | 8067 | # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', | 8337 | # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', |
2451 | 8068 | # as well as any symbol that contains `d'. | 8338 | # as well as any symbol that contains 'd'. |
2452 | 8069 | exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' | 8339 | exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' |
2453 | 8070 | # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out | 8340 | # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out |
2454 | 8071 | # platforms (ab)use it in PIC code, but their linkers get confused if | 8341 | # platforms (ab)use it in PIC code, but their linkers get confused if |
2455 | @@ -8080,7 +8350,7 @@ | |||
2456 | 8080 | # FIXME: the MSVC++ port hasn't been tested in a loooong time | 8350 | # FIXME: the MSVC++ port hasn't been tested in a loooong time |
2457 | 8081 | # When not using gcc, we currently assume that we are using | 8351 | # When not using gcc, we currently assume that we are using |
2458 | 8082 | # Microsoft Visual C++. | 8352 | # Microsoft Visual C++. |
2460 | 8083 | if test "$GCC" != yes; then | 8353 | if test yes != "$GCC"; then |
2461 | 8084 | with_gnu_ld=no | 8354 | with_gnu_ld=no |
2462 | 8085 | fi | 8355 | fi |
2463 | 8086 | ;; | 8356 | ;; |
2464 | @@ -8088,12 +8358,9 @@ | |||
2465 | 8088 | # we just hope/assume this is gcc and not c89 (= MSVC++) | 8358 | # we just hope/assume this is gcc and not c89 (= MSVC++) |
2466 | 8089 | with_gnu_ld=yes | 8359 | with_gnu_ld=yes |
2467 | 8090 | ;; | 8360 | ;; |
2469 | 8091 | openbsd*) | 8361 | openbsd* | bitrig*) |
2470 | 8092 | with_gnu_ld=no | 8362 | with_gnu_ld=no |
2471 | 8093 | ;; | 8363 | ;; |
2472 | 8094 | linux* | k*bsd*-gnu | gnu*) | ||
2473 | 8095 | link_all_deplibs=no | ||
2474 | 8096 | ;; | ||
2475 | 8097 | esac | 8364 | esac |
2476 | 8098 | 8365 | ||
2477 | 8099 | ld_shlibs=yes | 8366 | ld_shlibs=yes |
2478 | @@ -8101,7 +8368,7 @@ | |||
2479 | 8101 | # On some targets, GNU ld is compatible enough with the native linker | 8368 | # On some targets, GNU ld is compatible enough with the native linker |
2480 | 8102 | # that we're better off using the native interface for both. | 8369 | # that we're better off using the native interface for both. |
2481 | 8103 | lt_use_gnu_ld_interface=no | 8370 | lt_use_gnu_ld_interface=no |
2483 | 8104 | if test "$with_gnu_ld" = yes; then | 8371 | if test yes = "$with_gnu_ld"; then |
2484 | 8105 | case $host_os in | 8372 | case $host_os in |
2485 | 8106 | aix*) | 8373 | aix*) |
2486 | 8107 | # The AIX port of GNU ld has always aspired to compatibility | 8374 | # The AIX port of GNU ld has always aspired to compatibility |
2487 | @@ -8123,24 +8390,24 @@ | |||
2488 | 8123 | esac | 8390 | esac |
2489 | 8124 | fi | 8391 | fi |
2490 | 8125 | 8392 | ||
2492 | 8126 | if test "$lt_use_gnu_ld_interface" = yes; then | 8393 | if test yes = "$lt_use_gnu_ld_interface"; then |
2493 | 8127 | # If archive_cmds runs LD, not CC, wlarc should be empty | 8394 | # If archive_cmds runs LD, not CC, wlarc should be empty |
2495 | 8128 | wlarc='${wl}' | 8395 | wlarc='$wl' |
2496 | 8129 | 8396 | ||
2497 | 8130 | # Set some defaults for GNU ld with shared library support. These | 8397 | # Set some defaults for GNU ld with shared library support. These |
2498 | 8131 | # are reset later if shared libraries are not supported. Putting them | 8398 | # are reset later if shared libraries are not supported. Putting them |
2499 | 8132 | # here allows them to be overridden if necessary. | 8399 | # here allows them to be overridden if necessary. |
2500 | 8133 | runpath_var=LD_RUN_PATH | 8400 | runpath_var=LD_RUN_PATH |
2503 | 8134 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 8401 | hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' |
2504 | 8135 | export_dynamic_flag_spec='${wl}--export-dynamic' | 8402 | export_dynamic_flag_spec='$wl--export-dynamic' |
2505 | 8136 | # ancient GNU ld didn't support --whole-archive et. al. | 8403 | # ancient GNU ld didn't support --whole-archive et. al. |
2506 | 8137 | if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then | 8404 | if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then |
2508 | 8138 | whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' | 8405 | whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' |
2509 | 8139 | else | 8406 | else |
2510 | 8140 | whole_archive_flag_spec= | 8407 | whole_archive_flag_spec= |
2511 | 8141 | fi | 8408 | fi |
2512 | 8142 | supports_anon_versioning=no | 8409 | supports_anon_versioning=no |
2514 | 8143 | case `$LD -v 2>&1` in | 8410 | case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in |
2515 | 8144 | *GNU\ gold*) supports_anon_versioning=yes ;; | 8411 | *GNU\ gold*) supports_anon_versioning=yes ;; |
2516 | 8145 | *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 | 8412 | *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 |
2517 | 8146 | *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... | 8413 | *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... |
2518 | @@ -8153,7 +8420,7 @@ | |||
2519 | 8153 | case $host_os in | 8420 | case $host_os in |
2520 | 8154 | aix[3-9]*) | 8421 | aix[3-9]*) |
2521 | 8155 | # On AIX/PPC, the GNU linker is very broken | 8422 | # On AIX/PPC, the GNU linker is very broken |
2523 | 8156 | if test "$host_cpu" != ia64; then | 8423 | if test ia64 != "$host_cpu"; then |
2524 | 8157 | ld_shlibs=no | 8424 | ld_shlibs=no |
2525 | 8158 | cat <<_LT_EOF 1>&2 | 8425 | cat <<_LT_EOF 1>&2 |
2526 | 8159 | 8426 | ||
2527 | @@ -8172,7 +8439,7 @@ | |||
2528 | 8172 | case $host_cpu in | 8439 | case $host_cpu in |
2529 | 8173 | powerpc) | 8440 | powerpc) |
2530 | 8174 | # see comment about AmigaOS4 .so support | 8441 | # see comment about AmigaOS4 .so support |
2532 | 8175 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | 8442 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' |
2533 | 8176 | archive_expsym_cmds='' | 8443 | archive_expsym_cmds='' |
2534 | 8177 | ;; | 8444 | ;; |
2535 | 8178 | m68k) | 8445 | m68k) |
2536 | @@ -8188,7 +8455,7 @@ | |||
2537 | 8188 | allow_undefined_flag=unsupported | 8455 | allow_undefined_flag=unsupported |
2538 | 8189 | # Joseph Beckenbach <jrb3@best.com> says some releases of gcc | 8456 | # Joseph Beckenbach <jrb3@best.com> says some releases of gcc |
2539 | 8190 | # support --undefined. This deserves some investigation. FIXME | 8457 | # support --undefined. This deserves some investigation. FIXME |
2541 | 8191 | archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | 8458 | archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' |
2542 | 8192 | else | 8459 | else |
2543 | 8193 | ld_shlibs=no | 8460 | ld_shlibs=no |
2544 | 8194 | fi | 8461 | fi |
2545 | @@ -8198,7 +8465,7 @@ | |||
2546 | 8198 | # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, | 8465 | # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, |
2547 | 8199 | # as there is no search path for DLLs. | 8466 | # as there is no search path for DLLs. |
2548 | 8200 | hardcode_libdir_flag_spec='-L$libdir' | 8467 | hardcode_libdir_flag_spec='-L$libdir' |
2550 | 8201 | export_dynamic_flag_spec='${wl}--export-all-symbols' | 8468 | export_dynamic_flag_spec='$wl--export-all-symbols' |
2551 | 8202 | allow_undefined_flag=unsupported | 8469 | allow_undefined_flag=unsupported |
2552 | 8203 | always_export_symbols=no | 8470 | always_export_symbols=no |
2553 | 8204 | enable_shared_with_static_runtimes=yes | 8471 | enable_shared_with_static_runtimes=yes |
2554 | @@ -8206,61 +8473,89 @@ | |||
2555 | 8206 | exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' | 8473 | exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
2556 | 8207 | 8474 | ||
2557 | 8208 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 8475 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
2568 | 8209 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | 8476 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
2569 | 8210 | # If the export-symbols file already is a .def file (1st line | 8477 | # If the export-symbols file already is a .def file, use it as |
2570 | 8211 | # is EXPORTS), use it as is; otherwise, prepend... | 8478 | # is; otherwise, prepend EXPORTS... |
2571 | 8212 | archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | 8479 | archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then |
2572 | 8213 | cp $export_symbols $output_objdir/$soname.def; | 8480 | cp $export_symbols $output_objdir/$soname.def; |
2573 | 8214 | else | 8481 | else |
2574 | 8215 | echo EXPORTS > $output_objdir/$soname.def; | 8482 | echo EXPORTS > $output_objdir/$soname.def; |
2575 | 8216 | cat $export_symbols >> $output_objdir/$soname.def; | 8483 | cat $export_symbols >> $output_objdir/$soname.def; |
2576 | 8217 | fi~ | 8484 | fi~ |
2577 | 8218 | $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | 8485 | $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
2578 | 8219 | else | 8486 | else |
2579 | 8220 | ld_shlibs=no | 8487 | ld_shlibs=no |
2580 | 8221 | fi | 8488 | fi |
2581 | 8222 | ;; | 8489 | ;; |
2582 | 8223 | 8490 | ||
2583 | 8224 | haiku*) | 8491 | haiku*) |
2585 | 8225 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | 8492 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' |
2586 | 8226 | link_all_deplibs=yes | 8493 | link_all_deplibs=yes |
2587 | 8227 | ;; | 8494 | ;; |
2588 | 8228 | 8495 | ||
2589 | 8496 | os2*) | ||
2590 | 8497 | hardcode_libdir_flag_spec='-L$libdir' | ||
2591 | 8498 | hardcode_minus_L=yes | ||
2592 | 8499 | allow_undefined_flag=unsupported | ||
2593 | 8500 | shrext_cmds=.dll | ||
2594 | 8501 | archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ | ||
2595 | 8502 | $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ | ||
2596 | 8503 | $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ | ||
2597 | 8504 | $ECHO EXPORTS >> $output_objdir/$libname.def~ | ||
2598 | 8505 | emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ | ||
2599 | 8506 | $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ | ||
2600 | 8507 | emximp -o $lib $output_objdir/$libname.def' | ||
2601 | 8508 | archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ | ||
2602 | 8509 | $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ | ||
2603 | 8510 | $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ | ||
2604 | 8511 | $ECHO EXPORTS >> $output_objdir/$libname.def~ | ||
2605 | 8512 | prefix_cmds="$SED"~ | ||
2606 | 8513 | if test EXPORTS = "`$SED 1q $export_symbols`"; then | ||
2607 | 8514 | prefix_cmds="$prefix_cmds -e 1d"; | ||
2608 | 8515 | fi~ | ||
2609 | 8516 | prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ | ||
2610 | 8517 | cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ | ||
2611 | 8518 | $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ | ||
2612 | 8519 | emximp -o $lib $output_objdir/$libname.def' | ||
2613 | 8520 | old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' | ||
2614 | 8521 | enable_shared_with_static_runtimes=yes | ||
2615 | 8522 | ;; | ||
2616 | 8523 | |||
2617 | 8229 | interix[3-9]*) | 8524 | interix[3-9]*) |
2618 | 8230 | hardcode_direct=no | 8525 | hardcode_direct=no |
2619 | 8231 | hardcode_shlibpath_var=no | 8526 | hardcode_shlibpath_var=no |
2622 | 8232 | hardcode_libdir_flag_spec='${wl}-rpath,$libdir' | 8527 | hardcode_libdir_flag_spec='$wl-rpath,$libdir' |
2623 | 8233 | export_dynamic_flag_spec='${wl}-E' | 8528 | export_dynamic_flag_spec='$wl-E' |
2624 | 8234 | # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. | 8529 | # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. |
2625 | 8235 | # Instead, shared libraries are loaded at an image base (0x10000000 by | 8530 | # Instead, shared libraries are loaded at an image base (0x10000000 by |
2626 | 8236 | # default) and relocated if they conflict, which is a slow very memory | 8531 | # default) and relocated if they conflict, which is a slow very memory |
2627 | 8237 | # consuming and fragmenting process. To avoid this, we pick a random, | 8532 | # consuming and fragmenting process. To avoid this, we pick a random, |
2628 | 8238 | # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link | 8533 | # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link |
2629 | 8239 | # time. Moving up from 0x10000000 also allows more sbrk(2) space. | 8534 | # time. Moving up from 0x10000000 also allows more sbrk(2) space. |
2632 | 8240 | archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' | 8535 | archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' |
2633 | 8241 | archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' | 8536 | archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' |
2634 | 8242 | ;; | 8537 | ;; |
2635 | 8243 | 8538 | ||
2636 | 8244 | gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) | 8539 | gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) |
2637 | 8245 | tmp_diet=no | 8540 | tmp_diet=no |
2639 | 8246 | if test "$host_os" = linux-dietlibc; then | 8541 | if test linux-dietlibc = "$host_os"; then |
2640 | 8247 | case $cc_basename in | 8542 | case $cc_basename in |
2641 | 8248 | diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) | 8543 | diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) |
2642 | 8249 | esac | 8544 | esac |
2643 | 8250 | fi | 8545 | fi |
2644 | 8251 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ | 8546 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ |
2646 | 8252 | && test "$tmp_diet" = no | 8547 | && test no = "$tmp_diet" |
2647 | 8253 | then | 8548 | then |
2648 | 8254 | tmp_addflag=' $pic_flag' | 8549 | tmp_addflag=' $pic_flag' |
2649 | 8255 | tmp_sharedflag='-shared' | 8550 | tmp_sharedflag='-shared' |
2650 | 8256 | case $cc_basename,$host_cpu in | 8551 | case $cc_basename,$host_cpu in |
2651 | 8257 | pgcc*) # Portland Group C compiler | 8552 | pgcc*) # Portland Group C compiler |
2653 | 8258 | whole_archive_flag_spec='${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' | 8553 | whole_archive_flag_spec='$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' |
2654 | 8259 | tmp_addflag=' $pic_flag' | 8554 | tmp_addflag=' $pic_flag' |
2655 | 8260 | ;; | 8555 | ;; |
2656 | 8261 | pgf77* | pgf90* | pgf95* | pgfortran*) | 8556 | pgf77* | pgf90* | pgf95* | pgfortran*) |
2657 | 8262 | # Portland Group f77 and f90 compilers | 8557 | # Portland Group f77 and f90 compilers |
2659 | 8263 | whole_archive_flag_spec='${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' | 8558 | whole_archive_flag_spec='$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' |
2660 | 8264 | tmp_addflag=' $pic_flag -Mnomain' ;; | 8559 | tmp_addflag=' $pic_flag -Mnomain' ;; |
2661 | 8265 | ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 | 8560 | ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 |
2662 | 8266 | tmp_addflag=' -i_dynamic' ;; | 8561 | tmp_addflag=' -i_dynamic' ;; |
2663 | @@ -8271,42 +8566,47 @@ | |||
2664 | 8271 | lf95*) # Lahey Fortran 8.1 | 8566 | lf95*) # Lahey Fortran 8.1 |
2665 | 8272 | whole_archive_flag_spec= | 8567 | whole_archive_flag_spec= |
2666 | 8273 | tmp_sharedflag='--shared' ;; | 8568 | tmp_sharedflag='--shared' ;; |
2667 | 8569 | nagfor*) # NAGFOR 5.3 | ||
2668 | 8570 | tmp_sharedflag='-Wl,-shared' ;; | ||
2669 | 8274 | xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) | 8571 | xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) |
2670 | 8275 | tmp_sharedflag='-qmkshrobj' | 8572 | tmp_sharedflag='-qmkshrobj' |
2671 | 8276 | tmp_addflag= ;; | 8573 | tmp_addflag= ;; |
2672 | 8277 | nvcc*) # Cuda Compiler Driver 2.2 | 8574 | nvcc*) # Cuda Compiler Driver 2.2 |
2674 | 8278 | whole_archive_flag_spec='${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' | 8575 | whole_archive_flag_spec='$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' |
2675 | 8279 | compiler_needs_object=yes | 8576 | compiler_needs_object=yes |
2676 | 8280 | ;; | 8577 | ;; |
2677 | 8281 | esac | 8578 | esac |
2678 | 8282 | case `$CC -V 2>&1 | sed 5q` in | 8579 | case `$CC -V 2>&1 | sed 5q` in |
2679 | 8283 | *Sun\ C*) # Sun C 5.9 | 8580 | *Sun\ C*) # Sun C 5.9 |
2681 | 8284 | whole_archive_flag_spec='${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' | 8581 | whole_archive_flag_spec='$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' |
2682 | 8285 | compiler_needs_object=yes | 8582 | compiler_needs_object=yes |
2683 | 8286 | tmp_sharedflag='-G' ;; | 8583 | tmp_sharedflag='-G' ;; |
2684 | 8287 | *Sun\ F*) # Sun Fortran 8.3 | 8584 | *Sun\ F*) # Sun Fortran 8.3 |
2685 | 8288 | tmp_sharedflag='-G' ;; | 8585 | tmp_sharedflag='-G' ;; |
2686 | 8289 | esac | 8586 | esac |
2688 | 8290 | archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | 8587 | archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' |
2689 | 8291 | 8588 | ||
2691 | 8292 | if test "x$supports_anon_versioning" = xyes; then | 8589 | if test yes = "$supports_anon_versioning"; then |
2692 | 8293 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ | 8590 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
2696 | 8294 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ | 8591 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
2697 | 8295 | echo "local: *; };" >> $output_objdir/$libname.ver~ | 8592 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
2698 | 8296 | $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' | 8593 | $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' |
2699 | 8297 | fi | 8594 | fi |
2700 | 8298 | 8595 | ||
2701 | 8299 | case $cc_basename in | 8596 | case $cc_basename in |
2702 | 8597 | tcc*) | ||
2703 | 8598 | export_dynamic_flag_spec='-rdynamic' | ||
2704 | 8599 | ;; | ||
2705 | 8300 | xlf* | bgf* | bgxlf* | mpixlf*) | 8600 | xlf* | bgf* | bgxlf* | mpixlf*) |
2706 | 8301 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself | 8601 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself |
2707 | 8302 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | 8602 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
2709 | 8303 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 8603 | hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' |
2710 | 8304 | archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' | 8604 | archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
2712 | 8305 | if test "x$supports_anon_versioning" = xyes; then | 8605 | if test yes = "$supports_anon_versioning"; then |
2713 | 8306 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ | 8606 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
2717 | 8307 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ | 8607 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
2718 | 8308 | echo "local: *; };" >> $output_objdir/$libname.ver~ | 8608 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
2719 | 8309 | $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | 8609 | $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
2720 | 8310 | fi | 8610 | fi |
2721 | 8311 | ;; | 8611 | ;; |
2722 | 8312 | esac | 8612 | esac |
2723 | @@ -8315,13 +8615,13 @@ | |||
2724 | 8315 | fi | 8615 | fi |
2725 | 8316 | ;; | 8616 | ;; |
2726 | 8317 | 8617 | ||
2728 | 8318 | netbsd* | netbsdelf*-gnu) | 8618 | netbsd*) |
2729 | 8319 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then | 8619 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
2730 | 8320 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 8620 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
2731 | 8321 | wlarc= | 8621 | wlarc= |
2732 | 8322 | else | 8622 | else |
2735 | 8323 | archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | 8623 | archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' |
2736 | 8324 | archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | 8624 | archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' |
2737 | 8325 | fi | 8625 | fi |
2738 | 8326 | ;; | 8626 | ;; |
2739 | 8327 | 8627 | ||
2740 | @@ -8339,8 +8639,8 @@ | |||
2741 | 8339 | 8639 | ||
2742 | 8340 | _LT_EOF | 8640 | _LT_EOF |
2743 | 8341 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 8641 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
2746 | 8342 | archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | 8642 | archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' |
2747 | 8343 | archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | 8643 | archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' |
2748 | 8344 | else | 8644 | else |
2749 | 8345 | ld_shlibs=no | 8645 | ld_shlibs=no |
2750 | 8346 | fi | 8646 | fi |
2751 | @@ -8352,7 +8652,7 @@ | |||
2752 | 8352 | ld_shlibs=no | 8652 | ld_shlibs=no |
2753 | 8353 | cat <<_LT_EOF 1>&2 | 8653 | cat <<_LT_EOF 1>&2 |
2754 | 8354 | 8654 | ||
2756 | 8355 | *** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not | 8655 | *** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot |
2757 | 8356 | *** reliably create shared libraries on SCO systems. Therefore, libtool | 8656 | *** reliably create shared libraries on SCO systems. Therefore, libtool |
2758 | 8357 | *** is disabling shared libraries support. We urge you to upgrade GNU | 8657 | *** is disabling shared libraries support. We urge you to upgrade GNU |
2759 | 8358 | *** binutils to release 2.16.91.0.3 or newer. Another option is to modify | 8658 | *** binutils to release 2.16.91.0.3 or newer. Another option is to modify |
2760 | @@ -8367,9 +8667,9 @@ | |||
2761 | 8367 | # DT_RUNPATH tag from executables and libraries. But doing so | 8667 | # DT_RUNPATH tag from executables and libraries. But doing so |
2762 | 8368 | # requires that you compile everything twice, which is a pain. | 8668 | # requires that you compile everything twice, which is a pain. |
2763 | 8369 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 8669 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
2767 | 8370 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 8670 | hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' |
2768 | 8371 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | 8671 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' |
2769 | 8372 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | 8672 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' |
2770 | 8373 | else | 8673 | else |
2771 | 8374 | ld_shlibs=no | 8674 | ld_shlibs=no |
2772 | 8375 | fi | 8675 | fi |
2773 | @@ -8386,15 +8686,15 @@ | |||
2774 | 8386 | 8686 | ||
2775 | 8387 | *) | 8687 | *) |
2776 | 8388 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 8688 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
2779 | 8389 | archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | 8689 | archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' |
2780 | 8390 | archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | 8690 | archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' |
2781 | 8391 | else | 8691 | else |
2782 | 8392 | ld_shlibs=no | 8692 | ld_shlibs=no |
2783 | 8393 | fi | 8693 | fi |
2784 | 8394 | ;; | 8694 | ;; |
2785 | 8395 | esac | 8695 | esac |
2786 | 8396 | 8696 | ||
2788 | 8397 | if test "$ld_shlibs" = no; then | 8697 | if test no = "$ld_shlibs"; then |
2789 | 8398 | runpath_var= | 8698 | runpath_var= |
2790 | 8399 | hardcode_libdir_flag_spec= | 8699 | hardcode_libdir_flag_spec= |
2791 | 8400 | export_dynamic_flag_spec= | 8700 | export_dynamic_flag_spec= |
2792 | @@ -8410,7 +8710,7 @@ | |||
2793 | 8410 | # Note: this linker hardcodes the directories in LIBPATH if there | 8710 | # Note: this linker hardcodes the directories in LIBPATH if there |
2794 | 8411 | # are no directories specified by -L. | 8711 | # are no directories specified by -L. |
2795 | 8412 | hardcode_minus_L=yes | 8712 | hardcode_minus_L=yes |
2797 | 8413 | if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then | 8713 | if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then |
2798 | 8414 | # Neither direct hardcoding nor static linking is supported with a | 8714 | # Neither direct hardcoding nor static linking is supported with a |
2799 | 8415 | # broken collect2. | 8715 | # broken collect2. |
2800 | 8416 | hardcode_direct=unsupported | 8716 | hardcode_direct=unsupported |
2801 | @@ -8418,34 +8718,57 @@ | |||
2802 | 8418 | ;; | 8718 | ;; |
2803 | 8419 | 8719 | ||
2804 | 8420 | aix[4-9]*) | 8720 | aix[4-9]*) |
2806 | 8421 | if test "$host_cpu" = ia64; then | 8721 | if test ia64 = "$host_cpu"; then |
2807 | 8422 | # On IA64, the linker does run time linking by default, so we don't | 8722 | # On IA64, the linker does run time linking by default, so we don't |
2808 | 8423 | # have to do anything special. | 8723 | # have to do anything special. |
2809 | 8424 | aix_use_runtimelinking=no | 8724 | aix_use_runtimelinking=no |
2810 | 8425 | exp_sym_flag='-Bexport' | 8725 | exp_sym_flag='-Bexport' |
2812 | 8426 | no_entry_flag="" | 8726 | no_entry_flag= |
2813 | 8427 | else | 8727 | else |
2814 | 8428 | # If we're using GNU nm, then we don't want the "-C" option. | 8728 | # If we're using GNU nm, then we don't want the "-C" option. |
2818 | 8429 | # -C means demangle to AIX nm, but means don't demangle with GNU nm | 8729 | # -C means demangle to GNU nm, but means don't demangle to AIX nm. |
2819 | 8430 | # Also, AIX nm treats weak defined symbols like other global | 8730 | # Without the "-l" option, or with the "-B" option, AIX nm treats |
2820 | 8431 | # defined symbols, whereas GNU nm marks them as "W". | 8731 | # weak defined symbols like other global defined symbols, whereas |
2821 | 8732 | # GNU nm marks them as "W". | ||
2822 | 8733 | # While the 'weak' keyword is ignored in the Export File, we need | ||
2823 | 8734 | # it in the Import File for the 'aix-soname' feature, so we have | ||
2824 | 8735 | # to replace the "-B" option with "-P" for AIX nm. | ||
2825 | 8432 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then | 8736 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then |
2827 | 8433 | export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' | 8737 | export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' |
2828 | 8434 | else | 8738 | else |
2830 | 8435 | export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' | 8739 | export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' |
2831 | 8436 | fi | 8740 | fi |
2832 | 8437 | aix_use_runtimelinking=no | 8741 | aix_use_runtimelinking=no |
2833 | 8438 | 8742 | ||
2834 | 8439 | # Test if we are trying to use run time linking or normal | 8743 | # Test if we are trying to use run time linking or normal |
2835 | 8440 | # AIX style linking. If -brtl is somewhere in LDFLAGS, we | 8744 | # AIX style linking. If -brtl is somewhere in LDFLAGS, we |
2837 | 8441 | # need to do runtime linking. | 8745 | # have runtime linking enabled, and use it for executables. |
2838 | 8746 | # For shared libraries, we enable/disable runtime linking | ||
2839 | 8747 | # depending on the kind of the shared library created - | ||
2840 | 8748 | # when "with_aix_soname,aix_use_runtimelinking" is: | ||
2841 | 8749 | # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables | ||
2842 | 8750 | # "aix,yes" lib.so shared, rtl:yes, for executables | ||
2843 | 8751 | # lib.a static archive | ||
2844 | 8752 | # "both,no" lib.so.V(shr.o) shared, rtl:yes | ||
2845 | 8753 | # lib.a(lib.so.V) shared, rtl:no, for executables | ||
2846 | 8754 | # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables | ||
2847 | 8755 | # lib.a(lib.so.V) shared, rtl:no | ||
2848 | 8756 | # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables | ||
2849 | 8757 | # lib.a static archive | ||
2850 | 8442 | case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) | 8758 | case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) |
2851 | 8443 | for ld_flag in $LDFLAGS; do | 8759 | for ld_flag in $LDFLAGS; do |
2853 | 8444 | if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then | 8760 | if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then |
2854 | 8445 | aix_use_runtimelinking=yes | 8761 | aix_use_runtimelinking=yes |
2855 | 8446 | break | 8762 | break |
2856 | 8447 | fi | 8763 | fi |
2857 | 8448 | done | 8764 | done |
2858 | 8765 | if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then | ||
2859 | 8766 | # With aix-soname=svr4, we create the lib.so.V shared archives only, | ||
2860 | 8767 | # so we don't have lib.a shared libs to link our executables. | ||
2861 | 8768 | # We have to force runtime linking in this case. | ||
2862 | 8769 | aix_use_runtimelinking=yes | ||
2863 | 8770 | LDFLAGS="$LDFLAGS -Wl,-brtl" | ||
2864 | 8771 | fi | ||
2865 | 8449 | ;; | 8772 | ;; |
2866 | 8450 | esac | 8773 | esac |
2867 | 8451 | 8774 | ||
2868 | @@ -8464,13 +8787,21 @@ | |||
2869 | 8464 | hardcode_direct_absolute=yes | 8787 | hardcode_direct_absolute=yes |
2870 | 8465 | hardcode_libdir_separator=':' | 8788 | hardcode_libdir_separator=':' |
2871 | 8466 | link_all_deplibs=yes | 8789 | link_all_deplibs=yes |
2873 | 8467 | file_list_spec='${wl}-f,' | 8790 | file_list_spec='$wl-f,' |
2874 | 8791 | case $with_aix_soname,$aix_use_runtimelinking in | ||
2875 | 8792 | aix,*) ;; # traditional, no import file | ||
2876 | 8793 | svr4,* | *,yes) # use import file | ||
2877 | 8794 | # The Import File defines what to hardcode. | ||
2878 | 8795 | hardcode_direct=no | ||
2879 | 8796 | hardcode_direct_absolute=no | ||
2880 | 8797 | ;; | ||
2881 | 8798 | esac | ||
2882 | 8468 | 8799 | ||
2884 | 8469 | if test "$GCC" = yes; then | 8800 | if test yes = "$GCC"; then |
2885 | 8470 | case $host_os in aix4.[012]|aix4.[012].*) | 8801 | case $host_os in aix4.[012]|aix4.[012].*) |
2886 | 8471 | # We only want to do this on AIX 4.2 and lower, the check | 8802 | # We only want to do this on AIX 4.2 and lower, the check |
2887 | 8472 | # below for broken collect2 doesn't work under 4.3+ | 8803 | # below for broken collect2 doesn't work under 4.3+ |
2889 | 8473 | collect2name=`${CC} -print-prog-name=collect2` | 8804 | collect2name=`$CC -print-prog-name=collect2` |
2890 | 8474 | if test -f "$collect2name" && | 8805 | if test -f "$collect2name" && |
2891 | 8475 | strings "$collect2name" | $GREP resolve_lib_name >/dev/null | 8806 | strings "$collect2name" | $GREP resolve_lib_name >/dev/null |
2892 | 8476 | then | 8807 | then |
2893 | @@ -8489,36 +8820,42 @@ | |||
2894 | 8489 | ;; | 8820 | ;; |
2895 | 8490 | esac | 8821 | esac |
2896 | 8491 | shared_flag='-shared' | 8822 | shared_flag='-shared' |
2899 | 8492 | if test "$aix_use_runtimelinking" = yes; then | 8823 | if test yes = "$aix_use_runtimelinking"; then |
2900 | 8493 | shared_flag="$shared_flag "'${wl}-G' | 8824 | shared_flag="$shared_flag "'$wl-G' |
2901 | 8494 | fi | 8825 | fi |
2903 | 8495 | link_all_deplibs=no | 8826 | # Need to ensure runtime linking is disabled for the traditional |
2904 | 8827 | # shared library, or the linker may eventually find shared libraries | ||
2905 | 8828 | # /with/ Import File - we do not want to mix them. | ||
2906 | 8829 | shared_flag_aix='-shared' | ||
2907 | 8830 | shared_flag_svr4='-shared $wl-G' | ||
2908 | 8496 | else | 8831 | else |
2909 | 8497 | # not using gcc | 8832 | # not using gcc |
2911 | 8498 | if test "$host_cpu" = ia64; then | 8833 | if test ia64 = "$host_cpu"; then |
2912 | 8499 | # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release | 8834 | # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release |
2913 | 8500 | # chokes on -Wl,-G. The following line is correct: | 8835 | # chokes on -Wl,-G. The following line is correct: |
2914 | 8501 | shared_flag='-G' | 8836 | shared_flag='-G' |
2915 | 8502 | else | 8837 | else |
2918 | 8503 | if test "$aix_use_runtimelinking" = yes; then | 8838 | if test yes = "$aix_use_runtimelinking"; then |
2919 | 8504 | shared_flag='${wl}-G' | 8839 | shared_flag='$wl-G' |
2920 | 8505 | else | 8840 | else |
2922 | 8506 | shared_flag='${wl}-bM:SRE' | 8841 | shared_flag='$wl-bM:SRE' |
2923 | 8507 | fi | 8842 | fi |
2924 | 8843 | shared_flag_aix='$wl-bM:SRE' | ||
2925 | 8844 | shared_flag_svr4='$wl-G' | ||
2926 | 8508 | fi | 8845 | fi |
2927 | 8509 | fi | 8846 | fi |
2928 | 8510 | 8847 | ||
2930 | 8511 | export_dynamic_flag_spec='${wl}-bexpall' | 8848 | export_dynamic_flag_spec='$wl-bexpall' |
2931 | 8512 | # It seems that -bexpall does not export symbols beginning with | 8849 | # It seems that -bexpall does not export symbols beginning with |
2932 | 8513 | # underscore (_), so it is better to generate a list of symbols to export. | 8850 | # underscore (_), so it is better to generate a list of symbols to export. |
2933 | 8514 | always_export_symbols=yes | 8851 | always_export_symbols=yes |
2935 | 8515 | if test "$aix_use_runtimelinking" = yes; then | 8852 | if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then |
2936 | 8516 | # Warning - without using the other runtime loading flags (-brtl), | 8853 | # Warning - without using the other runtime loading flags (-brtl), |
2937 | 8517 | # -berok will link without error, but may produce a broken library. | 8854 | # -berok will link without error, but may produce a broken library. |
2938 | 8518 | allow_undefined_flag='-berok' | 8855 | allow_undefined_flag='-berok' |
2939 | 8519 | # Determine the default libpath from the value encoded in an | 8856 | # Determine the default libpath from the value encoded in an |
2940 | 8520 | # empty executable. | 8857 | # empty executable. |
2942 | 8521 | if test "${lt_cv_aix_libpath+set}" = set; then | 8858 | if test set = "${lt_cv_aix_libpath+set}"; then |
2943 | 8522 | aix_libpath=$lt_cv_aix_libpath | 8859 | aix_libpath=$lt_cv_aix_libpath |
2944 | 8523 | else | 8860 | else |
2945 | 8524 | if ${lt_cv_aix_libpath_+:} false; then : | 8861 | if ${lt_cv_aix_libpath_+:} false; then : |
2946 | @@ -8553,7 +8890,7 @@ | |||
2947 | 8553 | rm -f core conftest.err conftest.$ac_objext \ | 8890 | rm -f core conftest.err conftest.$ac_objext \ |
2948 | 8554 | conftest$ac_exeext conftest.$ac_ext | 8891 | conftest$ac_exeext conftest.$ac_ext |
2949 | 8555 | if test -z "$lt_cv_aix_libpath_"; then | 8892 | if test -z "$lt_cv_aix_libpath_"; then |
2951 | 8556 | lt_cv_aix_libpath_="/usr/lib:/lib" | 8893 | lt_cv_aix_libpath_=/usr/lib:/lib |
2952 | 8557 | fi | 8894 | fi |
2953 | 8558 | 8895 | ||
2954 | 8559 | fi | 8896 | fi |
2955 | @@ -8561,17 +8898,17 @@ | |||
2956 | 8561 | aix_libpath=$lt_cv_aix_libpath_ | 8898 | aix_libpath=$lt_cv_aix_libpath_ |
2957 | 8562 | fi | 8899 | fi |
2958 | 8563 | 8900 | ||
2961 | 8564 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 8901 | hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" |
2962 | 8565 | archive_expsym_cmds='$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" | 8902 | archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag |
2963 | 8566 | else | 8903 | else |
2966 | 8567 | if test "$host_cpu" = ia64; then | 8904 | if test ia64 = "$host_cpu"; then |
2967 | 8568 | hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' | 8905 | hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib' |
2968 | 8569 | allow_undefined_flag="-z nodefs" | 8906 | allow_undefined_flag="-z nodefs" |
2970 | 8570 | archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" | 8907 | archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" |
2971 | 8571 | else | 8908 | else |
2972 | 8572 | # Determine the default libpath from the value encoded in an | 8909 | # Determine the default libpath from the value encoded in an |
2973 | 8573 | # empty executable. | 8910 | # empty executable. |
2975 | 8574 | if test "${lt_cv_aix_libpath+set}" = set; then | 8911 | if test set = "${lt_cv_aix_libpath+set}"; then |
2976 | 8575 | aix_libpath=$lt_cv_aix_libpath | 8912 | aix_libpath=$lt_cv_aix_libpath |
2977 | 8576 | else | 8913 | else |
2978 | 8577 | if ${lt_cv_aix_libpath_+:} false; then : | 8914 | if ${lt_cv_aix_libpath_+:} false; then : |
2979 | @@ -8606,7 +8943,7 @@ | |||
2980 | 8606 | rm -f core conftest.err conftest.$ac_objext \ | 8943 | rm -f core conftest.err conftest.$ac_objext \ |
2981 | 8607 | conftest$ac_exeext conftest.$ac_ext | 8944 | conftest$ac_exeext conftest.$ac_ext |
2982 | 8608 | if test -z "$lt_cv_aix_libpath_"; then | 8945 | if test -z "$lt_cv_aix_libpath_"; then |
2984 | 8609 | lt_cv_aix_libpath_="/usr/lib:/lib" | 8946 | lt_cv_aix_libpath_=/usr/lib:/lib |
2985 | 8610 | fi | 8947 | fi |
2986 | 8611 | 8948 | ||
2987 | 8612 | fi | 8949 | fi |
2988 | @@ -8614,21 +8951,33 @@ | |||
2989 | 8614 | aix_libpath=$lt_cv_aix_libpath_ | 8951 | aix_libpath=$lt_cv_aix_libpath_ |
2990 | 8615 | fi | 8952 | fi |
2991 | 8616 | 8953 | ||
2993 | 8617 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 8954 | hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" |
2994 | 8618 | # Warning - without using the other run time loading flags, | 8955 | # Warning - without using the other run time loading flags, |
2995 | 8619 | # -berok will link without error, but may produce a broken library. | 8956 | # -berok will link without error, but may produce a broken library. |
2999 | 8620 | no_undefined_flag=' ${wl}-bernotok' | 8957 | no_undefined_flag=' $wl-bernotok' |
3000 | 8621 | allow_undefined_flag=' ${wl}-berok' | 8958 | allow_undefined_flag=' $wl-berok' |
3001 | 8622 | if test "$with_gnu_ld" = yes; then | 8959 | if test yes = "$with_gnu_ld"; then |
3002 | 8623 | # We only use this code for GNU lds that support --whole-archive. | 8960 | # We only use this code for GNU lds that support --whole-archive. |
3004 | 8624 | whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' | 8961 | whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive' |
3005 | 8625 | else | 8962 | else |
3006 | 8626 | # Exported symbols can be pulled into shared objects from archives | 8963 | # Exported symbols can be pulled into shared objects from archives |
3007 | 8627 | whole_archive_flag_spec='$convenience' | 8964 | whole_archive_flag_spec='$convenience' |
3008 | 8628 | fi | 8965 | fi |
3009 | 8629 | archive_cmds_need_lc=yes | 8966 | archive_cmds_need_lc=yes |
3012 | 8630 | # This is similar to how AIX traditionally builds its shared libraries. | 8967 | archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' |
3013 | 8631 | archive_expsym_cmds="\$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' | 8968 | # -brtl affects multiple linker settings, -berok does not and is overridden later |
3014 | 8969 | compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`' | ||
3015 | 8970 | if test svr4 != "$with_aix_soname"; then | ||
3016 | 8971 | # This is similar to how AIX traditionally builds its shared libraries. | ||
3017 | 8972 | archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' | ||
3018 | 8973 | fi | ||
3019 | 8974 | if test aix != "$with_aix_soname"; then | ||
3020 | 8975 | archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' | ||
3021 | 8976 | else | ||
3022 | 8977 | # used by -dlpreopen to get the symbols | ||
3023 | 8978 | archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir' | ||
3024 | 8979 | fi | ||
3025 | 8980 | archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d' | ||
3026 | 8632 | fi | 8981 | fi |
3027 | 8633 | fi | 8982 | fi |
3028 | 8634 | ;; | 8983 | ;; |
3029 | @@ -8637,7 +8986,7 @@ | |||
3030 | 8637 | case $host_cpu in | 8986 | case $host_cpu in |
3031 | 8638 | powerpc) | 8987 | powerpc) |
3032 | 8639 | # see comment about AmigaOS4 .so support | 8988 | # see comment about AmigaOS4 .so support |
3034 | 8640 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | 8989 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' |
3035 | 8641 | archive_expsym_cmds='' | 8990 | archive_expsym_cmds='' |
3036 | 8642 | ;; | 8991 | ;; |
3037 | 8643 | m68k) | 8992 | m68k) |
3038 | @@ -8667,16 +9016,17 @@ | |||
3039 | 8667 | # Tell ltmain to make .lib files, not .a files. | 9016 | # Tell ltmain to make .lib files, not .a files. |
3040 | 8668 | libext=lib | 9017 | libext=lib |
3041 | 8669 | # Tell ltmain to make .dll files, not .so files. | 9018 | # Tell ltmain to make .dll files, not .so files. |
3043 | 8670 | shrext_cmds=".dll" | 9019 | shrext_cmds=.dll |
3044 | 8671 | # FIXME: Setting linknames here is a bad hack. | 9020 | # FIXME: Setting linknames here is a bad hack. |
3053 | 8672 | archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' | 9021 | archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' |
3054 | 8673 | archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | 9022 | archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then |
3055 | 8674 | sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; | 9023 | cp "$export_symbols" "$output_objdir/$soname.def"; |
3056 | 8675 | else | 9024 | echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; |
3057 | 8676 | sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; | 9025 | else |
3058 | 8677 | fi~ | 9026 | $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; |
3059 | 8678 | $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ | 9027 | fi~ |
3060 | 8679 | linknames=' | 9028 | $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
3061 | 9029 | linknames=' | ||
3062 | 8680 | # The linker will not automatically build a static lib if we build a DLL. | 9030 | # The linker will not automatically build a static lib if we build a DLL. |
3063 | 8681 | # _LT_TAGVAR(old_archive_from_new_cmds, )='true' | 9031 | # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
3064 | 8682 | enable_shared_with_static_runtimes=yes | 9032 | enable_shared_with_static_runtimes=yes |
3065 | @@ -8685,18 +9035,18 @@ | |||
3066 | 8685 | # Don't use ranlib | 9035 | # Don't use ranlib |
3067 | 8686 | old_postinstall_cmds='chmod 644 $oldlib' | 9036 | old_postinstall_cmds='chmod 644 $oldlib' |
3068 | 8687 | postlink_cmds='lt_outputfile="@OUTPUT@"~ | 9037 | postlink_cmds='lt_outputfile="@OUTPUT@"~ |
3081 | 8688 | lt_tool_outputfile="@TOOL_OUTPUT@"~ | 9038 | lt_tool_outputfile="@TOOL_OUTPUT@"~ |
3082 | 8689 | case $lt_outputfile in | 9039 | case $lt_outputfile in |
3083 | 8690 | *.exe|*.EXE) ;; | 9040 | *.exe|*.EXE) ;; |
3084 | 8691 | *) | 9041 | *) |
3085 | 8692 | lt_outputfile="$lt_outputfile.exe" | 9042 | lt_outputfile=$lt_outputfile.exe |
3086 | 8693 | lt_tool_outputfile="$lt_tool_outputfile.exe" | 9043 | lt_tool_outputfile=$lt_tool_outputfile.exe |
3087 | 8694 | ;; | 9044 | ;; |
3088 | 8695 | esac~ | 9045 | esac~ |
3089 | 8696 | if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then | 9046 | if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then |
3090 | 8697 | $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; | 9047 | $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
3091 | 8698 | $RM "$lt_outputfile.manifest"; | 9048 | $RM "$lt_outputfile.manifest"; |
3092 | 8699 | fi' | 9049 | fi' |
3093 | 8700 | ;; | 9050 | ;; |
3094 | 8701 | *) | 9051 | *) |
3095 | 8702 | # Assume MSVC wrapper | 9052 | # Assume MSVC wrapper |
3096 | @@ -8705,7 +9055,7 @@ | |||
3097 | 8705 | # Tell ltmain to make .lib files, not .a files. | 9055 | # Tell ltmain to make .lib files, not .a files. |
3098 | 8706 | libext=lib | 9056 | libext=lib |
3099 | 8707 | # Tell ltmain to make .dll files, not .so files. | 9057 | # Tell ltmain to make .dll files, not .so files. |
3101 | 8708 | shrext_cmds=".dll" | 9058 | shrext_cmds=.dll |
3102 | 8709 | # FIXME: Setting linknames here is a bad hack. | 9059 | # FIXME: Setting linknames here is a bad hack. |
3103 | 8710 | archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | 9060 | archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
3104 | 8711 | # The linker will automatically build a .lib file if we build a DLL. | 9061 | # The linker will automatically build a .lib file if we build a DLL. |
3105 | @@ -8724,24 +9074,24 @@ | |||
3106 | 8724 | hardcode_direct=no | 9074 | hardcode_direct=no |
3107 | 8725 | hardcode_automatic=yes | 9075 | hardcode_automatic=yes |
3108 | 8726 | hardcode_shlibpath_var=unsupported | 9076 | hardcode_shlibpath_var=unsupported |
3111 | 8727 | if test "$lt_cv_ld_force_load" = "yes"; then | 9077 | if test yes = "$lt_cv_ld_force_load"; then |
3112 | 8728 | whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' | 9078 | whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' |
3113 | 8729 | 9079 | ||
3114 | 8730 | else | 9080 | else |
3115 | 8731 | whole_archive_flag_spec='' | 9081 | whole_archive_flag_spec='' |
3116 | 8732 | fi | 9082 | fi |
3117 | 8733 | link_all_deplibs=yes | 9083 | link_all_deplibs=yes |
3119 | 8734 | allow_undefined_flag="$_lt_dar_allow_undefined" | 9084 | allow_undefined_flag=$_lt_dar_allow_undefined |
3120 | 8735 | case $cc_basename in | 9085 | case $cc_basename in |
3122 | 8736 | ifort*) _lt_dar_can_shared=yes ;; | 9086 | ifort*|nagfor*) _lt_dar_can_shared=yes ;; |
3123 | 8737 | *) _lt_dar_can_shared=$GCC ;; | 9087 | *) _lt_dar_can_shared=$GCC ;; |
3124 | 8738 | esac | 9088 | esac |
3126 | 8739 | if test "$_lt_dar_can_shared" = "yes"; then | 9089 | if test yes = "$_lt_dar_can_shared"; then |
3127 | 8740 | output_verbose_link_cmd=func_echo_all | 9090 | output_verbose_link_cmd=func_echo_all |
3132 | 8741 | archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" | 9091 | archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" |
3133 | 8742 | module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" | 9092 | module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" |
3134 | 8743 | archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" | 9093 | archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" |
3135 | 8744 | module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" | 9094 | module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" |
3136 | 8745 | 9095 | ||
3137 | 8746 | else | 9096 | else |
3138 | 8747 | ld_shlibs=no | 9097 | ld_shlibs=no |
3139 | @@ -8783,33 +9133,33 @@ | |||
3140 | 8783 | ;; | 9133 | ;; |
3141 | 8784 | 9134 | ||
3142 | 8785 | hpux9*) | 9135 | hpux9*) |
3145 | 8786 | if test "$GCC" = yes; then | 9136 | if test yes = "$GCC"; then |
3146 | 8787 | archive_cmds='$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' | 9137 | archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' |
3147 | 8788 | else | 9138 | else |
3149 | 8789 | archive_cmds='$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' | 9139 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' |
3150 | 8790 | fi | 9140 | fi |
3152 | 8791 | hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' | 9141 | hardcode_libdir_flag_spec='$wl+b $wl$libdir' |
3153 | 8792 | hardcode_libdir_separator=: | 9142 | hardcode_libdir_separator=: |
3154 | 8793 | hardcode_direct=yes | 9143 | hardcode_direct=yes |
3155 | 8794 | 9144 | ||
3156 | 8795 | # hardcode_minus_L: Not really in the search PATH, | 9145 | # hardcode_minus_L: Not really in the search PATH, |
3157 | 8796 | # but as the default location of the library. | 9146 | # but as the default location of the library. |
3158 | 8797 | hardcode_minus_L=yes | 9147 | hardcode_minus_L=yes |
3160 | 8798 | export_dynamic_flag_spec='${wl}-E' | 9148 | export_dynamic_flag_spec='$wl-E' |
3161 | 8799 | ;; | 9149 | ;; |
3162 | 8800 | 9150 | ||
3163 | 8801 | hpux10*) | 9151 | hpux10*) |
3166 | 8802 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 9152 | if test yes,no = "$GCC,$with_gnu_ld"; then |
3167 | 8803 | archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | 9153 | archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
3168 | 8804 | else | 9154 | else |
3169 | 8805 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 9155 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
3170 | 8806 | fi | 9156 | fi |
3173 | 8807 | if test "$with_gnu_ld" = no; then | 9157 | if test no = "$with_gnu_ld"; then |
3174 | 8808 | hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' | 9158 | hardcode_libdir_flag_spec='$wl+b $wl$libdir' |
3175 | 8809 | hardcode_libdir_separator=: | 9159 | hardcode_libdir_separator=: |
3176 | 8810 | hardcode_direct=yes | 9160 | hardcode_direct=yes |
3177 | 8811 | hardcode_direct_absolute=yes | 9161 | hardcode_direct_absolute=yes |
3179 | 8812 | export_dynamic_flag_spec='${wl}-E' | 9162 | export_dynamic_flag_spec='$wl-E' |
3180 | 8813 | # hardcode_minus_L: Not really in the search PATH, | 9163 | # hardcode_minus_L: Not really in the search PATH, |
3181 | 8814 | # but as the default location of the library. | 9164 | # but as the default location of the library. |
3182 | 8815 | hardcode_minus_L=yes | 9165 | hardcode_minus_L=yes |
3183 | @@ -8817,25 +9167,25 @@ | |||
3184 | 8817 | ;; | 9167 | ;; |
3185 | 8818 | 9168 | ||
3186 | 8819 | hpux11*) | 9169 | hpux11*) |
3188 | 8820 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 9170 | if test yes,no = "$GCC,$with_gnu_ld"; then |
3189 | 8821 | case $host_cpu in | 9171 | case $host_cpu in |
3190 | 8822 | hppa*64*) | 9172 | hppa*64*) |
3192 | 8823 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 9173 | archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' |
3193 | 8824 | ;; | 9174 | ;; |
3194 | 8825 | ia64*) | 9175 | ia64*) |
3196 | 8826 | archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | 9176 | archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
3197 | 8827 | ;; | 9177 | ;; |
3198 | 8828 | *) | 9178 | *) |
3200 | 8829 | archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | 9179 | archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
3201 | 8830 | ;; | 9180 | ;; |
3202 | 8831 | esac | 9181 | esac |
3203 | 8832 | else | 9182 | else |
3204 | 8833 | case $host_cpu in | 9183 | case $host_cpu in |
3205 | 8834 | hppa*64*) | 9184 | hppa*64*) |
3207 | 8835 | archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 9185 | archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' |
3208 | 8836 | ;; | 9186 | ;; |
3209 | 8837 | ia64*) | 9187 | ia64*) |
3211 | 8838 | archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | 9188 | archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
3212 | 8839 | ;; | 9189 | ;; |
3213 | 8840 | *) | 9190 | *) |
3214 | 8841 | 9191 | ||
3215 | @@ -8847,7 +9197,7 @@ | |||
3216 | 8847 | $as_echo_n "(cached) " >&6 | 9197 | $as_echo_n "(cached) " >&6 |
3217 | 8848 | else | 9198 | else |
3218 | 8849 | lt_cv_prog_compiler__b=no | 9199 | lt_cv_prog_compiler__b=no |
3220 | 8850 | save_LDFLAGS="$LDFLAGS" | 9200 | save_LDFLAGS=$LDFLAGS |
3221 | 8851 | LDFLAGS="$LDFLAGS -b" | 9201 | LDFLAGS="$LDFLAGS -b" |
3222 | 8852 | echo "$lt_simple_link_test_code" > conftest.$ac_ext | 9202 | echo "$lt_simple_link_test_code" > conftest.$ac_ext |
3223 | 8853 | if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then | 9203 | if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then |
3224 | @@ -8866,14 +9216,14 @@ | |||
3225 | 8866 | fi | 9216 | fi |
3226 | 8867 | fi | 9217 | fi |
3227 | 8868 | $RM -r conftest* | 9218 | $RM -r conftest* |
3229 | 8869 | LDFLAGS="$save_LDFLAGS" | 9219 | LDFLAGS=$save_LDFLAGS |
3230 | 8870 | 9220 | ||
3231 | 8871 | fi | 9221 | fi |
3232 | 8872 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 | 9222 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 |
3233 | 8873 | $as_echo "$lt_cv_prog_compiler__b" >&6; } | 9223 | $as_echo "$lt_cv_prog_compiler__b" >&6; } |
3234 | 8874 | 9224 | ||
3237 | 8875 | if test x"$lt_cv_prog_compiler__b" = xyes; then | 9225 | if test yes = "$lt_cv_prog_compiler__b"; then |
3238 | 8876 | archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | 9226 | archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
3239 | 8877 | else | 9227 | else |
3240 | 8878 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 9228 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
3241 | 8879 | fi | 9229 | fi |
3242 | @@ -8881,8 +9231,8 @@ | |||
3243 | 8881 | ;; | 9231 | ;; |
3244 | 8882 | esac | 9232 | esac |
3245 | 8883 | fi | 9233 | fi |
3248 | 8884 | if test "$with_gnu_ld" = no; then | 9234 | if test no = "$with_gnu_ld"; then |
3249 | 8885 | hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' | 9235 | hardcode_libdir_flag_spec='$wl+b $wl$libdir' |
3250 | 8886 | hardcode_libdir_separator=: | 9236 | hardcode_libdir_separator=: |
3251 | 8887 | 9237 | ||
3252 | 8888 | case $host_cpu in | 9238 | case $host_cpu in |
3253 | @@ -8893,7 +9243,7 @@ | |||
3254 | 8893 | *) | 9243 | *) |
3255 | 8894 | hardcode_direct=yes | 9244 | hardcode_direct=yes |
3256 | 8895 | hardcode_direct_absolute=yes | 9245 | hardcode_direct_absolute=yes |
3258 | 8896 | export_dynamic_flag_spec='${wl}-E' | 9246 | export_dynamic_flag_spec='$wl-E' |
3259 | 8897 | 9247 | ||
3260 | 8898 | # hardcode_minus_L: Not really in the search PATH, | 9248 | # hardcode_minus_L: Not really in the search PATH, |
3261 | 8899 | # but as the default location of the library. | 9249 | # but as the default location of the library. |
3262 | @@ -8904,8 +9254,8 @@ | |||
3263 | 8904 | ;; | 9254 | ;; |
3264 | 8905 | 9255 | ||
3265 | 8906 | irix5* | irix6* | nonstopux*) | 9256 | irix5* | irix6* | nonstopux*) |
3268 | 8907 | if test "$GCC" = yes; then | 9257 | if test yes = "$GCC"; then |
3269 | 8908 | archive_cmds='$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' | 9258 | archive_cmds='$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' |
3270 | 8909 | # Try to use the -exported_symbol ld option, if it does not | 9259 | # Try to use the -exported_symbol ld option, if it does not |
3271 | 8910 | # work, assume that -exports_file does not work either and | 9260 | # work, assume that -exports_file does not work either and |
3272 | 8911 | # implicitly export all symbols. | 9261 | # implicitly export all symbols. |
3273 | @@ -8915,8 +9265,8 @@ | |||
3274 | 8915 | if ${lt_cv_irix_exported_symbol+:} false; then : | 9265 | if ${lt_cv_irix_exported_symbol+:} false; then : |
3275 | 8916 | $as_echo_n "(cached) " >&6 | 9266 | $as_echo_n "(cached) " >&6 |
3276 | 8917 | else | 9267 | else |
3279 | 8918 | save_LDFLAGS="$LDFLAGS" | 9268 | save_LDFLAGS=$LDFLAGS |
3280 | 8919 | LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | 9269 | LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" |
3281 | 8920 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 9270 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3282 | 8921 | /* end confdefs.h. */ | 9271 | /* end confdefs.h. */ |
3283 | 8922 | int foo (void) { return 0; } | 9272 | int foo (void) { return 0; } |
3284 | @@ -8928,25 +9278,35 @@ | |||
3285 | 8928 | fi | 9278 | fi |
3286 | 8929 | rm -f core conftest.err conftest.$ac_objext \ | 9279 | rm -f core conftest.err conftest.$ac_objext \ |
3287 | 8930 | conftest$ac_exeext conftest.$ac_ext | 9280 | conftest$ac_exeext conftest.$ac_ext |
3289 | 8931 | LDFLAGS="$save_LDFLAGS" | 9281 | LDFLAGS=$save_LDFLAGS |
3290 | 8932 | fi | 9282 | fi |
3291 | 8933 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 | 9283 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 |
3292 | 8934 | $as_echo "$lt_cv_irix_exported_symbol" >&6; } | 9284 | $as_echo "$lt_cv_irix_exported_symbol" >&6; } |
3295 | 8935 | if test "$lt_cv_irix_exported_symbol" = yes; then | 9285 | if test yes = "$lt_cv_irix_exported_symbol"; then |
3296 | 8936 | archive_expsym_cmds='$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' | 9286 | archive_expsym_cmds='$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' |
3297 | 8937 | fi | 9287 | fi |
3298 | 8938 | else | 9288 | else |
3301 | 8939 | archive_cmds='$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' | 9289 | archive_cmds='$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' |
3302 | 8940 | archive_expsym_cmds='$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' | 9290 | archive_expsym_cmds='$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' |
3303 | 8941 | fi | 9291 | fi |
3304 | 8942 | archive_cmds_need_lc='no' | 9292 | archive_cmds_need_lc='no' |
3306 | 8943 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 9293 | hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' |
3307 | 8944 | hardcode_libdir_separator=: | 9294 | hardcode_libdir_separator=: |
3308 | 8945 | inherit_rpath=yes | 9295 | inherit_rpath=yes |
3309 | 8946 | link_all_deplibs=yes | 9296 | link_all_deplibs=yes |
3310 | 8947 | ;; | 9297 | ;; |
3311 | 8948 | 9298 | ||
3313 | 8949 | netbsd* | netbsdelf*-gnu) | 9299 | linux*) |
3314 | 9300 | case $cc_basename in | ||
3315 | 9301 | tcc*) | ||
3316 | 9302 | # Fabrice Bellard et al's Tiny C Compiler | ||
3317 | 9303 | ld_shlibs=yes | ||
3318 | 9304 | archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | ||
3319 | 9305 | ;; | ||
3320 | 9306 | esac | ||
3321 | 9307 | ;; | ||
3322 | 9308 | |||
3323 | 9309 | netbsd*) | ||
3324 | 8950 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then | 9310 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
3325 | 8951 | archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out | 9311 | archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out |
3326 | 8952 | else | 9312 | else |
3327 | @@ -8960,7 +9320,7 @@ | |||
3328 | 8960 | newsos6) | 9320 | newsos6) |
3329 | 8961 | archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' | 9321 | archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' |
3330 | 8962 | hardcode_direct=yes | 9322 | hardcode_direct=yes |
3332 | 8963 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 9323 | hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' |
3333 | 8964 | hardcode_libdir_separator=: | 9324 | hardcode_libdir_separator=: |
3334 | 8965 | hardcode_shlibpath_var=no | 9325 | hardcode_shlibpath_var=no |
3335 | 8966 | ;; | 9326 | ;; |
3336 | @@ -8968,27 +9328,19 @@ | |||
3337 | 8968 | *nto* | *qnx*) | 9328 | *nto* | *qnx*) |
3338 | 8969 | ;; | 9329 | ;; |
3339 | 8970 | 9330 | ||
3341 | 8971 | openbsd*) | 9331 | openbsd* | bitrig*) |
3342 | 8972 | if test -f /usr/libexec/ld.so; then | 9332 | if test -f /usr/libexec/ld.so; then |
3343 | 8973 | hardcode_direct=yes | 9333 | hardcode_direct=yes |
3344 | 8974 | hardcode_shlibpath_var=no | 9334 | hardcode_shlibpath_var=no |
3345 | 8975 | hardcode_direct_absolute=yes | 9335 | hardcode_direct_absolute=yes |
3347 | 8976 | if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then | 9336 | if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then |
3348 | 8977 | archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | 9337 | archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
3352 | 8978 | archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' | 9338 | archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' |
3353 | 8979 | hardcode_libdir_flag_spec='${wl}-rpath,$libdir' | 9339 | hardcode_libdir_flag_spec='$wl-rpath,$libdir' |
3354 | 8980 | export_dynamic_flag_spec='${wl}-E' | 9340 | export_dynamic_flag_spec='$wl-E' |
3355 | 8981 | else | 9341 | else |
3366 | 8982 | case $host_os in | 9342 | archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
3367 | 8983 | openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) | 9343 | hardcode_libdir_flag_spec='$wl-rpath,$libdir' |
3358 | 8984 | archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' | ||
3359 | 8985 | hardcode_libdir_flag_spec='-R$libdir' | ||
3360 | 8986 | ;; | ||
3361 | 8987 | *) | ||
3362 | 8988 | archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | ||
3363 | 8989 | hardcode_libdir_flag_spec='${wl}-rpath,$libdir' | ||
3364 | 8990 | ;; | ||
3365 | 8991 | esac | ||
3368 | 8992 | fi | 9344 | fi |
3369 | 8993 | else | 9345 | else |
3370 | 8994 | ld_shlibs=no | 9346 | ld_shlibs=no |
3371 | @@ -8999,33 +9351,53 @@ | |||
3372 | 8999 | hardcode_libdir_flag_spec='-L$libdir' | 9351 | hardcode_libdir_flag_spec='-L$libdir' |
3373 | 9000 | hardcode_minus_L=yes | 9352 | hardcode_minus_L=yes |
3374 | 9001 | allow_undefined_flag=unsupported | 9353 | allow_undefined_flag=unsupported |
3377 | 9002 | archive_cmds='$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' | 9354 | shrext_cmds=.dll |
3378 | 9003 | old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' | 9355 | archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ |
3379 | 9356 | $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ | ||
3380 | 9357 | $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ | ||
3381 | 9358 | $ECHO EXPORTS >> $output_objdir/$libname.def~ | ||
3382 | 9359 | emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ | ||
3383 | 9360 | $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ | ||
3384 | 9361 | emximp -o $lib $output_objdir/$libname.def' | ||
3385 | 9362 | archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ | ||
3386 | 9363 | $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ | ||
3387 | 9364 | $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ | ||
3388 | 9365 | $ECHO EXPORTS >> $output_objdir/$libname.def~ | ||
3389 | 9366 | prefix_cmds="$SED"~ | ||
3390 | 9367 | if test EXPORTS = "`$SED 1q $export_symbols`"; then | ||
3391 | 9368 | prefix_cmds="$prefix_cmds -e 1d"; | ||
3392 | 9369 | fi~ | ||
3393 | 9370 | prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ | ||
3394 | 9371 | cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ | ||
3395 | 9372 | $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ | ||
3396 | 9373 | emximp -o $lib $output_objdir/$libname.def' | ||
3397 | 9374 | old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' | ||
3398 | 9375 | enable_shared_with_static_runtimes=yes | ||
3399 | 9004 | ;; | 9376 | ;; |
3400 | 9005 | 9377 | ||
3401 | 9006 | osf3*) | 9378 | osf3*) |
3405 | 9007 | if test "$GCC" = yes; then | 9379 | if test yes = "$GCC"; then |
3406 | 9008 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 9380 | allow_undefined_flag=' $wl-expect_unresolved $wl\*' |
3407 | 9009 | archive_cmds='$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' | 9381 | archive_cmds='$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' |
3408 | 9010 | else | 9382 | else |
3409 | 9011 | allow_undefined_flag=' -expect_unresolved \*' | 9383 | allow_undefined_flag=' -expect_unresolved \*' |
3411 | 9012 | archive_cmds='$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' | 9384 | archive_cmds='$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' |
3412 | 9013 | fi | 9385 | fi |
3413 | 9014 | archive_cmds_need_lc='no' | 9386 | archive_cmds_need_lc='no' |
3415 | 9015 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 9387 | hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' |
3416 | 9016 | hardcode_libdir_separator=: | 9388 | hardcode_libdir_separator=: |
3417 | 9017 | ;; | 9389 | ;; |
3418 | 9018 | 9390 | ||
3419 | 9019 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 9391 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
3424 | 9020 | if test "$GCC" = yes; then | 9392 | if test yes = "$GCC"; then |
3425 | 9021 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 9393 | allow_undefined_flag=' $wl-expect_unresolved $wl\*' |
3426 | 9022 | archive_cmds='$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' | 9394 | archive_cmds='$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' |
3427 | 9023 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 9395 | hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' |
3428 | 9024 | else | 9396 | else |
3429 | 9025 | allow_undefined_flag=' -expect_unresolved \*' | 9397 | allow_undefined_flag=' -expect_unresolved \*' |
3431 | 9026 | archive_cmds='$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' | 9398 | archive_cmds='$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' |
3432 | 9027 | archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ | 9399 | archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ |
3434 | 9028 | $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' | 9400 | $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' |
3435 | 9029 | 9401 | ||
3436 | 9030 | # Both c and cxx compiler support -rpath directly | 9402 | # Both c and cxx compiler support -rpath directly |
3437 | 9031 | hardcode_libdir_flag_spec='-rpath $libdir' | 9403 | hardcode_libdir_flag_spec='-rpath $libdir' |
3438 | @@ -9036,24 +9408,24 @@ | |||
3439 | 9036 | 9408 | ||
3440 | 9037 | solaris*) | 9409 | solaris*) |
3441 | 9038 | no_undefined_flag=' -z defs' | 9410 | no_undefined_flag=' -z defs' |
3445 | 9039 | if test "$GCC" = yes; then | 9411 | if test yes = "$GCC"; then |
3446 | 9040 | wlarc='${wl}' | 9412 | wlarc='$wl' |
3447 | 9041 | archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 9413 | archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' |
3448 | 9042 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ | 9414 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
3450 | 9043 | $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' | 9415 | $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' |
3451 | 9044 | else | 9416 | else |
3452 | 9045 | case `$CC -V 2>&1` in | 9417 | case `$CC -V 2>&1` in |
3453 | 9046 | *"Compilers 5.0"*) | 9418 | *"Compilers 5.0"*) |
3454 | 9047 | wlarc='' | 9419 | wlarc='' |
3456 | 9048 | archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' | 9420 | archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' |
3457 | 9049 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ | 9421 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
3459 | 9050 | $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' | 9422 | $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' |
3460 | 9051 | ;; | 9423 | ;; |
3461 | 9052 | *) | 9424 | *) |
3464 | 9053 | wlarc='${wl}' | 9425 | wlarc='$wl' |
3465 | 9054 | archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' | 9426 | archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' |
3466 | 9055 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ | 9427 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
3468 | 9056 | $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' | 9428 | $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
3469 | 9057 | ;; | 9429 | ;; |
3470 | 9058 | esac | 9430 | esac |
3471 | 9059 | fi | 9431 | fi |
3472 | @@ -9063,11 +9435,11 @@ | |||
3473 | 9063 | solaris2.[0-5] | solaris2.[0-5].*) ;; | 9435 | solaris2.[0-5] | solaris2.[0-5].*) ;; |
3474 | 9064 | *) | 9436 | *) |
3475 | 9065 | # The compiler driver will combine and reorder linker options, | 9437 | # The compiler driver will combine and reorder linker options, |
3477 | 9066 | # but understands `-z linker_flag'. GCC discards it without `$wl', | 9438 | # but understands '-z linker_flag'. GCC discards it without '$wl', |
3478 | 9067 | # but is careful enough not to reorder. | 9439 | # but is careful enough not to reorder. |
3479 | 9068 | # Supported since Solaris 2.6 (maybe 2.5.1?) | 9440 | # Supported since Solaris 2.6 (maybe 2.5.1?) |
3482 | 9069 | if test "$GCC" = yes; then | 9441 | if test yes = "$GCC"; then |
3483 | 9070 | whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' | 9442 | whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' |
3484 | 9071 | else | 9443 | else |
3485 | 9072 | whole_archive_flag_spec='-z allextract$convenience -z defaultextract' | 9444 | whole_archive_flag_spec='-z allextract$convenience -z defaultextract' |
3486 | 9073 | fi | 9445 | fi |
3487 | @@ -9077,10 +9449,10 @@ | |||
3488 | 9077 | ;; | 9449 | ;; |
3489 | 9078 | 9450 | ||
3490 | 9079 | sunos4*) | 9451 | sunos4*) |
3492 | 9080 | if test "x$host_vendor" = xsequent; then | 9452 | if test sequent = "$host_vendor"; then |
3493 | 9081 | # Use $CC to link under sequent, because it throws in some extra .o | 9453 | # Use $CC to link under sequent, because it throws in some extra .o |
3494 | 9082 | # files that make .init and .fini sections work. | 9454 | # files that make .init and .fini sections work. |
3496 | 9083 | archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' | 9455 | archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' |
3497 | 9084 | else | 9456 | else |
3498 | 9085 | archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' | 9457 | archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' |
3499 | 9086 | fi | 9458 | fi |
3500 | @@ -9129,43 +9501,43 @@ | |||
3501 | 9129 | ;; | 9501 | ;; |
3502 | 9130 | 9502 | ||
3503 | 9131 | sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) | 9503 | sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) |
3505 | 9132 | no_undefined_flag='${wl}-z,text' | 9504 | no_undefined_flag='$wl-z,text' |
3506 | 9133 | archive_cmds_need_lc=no | 9505 | archive_cmds_need_lc=no |
3507 | 9134 | hardcode_shlibpath_var=no | 9506 | hardcode_shlibpath_var=no |
3508 | 9135 | runpath_var='LD_RUN_PATH' | 9507 | runpath_var='LD_RUN_PATH' |
3509 | 9136 | 9508 | ||
3513 | 9137 | if test "$GCC" = yes; then | 9509 | if test yes = "$GCC"; then |
3514 | 9138 | archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | 9510 | archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
3515 | 9139 | archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | 9511 | archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
3516 | 9140 | else | 9512 | else |
3519 | 9141 | archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | 9513 | archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
3520 | 9142 | archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | 9514 | archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
3521 | 9143 | fi | 9515 | fi |
3522 | 9144 | ;; | 9516 | ;; |
3523 | 9145 | 9517 | ||
3524 | 9146 | sysv5* | sco3.2v5* | sco5v6*) | 9518 | sysv5* | sco3.2v5* | sco5v6*) |
3526 | 9147 | # Note: We can NOT use -z defs as we might desire, because we do not | 9519 | # Note: We CANNOT use -z defs as we might desire, because we do not |
3527 | 9148 | # link with -lc, and that would cause any symbols used from libc to | 9520 | # link with -lc, and that would cause any symbols used from libc to |
3528 | 9149 | # always be unresolved, which means just about no library would | 9521 | # always be unresolved, which means just about no library would |
3529 | 9150 | # ever link correctly. If we're not using GNU ld we use -z text | 9522 | # ever link correctly. If we're not using GNU ld we use -z text |
3530 | 9151 | # though, which does catch some bad symbols but isn't as heavy-handed | 9523 | # though, which does catch some bad symbols but isn't as heavy-handed |
3531 | 9152 | # as -z defs. | 9524 | # as -z defs. |
3534 | 9153 | no_undefined_flag='${wl}-z,text' | 9525 | no_undefined_flag='$wl-z,text' |
3535 | 9154 | allow_undefined_flag='${wl}-z,nodefs' | 9526 | allow_undefined_flag='$wl-z,nodefs' |
3536 | 9155 | archive_cmds_need_lc=no | 9527 | archive_cmds_need_lc=no |
3537 | 9156 | hardcode_shlibpath_var=no | 9528 | hardcode_shlibpath_var=no |
3539 | 9157 | hardcode_libdir_flag_spec='${wl}-R,$libdir' | 9529 | hardcode_libdir_flag_spec='$wl-R,$libdir' |
3540 | 9158 | hardcode_libdir_separator=':' | 9530 | hardcode_libdir_separator=':' |
3541 | 9159 | link_all_deplibs=yes | 9531 | link_all_deplibs=yes |
3543 | 9160 | export_dynamic_flag_spec='${wl}-Bexport' | 9532 | export_dynamic_flag_spec='$wl-Bexport' |
3544 | 9161 | runpath_var='LD_RUN_PATH' | 9533 | runpath_var='LD_RUN_PATH' |
3545 | 9162 | 9534 | ||
3549 | 9163 | if test "$GCC" = yes; then | 9535 | if test yes = "$GCC"; then |
3550 | 9164 | archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | 9536 | archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
3551 | 9165 | archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | 9537 | archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
3552 | 9166 | else | 9538 | else |
3555 | 9167 | archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | 9539 | archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
3556 | 9168 | archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | 9540 | archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
3557 | 9169 | fi | 9541 | fi |
3558 | 9170 | ;; | 9542 | ;; |
3559 | 9171 | 9543 | ||
3560 | @@ -9180,10 +9552,10 @@ | |||
3561 | 9180 | ;; | 9552 | ;; |
3562 | 9181 | esac | 9553 | esac |
3563 | 9182 | 9554 | ||
3565 | 9183 | if test x$host_vendor = xsni; then | 9555 | if test sni = "$host_vendor"; then |
3566 | 9184 | case $host in | 9556 | case $host in |
3567 | 9185 | sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) | 9557 | sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) |
3569 | 9186 | export_dynamic_flag_spec='${wl}-Blargedynsym' | 9558 | export_dynamic_flag_spec='$wl-Blargedynsym' |
3570 | 9187 | ;; | 9559 | ;; |
3571 | 9188 | esac | 9560 | esac |
3572 | 9189 | fi | 9561 | fi |
3573 | @@ -9191,7 +9563,7 @@ | |||
3574 | 9191 | 9563 | ||
3575 | 9192 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 | 9564 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 |
3576 | 9193 | $as_echo "$ld_shlibs" >&6; } | 9565 | $as_echo "$ld_shlibs" >&6; } |
3578 | 9194 | test "$ld_shlibs" = no && can_build_shared=no | 9566 | test no = "$ld_shlibs" && can_build_shared=no |
3579 | 9195 | 9567 | ||
3580 | 9196 | with_gnu_ld=$with_gnu_ld | 9568 | with_gnu_ld=$with_gnu_ld |
3581 | 9197 | 9569 | ||
3582 | @@ -9217,7 +9589,7 @@ | |||
3583 | 9217 | # Assume -lc should be added | 9589 | # Assume -lc should be added |
3584 | 9218 | archive_cmds_need_lc=yes | 9590 | archive_cmds_need_lc=yes |
3585 | 9219 | 9591 | ||
3587 | 9220 | if test "$enable_shared" = yes && test "$GCC" = yes; then | 9592 | if test yes,yes = "$GCC,$enable_shared"; then |
3588 | 9221 | case $archive_cmds in | 9593 | case $archive_cmds in |
3589 | 9222 | *'~'*) | 9594 | *'~'*) |
3590 | 9223 | # FIXME: we may have to deal with multi-command sequences. | 9595 | # FIXME: we may have to deal with multi-command sequences. |
3591 | @@ -9432,14 +9804,14 @@ | |||
3592 | 9432 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 | 9804 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 |
3593 | 9433 | $as_echo_n "checking dynamic linker characteristics... " >&6; } | 9805 | $as_echo_n "checking dynamic linker characteristics... " >&6; } |
3594 | 9434 | 9806 | ||
3596 | 9435 | if test "$GCC" = yes; then | 9807 | if test yes = "$GCC"; then |
3597 | 9436 | case $host_os in | 9808 | case $host_os in |
3600 | 9437 | darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; | 9809 | darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; |
3601 | 9438 | *) lt_awk_arg="/^libraries:/" ;; | 9810 | *) lt_awk_arg='/^libraries:/' ;; |
3602 | 9439 | esac | 9811 | esac |
3603 | 9440 | case $host_os in | 9812 | case $host_os in |
3606 | 9441 | mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; | 9813 | mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;; |
3607 | 9442 | *) lt_sed_strip_eq="s,=/,/,g" ;; | 9814 | *) lt_sed_strip_eq='s|=/|/|g' ;; |
3608 | 9443 | esac | 9815 | esac |
3609 | 9444 | lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` | 9816 | lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` |
3610 | 9445 | case $lt_search_path_spec in | 9817 | case $lt_search_path_spec in |
3611 | @@ -9455,28 +9827,35 @@ | |||
3612 | 9455 | ;; | 9827 | ;; |
3613 | 9456 | esac | 9828 | esac |
3614 | 9457 | # Ok, now we have the path, separated by spaces, we can step through it | 9829 | # Ok, now we have the path, separated by spaces, we can step through it |
3616 | 9458 | # and add multilib dir if necessary. | 9830 | # and add multilib dir if necessary... |
3617 | 9459 | lt_tmp_lt_search_path_spec= | 9831 | lt_tmp_lt_search_path_spec= |
3619 | 9460 | lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` | 9832 | lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` |
3620 | 9833 | # ...but if some path component already ends with the multilib dir we assume | ||
3621 | 9834 | # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). | ||
3622 | 9835 | case "$lt_multi_os_dir; $lt_search_path_spec " in | ||
3623 | 9836 | "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) | ||
3624 | 9837 | lt_multi_os_dir= | ||
3625 | 9838 | ;; | ||
3626 | 9839 | esac | ||
3627 | 9461 | for lt_sys_path in $lt_search_path_spec; do | 9840 | for lt_sys_path in $lt_search_path_spec; do |
3631 | 9462 | if test -d "$lt_sys_path/$lt_multi_os_dir"; then | 9841 | if test -d "$lt_sys_path$lt_multi_os_dir"; then |
3632 | 9463 | lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" | 9842 | lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" |
3633 | 9464 | else | 9843 | elif test -n "$lt_multi_os_dir"; then |
3634 | 9465 | test -d "$lt_sys_path" && \ | 9844 | test -d "$lt_sys_path" && \ |
3635 | 9466 | lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" | 9845 | lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" |
3636 | 9467 | fi | 9846 | fi |
3637 | 9468 | done | 9847 | done |
3638 | 9469 | lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' | 9848 | lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' |
3642 | 9470 | BEGIN {RS=" "; FS="/|\n";} { | 9849 | BEGIN {RS = " "; FS = "/|\n";} { |
3643 | 9471 | lt_foo=""; | 9850 | lt_foo = ""; |
3644 | 9472 | lt_count=0; | 9851 | lt_count = 0; |
3645 | 9473 | for (lt_i = NF; lt_i > 0; lt_i--) { | 9852 | for (lt_i = NF; lt_i > 0; lt_i--) { |
3646 | 9474 | if ($lt_i != "" && $lt_i != ".") { | 9853 | if ($lt_i != "" && $lt_i != ".") { |
3647 | 9475 | if ($lt_i == "..") { | 9854 | if ($lt_i == "..") { |
3648 | 9476 | lt_count++; | 9855 | lt_count++; |
3649 | 9477 | } else { | 9856 | } else { |
3650 | 9478 | if (lt_count == 0) { | 9857 | if (lt_count == 0) { |
3652 | 9479 | lt_foo="/" $lt_i lt_foo; | 9858 | lt_foo = "/" $lt_i lt_foo; |
3653 | 9480 | } else { | 9859 | } else { |
3654 | 9481 | lt_count--; | 9860 | lt_count--; |
3655 | 9482 | } | 9861 | } |
3656 | @@ -9490,7 +9869,7 @@ | |||
3657 | 9490 | # for these hosts. | 9869 | # for these hosts. |
3658 | 9491 | case $host_os in | 9870 | case $host_os in |
3659 | 9492 | mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ | 9871 | mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ |
3661 | 9493 | $SED 's,/\([A-Za-z]:\),\1,g'` ;; | 9872 | $SED 's|/\([A-Za-z]:\)|\1|g'` ;; |
3662 | 9494 | esac | 9873 | esac |
3663 | 9495 | sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` | 9874 | sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` |
3664 | 9496 | else | 9875 | else |
3665 | @@ -9499,7 +9878,7 @@ | |||
3666 | 9499 | library_names_spec= | 9878 | library_names_spec= |
3667 | 9500 | libname_spec='lib$name' | 9879 | libname_spec='lib$name' |
3668 | 9501 | soname_spec= | 9880 | soname_spec= |
3670 | 9502 | shrext_cmds=".so" | 9881 | shrext_cmds=.so |
3671 | 9503 | postinstall_cmds= | 9882 | postinstall_cmds= |
3672 | 9504 | postuninstall_cmds= | 9883 | postuninstall_cmds= |
3673 | 9505 | finish_cmds= | 9884 | finish_cmds= |
3674 | @@ -9516,14 +9895,16 @@ | |||
3675 | 9516 | # flags to be left without arguments | 9895 | # flags to be left without arguments |
3676 | 9517 | need_version=unknown | 9896 | need_version=unknown |
3677 | 9518 | 9897 | ||
3678 | 9898 | |||
3679 | 9899 | |||
3680 | 9519 | case $host_os in | 9900 | case $host_os in |
3681 | 9520 | aix3*) | 9901 | aix3*) |
3682 | 9521 | version_type=linux # correct to gnu/linux during the next big refactor | 9902 | version_type=linux # correct to gnu/linux during the next big refactor |
3684 | 9522 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' | 9903 | library_names_spec='$libname$release$shared_ext$versuffix $libname.a' |
3685 | 9523 | shlibpath_var=LIBPATH | 9904 | shlibpath_var=LIBPATH |
3686 | 9524 | 9905 | ||
3687 | 9525 | # AIX 3 has no versioning support, so we append a major version to the name. | 9906 | # AIX 3 has no versioning support, so we append a major version to the name. |
3689 | 9526 | soname_spec='${libname}${release}${shared_ext}$major' | 9907 | soname_spec='$libname$release$shared_ext$major' |
3690 | 9527 | ;; | 9908 | ;; |
3691 | 9528 | 9909 | ||
3692 | 9529 | aix[4-9]*) | 9910 | aix[4-9]*) |
3693 | @@ -9531,41 +9912,91 @@ | |||
3694 | 9531 | need_lib_prefix=no | 9912 | need_lib_prefix=no |
3695 | 9532 | need_version=no | 9913 | need_version=no |
3696 | 9533 | hardcode_into_libs=yes | 9914 | hardcode_into_libs=yes |
3698 | 9534 | if test "$host_cpu" = ia64; then | 9915 | if test ia64 = "$host_cpu"; then |
3699 | 9535 | # AIX 5 supports IA64 | 9916 | # AIX 5 supports IA64 |
3701 | 9536 | library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' | 9917 | library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' |
3702 | 9537 | shlibpath_var=LD_LIBRARY_PATH | 9918 | shlibpath_var=LD_LIBRARY_PATH |
3703 | 9538 | else | 9919 | else |
3704 | 9539 | # With GCC up to 2.95.x, collect2 would create an import file | 9920 | # With GCC up to 2.95.x, collect2 would create an import file |
3705 | 9540 | # for dependence libraries. The import file would start with | 9921 | # for dependence libraries. The import file would start with |
3708 | 9541 | # the line `#! .'. This would cause the generated library to | 9922 | # the line '#! .'. This would cause the generated library to |
3709 | 9542 | # depend on `.', always an invalid library. This was fixed in | 9923 | # depend on '.', always an invalid library. This was fixed in |
3710 | 9543 | # development snapshots of GCC prior to 3.0. | 9924 | # development snapshots of GCC prior to 3.0. |
3711 | 9544 | case $host_os in | 9925 | case $host_os in |
3712 | 9545 | aix4 | aix4.[01] | aix4.[01].*) | 9926 | aix4 | aix4.[01] | aix4.[01].*) |
3713 | 9546 | if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' | 9927 | if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' |
3714 | 9547 | echo ' yes ' | 9928 | echo ' yes ' |
3716 | 9548 | echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then | 9929 | echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then |
3717 | 9549 | : | 9930 | : |
3718 | 9550 | else | 9931 | else |
3719 | 9551 | can_build_shared=no | 9932 | can_build_shared=no |
3720 | 9552 | fi | 9933 | fi |
3721 | 9553 | ;; | 9934 | ;; |
3722 | 9554 | esac | 9935 | esac |
3724 | 9555 | # AIX (on Power*) has no versioning support, so currently we can not hardcode correct | 9936 | # Using Import Files as archive members, it is possible to support |
3725 | 9937 | # filename-based versioning of shared library archives on AIX. While | ||
3726 | 9938 | # this would work for both with and without runtime linking, it will | ||
3727 | 9939 | # prevent static linking of such archives. So we do filename-based | ||
3728 | 9940 | # shared library versioning with .so extension only, which is used | ||
3729 | 9941 | # when both runtime linking and shared linking is enabled. | ||
3730 | 9942 | # Unfortunately, runtime linking may impact performance, so we do | ||
3731 | 9943 | # not want this to be the default eventually. Also, we use the | ||
3732 | 9944 | # versioned .so libs for executables only if there is the -brtl | ||
3733 | 9945 | # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. | ||
3734 | 9946 | # To allow for filename-based versioning support, we need to create | ||
3735 | 9947 | # libNAME.so.V as an archive file, containing: | ||
3736 | 9948 | # *) an Import File, referring to the versioned filename of the | ||
3737 | 9949 | # archive as well as the shared archive member, telling the | ||
3738 | 9950 | # bitwidth (32 or 64) of that shared object, and providing the | ||
3739 | 9951 | # list of exported symbols of that shared object, eventually | ||
3740 | 9952 | # decorated with the 'weak' keyword | ||
3741 | 9953 | # *) the shared object with the F_LOADONLY flag set, to really avoid | ||
3742 | 9954 | # it being seen by the linker. | ||
3743 | 9955 | # At run time we better use the real file rather than another symlink, | ||
3744 | 9956 | # but for link time we create the symlink libNAME.so -> libNAME.so.V | ||
3745 | 9957 | |||
3746 | 9958 | case $with_aix_soname,$aix_use_runtimelinking in | ||
3747 | 9959 | # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct | ||
3748 | 9556 | # soname into executable. Probably we can add versioning support to | 9960 | # soname into executable. Probably we can add versioning support to |
3749 | 9557 | # collect2, so additional links can be useful in future. | 9961 | # collect2, so additional links can be useful in future. |
3751 | 9558 | if test "$aix_use_runtimelinking" = yes; then | 9962 | aix,yes) # traditional libtool |
3752 | 9963 | dynamic_linker='AIX unversionable lib.so' | ||
3753 | 9559 | # If using run time linking (on AIX 4.2 or later) use lib<name>.so | 9964 | # If using run time linking (on AIX 4.2 or later) use lib<name>.so |
3754 | 9560 | # instead of lib<name>.a to let people know that these are not | 9965 | # instead of lib<name>.a to let people know that these are not |
3755 | 9561 | # typical AIX shared libraries. | 9966 | # typical AIX shared libraries. |
3758 | 9562 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 9967 | library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
3759 | 9563 | else | 9968 | ;; |
3760 | 9969 | aix,no) # traditional AIX only | ||
3761 | 9970 | dynamic_linker='AIX lib.a(lib.so.V)' | ||
3762 | 9564 | # We preserve .a as extension for shared libraries through AIX4.2 | 9971 | # We preserve .a as extension for shared libraries through AIX4.2 |
3763 | 9565 | # and later when we are not doing run time linking. | 9972 | # and later when we are not doing run time linking. |
3767 | 9566 | library_names_spec='${libname}${release}.a $libname.a' | 9973 | library_names_spec='$libname$release.a $libname.a' |
3768 | 9567 | soname_spec='${libname}${release}${shared_ext}$major' | 9974 | soname_spec='$libname$release$shared_ext$major' |
3769 | 9568 | fi | 9975 | ;; |
3770 | 9976 | svr4,*) # full svr4 only | ||
3771 | 9977 | dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)" | ||
3772 | 9978 | library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' | ||
3773 | 9979 | # We do not specify a path in Import Files, so LIBPATH fires. | ||
3774 | 9980 | shlibpath_overrides_runpath=yes | ||
3775 | 9981 | ;; | ||
3776 | 9982 | *,yes) # both, prefer svr4 | ||
3777 | 9983 | dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)" | ||
3778 | 9984 | library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' | ||
3779 | 9985 | # unpreferred sharedlib libNAME.a needs extra handling | ||
3780 | 9986 | postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' | ||
3781 | 9987 | postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' | ||
3782 | 9988 | # We do not specify a path in Import Files, so LIBPATH fires. | ||
3783 | 9989 | shlibpath_overrides_runpath=yes | ||
3784 | 9990 | ;; | ||
3785 | 9991 | *,no) # both, prefer aix | ||
3786 | 9992 | dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)" | ||
3787 | 9993 | library_names_spec='$libname$release.a $libname.a' | ||
3788 | 9994 | soname_spec='$libname$release$shared_ext$major' | ||
3789 | 9995 | # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling | ||
3790 | 9996 | postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' | ||
3791 | 9997 | postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' | ||
3792 | 9998 | ;; | ||
3793 | 9999 | esac | ||
3794 | 9569 | shlibpath_var=LIBPATH | 10000 | shlibpath_var=LIBPATH |
3795 | 9570 | fi | 10001 | fi |
3796 | 9571 | ;; | 10002 | ;; |
3797 | @@ -9575,18 +10006,18 @@ | |||
3798 | 9575 | powerpc) | 10006 | powerpc) |
3799 | 9576 | # Since July 2007 AmigaOS4 officially supports .so libraries. | 10007 | # Since July 2007 AmigaOS4 officially supports .so libraries. |
3800 | 9577 | # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. | 10008 | # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. |
3802 | 9578 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 10009 | library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
3803 | 9579 | ;; | 10010 | ;; |
3804 | 9580 | m68k) | 10011 | m68k) |
3805 | 9581 | library_names_spec='$libname.ixlibrary $libname.a' | 10012 | library_names_spec='$libname.ixlibrary $libname.a' |
3806 | 9582 | # Create ${libname}_ixlibrary.a entries in /sys/libs. | 10013 | # Create ${libname}_ixlibrary.a entries in /sys/libs. |
3808 | 9583 | 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' | 10014 | finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $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' |
3809 | 9584 | ;; | 10015 | ;; |
3810 | 9585 | esac | 10016 | esac |
3811 | 9586 | ;; | 10017 | ;; |
3812 | 9587 | 10018 | ||
3813 | 9588 | beos*) | 10019 | beos*) |
3815 | 9589 | library_names_spec='${libname}${shared_ext}' | 10020 | library_names_spec='$libname$shared_ext' |
3816 | 9590 | dynamic_linker="$host_os ld.so" | 10021 | dynamic_linker="$host_os ld.so" |
3817 | 9591 | shlibpath_var=LIBRARY_PATH | 10022 | shlibpath_var=LIBRARY_PATH |
3818 | 9592 | ;; | 10023 | ;; |
3819 | @@ -9594,8 +10025,8 @@ | |||
3820 | 9594 | bsdi[45]*) | 10025 | bsdi[45]*) |
3821 | 9595 | version_type=linux # correct to gnu/linux during the next big refactor | 10026 | version_type=linux # correct to gnu/linux during the next big refactor |
3822 | 9596 | need_version=no | 10027 | need_version=no |
3825 | 9597 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 10028 | library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
3826 | 9598 | soname_spec='${libname}${release}${shared_ext}$major' | 10029 | soname_spec='$libname$release$shared_ext$major' |
3827 | 9599 | finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' | 10030 | finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' |
3828 | 9600 | shlibpath_var=LD_LIBRARY_PATH | 10031 | shlibpath_var=LD_LIBRARY_PATH |
3829 | 9601 | sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" | 10032 | sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" |
3830 | @@ -9607,7 +10038,7 @@ | |||
3831 | 9607 | 10038 | ||
3832 | 9608 | cygwin* | mingw* | pw32* | cegcc*) | 10039 | cygwin* | mingw* | pw32* | cegcc*) |
3833 | 9609 | version_type=windows | 10040 | version_type=windows |
3835 | 9610 | shrext_cmds=".dll" | 10041 | shrext_cmds=.dll |
3836 | 9611 | need_version=no | 10042 | need_version=no |
3837 | 9612 | need_lib_prefix=no | 10043 | need_lib_prefix=no |
3838 | 9613 | 10044 | ||
3839 | @@ -9616,8 +10047,8 @@ | |||
3840 | 9616 | # gcc | 10047 | # gcc |
3841 | 9617 | library_names_spec='$libname.dll.a' | 10048 | library_names_spec='$libname.dll.a' |
3842 | 9618 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 10049 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
3845 | 9619 | postinstall_cmds='base_file=`basename \${file}`~ | 10050 | postinstall_cmds='base_file=`basename \$file`~ |
3846 | 9620 | dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ | 10051 | dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ |
3847 | 9621 | dldir=$destdir/`dirname \$dlpath`~ | 10052 | dldir=$destdir/`dirname \$dlpath`~ |
3848 | 9622 | test -d \$dldir || mkdir -p \$dldir~ | 10053 | test -d \$dldir || mkdir -p \$dldir~ |
3849 | 9623 | $install_prog $dir/$dlname \$dldir/$dlname~ | 10054 | $install_prog $dir/$dlname \$dldir/$dlname~ |
3850 | @@ -9633,17 +10064,17 @@ | |||
3851 | 9633 | case $host_os in | 10064 | case $host_os in |
3852 | 9634 | cygwin*) | 10065 | cygwin*) |
3853 | 9635 | # Cygwin DLLs use 'cyg' prefix rather than 'lib' | 10066 | # Cygwin DLLs use 'cyg' prefix rather than 'lib' |
3855 | 9636 | soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 10067 | soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' |
3856 | 9637 | 10068 | ||
3857 | 9638 | sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" | 10069 | sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" |
3858 | 9639 | ;; | 10070 | ;; |
3859 | 9640 | mingw* | cegcc*) | 10071 | mingw* | cegcc*) |
3860 | 9641 | # MinGW DLLs use traditional 'lib' prefix | 10072 | # MinGW DLLs use traditional 'lib' prefix |
3862 | 9642 | soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 10073 | soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' |
3863 | 9643 | ;; | 10074 | ;; |
3864 | 9644 | pw32*) | 10075 | pw32*) |
3865 | 9645 | # pw32 DLLs use 'pw' prefix rather than 'lib' | 10076 | # pw32 DLLs use 'pw' prefix rather than 'lib' |
3867 | 9646 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 10077 | library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' |
3868 | 9647 | ;; | 10078 | ;; |
3869 | 9648 | esac | 10079 | esac |
3870 | 9649 | dynamic_linker='Win32 ld.exe' | 10080 | dynamic_linker='Win32 ld.exe' |
3871 | @@ -9652,8 +10083,8 @@ | |||
3872 | 9652 | *,cl*) | 10083 | *,cl*) |
3873 | 9653 | # Native MSVC | 10084 | # Native MSVC |
3874 | 9654 | libname_spec='$name' | 10085 | libname_spec='$name' |
3877 | 9655 | soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 10086 | soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' |
3878 | 9656 | library_names_spec='${libname}.dll.lib' | 10087 | library_names_spec='$libname.dll.lib' |
3879 | 9657 | 10088 | ||
3880 | 9658 | case $build_os in | 10089 | case $build_os in |
3881 | 9659 | mingw*) | 10090 | mingw*) |
3882 | @@ -9680,7 +10111,7 @@ | |||
3883 | 9680 | sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | 10111 | sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
3884 | 9681 | ;; | 10112 | ;; |
3885 | 9682 | *) | 10113 | *) |
3887 | 9683 | sys_lib_search_path_spec="$LIB" | 10114 | sys_lib_search_path_spec=$LIB |
3888 | 9684 | if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then | 10115 | if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
3889 | 9685 | # It is most probably a Windows format PATH. | 10116 | # It is most probably a Windows format PATH. |
3890 | 9686 | sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | 10117 | sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
3891 | @@ -9693,8 +10124,8 @@ | |||
3892 | 9693 | esac | 10124 | esac |
3893 | 9694 | 10125 | ||
3894 | 9695 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 10126 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
3897 | 9696 | postinstall_cmds='base_file=`basename \${file}`~ | 10127 | postinstall_cmds='base_file=`basename \$file`~ |
3898 | 9697 | dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ | 10128 | dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ |
3899 | 9698 | dldir=$destdir/`dirname \$dlpath`~ | 10129 | dldir=$destdir/`dirname \$dlpath`~ |
3900 | 9699 | test -d \$dldir || mkdir -p \$dldir~ | 10130 | test -d \$dldir || mkdir -p \$dldir~ |
3901 | 9700 | $install_prog $dir/$dlname \$dldir/$dlname' | 10131 | $install_prog $dir/$dlname \$dldir/$dlname' |
3902 | @@ -9707,7 +10138,7 @@ | |||
3903 | 9707 | 10138 | ||
3904 | 9708 | *) | 10139 | *) |
3905 | 9709 | # Assume MSVC wrapper | 10140 | # Assume MSVC wrapper |
3907 | 9710 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' | 10141 | library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' |
3908 | 9711 | dynamic_linker='Win32 ld.exe' | 10142 | dynamic_linker='Win32 ld.exe' |
3909 | 9712 | ;; | 10143 | ;; |
3910 | 9713 | esac | 10144 | esac |
3911 | @@ -9720,8 +10151,8 @@ | |||
3912 | 9720 | version_type=darwin | 10151 | version_type=darwin |
3913 | 9721 | need_lib_prefix=no | 10152 | need_lib_prefix=no |
3914 | 9722 | need_version=no | 10153 | need_version=no |
3917 | 9723 | library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' | 10154 | library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' |
3918 | 9724 | soname_spec='${libname}${release}${major}$shared_ext' | 10155 | soname_spec='$libname$release$major$shared_ext' |
3919 | 9725 | shlibpath_overrides_runpath=yes | 10156 | shlibpath_overrides_runpath=yes |
3920 | 9726 | shlibpath_var=DYLD_LIBRARY_PATH | 10157 | shlibpath_var=DYLD_LIBRARY_PATH |
3921 | 9727 | shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' | 10158 | shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' |
3922 | @@ -9734,8 +10165,8 @@ | |||
3923 | 9734 | version_type=linux # correct to gnu/linux during the next big refactor | 10165 | version_type=linux # correct to gnu/linux during the next big refactor |
3924 | 9735 | need_lib_prefix=no | 10166 | need_lib_prefix=no |
3925 | 9736 | need_version=no | 10167 | need_version=no |
3928 | 9737 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' | 10168 | library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
3929 | 9738 | soname_spec='${libname}${release}${shared_ext}$major' | 10169 | soname_spec='$libname$release$shared_ext$major' |
3930 | 9739 | shlibpath_var=LD_LIBRARY_PATH | 10170 | shlibpath_var=LD_LIBRARY_PATH |
3931 | 9740 | ;; | 10171 | ;; |
3932 | 9741 | 10172 | ||
3933 | @@ -9753,12 +10184,13 @@ | |||
3934 | 9753 | version_type=freebsd-$objformat | 10184 | version_type=freebsd-$objformat |
3935 | 9754 | case $version_type in | 10185 | case $version_type in |
3936 | 9755 | freebsd-elf*) | 10186 | freebsd-elf*) |
3938 | 9756 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' | 10187 | library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
3939 | 10188 | soname_spec='$libname$release$shared_ext$major' | ||
3940 | 9757 | need_version=no | 10189 | need_version=no |
3941 | 9758 | need_lib_prefix=no | 10190 | need_lib_prefix=no |
3942 | 9759 | ;; | 10191 | ;; |
3943 | 9760 | freebsd-*) | 10192 | freebsd-*) |
3945 | 9761 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' | 10193 | library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' |
3946 | 9762 | need_version=yes | 10194 | need_version=yes |
3947 | 9763 | ;; | 10195 | ;; |
3948 | 9764 | esac | 10196 | esac |
3949 | @@ -9788,10 +10220,10 @@ | |||
3950 | 9788 | need_lib_prefix=no | 10220 | need_lib_prefix=no |
3951 | 9789 | need_version=no | 10221 | need_version=no |
3952 | 9790 | dynamic_linker="$host_os runtime_loader" | 10222 | dynamic_linker="$host_os runtime_loader" |
3955 | 9791 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' | 10223 | library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
3956 | 9792 | soname_spec='${libname}${release}${shared_ext}$major' | 10224 | soname_spec='$libname$release$shared_ext$major' |
3957 | 9793 | shlibpath_var=LIBRARY_PATH | 10225 | shlibpath_var=LIBRARY_PATH |
3959 | 9794 | shlibpath_overrides_runpath=yes | 10226 | shlibpath_overrides_runpath=no |
3960 | 9795 | sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' | 10227 | sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' |
3961 | 9796 | hardcode_into_libs=yes | 10228 | hardcode_into_libs=yes |
3962 | 9797 | ;; | 10229 | ;; |
3963 | @@ -9809,14 +10241,15 @@ | |||
3964 | 9809 | dynamic_linker="$host_os dld.so" | 10241 | dynamic_linker="$host_os dld.so" |
3965 | 9810 | shlibpath_var=LD_LIBRARY_PATH | 10242 | shlibpath_var=LD_LIBRARY_PATH |
3966 | 9811 | shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. | 10243 | shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. |
3970 | 9812 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 10244 | library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
3971 | 9813 | soname_spec='${libname}${release}${shared_ext}$major' | 10245 | soname_spec='$libname$release$shared_ext$major' |
3972 | 9814 | if test "X$HPUX_IA64_MODE" = X32; then | 10246 | if test 32 = "$HPUX_IA64_MODE"; then |
3973 | 9815 | sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" | 10247 | sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" |
3974 | 10248 | sys_lib_dlsearch_path_spec=/usr/lib/hpux32 | ||
3975 | 9816 | else | 10249 | else |
3976 | 9817 | sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" | 10250 | sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" |
3977 | 10251 | sys_lib_dlsearch_path_spec=/usr/lib/hpux64 | ||
3978 | 9818 | fi | 10252 | fi |
3979 | 9819 | sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec | ||
3980 | 9820 | ;; | 10253 | ;; |
3981 | 9821 | hppa*64*) | 10254 | hppa*64*) |
3982 | 9822 | shrext_cmds='.sl' | 10255 | shrext_cmds='.sl' |
3983 | @@ -9824,8 +10257,8 @@ | |||
3984 | 9824 | dynamic_linker="$host_os dld.sl" | 10257 | dynamic_linker="$host_os dld.sl" |
3985 | 9825 | shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH | 10258 | shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH |
3986 | 9826 | shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. | 10259 | shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. |
3989 | 9827 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 10260 | library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
3990 | 9828 | soname_spec='${libname}${release}${shared_ext}$major' | 10261 | soname_spec='$libname$release$shared_ext$major' |
3991 | 9829 | sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" | 10262 | sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" |
3992 | 9830 | sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec | 10263 | sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec |
3993 | 9831 | ;; | 10264 | ;; |
3994 | @@ -9834,8 +10267,8 @@ | |||
3995 | 9834 | dynamic_linker="$host_os dld.sl" | 10267 | dynamic_linker="$host_os dld.sl" |
3996 | 9835 | shlibpath_var=SHLIB_PATH | 10268 | shlibpath_var=SHLIB_PATH |
3997 | 9836 | shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH | 10269 | shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH |
4000 | 9837 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 10270 | library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
4001 | 9838 | soname_spec='${libname}${release}${shared_ext}$major' | 10271 | soname_spec='$libname$release$shared_ext$major' |
4002 | 9839 | ;; | 10272 | ;; |
4003 | 9840 | esac | 10273 | esac |
4004 | 9841 | # HP-UX runs *really* slowly unless shared libraries are mode 555, ... | 10274 | # HP-UX runs *really* slowly unless shared libraries are mode 555, ... |
4005 | @@ -9848,8 +10281,8 @@ | |||
4006 | 9848 | version_type=linux # correct to gnu/linux during the next big refactor | 10281 | version_type=linux # correct to gnu/linux during the next big refactor |
4007 | 9849 | need_lib_prefix=no | 10282 | need_lib_prefix=no |
4008 | 9850 | need_version=no | 10283 | need_version=no |
4011 | 9851 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | 10284 | library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
4012 | 9852 | soname_spec='${libname}${release}${shared_ext}$major' | 10285 | soname_spec='$libname$release$shared_ext$major' |
4013 | 9853 | dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' | 10286 | dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' |
4014 | 9854 | shlibpath_var=LD_LIBRARY_PATH | 10287 | shlibpath_var=LD_LIBRARY_PATH |
4015 | 9855 | shlibpath_overrides_runpath=no | 10288 | shlibpath_overrides_runpath=no |
4016 | @@ -9860,7 +10293,7 @@ | |||
4017 | 9860 | case $host_os in | 10293 | case $host_os in |
4018 | 9861 | nonstopux*) version_type=nonstopux ;; | 10294 | nonstopux*) version_type=nonstopux ;; |
4019 | 9862 | *) | 10295 | *) |
4021 | 9863 | if test "$lt_cv_prog_gnu_ld" = yes; then | 10296 | if test yes = "$lt_cv_prog_gnu_ld"; then |
4022 | 9864 | version_type=linux # correct to gnu/linux during the next big refactor | 10297 | version_type=linux # correct to gnu/linux during the next big refactor |
4023 | 9865 | else | 10298 | else |
4024 | 9866 | version_type=irix | 10299 | version_type=irix |
4025 | @@ -9868,8 +10301,8 @@ | |||
4026 | 9868 | esac | 10301 | esac |
4027 | 9869 | need_lib_prefix=no | 10302 | need_lib_prefix=no |
4028 | 9870 | need_version=no | 10303 | need_version=no |
4031 | 9871 | soname_spec='${libname}${release}${shared_ext}$major' | 10304 | soname_spec='$libname$release$shared_ext$major' |
4032 | 9872 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' | 10305 | library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' |
4033 | 9873 | case $host_os in | 10306 | case $host_os in |
4034 | 9874 | irix5* | nonstopux*) | 10307 | irix5* | nonstopux*) |
4035 | 9875 | libsuff= shlibsuff= | 10308 | libsuff= shlibsuff= |
4036 | @@ -9888,8 +10321,8 @@ | |||
4037 | 9888 | esac | 10321 | esac |
4038 | 9889 | shlibpath_var=LD_LIBRARY${shlibsuff}_PATH | 10322 | shlibpath_var=LD_LIBRARY${shlibsuff}_PATH |
4039 | 9890 | shlibpath_overrides_runpath=no | 10323 | shlibpath_overrides_runpath=no |
4042 | 9891 | sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" | 10324 | sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" |
4043 | 9892 | sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" | 10325 | sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" |
4044 | 9893 | hardcode_into_libs=yes | 10326 | hardcode_into_libs=yes |
4045 | 9894 | ;; | 10327 | ;; |
4046 | 9895 | 10328 | ||
4047 | @@ -9898,13 +10331,33 @@ | |||
4048 | 9898 | dynamic_linker=no | 10331 | dynamic_linker=no |
4049 | 9899 | ;; | 10332 | ;; |
4050 | 9900 | 10333 | ||
4051 | 10334 | linux*android*) | ||
4052 | 10335 | version_type=none # Android doesn't support versioned libraries. | ||
4053 | 10336 | need_lib_prefix=no | ||
4054 | 10337 | need_version=no | ||
4055 | 10338 | library_names_spec='$libname$release$shared_ext' | ||
4056 | 10339 | soname_spec='$libname$release$shared_ext' | ||
4057 | 10340 | finish_cmds= | ||
4058 | 10341 | shlibpath_var=LD_LIBRARY_PATH | ||
4059 | 10342 | shlibpath_overrides_runpath=yes | ||
4060 | 10343 | |||
4061 | 10344 | # This implies no fast_install, which is unacceptable. | ||
4062 | 10345 | # Some rework will be needed to allow for fast_install | ||
4063 | 10346 | # before this can be enabled. | ||
4064 | 10347 | hardcode_into_libs=yes | ||
4065 | 10348 | |||
4066 | 10349 | dynamic_linker='Android linker' | ||
4067 | 10350 | # Don't embed -rpath directories since the linker doesn't support them. | ||
4068 | 10351 | hardcode_libdir_flag_spec='-L$libdir' | ||
4069 | 10352 | ;; | ||
4070 | 10353 | |||
4071 | 9901 | # This must be glibc/ELF. | 10354 | # This must be glibc/ELF. |
4072 | 9902 | linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) | 10355 | linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) |
4073 | 9903 | version_type=linux # correct to gnu/linux during the next big refactor | 10356 | version_type=linux # correct to gnu/linux during the next big refactor |
4074 | 9904 | need_lib_prefix=no | 10357 | need_lib_prefix=no |
4075 | 9905 | need_version=no | 10358 | need_version=no |
4078 | 9906 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 10359 | library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
4079 | 9907 | soname_spec='${libname}${release}${shared_ext}$major' | 10360 | soname_spec='$libname$release$shared_ext$major' |
4080 | 9908 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' | 10361 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' |
4081 | 9909 | shlibpath_var=LD_LIBRARY_PATH | 10362 | shlibpath_var=LD_LIBRARY_PATH |
4082 | 9910 | shlibpath_overrides_runpath=no | 10363 | shlibpath_overrides_runpath=no |
4083 | @@ -9948,7 +10401,12 @@ | |||
4084 | 9948 | # before this can be enabled. | 10401 | # before this can be enabled. |
4085 | 9949 | hardcode_into_libs=yes | 10402 | hardcode_into_libs=yes |
4086 | 9950 | 10403 | ||
4088 | 9951 | # Append ld.so.conf contents to the search path | 10404 | # Ideally, we could use ldconfig to report *all* directores which are |
4089 | 10405 | # searched for libraries, however this is still not possible. Aside from not | ||
4090 | 10406 | # being certain /sbin/ldconfig is available, command | ||
4091 | 10407 | # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, | ||
4092 | 10408 | # even though it is searched at run-time. Try to do the best guess by | ||
4093 | 10409 | # appending ld.so.conf contents (and includes) to the search path. | ||
4094 | 9952 | if test -f /etc/ld.so.conf; then | 10410 | if test -f /etc/ld.so.conf; then |
4095 | 9953 | 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' ' '` | 10411 | 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' ' '` |
4096 | 9954 | sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" | 10412 | sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" |
4097 | @@ -9963,29 +10421,17 @@ | |||
4098 | 9963 | dynamic_linker='GNU/Linux ld.so' | 10421 | dynamic_linker='GNU/Linux ld.so' |
4099 | 9964 | ;; | 10422 | ;; |
4100 | 9965 | 10423 | ||
4101 | 9966 | netbsdelf*-gnu) | ||
4102 | 9967 | version_type=linux | ||
4103 | 9968 | need_lib_prefix=no | ||
4104 | 9969 | need_version=no | ||
4105 | 9970 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | ||
4106 | 9971 | soname_spec='${libname}${release}${shared_ext}$major' | ||
4107 | 9972 | shlibpath_var=LD_LIBRARY_PATH | ||
4108 | 9973 | shlibpath_overrides_runpath=no | ||
4109 | 9974 | hardcode_into_libs=yes | ||
4110 | 9975 | dynamic_linker='NetBSD ld.elf_so' | ||
4111 | 9976 | ;; | ||
4112 | 9977 | |||
4113 | 9978 | netbsd*) | 10424 | netbsd*) |
4114 | 9979 | version_type=sunos | 10425 | version_type=sunos |
4115 | 9980 | need_lib_prefix=no | 10426 | need_lib_prefix=no |
4116 | 9981 | need_version=no | 10427 | need_version=no |
4117 | 9982 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then | 10428 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
4119 | 9983 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' | 10429 | library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' |
4120 | 9984 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' | 10430 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' |
4121 | 9985 | dynamic_linker='NetBSD (a.out) ld.so' | 10431 | dynamic_linker='NetBSD (a.out) ld.so' |
4122 | 9986 | else | 10432 | else |
4125 | 9987 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | 10433 | library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
4126 | 9988 | soname_spec='${libname}${release}${shared_ext}$major' | 10434 | soname_spec='$libname$release$shared_ext$major' |
4127 | 9989 | dynamic_linker='NetBSD ld.elf_so' | 10435 | dynamic_linker='NetBSD ld.elf_so' |
4128 | 9990 | fi | 10436 | fi |
4129 | 9991 | shlibpath_var=LD_LIBRARY_PATH | 10437 | shlibpath_var=LD_LIBRARY_PATH |
4130 | @@ -9995,7 +10441,7 @@ | |||
4131 | 9995 | 10441 | ||
4132 | 9996 | newsos6) | 10442 | newsos6) |
4133 | 9997 | version_type=linux # correct to gnu/linux during the next big refactor | 10443 | version_type=linux # correct to gnu/linux during the next big refactor |
4135 | 9998 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 10444 | library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
4136 | 9999 | shlibpath_var=LD_LIBRARY_PATH | 10445 | shlibpath_var=LD_LIBRARY_PATH |
4137 | 10000 | shlibpath_overrides_runpath=yes | 10446 | shlibpath_overrides_runpath=yes |
4138 | 10001 | ;; | 10447 | ;; |
4139 | @@ -10004,58 +10450,68 @@ | |||
4140 | 10004 | version_type=qnx | 10450 | version_type=qnx |
4141 | 10005 | need_lib_prefix=no | 10451 | need_lib_prefix=no |
4142 | 10006 | need_version=no | 10452 | need_version=no |
4145 | 10007 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 10453 | library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
4146 | 10008 | soname_spec='${libname}${release}${shared_ext}$major' | 10454 | soname_spec='$libname$release$shared_ext$major' |
4147 | 10009 | shlibpath_var=LD_LIBRARY_PATH | 10455 | shlibpath_var=LD_LIBRARY_PATH |
4148 | 10010 | shlibpath_overrides_runpath=no | 10456 | shlibpath_overrides_runpath=no |
4149 | 10011 | hardcode_into_libs=yes | 10457 | hardcode_into_libs=yes |
4150 | 10012 | dynamic_linker='ldqnx.so' | 10458 | dynamic_linker='ldqnx.so' |
4151 | 10013 | ;; | 10459 | ;; |
4152 | 10014 | 10460 | ||
4154 | 10015 | openbsd*) | 10461 | openbsd* | bitrig*) |
4155 | 10016 | version_type=sunos | 10462 | version_type=sunos |
4157 | 10017 | sys_lib_dlsearch_path_spec="/usr/lib" | 10463 | sys_lib_dlsearch_path_spec=/usr/lib |
4158 | 10018 | need_lib_prefix=no | 10464 | need_lib_prefix=no |
4165 | 10019 | # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. | 10465 | if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then |
4166 | 10020 | case $host_os in | 10466 | need_version=no |
4167 | 10021 | openbsd3.3 | openbsd3.3.*) need_version=yes ;; | 10467 | else |
4168 | 10022 | *) need_version=no ;; | 10468 | need_version=yes |
4169 | 10023 | esac | 10469 | fi |
4170 | 10024 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' | 10470 | library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' |
4171 | 10025 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' | 10471 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' |
4172 | 10026 | shlibpath_var=LD_LIBRARY_PATH | 10472 | shlibpath_var=LD_LIBRARY_PATH |
4185 | 10027 | if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then | 10473 | shlibpath_overrides_runpath=yes |
4174 | 10028 | case $host_os in | ||
4175 | 10029 | openbsd2.[89] | openbsd2.[89].*) | ||
4176 | 10030 | shlibpath_overrides_runpath=no | ||
4177 | 10031 | ;; | ||
4178 | 10032 | *) | ||
4179 | 10033 | shlibpath_overrides_runpath=yes | ||
4180 | 10034 | ;; | ||
4181 | 10035 | esac | ||
4182 | 10036 | else | ||
4183 | 10037 | shlibpath_overrides_runpath=yes | ||
4184 | 10038 | fi | ||
4186 | 10039 | ;; | 10474 | ;; |
4187 | 10040 | 10475 | ||
4188 | 10041 | os2*) | 10476 | os2*) |
4189 | 10042 | libname_spec='$name' | 10477 | libname_spec='$name' |
4191 | 10043 | shrext_cmds=".dll" | 10478 | version_type=windows |
4192 | 10479 | shrext_cmds=.dll | ||
4193 | 10480 | need_version=no | ||
4194 | 10044 | need_lib_prefix=no | 10481 | need_lib_prefix=no |
4196 | 10045 | library_names_spec='$libname${shared_ext} $libname.a' | 10482 | # OS/2 can only load a DLL with a base name of 8 characters or less. |
4197 | 10483 | soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; | ||
4198 | 10484 | v=$($ECHO $release$versuffix | tr -d .-); | ||
4199 | 10485 | n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); | ||
4200 | 10486 | $ECHO $n$v`$shared_ext' | ||
4201 | 10487 | library_names_spec='${libname}_dll.$libext' | ||
4202 | 10046 | dynamic_linker='OS/2 ld.exe' | 10488 | dynamic_linker='OS/2 ld.exe' |
4204 | 10047 | shlibpath_var=LIBPATH | 10489 | shlibpath_var=BEGINLIBPATH |
4205 | 10490 | sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" | ||
4206 | 10491 | sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec | ||
4207 | 10492 | postinstall_cmds='base_file=`basename \$file`~ | ||
4208 | 10493 | dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ | ||
4209 | 10494 | dldir=$destdir/`dirname \$dlpath`~ | ||
4210 | 10495 | test -d \$dldir || mkdir -p \$dldir~ | ||
4211 | 10496 | $install_prog $dir/$dlname \$dldir/$dlname~ | ||
4212 | 10497 | chmod a+x \$dldir/$dlname~ | ||
4213 | 10498 | if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then | ||
4214 | 10499 | eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; | ||
4215 | 10500 | fi' | ||
4216 | 10501 | postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ | ||
4217 | 10502 | dlpath=$dir/\$dldll~ | ||
4218 | 10503 | $RM \$dlpath' | ||
4219 | 10048 | ;; | 10504 | ;; |
4220 | 10049 | 10505 | ||
4221 | 10050 | osf3* | osf4* | osf5*) | 10506 | osf3* | osf4* | osf5*) |
4222 | 10051 | version_type=osf | 10507 | version_type=osf |
4223 | 10052 | need_lib_prefix=no | 10508 | need_lib_prefix=no |
4224 | 10053 | need_version=no | 10509 | need_version=no |
4227 | 10054 | soname_spec='${libname}${release}${shared_ext}$major' | 10510 | soname_spec='$libname$release$shared_ext$major' |
4228 | 10055 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 10511 | library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
4229 | 10056 | shlibpath_var=LD_LIBRARY_PATH | 10512 | shlibpath_var=LD_LIBRARY_PATH |
4230 | 10057 | sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" | 10513 | sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" |
4232 | 10058 | sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" | 10514 | sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec |
4233 | 10059 | ;; | 10515 | ;; |
4234 | 10060 | 10516 | ||
4235 | 10061 | rdos*) | 10517 | rdos*) |
4236 | @@ -10066,8 +10522,8 @@ | |||
4237 | 10066 | version_type=linux # correct to gnu/linux during the next big refactor | 10522 | version_type=linux # correct to gnu/linux during the next big refactor |
4238 | 10067 | need_lib_prefix=no | 10523 | need_lib_prefix=no |
4239 | 10068 | need_version=no | 10524 | need_version=no |
4242 | 10069 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 10525 | library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
4243 | 10070 | soname_spec='${libname}${release}${shared_ext}$major' | 10526 | soname_spec='$libname$release$shared_ext$major' |
4244 | 10071 | shlibpath_var=LD_LIBRARY_PATH | 10527 | shlibpath_var=LD_LIBRARY_PATH |
4245 | 10072 | shlibpath_overrides_runpath=yes | 10528 | shlibpath_overrides_runpath=yes |
4246 | 10073 | hardcode_into_libs=yes | 10529 | hardcode_into_libs=yes |
4247 | @@ -10077,11 +10533,11 @@ | |||
4248 | 10077 | 10533 | ||
4249 | 10078 | sunos4*) | 10534 | sunos4*) |
4250 | 10079 | version_type=sunos | 10535 | version_type=sunos |
4252 | 10080 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' | 10536 | library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' |
4253 | 10081 | finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' | 10537 | finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' |
4254 | 10082 | shlibpath_var=LD_LIBRARY_PATH | 10538 | shlibpath_var=LD_LIBRARY_PATH |
4255 | 10083 | shlibpath_overrides_runpath=yes | 10539 | shlibpath_overrides_runpath=yes |
4257 | 10084 | if test "$with_gnu_ld" = yes; then | 10540 | if test yes = "$with_gnu_ld"; then |
4258 | 10085 | need_lib_prefix=no | 10541 | need_lib_prefix=no |
4259 | 10086 | fi | 10542 | fi |
4260 | 10087 | need_version=yes | 10543 | need_version=yes |
4261 | @@ -10089,8 +10545,8 @@ | |||
4262 | 10089 | 10545 | ||
4263 | 10090 | sysv4 | sysv4.3*) | 10546 | sysv4 | sysv4.3*) |
4264 | 10091 | version_type=linux # correct to gnu/linux during the next big refactor | 10547 | version_type=linux # correct to gnu/linux during the next big refactor |
4267 | 10092 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 10548 | library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
4268 | 10093 | soname_spec='${libname}${release}${shared_ext}$major' | 10549 | soname_spec='$libname$release$shared_ext$major' |
4269 | 10094 | shlibpath_var=LD_LIBRARY_PATH | 10550 | shlibpath_var=LD_LIBRARY_PATH |
4270 | 10095 | case $host_vendor in | 10551 | case $host_vendor in |
4271 | 10096 | sni) | 10552 | sni) |
4272 | @@ -10111,24 +10567,24 @@ | |||
4273 | 10111 | ;; | 10567 | ;; |
4274 | 10112 | 10568 | ||
4275 | 10113 | sysv4*MP*) | 10569 | sysv4*MP*) |
4277 | 10114 | if test -d /usr/nec ;then | 10570 | if test -d /usr/nec; then |
4278 | 10115 | version_type=linux # correct to gnu/linux during the next big refactor | 10571 | version_type=linux # correct to gnu/linux during the next big refactor |
4281 | 10116 | library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' | 10572 | library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' |
4282 | 10117 | soname_spec='$libname${shared_ext}.$major' | 10573 | soname_spec='$libname$shared_ext.$major' |
4283 | 10118 | shlibpath_var=LD_LIBRARY_PATH | 10574 | shlibpath_var=LD_LIBRARY_PATH |
4284 | 10119 | fi | 10575 | fi |
4285 | 10120 | ;; | 10576 | ;; |
4286 | 10121 | 10577 | ||
4287 | 10122 | sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) | 10578 | sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) |
4289 | 10123 | version_type=freebsd-elf | 10579 | version_type=sco |
4290 | 10124 | need_lib_prefix=no | 10580 | need_lib_prefix=no |
4291 | 10125 | need_version=no | 10581 | need_version=no |
4294 | 10126 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' | 10582 | library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' |
4295 | 10127 | soname_spec='${libname}${release}${shared_ext}$major' | 10583 | soname_spec='$libname$release$shared_ext$major' |
4296 | 10128 | shlibpath_var=LD_LIBRARY_PATH | 10584 | shlibpath_var=LD_LIBRARY_PATH |
4297 | 10129 | shlibpath_overrides_runpath=yes | 10585 | shlibpath_overrides_runpath=yes |
4298 | 10130 | hardcode_into_libs=yes | 10586 | hardcode_into_libs=yes |
4300 | 10131 | if test "$with_gnu_ld" = yes; then | 10587 | if test yes = "$with_gnu_ld"; then |
4301 | 10132 | sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' | 10588 | sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' |
4302 | 10133 | else | 10589 | else |
4303 | 10134 | sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' | 10590 | sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' |
4304 | @@ -10146,7 +10602,7 @@ | |||
4305 | 10146 | version_type=linux # correct to gnu/linux during the next big refactor | 10602 | version_type=linux # correct to gnu/linux during the next big refactor |
4306 | 10147 | need_lib_prefix=no | 10603 | need_lib_prefix=no |
4307 | 10148 | need_version=no | 10604 | need_version=no |
4309 | 10149 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 10605 | library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
4310 | 10150 | shlibpath_var=LD_LIBRARY_PATH | 10606 | shlibpath_var=LD_LIBRARY_PATH |
4311 | 10151 | shlibpath_overrides_runpath=no | 10607 | shlibpath_overrides_runpath=no |
4312 | 10152 | hardcode_into_libs=yes | 10608 | hardcode_into_libs=yes |
4313 | @@ -10154,8 +10610,8 @@ | |||
4314 | 10154 | 10610 | ||
4315 | 10155 | uts4*) | 10611 | uts4*) |
4316 | 10156 | version_type=linux # correct to gnu/linux during the next big refactor | 10612 | version_type=linux # correct to gnu/linux during the next big refactor |
4319 | 10157 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 10613 | library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
4320 | 10158 | soname_spec='${libname}${release}${shared_ext}$major' | 10614 | soname_spec='$libname$release$shared_ext$major' |
4321 | 10159 | shlibpath_var=LD_LIBRARY_PATH | 10615 | shlibpath_var=LD_LIBRARY_PATH |
4322 | 10160 | ;; | 10616 | ;; |
4323 | 10161 | 10617 | ||
4324 | @@ -10165,19 +10621,27 @@ | |||
4325 | 10165 | esac | 10621 | esac |
4326 | 10166 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 | 10622 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 |
4327 | 10167 | $as_echo "$dynamic_linker" >&6; } | 10623 | $as_echo "$dynamic_linker" >&6; } |
4329 | 10168 | test "$dynamic_linker" = no && can_build_shared=no | 10624 | test no = "$dynamic_linker" && can_build_shared=no |
4330 | 10169 | 10625 | ||
4331 | 10170 | variables_saved_for_relink="PATH $shlibpath_var $runpath_var" | 10626 | variables_saved_for_relink="PATH $shlibpath_var $runpath_var" |
4333 | 10171 | if test "$GCC" = yes; then | 10627 | if test yes = "$GCC"; then |
4334 | 10172 | variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" | 10628 | variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" |
4335 | 10173 | fi | 10629 | fi |
4336 | 10174 | 10630 | ||
4343 | 10175 | if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then | 10631 | if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then |
4344 | 10176 | sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" | 10632 | sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec |
4345 | 10177 | fi | 10633 | fi |
4346 | 10178 | if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then | 10634 | |
4347 | 10179 | sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" | 10635 | if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then |
4348 | 10180 | fi | 10636 | sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec |
4349 | 10637 | fi | ||
4350 | 10638 | |||
4351 | 10639 | # lt_cv_sys_lib... is unaugmented for libtool script decls... | ||
4352 | 10640 | lt_cv_sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec | ||
4353 | 10641 | |||
4354 | 10642 | # ..but sys_lib_... needs LT_SYS_LIBRARY_PATH munging for | ||
4355 | 10643 | # LT_SYS_DLSEARCH_PATH macro in ltdl.m4 to work with the correct paths: | ||
4356 | 10644 | func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" | ||
4357 | 10181 | 10645 | ||
4358 | 10182 | 10646 | ||
4359 | 10183 | 10647 | ||
4360 | @@ -10275,15 +10739,15 @@ | |||
4361 | 10275 | hardcode_action= | 10739 | hardcode_action= |
4362 | 10276 | if test -n "$hardcode_libdir_flag_spec" || | 10740 | if test -n "$hardcode_libdir_flag_spec" || |
4363 | 10277 | test -n "$runpath_var" || | 10741 | test -n "$runpath_var" || |
4365 | 10278 | test "X$hardcode_automatic" = "Xyes" ; then | 10742 | test yes = "$hardcode_automatic"; then |
4366 | 10279 | 10743 | ||
4367 | 10280 | # We can hardcode non-existent directories. | 10744 | # We can hardcode non-existent directories. |
4369 | 10281 | if test "$hardcode_direct" != no && | 10745 | if test no != "$hardcode_direct" && |
4370 | 10282 | # If the only mechanism to avoid hardcoding is shlibpath_var, we | 10746 | # If the only mechanism to avoid hardcoding is shlibpath_var, we |
4371 | 10283 | # have to relink, otherwise we might link with an installed library | 10747 | # have to relink, otherwise we might link with an installed library |
4372 | 10284 | # when we should be linking with a yet-to-be-installed one | 10748 | # when we should be linking with a yet-to-be-installed one |
4375 | 10285 | ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && | 10749 | ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" && |
4376 | 10286 | test "$hardcode_minus_L" != no; then | 10750 | test no != "$hardcode_minus_L"; then |
4377 | 10287 | # Linking always hardcodes the temporary library directory. | 10751 | # Linking always hardcodes the temporary library directory. |
4378 | 10288 | hardcode_action=relink | 10752 | hardcode_action=relink |
4379 | 10289 | else | 10753 | else |
4380 | @@ -10298,12 +10762,12 @@ | |||
4381 | 10298 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 | 10762 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 |
4382 | 10299 | $as_echo "$hardcode_action" >&6; } | 10763 | $as_echo "$hardcode_action" >&6; } |
4383 | 10300 | 10764 | ||
4386 | 10301 | if test "$hardcode_action" = relink || | 10765 | if test relink = "$hardcode_action" || |
4387 | 10302 | test "$inherit_rpath" = yes; then | 10766 | test yes = "$inherit_rpath"; then |
4388 | 10303 | # Fast installation is not supported | 10767 | # Fast installation is not supported |
4389 | 10304 | enable_fast_install=no | 10768 | enable_fast_install=no |
4392 | 10305 | elif test "$shlibpath_overrides_runpath" = yes || | 10769 | elif test yes = "$shlibpath_overrides_runpath" || |
4393 | 10306 | test "$enable_shared" = no; then | 10770 | test no = "$enable_shared"; then |
4394 | 10307 | # Fast installation is not necessary | 10771 | # Fast installation is not necessary |
4395 | 10308 | enable_fast_install=needless | 10772 | enable_fast_install=needless |
4396 | 10309 | fi | 10773 | fi |
4397 | @@ -10313,7 +10777,7 @@ | |||
4398 | 10313 | 10777 | ||
4399 | 10314 | 10778 | ||
4400 | 10315 | 10779 | ||
4402 | 10316 | if test "x$enable_dlopen" != xyes; then | 10780 | if test yes != "$enable_dlopen"; then |
4403 | 10317 | enable_dlopen=unknown | 10781 | enable_dlopen=unknown |
4404 | 10318 | enable_dlopen_self=unknown | 10782 | enable_dlopen_self=unknown |
4405 | 10319 | enable_dlopen_self_static=unknown | 10783 | enable_dlopen_self_static=unknown |
4406 | @@ -10323,23 +10787,23 @@ | |||
4407 | 10323 | 10787 | ||
4408 | 10324 | case $host_os in | 10788 | case $host_os in |
4409 | 10325 | beos*) | 10789 | beos*) |
4411 | 10326 | lt_cv_dlopen="load_add_on" | 10790 | lt_cv_dlopen=load_add_on |
4412 | 10327 | lt_cv_dlopen_libs= | 10791 | lt_cv_dlopen_libs= |
4413 | 10328 | lt_cv_dlopen_self=yes | 10792 | lt_cv_dlopen_self=yes |
4414 | 10329 | ;; | 10793 | ;; |
4415 | 10330 | 10794 | ||
4416 | 10331 | mingw* | pw32* | cegcc*) | 10795 | mingw* | pw32* | cegcc*) |
4418 | 10332 | lt_cv_dlopen="LoadLibrary" | 10796 | lt_cv_dlopen=LoadLibrary |
4419 | 10333 | lt_cv_dlopen_libs= | 10797 | lt_cv_dlopen_libs= |
4420 | 10334 | ;; | 10798 | ;; |
4421 | 10335 | 10799 | ||
4422 | 10336 | cygwin*) | 10800 | cygwin*) |
4424 | 10337 | lt_cv_dlopen="dlopen" | 10801 | lt_cv_dlopen=dlopen |
4425 | 10338 | lt_cv_dlopen_libs= | 10802 | lt_cv_dlopen_libs= |
4426 | 10339 | ;; | 10803 | ;; |
4427 | 10340 | 10804 | ||
4428 | 10341 | darwin*) | 10805 | darwin*) |
4430 | 10342 | # if libdl is installed we need to link against it | 10806 | # if libdl is installed we need to link against it |
4431 | 10343 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 | 10807 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 |
4432 | 10344 | $as_echo_n "checking for dlopen in -ldl... " >&6; } | 10808 | $as_echo_n "checking for dlopen in -ldl... " >&6; } |
4433 | 10345 | if ${ac_cv_lib_dl_dlopen+:} false; then : | 10809 | if ${ac_cv_lib_dl_dlopen+:} false; then : |
4434 | @@ -10377,10 +10841,10 @@ | |||
4435 | 10377 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 | 10841 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 |
4436 | 10378 | $as_echo "$ac_cv_lib_dl_dlopen" >&6; } | 10842 | $as_echo "$ac_cv_lib_dl_dlopen" >&6; } |
4437 | 10379 | if test "x$ac_cv_lib_dl_dlopen" = xyes; then : | 10843 | if test "x$ac_cv_lib_dl_dlopen" = xyes; then : |
4439 | 10380 | lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" | 10844 | lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl |
4440 | 10381 | else | 10845 | else |
4441 | 10382 | 10846 | ||
4443 | 10383 | lt_cv_dlopen="dyld" | 10847 | lt_cv_dlopen=dyld |
4444 | 10384 | lt_cv_dlopen_libs= | 10848 | lt_cv_dlopen_libs= |
4445 | 10385 | lt_cv_dlopen_self=yes | 10849 | lt_cv_dlopen_self=yes |
4446 | 10386 | 10850 | ||
4447 | @@ -10388,10 +10852,18 @@ | |||
4448 | 10388 | 10852 | ||
4449 | 10389 | ;; | 10853 | ;; |
4450 | 10390 | 10854 | ||
4451 | 10855 | tpf*) | ||
4452 | 10856 | # Don't try to run any link tests for TPF. We know it's impossible | ||
4453 | 10857 | # because TPF is a cross-compiler, and we know how we open DSOs. | ||
4454 | 10858 | lt_cv_dlopen=dlopen | ||
4455 | 10859 | lt_cv_dlopen_libs= | ||
4456 | 10860 | lt_cv_dlopen_self=no | ||
4457 | 10861 | ;; | ||
4458 | 10862 | |||
4459 | 10391 | *) | 10863 | *) |
4460 | 10392 | ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" | 10864 | ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" |
4461 | 10393 | if test "x$ac_cv_func_shl_load" = xyes; then : | 10865 | if test "x$ac_cv_func_shl_load" = xyes; then : |
4463 | 10394 | lt_cv_dlopen="shl_load" | 10866 | lt_cv_dlopen=shl_load |
4464 | 10395 | else | 10867 | else |
4465 | 10396 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 | 10868 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 |
4466 | 10397 | $as_echo_n "checking for shl_load in -ldld... " >&6; } | 10869 | $as_echo_n "checking for shl_load in -ldld... " >&6; } |
4467 | @@ -10430,11 +10902,11 @@ | |||
4468 | 10430 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 | 10902 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 |
4469 | 10431 | $as_echo "$ac_cv_lib_dld_shl_load" >&6; } | 10903 | $as_echo "$ac_cv_lib_dld_shl_load" >&6; } |
4470 | 10432 | if test "x$ac_cv_lib_dld_shl_load" = xyes; then : | 10904 | if test "x$ac_cv_lib_dld_shl_load" = xyes; then : |
4472 | 10433 | lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" | 10905 | lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld |
4473 | 10434 | else | 10906 | else |
4474 | 10435 | ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" | 10907 | ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" |
4475 | 10436 | if test "x$ac_cv_func_dlopen" = xyes; then : | 10908 | if test "x$ac_cv_func_dlopen" = xyes; then : |
4477 | 10437 | lt_cv_dlopen="dlopen" | 10909 | lt_cv_dlopen=dlopen |
4478 | 10438 | else | 10910 | else |
4479 | 10439 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 | 10911 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 |
4480 | 10440 | $as_echo_n "checking for dlopen in -ldl... " >&6; } | 10912 | $as_echo_n "checking for dlopen in -ldl... " >&6; } |
4481 | @@ -10473,7 +10945,7 @@ | |||
4482 | 10473 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 | 10945 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 |
4483 | 10474 | $as_echo "$ac_cv_lib_dl_dlopen" >&6; } | 10946 | $as_echo "$ac_cv_lib_dl_dlopen" >&6; } |
4484 | 10475 | if test "x$ac_cv_lib_dl_dlopen" = xyes; then : | 10947 | if test "x$ac_cv_lib_dl_dlopen" = xyes; then : |
4486 | 10476 | lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" | 10948 | lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl |
4487 | 10477 | else | 10949 | else |
4488 | 10478 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 | 10950 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 |
4489 | 10479 | $as_echo_n "checking for dlopen in -lsvld... " >&6; } | 10951 | $as_echo_n "checking for dlopen in -lsvld... " >&6; } |
4490 | @@ -10512,7 +10984,7 @@ | |||
4491 | 10512 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 | 10984 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 |
4492 | 10513 | $as_echo "$ac_cv_lib_svld_dlopen" >&6; } | 10985 | $as_echo "$ac_cv_lib_svld_dlopen" >&6; } |
4493 | 10514 | if test "x$ac_cv_lib_svld_dlopen" = xyes; then : | 10986 | if test "x$ac_cv_lib_svld_dlopen" = xyes; then : |
4495 | 10515 | lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" | 10987 | lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld |
4496 | 10516 | else | 10988 | else |
4497 | 10517 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 | 10989 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 |
4498 | 10518 | $as_echo_n "checking for dld_link in -ldld... " >&6; } | 10990 | $as_echo_n "checking for dld_link in -ldld... " >&6; } |
4499 | @@ -10551,7 +11023,7 @@ | |||
4500 | 10551 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 | 11023 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 |
4501 | 10552 | $as_echo "$ac_cv_lib_dld_dld_link" >&6; } | 11024 | $as_echo "$ac_cv_lib_dld_dld_link" >&6; } |
4502 | 10553 | if test "x$ac_cv_lib_dld_dld_link" = xyes; then : | 11025 | if test "x$ac_cv_lib_dld_dld_link" = xyes; then : |
4504 | 10554 | lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" | 11026 | lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld |
4505 | 10555 | fi | 11027 | fi |
4506 | 10556 | 11028 | ||
4507 | 10557 | 11029 | ||
4508 | @@ -10572,21 +11044,21 @@ | |||
4509 | 10572 | ;; | 11044 | ;; |
4510 | 10573 | esac | 11045 | esac |
4511 | 10574 | 11046 | ||
4513 | 10575 | if test "x$lt_cv_dlopen" != xno; then | 11047 | if test no = "$lt_cv_dlopen"; then |
4514 | 11048 | enable_dlopen=no | ||
4515 | 11049 | else | ||
4516 | 10576 | enable_dlopen=yes | 11050 | enable_dlopen=yes |
4517 | 10577 | else | ||
4518 | 10578 | enable_dlopen=no | ||
4519 | 10579 | fi | 11051 | fi |
4520 | 10580 | 11052 | ||
4521 | 10581 | case $lt_cv_dlopen in | 11053 | case $lt_cv_dlopen in |
4522 | 10582 | dlopen) | 11054 | dlopen) |
4525 | 10583 | save_CPPFLAGS="$CPPFLAGS" | 11055 | save_CPPFLAGS=$CPPFLAGS |
4526 | 10584 | test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" | 11056 | test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" |
4527 | 10585 | 11057 | ||
4529 | 10586 | save_LDFLAGS="$LDFLAGS" | 11058 | save_LDFLAGS=$LDFLAGS |
4530 | 10587 | wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" | 11059 | wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" |
4531 | 10588 | 11060 | ||
4533 | 10589 | save_LIBS="$LIBS" | 11061 | save_LIBS=$LIBS |
4534 | 10590 | LIBS="$lt_cv_dlopen_libs $LIBS" | 11062 | LIBS="$lt_cv_dlopen_libs $LIBS" |
4535 | 10591 | 11063 | ||
4536 | 10592 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 | 11064 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 |
4537 | @@ -10594,7 +11066,7 @@ | |||
4538 | 10594 | if ${lt_cv_dlopen_self+:} false; then : | 11066 | if ${lt_cv_dlopen_self+:} false; then : |
4539 | 10595 | $as_echo_n "(cached) " >&6 | 11067 | $as_echo_n "(cached) " >&6 |
4540 | 10596 | else | 11068 | else |
4542 | 10597 | if test "$cross_compiling" = yes; then : | 11069 | if test yes = "$cross_compiling"; then : |
4543 | 10598 | lt_cv_dlopen_self=cross | 11070 | lt_cv_dlopen_self=cross |
4544 | 10599 | else | 11071 | else |
4545 | 10600 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 11072 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
4546 | @@ -10641,9 +11113,9 @@ | |||
4547 | 10641 | # endif | 11113 | # endif |
4548 | 10642 | #endif | 11114 | #endif |
4549 | 10643 | 11115 | ||
4551 | 10644 | /* When -fvisbility=hidden is used, assume the code has been annotated | 11116 | /* When -fvisibility=hidden is used, assume the code has been annotated |
4552 | 10645 | correspondingly for the symbols needed. */ | 11117 | correspondingly for the symbols needed. */ |
4554 | 10646 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 11118 | #if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
4555 | 10647 | int fnord () __attribute__((visibility("default"))); | 11119 | int fnord () __attribute__((visibility("default"))); |
4556 | 10648 | #endif | 11120 | #endif |
4557 | 10649 | 11121 | ||
4558 | @@ -10673,7 +11145,7 @@ | |||
4559 | 10673 | (eval $ac_link) 2>&5 | 11145 | (eval $ac_link) 2>&5 |
4560 | 10674 | ac_status=$? | 11146 | ac_status=$? |
4561 | 10675 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | 11147 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
4563 | 10676 | test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then | 11148 | test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then |
4564 | 10677 | (./conftest; exit; ) >&5 2>/dev/null | 11149 | (./conftest; exit; ) >&5 2>/dev/null |
4565 | 10678 | lt_status=$? | 11150 | lt_status=$? |
4566 | 10679 | case x$lt_status in | 11151 | case x$lt_status in |
4567 | @@ -10693,14 +11165,14 @@ | |||
4568 | 10693 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 | 11165 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 |
4569 | 10694 | $as_echo "$lt_cv_dlopen_self" >&6; } | 11166 | $as_echo "$lt_cv_dlopen_self" >&6; } |
4570 | 10695 | 11167 | ||
4572 | 10696 | if test "x$lt_cv_dlopen_self" = xyes; then | 11168 | if test yes = "$lt_cv_dlopen_self"; then |
4573 | 10697 | wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" | 11169 | wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" |
4574 | 10698 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 | 11170 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 |
4575 | 10699 | $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } | 11171 | $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } |
4576 | 10700 | if ${lt_cv_dlopen_self_static+:} false; then : | 11172 | if ${lt_cv_dlopen_self_static+:} false; then : |
4577 | 10701 | $as_echo_n "(cached) " >&6 | 11173 | $as_echo_n "(cached) " >&6 |
4578 | 10702 | else | 11174 | else |
4580 | 10703 | if test "$cross_compiling" = yes; then : | 11175 | if test yes = "$cross_compiling"; then : |
4581 | 10704 | lt_cv_dlopen_self_static=cross | 11176 | lt_cv_dlopen_self_static=cross |
4582 | 10705 | else | 11177 | else |
4583 | 10706 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 11178 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
4584 | @@ -10747,9 +11219,9 @@ | |||
4585 | 10747 | # endif | 11219 | # endif |
4586 | 10748 | #endif | 11220 | #endif |
4587 | 10749 | 11221 | ||
4589 | 10750 | /* When -fvisbility=hidden is used, assume the code has been annotated | 11222 | /* When -fvisibility=hidden is used, assume the code has been annotated |
4590 | 10751 | correspondingly for the symbols needed. */ | 11223 | correspondingly for the symbols needed. */ |
4592 | 10752 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 11224 | #if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
4593 | 10753 | int fnord () __attribute__((visibility("default"))); | 11225 | int fnord () __attribute__((visibility("default"))); |
4594 | 10754 | #endif | 11226 | #endif |
4595 | 10755 | 11227 | ||
4596 | @@ -10779,7 +11251,7 @@ | |||
4597 | 10779 | (eval $ac_link) 2>&5 | 11251 | (eval $ac_link) 2>&5 |
4598 | 10780 | ac_status=$? | 11252 | ac_status=$? |
4599 | 10781 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | 11253 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
4601 | 10782 | test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then | 11254 | test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then |
4602 | 10783 | (./conftest; exit; ) >&5 2>/dev/null | 11255 | (./conftest; exit; ) >&5 2>/dev/null |
4603 | 10784 | lt_status=$? | 11256 | lt_status=$? |
4604 | 10785 | case x$lt_status in | 11257 | case x$lt_status in |
4605 | @@ -10800,9 +11272,9 @@ | |||
4606 | 10800 | $as_echo "$lt_cv_dlopen_self_static" >&6; } | 11272 | $as_echo "$lt_cv_dlopen_self_static" >&6; } |
4607 | 10801 | fi | 11273 | fi |
4608 | 10802 | 11274 | ||
4612 | 10803 | CPPFLAGS="$save_CPPFLAGS" | 11275 | CPPFLAGS=$save_CPPFLAGS |
4613 | 10804 | LDFLAGS="$save_LDFLAGS" | 11276 | LDFLAGS=$save_LDFLAGS |
4614 | 10805 | LIBS="$save_LIBS" | 11277 | LIBS=$save_LIBS |
4615 | 10806 | ;; | 11278 | ;; |
4616 | 10807 | esac | 11279 | esac |
4617 | 10808 | 11280 | ||
4618 | @@ -10846,7 +11318,7 @@ | |||
4619 | 10846 | # FIXME - insert some real tests, host_os isn't really good enough | 11318 | # FIXME - insert some real tests, host_os isn't really good enough |
4620 | 10847 | case $host_os in | 11319 | case $host_os in |
4621 | 10848 | darwin*) | 11320 | darwin*) |
4623 | 10849 | if test -n "$STRIP" ; then | 11321 | if test -n "$STRIP"; then |
4624 | 10850 | striplib="$STRIP -x" | 11322 | striplib="$STRIP -x" |
4625 | 10851 | old_striplib="$STRIP -S" | 11323 | old_striplib="$STRIP -S" |
4626 | 10852 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | 11324 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
4627 | @@ -10874,7 +11346,7 @@ | |||
4628 | 10874 | 11346 | ||
4629 | 10875 | 11347 | ||
4630 | 10876 | 11348 | ||
4632 | 10877 | # Report which library types will actually be built | 11349 | # Report what library types will actually be built |
4633 | 10878 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 | 11350 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 |
4634 | 10879 | $as_echo_n "checking if libtool supports shared libraries... " >&6; } | 11351 | $as_echo_n "checking if libtool supports shared libraries... " >&6; } |
4635 | 10880 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 | 11352 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 |
4636 | @@ -10882,13 +11354,13 @@ | |||
4637 | 10882 | 11354 | ||
4638 | 10883 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 | 11355 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 |
4639 | 10884 | $as_echo_n "checking whether to build shared libraries... " >&6; } | 11356 | $as_echo_n "checking whether to build shared libraries... " >&6; } |
4641 | 10885 | test "$can_build_shared" = "no" && enable_shared=no | 11357 | test no = "$can_build_shared" && enable_shared=no |
4642 | 10886 | 11358 | ||
4643 | 10887 | # On AIX, shared libraries and static libraries use the same namespace, and | 11359 | # On AIX, shared libraries and static libraries use the same namespace, and |
4644 | 10888 | # are all built from PIC. | 11360 | # are all built from PIC. |
4645 | 10889 | case $host_os in | 11361 | case $host_os in |
4646 | 10890 | aix3*) | 11362 | aix3*) |
4648 | 10891 | test "$enable_shared" = yes && enable_static=no | 11363 | test yes = "$enable_shared" && enable_static=no |
4649 | 10892 | if test -n "$RANLIB"; then | 11364 | if test -n "$RANLIB"; then |
4650 | 10893 | archive_cmds="$archive_cmds~\$RANLIB \$lib" | 11365 | archive_cmds="$archive_cmds~\$RANLIB \$lib" |
4651 | 10894 | postinstall_cmds='$RANLIB $lib' | 11366 | postinstall_cmds='$RANLIB $lib' |
4652 | @@ -10896,8 +11368,12 @@ | |||
4653 | 10896 | ;; | 11368 | ;; |
4654 | 10897 | 11369 | ||
4655 | 10898 | aix[4-9]*) | 11370 | aix[4-9]*) |
4658 | 10899 | if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then | 11371 | if test ia64 != "$host_cpu"; then |
4659 | 10900 | test "$enable_shared" = yes && enable_static=no | 11372 | case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in |
4660 | 11373 | yes,aix,yes) ;; # shared object as lib.so file only | ||
4661 | 11374 | yes,svr4,*) ;; # shared object as lib.so archive member only | ||
4662 | 11375 | yes,*) enable_static=no ;; # shared object in lib.a archive as well | ||
4663 | 11376 | esac | ||
4664 | 10901 | fi | 11377 | fi |
4665 | 10902 | ;; | 11378 | ;; |
4666 | 10903 | esac | 11379 | esac |
4667 | @@ -10907,7 +11383,7 @@ | |||
4668 | 10907 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 | 11383 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 |
4669 | 10908 | $as_echo_n "checking whether to build static libraries... " >&6; } | 11384 | $as_echo_n "checking whether to build static libraries... " >&6; } |
4670 | 10909 | # Make sure either enable_shared or enable_static is yes. | 11385 | # Make sure either enable_shared or enable_static is yes. |
4672 | 10910 | test "$enable_shared" = yes || enable_static=yes | 11386 | test yes = "$enable_shared" || enable_static=yes |
4673 | 10911 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 | 11387 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 |
4674 | 10912 | $as_echo "$enable_static" >&6; } | 11388 | $as_echo "$enable_static" >&6; } |
4675 | 10913 | 11389 | ||
4676 | @@ -10921,7 +11397,7 @@ | |||
4677 | 10921 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | 11397 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
4678 | 10922 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | 11398 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
4679 | 10923 | 11399 | ||
4681 | 10924 | CC="$lt_save_CC" | 11400 | CC=$lt_save_CC |
4682 | 10925 | 11401 | ||
4683 | 10926 | 11402 | ||
4684 | 10927 | 11403 | ||
4685 | @@ -10946,6 +11422,21 @@ | |||
4686 | 10946 | 11422 | ||
4687 | 10947 | 11423 | ||
4688 | 10948 | 11424 | ||
4689 | 11425 | # If library source has changed since last release, increment revision | ||
4690 | 11426 | # If public symbols have been added, removed or changed since last release, | ||
4691 | 11427 | # increment current and set revision to 0 | ||
4692 | 11428 | # If public symbols have been added since last release, increment age | ||
4693 | 11429 | # If public symbols have been removed since last release, set age to 0 | ||
4694 | 11430 | |||
4695 | 11431 | |||
4696 | 11432 | |||
4697 | 11433 | LT_CURRENT=0 | ||
4698 | 11434 | LT_REVISION=0 | ||
4699 | 11435 | LT_AGE=0 | ||
4700 | 11436 | |||
4701 | 11437 | |||
4702 | 11438 | |||
4703 | 11439 | |||
4704 | 10949 | am__api_version='1.14' | 11440 | am__api_version='1.14' |
4705 | 10950 | 11441 | ||
4706 | 10951 | # Find a good install program. We prefer a C program (faster), | 11442 | # Find a good install program. We prefer a C program (faster), |
4707 | @@ -11450,7 +11941,7 @@ | |||
4708 | 11450 | 11941 | ||
4709 | 11451 | # Define the identity of the package. | 11942 | # Define the identity of the package. |
4710 | 11452 | PACKAGE='caribou' | 11943 | PACKAGE='caribou' |
4712 | 11453 | VERSION='0.4.15' | 11944 | VERSION='0.4.17' |
4713 | 11454 | 11945 | ||
4714 | 11455 | 11946 | ||
4715 | 11456 | cat >>confdefs.h <<_ACEOF | 11947 | cat >>confdefs.h <<_ACEOF |
4716 | @@ -11671,7 +12162,6 @@ | |||
4717 | 11671 | fi | 12162 | fi |
4718 | 11672 | fi | 12163 | fi |
4719 | 11673 | 12164 | ||
4720 | 11674 | |||
4721 | 11675 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 | 12165 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 |
4722 | 11676 | $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } | 12166 | $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } |
4723 | 11677 | # Check whether --enable-maintainer-mode was given. | 12167 | # Check whether --enable-maintainer-mode was given. |
4724 | @@ -15423,7 +15913,7 @@ | |||
4725 | 15423 | # report actual input values of CONFIG_FILES etc. instead of their | 15913 | # report actual input values of CONFIG_FILES etc. instead of their |
4726 | 15424 | # values after options handling. | 15914 | # values after options handling. |
4727 | 15425 | ac_log=" | 15915 | ac_log=" |
4729 | 15426 | This file was extended by caribou $as_me 0.4.15, which was | 15916 | This file was extended by caribou $as_me 0.4.17, which was |
4730 | 15427 | generated by GNU Autoconf 2.69. Invocation command line was | 15917 | generated by GNU Autoconf 2.69. Invocation command line was |
4731 | 15428 | 15918 | ||
4732 | 15429 | CONFIG_FILES = $CONFIG_FILES | 15919 | CONFIG_FILES = $CONFIG_FILES |
4733 | @@ -15480,7 +15970,7 @@ | |||
4734 | 15480 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | 15970 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
4735 | 15481 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" | 15971 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
4736 | 15482 | ac_cs_version="\\ | 15972 | ac_cs_version="\\ |
4738 | 15483 | caribou config.status 0.4.15 | 15973 | caribou config.status 0.4.17 |
4739 | 15484 | configured by $0, generated by GNU Autoconf 2.69, | 15974 | configured by $0, generated by GNU Autoconf 2.69, |
4740 | 15485 | with options \\"\$ac_cs_config\\" | 15975 | with options \\"\$ac_cs_config\\" |
4741 | 15486 | 15976 | ||
4742 | @@ -15603,6 +16093,7 @@ | |||
4743 | 15603 | enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' | 16093 | enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' |
4744 | 15604 | pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' | 16094 | pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' |
4745 | 15605 | enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' | 16095 | enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' |
4746 | 16096 | shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`' | ||
4747 | 15606 | SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' | 16097 | SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' |
4748 | 15607 | ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' | 16098 | ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' |
4749 | 15608 | PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' | 16099 | PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' |
4750 | @@ -15652,10 +16143,13 @@ | |||
4751 | 15652 | GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' | 16143 | GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' |
4752 | 15653 | lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' | 16144 | lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' |
4753 | 15654 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | 16145 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
4754 | 16146 | lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`' | ||
4755 | 15655 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | 16147 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
4756 | 15656 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' | 16148 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' |
4757 | 16149 | lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`' | ||
4758 | 15657 | nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' | 16150 | nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' |
4759 | 15658 | lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' | 16151 | lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' |
4760 | 16152 | lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`' | ||
4761 | 15659 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' | 16153 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' |
4762 | 15660 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' | 16154 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' |
4763 | 15661 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' | 16155 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' |
4764 | @@ -15720,7 +16214,7 @@ | |||
4765 | 15720 | finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' | 16214 | finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' |
4766 | 15721 | hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' | 16215 | hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' |
4767 | 15722 | sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' | 16216 | sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' |
4769 | 15723 | sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' | 16217 | lt_cv_sys_lib_dlsearch_path_spec='`$ECHO "$lt_cv_sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' |
4770 | 15724 | hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' | 16218 | hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' |
4771 | 15725 | enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' | 16219 | enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' |
4772 | 15726 | enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' | 16220 | enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' |
4773 | @@ -15771,9 +16265,12 @@ | |||
4774 | 15771 | compiler \ | 16265 | compiler \ |
4775 | 15772 | lt_cv_sys_global_symbol_pipe \ | 16266 | lt_cv_sys_global_symbol_pipe \ |
4776 | 15773 | lt_cv_sys_global_symbol_to_cdecl \ | 16267 | lt_cv_sys_global_symbol_to_cdecl \ |
4777 | 16268 | lt_cv_sys_global_symbol_to_import \ | ||
4778 | 15774 | lt_cv_sys_global_symbol_to_c_name_address \ | 16269 | lt_cv_sys_global_symbol_to_c_name_address \ |
4779 | 15775 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 16270 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
4780 | 16271 | lt_cv_nm_interface \ | ||
4781 | 15776 | nm_file_list_spec \ | 16272 | nm_file_list_spec \ |
4782 | 16273 | lt_cv_truncate_bin \ | ||
4783 | 15777 | lt_prog_compiler_no_builtin_flag \ | 16274 | lt_prog_compiler_no_builtin_flag \ |
4784 | 15778 | lt_prog_compiler_pic \ | 16275 | lt_prog_compiler_pic \ |
4785 | 15779 | lt_prog_compiler_wl \ | 16276 | lt_prog_compiler_wl \ |
4786 | @@ -15808,7 +16305,7 @@ | |||
4787 | 15808 | striplib; do | 16305 | striplib; do |
4788 | 15809 | case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in | 16306 | case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in |
4789 | 15810 | *[\\\\\\\`\\"\\\$]*) | 16307 | *[\\\\\\\`\\"\\\$]*) |
4791 | 15811 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" | 16308 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes |
4792 | 15812 | ;; | 16309 | ;; |
4793 | 15813 | *) | 16310 | *) |
4794 | 15814 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" | 16311 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" |
4795 | @@ -15835,10 +16332,10 @@ | |||
4796 | 15835 | postuninstall_cmds \ | 16332 | postuninstall_cmds \ |
4797 | 15836 | finish_cmds \ | 16333 | finish_cmds \ |
4798 | 15837 | sys_lib_search_path_spec \ | 16334 | sys_lib_search_path_spec \ |
4800 | 15838 | sys_lib_dlsearch_path_spec; do | 16335 | lt_cv_sys_lib_dlsearch_path_spec; do |
4801 | 15839 | case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in | 16336 | case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in |
4802 | 15840 | *[\\\\\\\`\\"\\\$]*) | 16337 | *[\\\\\\\`\\"\\\$]*) |
4804 | 15841 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" | 16338 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes |
4805 | 15842 | ;; | 16339 | ;; |
4806 | 15843 | *) | 16340 | *) |
4807 | 15844 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" | 16341 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" |
4808 | @@ -15847,19 +16344,16 @@ | |||
4809 | 15847 | done | 16344 | done |
4810 | 15848 | 16345 | ||
4811 | 15849 | ac_aux_dir='$ac_aux_dir' | 16346 | ac_aux_dir='$ac_aux_dir' |
4812 | 15850 | xsi_shell='$xsi_shell' | ||
4813 | 15851 | lt_shell_append='$lt_shell_append' | ||
4814 | 15852 | 16347 | ||
4816 | 15853 | # See if we are running on zsh, and set the options which allow our | 16348 | # See if we are running on zsh, and set the options that allow our |
4817 | 15854 | # commands through without removal of \ escapes INIT. | 16349 | # commands through without removal of \ escapes INIT. |
4819 | 15855 | if test -n "\${ZSH_VERSION+set}" ; then | 16350 | if test -n "\${ZSH_VERSION+set}"; then |
4820 | 15856 | setopt NO_GLOB_SUBST | 16351 | setopt NO_GLOB_SUBST |
4821 | 15857 | fi | 16352 | fi |
4822 | 15858 | 16353 | ||
4823 | 15859 | 16354 | ||
4824 | 15860 | PACKAGE='$PACKAGE' | 16355 | PACKAGE='$PACKAGE' |
4825 | 15861 | VERSION='$VERSION' | 16356 | VERSION='$VERSION' |
4826 | 15862 | TIMESTAMP='$TIMESTAMP' | ||
4827 | 15863 | RM='$RM' | 16357 | RM='$RM' |
4828 | 15864 | ofile='$ofile' | 16358 | ofile='$ofile' |
4829 | 15865 | 16359 | ||
4830 | @@ -16335,55 +16829,53 @@ | |||
4831 | 16335 | case $ac_file$ac_mode in | 16829 | case $ac_file$ac_mode in |
4832 | 16336 | "libtool":C) | 16830 | "libtool":C) |
4833 | 16337 | 16831 | ||
4835 | 16338 | # See if we are running on zsh, and set the options which allow our | 16832 | # See if we are running on zsh, and set the options that allow our |
4836 | 16339 | # commands through without removal of \ escapes. | 16833 | # commands through without removal of \ escapes. |
4838 | 16340 | if test -n "${ZSH_VERSION+set}" ; then | 16834 | if test -n "${ZSH_VERSION+set}"; then |
4839 | 16341 | setopt NO_GLOB_SUBST | 16835 | setopt NO_GLOB_SUBST |
4840 | 16342 | fi | 16836 | fi |
4841 | 16343 | 16837 | ||
4843 | 16344 | cfgfile="${ofile}T" | 16838 | cfgfile=${ofile}T |
4844 | 16345 | trap "$RM \"$cfgfile\"; exit 1" 1 2 15 | 16839 | trap "$RM \"$cfgfile\"; exit 1" 1 2 15 |
4845 | 16346 | $RM "$cfgfile" | 16840 | $RM "$cfgfile" |
4846 | 16347 | 16841 | ||
4847 | 16348 | cat <<_LT_EOF >> "$cfgfile" | 16842 | cat <<_LT_EOF >> "$cfgfile" |
4848 | 16349 | #! $SHELL | 16843 | #! $SHELL |
4852 | 16350 | 16844 | # Generated automatically by $as_me ($PACKAGE) $VERSION | |
4850 | 16351 | # `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. | ||
4851 | 16352 | # Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION | ||
4853 | 16353 | # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: | 16845 | # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: |
4854 | 16354 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 16846 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
4875 | 16355 | # | 16847 | |
4876 | 16356 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 16848 | # Provide generalized library-building support services. |
4877 | 16357 | # 2006, 2007, 2008, 2009, 2010, 2011 Free Software | 16849 | # Written by Gordon Matzigkeit, 1996 |
4878 | 16358 | # Foundation, Inc. | 16850 | |
4879 | 16359 | # Written by Gordon Matzigkeit, 1996 | 16851 | # Copyright (C) 2014 Free Software Foundation, Inc. |
4880 | 16360 | # | 16852 | # This is free software; see the source for copying conditions. There is NO |
4881 | 16361 | # This file is part of GNU Libtool. | 16853 | # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
4882 | 16362 | # | 16854 | |
4883 | 16363 | # GNU Libtool is free software; you can redistribute it and/or | 16855 | # GNU Libtool is free software; you can redistribute it and/or modify |
4884 | 16364 | # modify it under the terms of the GNU General Public License as | 16856 | # it under the terms of the GNU General Public License as published by |
4885 | 16365 | # published by the Free Software Foundation; either version 2 of | 16857 | # the Free Software Foundation; either version 2 of of the License, or |
4886 | 16366 | # the License, or (at your option) any later version. | 16858 | # (at your option) any later version. |
4887 | 16367 | # | 16859 | # |
4888 | 16368 | # As a special exception to the GNU General Public License, | 16860 | # As a special exception to the GNU General Public License, if you |
4889 | 16369 | # if you distribute this file as part of a program or library that | 16861 | # distribute this file as part of a program or library that is built |
4890 | 16370 | # is built using GNU Libtool, you may include this file under the | 16862 | # using GNU Libtool, you may include this file under the same |
4891 | 16371 | # same distribution terms that you use for the rest of that program. | 16863 | # distribution terms that you use for the rest of that program. |
4892 | 16372 | # | 16864 | # |
4893 | 16373 | # GNU Libtool is distributed in the hope that it will be useful, | 16865 | # GNU Libtool is distributed in the hope that it will be useful, but |
4894 | 16374 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | 16866 | # WITHOUT ANY WARRANTY; without even the implied warranty of |
4895 | 16375 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 16867 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
4896 | 16376 | # GNU General Public License for more details. | 16868 | # GNU General Public License for more details. |
4897 | 16377 | # | 16869 | # |
4898 | 16378 | # You should have received a copy of the GNU General Public License | 16870 | # You should have received a copy of the GNU General Public License |
4903 | 16379 | # along with GNU Libtool; see the file COPYING. If not, a copy | 16871 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
4900 | 16380 | # can be downloaded from http://www.gnu.org/licenses/gpl.html, or | ||
4901 | 16381 | # obtained by writing to the Free Software Foundation, Inc., | ||
4902 | 16382 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
4904 | 16383 | 16872 | ||
4905 | 16384 | 16873 | ||
4906 | 16385 | # The names of the tagged configurations supported by this script. | 16874 | # The names of the tagged configurations supported by this script. |
4908 | 16386 | available_tags="" | 16875 | available_tags='' |
4909 | 16876 | |||
4910 | 16877 | # Configured defaults for sys_lib_dlsearch_path munging. | ||
4911 | 16878 | : \${LT_SYS_LIBRARY_PATH="$LT_SYS_LIBRARY_PATH"} | ||
4912 | 16387 | 16879 | ||
4913 | 16388 | # ### BEGIN LIBTOOL CONFIG | 16880 | # ### BEGIN LIBTOOL CONFIG |
4914 | 16389 | 16881 | ||
4915 | @@ -16403,6 +16895,9 @@ | |||
4916 | 16403 | # Whether or not to optimize for fast installation. | 16895 | # Whether or not to optimize for fast installation. |
4917 | 16404 | fast_install=$enable_fast_install | 16896 | fast_install=$enable_fast_install |
4918 | 16405 | 16897 | ||
4919 | 16898 | # Shared archive member basename,for filename based shared library versioning on AIX. | ||
4920 | 16899 | shared_archive_member_spec=$shared_archive_member_spec | ||
4921 | 16900 | |||
4922 | 16406 | # Shell to use when invoking shell scripts. | 16901 | # Shell to use when invoking shell scripts. |
4923 | 16407 | SHELL=$lt_SHELL | 16902 | SHELL=$lt_SHELL |
4924 | 16408 | 16903 | ||
4925 | @@ -16520,18 +17015,27 @@ | |||
4926 | 16520 | # Transform the output of nm in a proper C declaration. | 17015 | # Transform the output of nm in a proper C declaration. |
4927 | 16521 | global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl | 17016 | global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl |
4928 | 16522 | 17017 | ||
4929 | 17018 | # Transform the output of nm into a list of symbols to manually relocate. | ||
4930 | 17019 | global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import | ||
4931 | 17020 | |||
4932 | 16523 | # Transform the output of nm in a C name address pair. | 17021 | # Transform the output of nm in a C name address pair. |
4933 | 16524 | global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address | 17022 | global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
4934 | 16525 | 17023 | ||
4935 | 16526 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 17024 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
4936 | 16527 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 17025 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
4937 | 16528 | 17026 | ||
4938 | 17027 | # The name lister interface. | ||
4939 | 17028 | nm_interface=$lt_lt_cv_nm_interface | ||
4940 | 17029 | |||
4941 | 16529 | # Specify filename containing input files for \$NM. | 17030 | # Specify filename containing input files for \$NM. |
4942 | 16530 | nm_file_list_spec=$lt_nm_file_list_spec | 17031 | nm_file_list_spec=$lt_nm_file_list_spec |
4943 | 16531 | 17032 | ||
4945 | 16532 | # The root where to search for dependent libraries,and in which our libraries should be installed. | 17033 | # The root where to search for dependent libraries,and where our libraries should be installed. |
4946 | 16533 | lt_sysroot=$lt_sysroot | 17034 | lt_sysroot=$lt_sysroot |
4947 | 16534 | 17035 | ||
4948 | 17036 | # Command to truncate a binary pipe. | ||
4949 | 17037 | lt_truncate_bin=$lt_lt_cv_truncate_bin | ||
4950 | 17038 | |||
4951 | 16535 | # The name of the directory that contains temporary libtool files. | 17039 | # The name of the directory that contains temporary libtool files. |
4952 | 16536 | objdir=$objdir | 17040 | objdir=$objdir |
4953 | 16537 | 17041 | ||
4954 | @@ -16623,7 +17127,7 @@ | |||
4955 | 16623 | sys_lib_search_path_spec=$lt_sys_lib_search_path_spec | 17127 | sys_lib_search_path_spec=$lt_sys_lib_search_path_spec |
4956 | 16624 | 17128 | ||
4957 | 16625 | # Run-time system search path for libraries. | 17129 | # Run-time system search path for libraries. |
4959 | 16626 | sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec | 17130 | sys_lib_dlsearch_path_spec=$lt_lt_cv_sys_lib_dlsearch_path_spec |
4960 | 16627 | 17131 | ||
4961 | 16628 | # Whether dlopen is supported. | 17132 | # Whether dlopen is supported. |
4962 | 16629 | dlopen_support=$enable_dlopen | 17133 | dlopen_support=$enable_dlopen |
4963 | @@ -16716,13 +17220,13 @@ | |||
4964 | 16716 | # Whether we need a single "-rpath" flag with a separated argument. | 17220 | # Whether we need a single "-rpath" flag with a separated argument. |
4965 | 16717 | hardcode_libdir_separator=$lt_hardcode_libdir_separator | 17221 | hardcode_libdir_separator=$lt_hardcode_libdir_separator |
4966 | 16718 | 17222 | ||
4968 | 16719 | # Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes | 17223 | # Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes |
4969 | 16720 | # DIR into the resulting binary. | 17224 | # DIR into the resulting binary. |
4970 | 16721 | hardcode_direct=$hardcode_direct | 17225 | hardcode_direct=$hardcode_direct |
4971 | 16722 | 17226 | ||
4973 | 16723 | # Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes | 17227 | # Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes |
4974 | 16724 | # DIR into the resulting binary and the resulting library dependency is | 17228 | # DIR into the resulting binary and the resulting library dependency is |
4976 | 16725 | # "absolute",i.e impossible to change by setting \${shlibpath_var} if the | 17229 | # "absolute",i.e impossible to change by setting \$shlibpath_var if the |
4977 | 16726 | # library is relocated. | 17230 | # library is relocated. |
4978 | 16727 | hardcode_direct_absolute=$hardcode_direct_absolute | 17231 | hardcode_direct_absolute=$hardcode_direct_absolute |
4979 | 16728 | 17232 | ||
4980 | @@ -16774,13 +17278,71 @@ | |||
4981 | 16774 | 17278 | ||
4982 | 16775 | _LT_EOF | 17279 | _LT_EOF |
4983 | 16776 | 17280 | ||
4984 | 17281 | cat <<'_LT_EOF' >> "$cfgfile" | ||
4985 | 17282 | ## -------------------------------------- ## | ||
4986 | 17283 | ## Shell functions shared with configure. ## | ||
4987 | 17284 | ## -------------------------------------- ## | ||
4988 | 17285 | |||
4989 | 17286 | # func_munge_path_list VARIABLE PATH | ||
4990 | 17287 | # ----------------------------------- | ||
4991 | 17288 | # VARIABLE is name of variable containing _space_ separated list of | ||
4992 | 17289 | # directories to be munged by the contents of PATH, which is string | ||
4993 | 17290 | # having a format: | ||
4994 | 17291 | # "DIR[:DIR]:" | ||
4995 | 17292 | # string "DIR[ DIR]" will be prepended to VARIABLE | ||
4996 | 17293 | # ":DIR[:DIR]" | ||
4997 | 17294 | # string "DIR[ DIR]" will be appended to VARIABLE | ||
4998 | 17295 | # "DIRP[:DIRP]::[DIRA:]DIRA" | ||
4999 | 17296 | # string "DIRP[ DIRP]" will be prepended to VARIABLE and string | ||
5000 | 17297 | # "DIRA[ DIRA]" will be appended to VARIABLE |
The diff has been truncated for viewing.
Thanks. Uploaded.