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 | LIPO = @LIPO@ |
6 | LN_S = @LN_S@ |
7 | LTLIBOBJS = @LTLIBOBJS@ |
8 | +LT_AGE = @LT_AGE@ |
9 | +LT_CURRENT = @LT_CURRENT@ |
10 | +LT_REVISION = @LT_REVISION@ |
11 | +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ |
12 | MAINT = @MAINT@ |
13 | MAKEINFO = @MAKEINFO@ |
14 | MANIFEST_TOOL = @MANIFEST_TOOL@ |
15 | |
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 | ============= |
21 | +Version 0.4.17 |
22 | +============= |
23 | +- Bundle tools to generate and manipulate keyboard layout files. |
24 | + See https://wiki.gnome.org/Projects/Caribou/NewLayout for details |
25 | +- Bug 691811 - Add support for azerty layout as seen in french |
26 | +- Bug 743267 - Caribou does 100-130 syscalls for each keypress |
27 | +- Bug 743880 - String that is hard to understand |
28 | +- Translation updates (Turkish, Czech, Polish, German, Lithuanian, |
29 | + Hungarian, Spanish, Norwegian bokmål, French, Indonesian, Slovenian) |
30 | + |
31 | +============= |
32 | +Version 0.4.16 |
33 | +============= |
34 | +- Stop using deprecated accessibility events ("focus:*") |
35 | +- Bug 739837 - Allow label overwrite in keyboard layout |
36 | +- Bug 739716 - Add more keys to label_map |
37 | +- Bug 739711 - Escape key does not work in us layout. |
38 | +- Bug 739526 - Some buttons do not have a label. |
39 | +- Bug 722634 - [regression] build failure: ImportError: No module named 'caribou_settings' |
40 | +- Translation updates (Punjabi, Nepali, Slovak) |
41 | + |
42 | +============= |
43 | Version 0.4.15 |
44 | ============= |
45 | - Fix race condition when invoking OSK through D-Bus (see comment in |
46 | |
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 | AC_SUBST([USE_NLS]) |
52 | ]) |
53 | |
54 | -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- |
55 | -# serial 1 (pkg-config-0.24) |
56 | -# |
57 | -# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. |
58 | -# |
59 | -# This program is free software; you can redistribute it and/or modify |
60 | -# it under the terms of the GNU General Public License as published by |
61 | -# the Free Software Foundation; either version 2 of the License, or |
62 | -# (at your option) any later version. |
63 | -# |
64 | -# This program is distributed in the hope that it will be useful, but |
65 | -# WITHOUT ANY WARRANTY; without even the implied warranty of |
66 | -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
67 | -# General Public License for more details. |
68 | -# |
69 | -# You should have received a copy of the GNU General Public License |
70 | -# along with this program; if not, write to the Free Software |
71 | -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
72 | -# |
73 | -# As a special exception to the GNU General Public License, if you |
74 | -# distribute this file as part of a program that contains a |
75 | -# configuration script generated by Autoconf, you may include it under |
76 | -# the same distribution terms that you use for the rest of that program. |
77 | - |
78 | -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) |
79 | -# ---------------------------------- |
80 | -AC_DEFUN([PKG_PROG_PKG_CONFIG], |
81 | -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) |
82 | -m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) |
83 | -m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) |
84 | -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) |
85 | -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) |
86 | -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) |
87 | - |
88 | -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
89 | - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) |
90 | -fi |
91 | -if test -n "$PKG_CONFIG"; then |
92 | - _pkg_min_version=m4_default([$1], [0.9.0]) |
93 | - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) |
94 | - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then |
95 | - AC_MSG_RESULT([yes]) |
96 | - else |
97 | - AC_MSG_RESULT([no]) |
98 | - PKG_CONFIG="" |
99 | - fi |
100 | -fi[]dnl |
101 | -])# PKG_PROG_PKG_CONFIG |
102 | - |
103 | -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) |
104 | -# |
105 | -# Check to see whether a particular set of modules exists. Similar |
106 | -# to PKG_CHECK_MODULES(), but does not set variables or print errors. |
107 | -# |
108 | -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) |
109 | -# only at the first occurence in configure.ac, so if the first place |
110 | -# it's called might be skipped (such as if it is within an "if", you |
111 | -# have to call PKG_CHECK_EXISTS manually |
112 | -# -------------------------------------------------------------- |
113 | -AC_DEFUN([PKG_CHECK_EXISTS], |
114 | -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl |
115 | -if test -n "$PKG_CONFIG" && \ |
116 | - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then |
117 | - m4_default([$2], [:]) |
118 | -m4_ifvaln([$3], [else |
119 | - $3])dnl |
120 | -fi]) |
121 | - |
122 | -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) |
123 | -# --------------------------------------------- |
124 | -m4_define([_PKG_CONFIG], |
125 | -[if test -n "$$1"; then |
126 | - pkg_cv_[]$1="$$1" |
127 | - elif test -n "$PKG_CONFIG"; then |
128 | - PKG_CHECK_EXISTS([$3], |
129 | - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` |
130 | - test "x$?" != "x0" && pkg_failed=yes ], |
131 | - [pkg_failed=yes]) |
132 | - else |
133 | - pkg_failed=untried |
134 | -fi[]dnl |
135 | -])# _PKG_CONFIG |
136 | - |
137 | -# _PKG_SHORT_ERRORS_SUPPORTED |
138 | -# ----------------------------- |
139 | -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], |
140 | -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) |
141 | -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
142 | - _pkg_short_errors_supported=yes |
143 | -else |
144 | - _pkg_short_errors_supported=no |
145 | -fi[]dnl |
146 | -])# _PKG_SHORT_ERRORS_SUPPORTED |
147 | - |
148 | - |
149 | -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], |
150 | -# [ACTION-IF-NOT-FOUND]) |
151 | -# |
152 | -# |
153 | -# Note that if there is a possibility the first call to |
154 | -# PKG_CHECK_MODULES might not happen, you should be sure to include an |
155 | -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac |
156 | -# |
157 | -# |
158 | -# -------------------------------------------------------------- |
159 | -AC_DEFUN([PKG_CHECK_MODULES], |
160 | -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl |
161 | -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl |
162 | -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl |
163 | - |
164 | -pkg_failed=no |
165 | -AC_MSG_CHECKING([for $1]) |
166 | - |
167 | -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) |
168 | -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) |
169 | - |
170 | -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS |
171 | -and $1[]_LIBS to avoid the need to call pkg-config. |
172 | -See the pkg-config man page for more details.]) |
173 | - |
174 | -if test $pkg_failed = yes; then |
175 | - AC_MSG_RESULT([no]) |
176 | - _PKG_SHORT_ERRORS_SUPPORTED |
177 | - if test $_pkg_short_errors_supported = yes; then |
178 | - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` |
179 | - else |
180 | - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` |
181 | - fi |
182 | - # Put the nasty error message in config.log where it belongs |
183 | - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD |
184 | - |
185 | - m4_default([$4], [AC_MSG_ERROR( |
186 | -[Package requirements ($2) were not met: |
187 | - |
188 | -$$1_PKG_ERRORS |
189 | - |
190 | -Consider adjusting the PKG_CONFIG_PATH environment variable if you |
191 | -installed software in a non-standard prefix. |
192 | - |
193 | -_PKG_TEXT])[]dnl |
194 | - ]) |
195 | -elif test $pkg_failed = untried; then |
196 | - AC_MSG_RESULT([no]) |
197 | - m4_default([$4], [AC_MSG_FAILURE( |
198 | -[The pkg-config script could not be found or is too old. Make sure it |
199 | -is in your PATH or set the PKG_CONFIG environment variable to the full |
200 | -path to pkg-config. |
201 | - |
202 | -_PKG_TEXT |
203 | - |
204 | -To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl |
205 | - ]) |
206 | -else |
207 | - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS |
208 | - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS |
209 | - AC_MSG_RESULT([yes]) |
210 | - $3 |
211 | -fi[]dnl |
212 | -])# PKG_CHECK_MODULES |
213 | - |
214 | - |
215 | -# PKG_INSTALLDIR(DIRECTORY) |
216 | -# ------------------------- |
217 | -# Substitutes the variable pkgconfigdir as the location where a module |
218 | -# should install pkg-config .pc files. By default the directory is |
219 | -# $libdir/pkgconfig, but the default can be changed by passing |
220 | -# DIRECTORY. The user can override through the --with-pkgconfigdir |
221 | -# parameter. |
222 | -AC_DEFUN([PKG_INSTALLDIR], |
223 | -[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) |
224 | -m4_pushdef([pkg_description], |
225 | - [pkg-config installation directory @<:@]pkg_default[@:>@]) |
226 | -AC_ARG_WITH([pkgconfigdir], |
227 | - [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, |
228 | - [with_pkgconfigdir=]pkg_default) |
229 | -AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) |
230 | -m4_popdef([pkg_default]) |
231 | -m4_popdef([pkg_description]) |
232 | -]) dnl PKG_INSTALLDIR |
233 | - |
234 | - |
235 | -# PKG_NOARCH_INSTALLDIR(DIRECTORY) |
236 | -# ------------------------- |
237 | -# Substitutes the variable noarch_pkgconfigdir as the location where a |
238 | -# module should install arch-independent pkg-config .pc files. By |
239 | -# default the directory is $datadir/pkgconfig, but the default can be |
240 | -# changed by passing DIRECTORY. The user can override through the |
241 | -# --with-noarch-pkgconfigdir parameter. |
242 | -AC_DEFUN([PKG_NOARCH_INSTALLDIR], |
243 | -[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) |
244 | -m4_pushdef([pkg_description], |
245 | - [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) |
246 | -AC_ARG_WITH([noarch-pkgconfigdir], |
247 | - [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, |
248 | - [with_noarch_pkgconfigdir=]pkg_default) |
249 | -AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) |
250 | -m4_popdef([pkg_default]) |
251 | -m4_popdef([pkg_description]) |
252 | -]) dnl PKG_NOARCH_INSTALLDIR |
253 | - |
254 | - |
255 | -# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, |
256 | -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) |
257 | -# ------------------------------------------- |
258 | -# Retrieves the value of the pkg-config variable for the given module. |
259 | -AC_DEFUN([PKG_CHECK_VAR], |
260 | -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl |
261 | -AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl |
262 | - |
263 | -_PKG_CONFIG([$1], [variable="][$3]["], [$2]) |
264 | -AS_VAR_COPY([$1], [pkg_cv_][$1]) |
265 | - |
266 | -AS_VAR_IF([$1], [""], [$5], [$4])dnl |
267 | -])# PKG_CHECK_VAR |
268 | - |
269 | # Configure paths for GLIB |
270 | # Owen Taylor 1997-2001 |
271 | |
272 | @@ -1097,6 +882,221 @@ |
273 | _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) |
274 | ]) |
275 | |
276 | +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- |
277 | +# serial 1 (pkg-config-0.24) |
278 | +# |
279 | +# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. |
280 | +# |
281 | +# This program is free software; you can redistribute it and/or modify |
282 | +# it under the terms of the GNU General Public License as published by |
283 | +# the Free Software Foundation; either version 2 of the License, or |
284 | +# (at your option) any later version. |
285 | +# |
286 | +# This program is distributed in the hope that it will be useful, but |
287 | +# WITHOUT ANY WARRANTY; without even the implied warranty of |
288 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
289 | +# General Public License for more details. |
290 | +# |
291 | +# You should have received a copy of the GNU General Public License |
292 | +# along with this program; if not, write to the Free Software |
293 | +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
294 | +# |
295 | +# As a special exception to the GNU General Public License, if you |
296 | +# distribute this file as part of a program that contains a |
297 | +# configuration script generated by Autoconf, you may include it under |
298 | +# the same distribution terms that you use for the rest of that program. |
299 | + |
300 | +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) |
301 | +# ---------------------------------- |
302 | +AC_DEFUN([PKG_PROG_PKG_CONFIG], |
303 | +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) |
304 | +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) |
305 | +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) |
306 | +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) |
307 | +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) |
308 | +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) |
309 | + |
310 | +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
311 | + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) |
312 | +fi |
313 | +if test -n "$PKG_CONFIG"; then |
314 | + _pkg_min_version=m4_default([$1], [0.9.0]) |
315 | + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) |
316 | + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then |
317 | + AC_MSG_RESULT([yes]) |
318 | + else |
319 | + AC_MSG_RESULT([no]) |
320 | + PKG_CONFIG="" |
321 | + fi |
322 | +fi[]dnl |
323 | +])# PKG_PROG_PKG_CONFIG |
324 | + |
325 | +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) |
326 | +# |
327 | +# Check to see whether a particular set of modules exists. Similar |
328 | +# to PKG_CHECK_MODULES(), but does not set variables or print errors. |
329 | +# |
330 | +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) |
331 | +# only at the first occurence in configure.ac, so if the first place |
332 | +# it's called might be skipped (such as if it is within an "if", you |
333 | +# have to call PKG_CHECK_EXISTS manually |
334 | +# -------------------------------------------------------------- |
335 | +AC_DEFUN([PKG_CHECK_EXISTS], |
336 | +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl |
337 | +if test -n "$PKG_CONFIG" && \ |
338 | + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then |
339 | + m4_default([$2], [:]) |
340 | +m4_ifvaln([$3], [else |
341 | + $3])dnl |
342 | +fi]) |
343 | + |
344 | +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) |
345 | +# --------------------------------------------- |
346 | +m4_define([_PKG_CONFIG], |
347 | +[if test -n "$$1"; then |
348 | + pkg_cv_[]$1="$$1" |
349 | + elif test -n "$PKG_CONFIG"; then |
350 | + PKG_CHECK_EXISTS([$3], |
351 | + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` |
352 | + test "x$?" != "x0" && pkg_failed=yes ], |
353 | + [pkg_failed=yes]) |
354 | + else |
355 | + pkg_failed=untried |
356 | +fi[]dnl |
357 | +])# _PKG_CONFIG |
358 | + |
359 | +# _PKG_SHORT_ERRORS_SUPPORTED |
360 | +# ----------------------------- |
361 | +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], |
362 | +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) |
363 | +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
364 | + _pkg_short_errors_supported=yes |
365 | +else |
366 | + _pkg_short_errors_supported=no |
367 | +fi[]dnl |
368 | +])# _PKG_SHORT_ERRORS_SUPPORTED |
369 | + |
370 | + |
371 | +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], |
372 | +# [ACTION-IF-NOT-FOUND]) |
373 | +# |
374 | +# |
375 | +# Note that if there is a possibility the first call to |
376 | +# PKG_CHECK_MODULES might not happen, you should be sure to include an |
377 | +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac |
378 | +# |
379 | +# |
380 | +# -------------------------------------------------------------- |
381 | +AC_DEFUN([PKG_CHECK_MODULES], |
382 | +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl |
383 | +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl |
384 | +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl |
385 | + |
386 | +pkg_failed=no |
387 | +AC_MSG_CHECKING([for $1]) |
388 | + |
389 | +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) |
390 | +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) |
391 | + |
392 | +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS |
393 | +and $1[]_LIBS to avoid the need to call pkg-config. |
394 | +See the pkg-config man page for more details.]) |
395 | + |
396 | +if test $pkg_failed = yes; then |
397 | + AC_MSG_RESULT([no]) |
398 | + _PKG_SHORT_ERRORS_SUPPORTED |
399 | + if test $_pkg_short_errors_supported = yes; then |
400 | + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` |
401 | + else |
402 | + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` |
403 | + fi |
404 | + # Put the nasty error message in config.log where it belongs |
405 | + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD |
406 | + |
407 | + m4_default([$4], [AC_MSG_ERROR( |
408 | +[Package requirements ($2) were not met: |
409 | + |
410 | +$$1_PKG_ERRORS |
411 | + |
412 | +Consider adjusting the PKG_CONFIG_PATH environment variable if you |
413 | +installed software in a non-standard prefix. |
414 | + |
415 | +_PKG_TEXT])[]dnl |
416 | + ]) |
417 | +elif test $pkg_failed = untried; then |
418 | + AC_MSG_RESULT([no]) |
419 | + m4_default([$4], [AC_MSG_FAILURE( |
420 | +[The pkg-config script could not be found or is too old. Make sure it |
421 | +is in your PATH or set the PKG_CONFIG environment variable to the full |
422 | +path to pkg-config. |
423 | + |
424 | +_PKG_TEXT |
425 | + |
426 | +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl |
427 | + ]) |
428 | +else |
429 | + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS |
430 | + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS |
431 | + AC_MSG_RESULT([yes]) |
432 | + $3 |
433 | +fi[]dnl |
434 | +])# PKG_CHECK_MODULES |
435 | + |
436 | + |
437 | +# PKG_INSTALLDIR(DIRECTORY) |
438 | +# ------------------------- |
439 | +# Substitutes the variable pkgconfigdir as the location where a module |
440 | +# should install pkg-config .pc files. By default the directory is |
441 | +# $libdir/pkgconfig, but the default can be changed by passing |
442 | +# DIRECTORY. The user can override through the --with-pkgconfigdir |
443 | +# parameter. |
444 | +AC_DEFUN([PKG_INSTALLDIR], |
445 | +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) |
446 | +m4_pushdef([pkg_description], |
447 | + [pkg-config installation directory @<:@]pkg_default[@:>@]) |
448 | +AC_ARG_WITH([pkgconfigdir], |
449 | + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, |
450 | + [with_pkgconfigdir=]pkg_default) |
451 | +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) |
452 | +m4_popdef([pkg_default]) |
453 | +m4_popdef([pkg_description]) |
454 | +]) dnl PKG_INSTALLDIR |
455 | + |
456 | + |
457 | +# PKG_NOARCH_INSTALLDIR(DIRECTORY) |
458 | +# ------------------------- |
459 | +# Substitutes the variable noarch_pkgconfigdir as the location where a |
460 | +# module should install arch-independent pkg-config .pc files. By |
461 | +# default the directory is $datadir/pkgconfig, but the default can be |
462 | +# changed by passing DIRECTORY. The user can override through the |
463 | +# --with-noarch-pkgconfigdir parameter. |
464 | +AC_DEFUN([PKG_NOARCH_INSTALLDIR], |
465 | +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) |
466 | +m4_pushdef([pkg_description], |
467 | + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) |
468 | +AC_ARG_WITH([noarch-pkgconfigdir], |
469 | + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, |
470 | + [with_noarch_pkgconfigdir=]pkg_default) |
471 | +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) |
472 | +m4_popdef([pkg_default]) |
473 | +m4_popdef([pkg_description]) |
474 | +]) dnl PKG_NOARCH_INSTALLDIR |
475 | + |
476 | + |
477 | +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, |
478 | +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) |
479 | +# ------------------------------------------- |
480 | +# Retrieves the value of the pkg-config variable for the given module. |
481 | +AC_DEFUN([PKG_CHECK_VAR], |
482 | +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl |
483 | +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl |
484 | + |
485 | +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) |
486 | +AS_VAR_COPY([$1], [pkg_cv_][$1]) |
487 | + |
488 | +AS_VAR_IF([$1], [""], [$5], [$4])dnl |
489 | +])# PKG_CHECK_VAR |
490 | + |
491 | # Copyright (C) 2002-2013 Free Software Foundation, Inc. |
492 | # |
493 | # This file is free software; the Free Software Foundation |
494 | @@ -1650,8 +1650,7 @@ |
495 | END |
496 | AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) |
497 | fi |
498 | -fi |
499 | -]) |
500 | +fi]) |
501 | |
502 | dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not |
503 | dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further |
504 | |
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 | LIPO = @LIPO@ |
510 | LN_S = @LN_S@ |
511 | LTLIBOBJS = @LTLIBOBJS@ |
512 | +LT_AGE = @LT_AGE@ |
513 | +LT_CURRENT = @LT_CURRENT@ |
514 | +LT_REVISION = @LT_REVISION@ |
515 | +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ |
516 | MAINT = @MAINT@ |
517 | MAKEINFO = @MAKEINFO@ |
518 | MANIFEST_TOOL = @MANIFEST_TOOL@ |
519 | |
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 | export ANTLER_THEME_PATH="$(dirname $script_dir)/data" |
525 | fi |
526 | |
527 | -@PYTHON@ -c " |
528 | -from caribou.antler.main import AntlerKeyboardService |
529 | -AntlerKeyboardService().run()" |
530 | +@PYTHON@ -m caribou.antler.main "$@" |
531 | |
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 | LIPO = @LIPO@ |
537 | LN_S = @LN_S@ |
538 | LTLIBOBJS = @LTLIBOBJS@ |
539 | +LT_AGE = @LT_AGE@ |
540 | +LT_CURRENT = @LT_CURRENT@ |
541 | +LT_REVISION = @LT_REVISION@ |
542 | +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ |
543 | MAINT = @MAINT@ |
544 | MAKEINFO = @MAKEINFO@ |
545 | MANIFEST_TOOL = @MANIFEST_TOOL@ |
546 | |
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 | LIPO = @LIPO@ |
552 | LN_S = @LN_S@ |
553 | LTLIBOBJS = @LTLIBOBJS@ |
554 | +LT_AGE = @LT_AGE@ |
555 | +LT_CURRENT = @LT_CURRENT@ |
556 | +LT_REVISION = @LT_REVISION@ |
557 | +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ |
558 | MAINT = @MAINT@ |
559 | MAKEINFO = @MAKEINFO@ |
560 | MANIFEST_TOOL = @MANIFEST_TOOL@ |
561 | |
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 @@ |
566 | -from antler_settings import AntlerSettings |
567 | +from .antler_settings import AntlerSettings |
568 | |
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 | self.add_row([c.get_children() for c in row.get_columns()], row_num) |
574 | |
575 | class AntlerKeyboardView(Gtk.Notebook): |
576 | - def __init__(self, keyboard_type): |
577 | + def __init__(self, keyboard_type='touch', keyboard_file=None, |
578 | + keyboard_level=None): |
579 | GObject.GObject.__init__(self) |
580 | settings = AntlerSettings() |
581 | self.set_show_tabs(False) |
582 | @@ -244,10 +245,11 @@ |
583 | Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION + 1) |
584 | |
585 | self.scanner = Caribou.Scanner() |
586 | - self.set_keyboard_model(keyboard_type) |
587 | + self.set_keyboard_model(keyboard_type, keyboard_file, keyboard_level) |
588 | |
589 | - def set_keyboard_model(self, keyboard_type): |
590 | - self.keyboard_model = Caribou.KeyboardModel(keyboard_type=keyboard_type) |
591 | + def set_keyboard_model(self, keyboard_type, keyboard_file, keyboard_level): |
592 | + self.keyboard_model = Caribou.KeyboardModel(keyboard_type=keyboard_type, |
593 | + keyboard_file=keyboard_file) |
594 | |
595 | self.scanner.set_keyboard(self.keyboard_model) |
596 | self.keyboard_model.connect("notify::active-group", self._on_group_changed) |
597 | @@ -265,7 +267,7 @@ |
598 | layout.show() |
599 | self.layers[gname][lname] = self.append_page(layout, None) |
600 | |
601 | - self._set_to_active_layer() |
602 | + self._set_to_active_layer(keyboard_level=keyboard_level) |
603 | |
604 | def _on_key_clicked(self, model, key): |
605 | if key.props.name == "Caribou_Prefs": |
606 | @@ -301,10 +303,13 @@ |
607 | def _on_group_changed(self, kb, prop): |
608 | self._set_to_active_layer() |
609 | |
610 | - def _set_to_active_layer(self): |
611 | + def _set_to_active_layer(self, keyboard_level=None): |
612 | active_group_name = self.keyboard_model.props.active_group |
613 | active_group = self.keyboard_model.get_group(active_group_name) |
614 | - active_level_name = active_group.props.active_level |
615 | + if keyboard_level: |
616 | + active_level_name = keyboard_level |
617 | + else: |
618 | + active_level_name = active_group.props.active_level |
619 | |
620 | self.set_current_page(self.layers[active_group_name][active_level_name]) |
621 | |
622 | |
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 @@ |
627 | -from gi.repository import Caribou, GObject |
628 | -from window import AntlerWindowEntry |
629 | -from keyboard_view import AntlerKeyboardView |
630 | +from gi.repository import Caribou, GLib, GObject, Gtk |
631 | +from .window import AntlerWindowEntry |
632 | +from .keyboard_view import AntlerKeyboardView |
633 | import sys |
634 | |
635 | -class AntlerKeyboardService(Caribou.KeyboardService): |
636 | - def __init__(self): |
637 | +class AntlerKeyboardCommand(object): |
638 | + def run(self): |
639 | + pass |
640 | + |
641 | +class AntlerKeyboardService(Caribou.KeyboardService, AntlerKeyboardCommand): |
642 | + def __init__(self, args=None): |
643 | GObject.GObject.__init__(self) |
644 | self.register_keyboard("Antler") |
645 | self.window = AntlerWindowEntry(AntlerKeyboardView) |
646 | @@ -29,6 +33,39 @@ |
647 | sys.stderr.write("Another service acquired %s, quitting..\n" % name) |
648 | sys.exit(0) |
649 | |
650 | +class AntlerKeyboardPreview(Gtk.Window, AntlerKeyboardCommand): |
651 | + def __init__(self, args=None): |
652 | + GObject.GObject.__init__(self) |
653 | + if not args or not args.file: |
654 | + sys.stderr.write("Specify keyboard file with -f option.\n") |
655 | + sys.exit(1) |
656 | + self.window = Gtk.Window() |
657 | + self.window.add(AntlerKeyboardView(keyboard_file=args.file, |
658 | + keyboard_level=args.level)) |
659 | + |
660 | + def run(self): |
661 | + self.window.show_all() |
662 | + Gtk.main() |
663 | + |
664 | if __name__ == "__main__": |
665 | - antler_keyboard_service = AntlerKeyboardService() |
666 | - antler_keyboard_service.run() |
667 | + import argparse |
668 | + import signal |
669 | + signal.signal(signal.SIGINT, signal.SIG_DFL) |
670 | + |
671 | + GLib.set_prgname('antler-keyboard') |
672 | + |
673 | + parser = argparse.ArgumentParser(description='antler-keyboard') |
674 | + parser.add_argument('-c', '--command', type=str, default='service', |
675 | + help='command (service or preview, default: service)') |
676 | + parser.add_argument('-f', '--file', type=str, |
677 | + help='keyboard file') |
678 | + parser.add_argument('-l', '--level', type=str, |
679 | + help='shift level') |
680 | + args = parser.parse_args() |
681 | + |
682 | + command = globals().get('AntlerKeyboard%s' % args.command.capitalize()) |
683 | + if command: |
684 | + command(args).run() |
685 | + else: |
686 | + sys.stderr.write("Unknown command: %s\n" % args.command) |
687 | + sys.exit(1) |
688 | |
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 | import os |
694 | import sys |
695 | |
696 | -Clutter.init("antler") |
697 | - |
698 | |
699 | class AnimatedWindowBase(Gtk.Window, Clutter.Animatable): |
700 | __gproperties__ = { |
701 | @@ -220,7 +218,7 @@ |
702 | self.add(self._vbox) |
703 | |
704 | self.keyboard_view_factory = keyboard_view_factory |
705 | - self.keyboard_view = keyboard_view_factory (settings.keyboard_type.value) |
706 | + self.keyboard_view = keyboard_view_factory (keyboard_type=settings.keyboard_type.value) |
707 | |
708 | self._vbox.pack_start(self.keyboard_view, True, True, 0) |
709 | |
710 | |
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 | LIPO = @LIPO@ |
716 | LN_S = @LN_S@ |
717 | LTLIBOBJS = @LTLIBOBJS@ |
718 | +LT_AGE = @LT_AGE@ |
719 | +LT_CURRENT = @LT_CURRENT@ |
720 | +LT_REVISION = @LT_REVISION@ |
721 | +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ |
722 | MAINT = @MAINT@ |
723 | MAKEINFO = @MAKEINFO@ |
724 | MANIFEST_TOOL = @MANIFEST_TOOL@ |
725 | |
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 | GSETTINGS_SCHEMA = "org.gnome.caribou" |
731 | |
732 | -from caribou_settings import CaribouSettings |
733 | +from .caribou_settings import CaribouSettings |
734 | |
735 | AllSettings = [CaribouSettings] |
736 | |
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 | def value(self, val): |
742 | _val = self.convert_value(val) |
743 | if self.allowed and _val not in [a for a, b in self.allowed]: |
744 | - raise ValueError, "'%s' not a valid value" % _val |
745 | + raise ValueError("'%s' not a valid value" % _val) |
746 | self._value = _val |
747 | if not self.hush: |
748 | self.emit('value-changed', _val) |
749 | |
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 | # Configuration validation subroutine script. |
755 | # Copyright 1992-2014 Free Software Foundation, Inc. |
756 | |
757 | -timestamp='2014-05-01' |
758 | +timestamp='2014-07-28' |
759 | |
760 | # This file is free software; you can redistribute it and/or modify it |
761 | # under the terms of the GNU General Public License as published by |
762 | @@ -828,6 +828,10 @@ |
763 | basic_machine=powerpc-unknown |
764 | os=-morphos |
765 | ;; |
766 | + moxiebox) |
767 | + basic_machine=moxie-unknown |
768 | + os=-moxiebox |
769 | + ;; |
770 | msdos) |
771 | basic_machine=i386-pc |
772 | os=-msdos |
773 | @@ -1012,7 +1016,7 @@ |
774 | ;; |
775 | ppc64) basic_machine=powerpc64-unknown |
776 | ;; |
777 | - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` |
778 | + ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` |
779 | ;; |
780 | ppc64le | powerpc64little | ppc64-le | powerpc64-little) |
781 | basic_machine=powerpc64le-unknown |
782 | @@ -1373,7 +1377,7 @@ |
783 | | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
784 | | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ |
785 | | -linux-newlib* | -linux-musl* | -linux-uclibc* \ |
786 | - | -uxpv* | -beos* | -mpeix* | -udk* \ |
787 | + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ |
788 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
789 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
790 | | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ |
791 | |
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 | #! /bin/sh |
797 | # Guess values for system-dependent variables and create Makefiles. |
798 | -# Generated by GNU Autoconf 2.69 for caribou 0.4.15. |
799 | +# Generated by GNU Autoconf 2.69 for caribou 0.4.17. |
800 | # |
801 | # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=caribou>. |
802 | # |
803 | @@ -651,8 +651,8 @@ |
804 | # Identity of this package. |
805 | PACKAGE_NAME='caribou' |
806 | PACKAGE_TARNAME='caribou' |
807 | -PACKAGE_VERSION='0.4.15' |
808 | -PACKAGE_STRING='caribou 0.4.15' |
809 | +PACKAGE_VERSION='0.4.17' |
810 | +PACKAGE_STRING='caribou 0.4.17' |
811 | PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=caribou' |
812 | PACKAGE_URL='' |
813 | |
814 | @@ -839,7 +839,11 @@ |
815 | INSTALL_DATA |
816 | INSTALL_SCRIPT |
817 | INSTALL_PROGRAM |
818 | +LT_AGE |
819 | +LT_REVISION |
820 | +LT_CURRENT |
821 | CPP |
822 | +LT_SYS_LIBRARY_PATH |
823 | OTOOL64 |
824 | OTOOL |
825 | LIPO |
826 | @@ -923,6 +927,7 @@ |
827 | enable_static |
828 | with_pic |
829 | enable_fast_install |
830 | +with_aix_soname |
831 | with_gnu_ld |
832 | with_sysroot |
833 | enable_libtool_lock |
834 | @@ -944,6 +949,7 @@ |
835 | LDFLAGS |
836 | LIBS |
837 | CPPFLAGS |
838 | +LT_SYS_LIBRARY_PATH |
839 | CPP |
840 | PKG_CONFIG |
841 | PKG_CONFIG_PATH |
842 | @@ -1499,7 +1505,7 @@ |
843 | # Omit some internal or obsolete options to make the list less imposing. |
844 | # This message is too long to be a string in the A/UX 3.1 sh. |
845 | cat <<_ACEOF |
846 | -\`configure' configures caribou 0.4.15 to adapt to many kinds of systems. |
847 | +\`configure' configures caribou 0.4.17 to adapt to many kinds of systems. |
848 | |
849 | Usage: $0 [OPTION]... [VAR=VALUE]... |
850 | |
851 | @@ -1569,7 +1575,7 @@ |
852 | |
853 | if test -n "$ac_init_help"; then |
854 | case $ac_init_help in |
855 | - short | recursive ) echo "Configuration of caribou 0.4.15:";; |
856 | + short | recursive ) echo "Configuration of caribou 0.4.17:";; |
857 | esac |
858 | cat <<\_ACEOF |
859 | |
860 | @@ -1604,9 +1610,12 @@ |
861 | --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) |
862 | --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use |
863 | both] |
864 | + --with-aix-soname=aix|svr4|both |
865 | + shared library versioning (aka "SONAME") variant to |
866 | + provide on AIX, [default=aix]. |
867 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
868 | - --with-sysroot=DIR Search for dependent libraries within DIR |
869 | - (or the compiler's sysroot if not specified). |
870 | + --with-sysroot[=DIR] Search for dependent libraries within DIR (or the |
871 | + compiler's sysroot if not specified). |
872 | |
873 | Some influential environment variables: |
874 | CC C compiler command |
875 | @@ -1616,6 +1625,8 @@ |
876 | LIBS libraries to pass to the linker, e.g. -l<library> |
877 | CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if |
878 | you have headers in a nonstandard directory <include dir> |
879 | + LT_SYS_LIBRARY_PATH |
880 | + User-defined run-time library search path. |
881 | CPP C preprocessor |
882 | PKG_CONFIG path to pkg-config utility |
883 | PKG_CONFIG_PATH |
884 | @@ -1706,7 +1717,7 @@ |
885 | test -n "$ac_init_help" && exit $ac_status |
886 | if $ac_init_version; then |
887 | cat <<\_ACEOF |
888 | -caribou configure 0.4.15 |
889 | +caribou configure 0.4.17 |
890 | generated by GNU Autoconf 2.69 |
891 | |
892 | Copyright (C) 2012 Free Software Foundation, Inc. |
893 | @@ -2075,7 +2086,7 @@ |
894 | This file contains any messages produced by compilers while |
895 | running configure, to aid debugging if configure makes a mistake. |
896 | |
897 | -It was created by caribou $as_me 0.4.15, which was |
898 | +It was created by caribou $as_me 0.4.17, which was |
899 | generated by GNU Autoconf 2.69. Invocation command line was |
900 | |
901 | $ $0 $@ |
902 | @@ -2463,22 +2474,22 @@ |
903 | |
904 | |
905 | |
906 | -macro_version='2.4.2' |
907 | -macro_revision='1.3337' |
908 | - |
909 | - |
910 | - |
911 | - |
912 | - |
913 | - |
914 | - |
915 | - |
916 | - |
917 | - |
918 | - |
919 | - |
920 | - |
921 | -ltmain="$ac_aux_dir/ltmain.sh" |
922 | +macro_version='2.4.5' |
923 | +macro_revision='2.4.5' |
924 | + |
925 | + |
926 | + |
927 | + |
928 | + |
929 | + |
930 | + |
931 | + |
932 | + |
933 | + |
934 | + |
935 | + |
936 | + |
937 | +ltmain=$ac_aux_dir/ltmain.sh |
938 | |
939 | # Make sure we can run config.sub. |
940 | $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || |
941 | @@ -2598,7 +2609,7 @@ |
942 | $ECHO "" |
943 | } |
944 | |
945 | -case "$ECHO" in |
946 | +case $ECHO in |
947 | printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 |
948 | $as_echo "printf" >&6; } ;; |
949 | print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 |
950 | @@ -3772,19 +3783,19 @@ |
951 | |
952 | # Check whether --with-gnu-ld was given. |
953 | if test "${with_gnu_ld+set}" = set; then : |
954 | - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes |
955 | + withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes |
956 | else |
957 | with_gnu_ld=no |
958 | fi |
959 | |
960 | ac_prog=ld |
961 | -if test "$GCC" = yes; then |
962 | +if test yes = "$GCC"; then |
963 | # Check if gcc -print-prog-name=ld gives a path. |
964 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 |
965 | $as_echo_n "checking for ld used by $CC... " >&6; } |
966 | case $host in |
967 | *-*-mingw*) |
968 | - # gcc leaves a trailing carriage return which upsets mingw |
969 | + # gcc leaves a trailing carriage return, which upsets mingw |
970 | ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; |
971 | *) |
972 | ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; |
973 | @@ -3798,7 +3809,7 @@ |
974 | while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do |
975 | ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` |
976 | done |
977 | - test -z "$LD" && LD="$ac_prog" |
978 | + test -z "$LD" && LD=$ac_prog |
979 | ;; |
980 | "") |
981 | # If it fails, then pretend we aren't using GCC. |
982 | @@ -3809,7 +3820,7 @@ |
983 | with_gnu_ld=unknown |
984 | ;; |
985 | esac |
986 | -elif test "$with_gnu_ld" = yes; then |
987 | +elif test yes = "$with_gnu_ld"; then |
988 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 |
989 | $as_echo_n "checking for GNU ld... " >&6; } |
990 | else |
991 | @@ -3820,32 +3831,32 @@ |
992 | $as_echo_n "(cached) " >&6 |
993 | else |
994 | if test -z "$LD"; then |
995 | - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR |
996 | + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR |
997 | for ac_dir in $PATH; do |
998 | - IFS="$lt_save_ifs" |
999 | + IFS=$lt_save_ifs |
1000 | test -z "$ac_dir" && ac_dir=. |
1001 | if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then |
1002 | - lt_cv_path_LD="$ac_dir/$ac_prog" |
1003 | + lt_cv_path_LD=$ac_dir/$ac_prog |
1004 | # Check to see if the program is GNU ld. I'd rather use --version, |
1005 | # but apparently some variants of GNU ld only accept -v. |
1006 | # Break only if it was the GNU/non-GNU ld that we prefer. |
1007 | case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in |
1008 | *GNU* | *'with BFD'*) |
1009 | - test "$with_gnu_ld" != no && break |
1010 | + test no != "$with_gnu_ld" && break |
1011 | ;; |
1012 | *) |
1013 | - test "$with_gnu_ld" != yes && break |
1014 | + test yes != "$with_gnu_ld" && break |
1015 | ;; |
1016 | esac |
1017 | fi |
1018 | done |
1019 | - IFS="$lt_save_ifs" |
1020 | + IFS=$lt_save_ifs |
1021 | else |
1022 | - lt_cv_path_LD="$LD" # Let the user override the test with a path. |
1023 | + lt_cv_path_LD=$LD # Let the user override the test with a path. |
1024 | fi |
1025 | fi |
1026 | |
1027 | -LD="$lt_cv_path_LD" |
1028 | +LD=$lt_cv_path_LD |
1029 | if test -n "$LD"; then |
1030 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 |
1031 | $as_echo "$LD" >&6; } |
1032 | @@ -3888,33 +3899,38 @@ |
1033 | else |
1034 | if test -n "$NM"; then |
1035 | # Let the user override the test. |
1036 | - lt_cv_path_NM="$NM" |
1037 | + lt_cv_path_NM=$NM |
1038 | else |
1039 | - lt_nm_to_check="${ac_tool_prefix}nm" |
1040 | + lt_nm_to_check=${ac_tool_prefix}nm |
1041 | if test -n "$ac_tool_prefix" && test "$build" = "$host"; then |
1042 | lt_nm_to_check="$lt_nm_to_check nm" |
1043 | fi |
1044 | for lt_tmp_nm in $lt_nm_to_check; do |
1045 | - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR |
1046 | + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR |
1047 | for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do |
1048 | - IFS="$lt_save_ifs" |
1049 | + IFS=$lt_save_ifs |
1050 | test -z "$ac_dir" && ac_dir=. |
1051 | - tmp_nm="$ac_dir/$lt_tmp_nm" |
1052 | - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then |
1053 | + tmp_nm=$ac_dir/$lt_tmp_nm |
1054 | + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then |
1055 | # Check to see if the nm accepts a BSD-compat flag. |
1056 | - # Adding the `sed 1q' prevents false positives on HP-UX, which says: |
1057 | + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: |
1058 | # nm: unknown option "B" ignored |
1059 | # Tru64's nm complains that /dev/null is an invalid object file |
1060 | - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in |
1061 | - */dev/null* | *'Invalid file or object type'*) |
1062 | + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty |
1063 | + case $build_os in |
1064 | + mingw*) lt_bad_file=conftest.nm/nofile ;; |
1065 | + *) lt_bad_file=/dev/null ;; |
1066 | + esac |
1067 | + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in |
1068 | + *$lt_bad_file* | *'Invalid file or object type'*) |
1069 | lt_cv_path_NM="$tmp_nm -B" |
1070 | - break |
1071 | + break 2 |
1072 | ;; |
1073 | *) |
1074 | case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in |
1075 | */dev/null*) |
1076 | lt_cv_path_NM="$tmp_nm -p" |
1077 | - break |
1078 | + break 2 |
1079 | ;; |
1080 | *) |
1081 | lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but |
1082 | @@ -3925,15 +3941,15 @@ |
1083 | esac |
1084 | fi |
1085 | done |
1086 | - IFS="$lt_save_ifs" |
1087 | + IFS=$lt_save_ifs |
1088 | done |
1089 | : ${lt_cv_path_NM=no} |
1090 | fi |
1091 | fi |
1092 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 |
1093 | $as_echo "$lt_cv_path_NM" >&6; } |
1094 | -if test "$lt_cv_path_NM" != "no"; then |
1095 | - NM="$lt_cv_path_NM" |
1096 | +if test no != "$lt_cv_path_NM"; then |
1097 | + NM=$lt_cv_path_NM |
1098 | else |
1099 | # Didn't find any BSD compatible name lister, look for dumpbin. |
1100 | if test -n "$DUMPBIN"; then : |
1101 | @@ -4039,9 +4055,9 @@ |
1102 | fi |
1103 | fi |
1104 | |
1105 | - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in |
1106 | + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in |
1107 | *COFF*) |
1108 | - DUMPBIN="$DUMPBIN -symbols" |
1109 | + DUMPBIN="$DUMPBIN -symbols -headers" |
1110 | ;; |
1111 | *) |
1112 | DUMPBIN=: |
1113 | @@ -4049,8 +4065,8 @@ |
1114 | esac |
1115 | fi |
1116 | |
1117 | - if test "$DUMPBIN" != ":"; then |
1118 | - NM="$DUMPBIN" |
1119 | + if test : != "$DUMPBIN"; then |
1120 | + NM=$DUMPBIN |
1121 | fi |
1122 | fi |
1123 | test -z "$NM" && NM=nm |
1124 | @@ -4101,7 +4117,7 @@ |
1125 | $as_echo_n "(cached) " >&6 |
1126 | else |
1127 | i=0 |
1128 | - teststring="ABCD" |
1129 | + teststring=ABCD |
1130 | |
1131 | case $build_os in |
1132 | msdosdjgpp*) |
1133 | @@ -4141,7 +4157,7 @@ |
1134 | lt_cv_sys_max_cmd_len=8192; |
1135 | ;; |
1136 | |
1137 | - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) |
1138 | + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) |
1139 | # This has been around since 386BSD, at least. Likely further. |
1140 | if test -x /sbin/sysctl; then |
1141 | lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` |
1142 | @@ -4192,22 +4208,22 @@ |
1143 | *) |
1144 | lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` |
1145 | if test -n "$lt_cv_sys_max_cmd_len" && \ |
1146 | - test undefined != "$lt_cv_sys_max_cmd_len"; then |
1147 | + test undefined != "$lt_cv_sys_max_cmd_len"; then |
1148 | lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` |
1149 | lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` |
1150 | else |
1151 | # Make teststring a little bigger before we do anything with it. |
1152 | # a 1K string should be a reasonable start. |
1153 | - for i in 1 2 3 4 5 6 7 8 ; do |
1154 | + for i in 1 2 3 4 5 6 7 8; do |
1155 | teststring=$teststring$teststring |
1156 | done |
1157 | SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} |
1158 | # If test is not a shell built-in, we'll probably end up computing a |
1159 | # maximum length that is only half of the actual maximum length, but |
1160 | # we can't tell. |
1161 | - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ |
1162 | + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ |
1163 | = "X$teststring$teststring"; } >/dev/null 2>&1 && |
1164 | - test $i != 17 # 1/2 MB should be enough |
1165 | + test 17 != "$i" # 1/2 MB should be enough |
1166 | do |
1167 | i=`expr $i + 1` |
1168 | teststring=$teststring$teststring |
1169 | @@ -4225,7 +4241,7 @@ |
1170 | |
1171 | fi |
1172 | |
1173 | -if test -n $lt_cv_sys_max_cmd_len ; then |
1174 | +if test -n "$lt_cv_sys_max_cmd_len"; then |
1175 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 |
1176 | $as_echo "$lt_cv_sys_max_cmd_len" >&6; } |
1177 | else |
1178 | @@ -4243,30 +4259,6 @@ |
1179 | : ${MV="mv -f"} |
1180 | : ${RM="rm -f"} |
1181 | |
1182 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 |
1183 | -$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } |
1184 | -# Try some XSI features |
1185 | -xsi_shell=no |
1186 | -( _lt_dummy="a/b/c" |
1187 | - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
1188 | - = c,a/b,b/c, \ |
1189 | - && eval 'test $(( 1 + 1 )) -eq 2 \ |
1190 | - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
1191 | - && xsi_shell=yes |
1192 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 |
1193 | -$as_echo "$xsi_shell" >&6; } |
1194 | - |
1195 | - |
1196 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 |
1197 | -$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } |
1198 | -lt_shell_append=no |
1199 | -( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ |
1200 | - >/dev/null 2>&1 \ |
1201 | - && lt_shell_append=yes |
1202 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 |
1203 | -$as_echo "$lt_shell_append" >&6; } |
1204 | - |
1205 | - |
1206 | if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then |
1207 | lt_unset=unset |
1208 | else |
1209 | @@ -4389,13 +4381,13 @@ |
1210 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
1211 | case $host_os in |
1212 | cygwin* | mingw* | pw32* | cegcc*) |
1213 | - if test "$GCC" != yes; then |
1214 | + if test yes != "$GCC"; then |
1215 | reload_cmds=false |
1216 | fi |
1217 | ;; |
1218 | darwin*) |
1219 | - if test "$GCC" = yes; then |
1220 | - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
1221 | + if test yes = "$GCC"; then |
1222 | + reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs' |
1223 | else |
1224 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
1225 | fi |
1226 | @@ -4523,13 +4515,13 @@ |
1227 | # Need to set the preceding variable on all platforms that support |
1228 | # interlibrary dependencies. |
1229 | # 'none' -- dependencies not supported. |
1230 | -# `unknown' -- same as none, but documents that we really don't know. |
1231 | +# 'unknown' -- same as none, but documents that we really don't know. |
1232 | # 'pass_all' -- all dependencies passed with no checks. |
1233 | # 'test_compile' -- check by making test program. |
1234 | # 'file_magic [[regex]]' -- check by looking for files in library path |
1235 | -# which responds to the $file_magic_cmd with a given extended regex. |
1236 | -# If you have `file' or equivalent on your system and you're not sure |
1237 | -# whether `pass_all' will *always* work, you probably want this one. |
1238 | +# that responds to the $file_magic_cmd with a given extended regex. |
1239 | +# If you have 'file' or equivalent on your system and you're not sure |
1240 | +# whether 'pass_all' will *always* work, you probably want this one. |
1241 | |
1242 | case $host_os in |
1243 | aix[4-9]*) |
1244 | @@ -4556,8 +4548,7 @@ |
1245 | # Base MSYS/MinGW do not provide the 'file' command needed by |
1246 | # func_win32_libid shell function, so use a weaker test based on 'objdump', |
1247 | # unless we find 'file', for example because we are cross-compiling. |
1248 | - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. |
1249 | - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then |
1250 | + if ( file / ) >/dev/null 2>&1; then |
1251 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
1252 | lt_cv_file_magic_cmd='func_win32_libid' |
1253 | else |
1254 | @@ -4635,7 +4626,7 @@ |
1255 | lt_cv_deplibs_check_method=pass_all |
1256 | ;; |
1257 | |
1258 | -netbsd* | netbsdelf*-gnu) |
1259 | +netbsd*) |
1260 | if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then |
1261 | lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' |
1262 | else |
1263 | @@ -4653,8 +4644,8 @@ |
1264 | lt_cv_deplibs_check_method=pass_all |
1265 | ;; |
1266 | |
1267 | -openbsd*) |
1268 | - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then |
1269 | +openbsd* | bitrig*) |
1270 | + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then |
1271 | lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' |
1272 | else |
1273 | lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' |
1274 | @@ -4707,6 +4698,9 @@ |
1275 | tpf*) |
1276 | lt_cv_deplibs_check_method=pass_all |
1277 | ;; |
1278 | +os2*) |
1279 | + lt_cv_deplibs_check_method=pass_all |
1280 | + ;; |
1281 | esac |
1282 | |
1283 | fi |
1284 | @@ -4864,8 +4858,8 @@ |
1285 | |
1286 | case $host_os in |
1287 | cygwin* | mingw* | pw32* | cegcc*) |
1288 | - # two different shell functions defined in ltmain.sh |
1289 | - # decide which to use based on capabilities of $DLLTOOL |
1290 | + # two different shell functions defined in ltmain.sh; |
1291 | + # decide which one to use based on capabilities of $DLLTOOL |
1292 | case `$DLLTOOL --help 2>&1` in |
1293 | *--identify-strict*) |
1294 | lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
1295 | @@ -4877,7 +4871,7 @@ |
1296 | ;; |
1297 | *) |
1298 | # fallback: assume linklib IS sharedlib |
1299 | - lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
1300 | + lt_cv_sharedlib_from_linklib_cmd=$ECHO |
1301 | ;; |
1302 | esac |
1303 | |
1304 | @@ -5032,7 +5026,7 @@ |
1305 | ac_status=$? |
1306 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
1307 | test $ac_status = 0; } |
1308 | - if test "$ac_status" -eq 0; then |
1309 | + if test 0 -eq "$ac_status"; then |
1310 | # Ensure the archiver fails upon bogus file names. |
1311 | rm -f conftest.$ac_objext libconftest.a |
1312 | { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
1313 | @@ -5040,7 +5034,7 @@ |
1314 | ac_status=$? |
1315 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
1316 | test $ac_status = 0; } |
1317 | - if test "$ac_status" -ne 0; then |
1318 | + if test 0 -ne "$ac_status"; then |
1319 | lt_cv_ar_at_file=@ |
1320 | fi |
1321 | fi |
1322 | @@ -5053,7 +5047,7 @@ |
1323 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
1324 | $as_echo "$lt_cv_ar_at_file" >&6; } |
1325 | |
1326 | -if test "x$lt_cv_ar_at_file" = xno; then |
1327 | +if test no = "$lt_cv_ar_at_file"; then |
1328 | archiver_list_spec= |
1329 | else |
1330 | archiver_list_spec=$lt_cv_ar_at_file |
1331 | @@ -5270,7 +5264,7 @@ |
1332 | |
1333 | if test -n "$RANLIB"; then |
1334 | case $host_os in |
1335 | - openbsd*) |
1336 | + bitrig* | openbsd*) |
1337 | old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" |
1338 | ;; |
1339 | *) |
1340 | @@ -5402,7 +5396,7 @@ |
1341 | symcode='[ABCDGISTW]' |
1342 | ;; |
1343 | hpux*) |
1344 | - if test "$host_cpu" = ia64; then |
1345 | + if test ia64 = "$host_cpu"; then |
1346 | symcode='[ABCDEGRST]' |
1347 | fi |
1348 | ;; |
1349 | @@ -5435,14 +5429,44 @@ |
1350 | symcode='[ABCDGIRSTW]' ;; |
1351 | esac |
1352 | |
1353 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
1354 | + # Gets list of data symbols to import. |
1355 | + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" |
1356 | + # Adjust the below global symbol transforms to fixup imported variables. |
1357 | + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" |
1358 | + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" |
1359 | + lt_c_name_lib_hook="\ |
1360 | + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ |
1361 | + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" |
1362 | +else |
1363 | + # Disable hooks by default. |
1364 | + lt_cv_sys_global_symbol_to_import= |
1365 | + lt_cdecl_hook= |
1366 | + lt_c_name_hook= |
1367 | + lt_c_name_lib_hook= |
1368 | +fi |
1369 | + |
1370 | # Transform an extracted symbol line into a proper C declaration. |
1371 | # Some systems (esp. on ia64) link data and code symbols differently, |
1372 | # so use this general approach. |
1373 | -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
1374 | +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ |
1375 | +$lt_cdecl_hook\ |
1376 | +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ |
1377 | +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" |
1378 | |
1379 | # Transform an extracted symbol line into symbol name and symbol address |
1380 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
1381 | -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'" |
1382 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ |
1383 | +$lt_c_name_hook\ |
1384 | +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ |
1385 | +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" |
1386 | + |
1387 | +# Transform an extracted symbol line into symbol name with lib prefix and |
1388 | +# symbol address. |
1389 | +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ |
1390 | +$lt_c_name_lib_hook\ |
1391 | +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ |
1392 | +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ |
1393 | +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" |
1394 | |
1395 | # Handle CRLF in mingw tool chain |
1396 | opt_cr= |
1397 | @@ -5460,21 +5484,24 @@ |
1398 | |
1399 | # Write the raw and C identifiers. |
1400 | if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
1401 | - # Fake it for dumpbin and say T for any non-static function |
1402 | - # and D for any global variable. |
1403 | + # Fake it for dumpbin and say T for any non-static function, |
1404 | + # D for any global variable and I for any imported variable. |
1405 | # Also find C++ and __fastcall symbols from MSVC++, |
1406 | # which start with @ or ?. |
1407 | lt_cv_sys_global_symbol_pipe="$AWK '"\ |
1408 | " {last_section=section; section=\$ 3};"\ |
1409 | " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ |
1410 | " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ |
1411 | +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ |
1412 | +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ |
1413 | +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ |
1414 | " \$ 0!~/External *\|/{next};"\ |
1415 | " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ |
1416 | " {if(hide[section]) next};"\ |
1417 | -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ |
1418 | -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ |
1419 | -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ |
1420 | -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ |
1421 | +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ |
1422 | +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ |
1423 | +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ |
1424 | +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ |
1425 | " ' prfx=^$ac_symprfx" |
1426 | else |
1427 | 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 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
1430 | cat <<_LT_EOF > conftest.$ac_ext |
1431 | /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
1432 | -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
1433 | -/* DATA imports from DLLs on WIN32 con't be const, because runtime |
1434 | +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE |
1435 | +/* DATA imports from DLLs on WIN32 can't be const, because runtime |
1436 | relocations are performed -- see ld's documentation on pseudo-relocs. */ |
1437 | # define LT_DLSYM_CONST |
1438 | -#elif defined(__osf__) |
1439 | +#elif defined __osf__ |
1440 | /* This system does not cope well with relocations in const data. */ |
1441 | # define LT_DLSYM_CONST |
1442 | #else |
1443 | @@ -5552,7 +5579,7 @@ |
1444 | { |
1445 | { "@PROGRAM@", (void *) 0 }, |
1446 | _LT_EOF |
1447 | - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext |
1448 | + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext |
1449 | cat <<\_LT_EOF >> conftest.$ac_ext |
1450 | {0, (void *) 0} |
1451 | }; |
1452 | @@ -5572,13 +5599,13 @@ |
1453 | mv conftest.$ac_objext conftstm.$ac_objext |
1454 | lt_globsym_save_LIBS=$LIBS |
1455 | lt_globsym_save_CFLAGS=$CFLAGS |
1456 | - LIBS="conftstm.$ac_objext" |
1457 | + LIBS=conftstm.$ac_objext |
1458 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
1459 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
1460 | (eval $ac_link) 2>&5 |
1461 | ac_status=$? |
1462 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
1463 | - test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
1464 | + test $ac_status = 0; } && test -s conftest$ac_exeext; then |
1465 | pipe_works=yes |
1466 | fi |
1467 | LIBS=$lt_globsym_save_LIBS |
1468 | @@ -5599,7 +5626,7 @@ |
1469 | rm -rf conftest* conftst* |
1470 | |
1471 | # Do not use the global_symbol_pipe unless it works. |
1472 | - if test "$pipe_works" = yes; then |
1473 | + if test yes = "$pipe_works"; then |
1474 | break |
1475 | else |
1476 | lt_cv_sys_global_symbol_pipe= |
1477 | @@ -5652,6 +5679,16 @@ |
1478 | |
1479 | |
1480 | |
1481 | + |
1482 | + |
1483 | + |
1484 | + |
1485 | + |
1486 | + |
1487 | + |
1488 | + |
1489 | + |
1490 | + |
1491 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
1492 | $as_echo_n "checking for sysroot... " >&6; } |
1493 | |
1494 | @@ -5664,9 +5701,9 @@ |
1495 | |
1496 | |
1497 | lt_sysroot= |
1498 | -case ${with_sysroot} in #( |
1499 | +case $with_sysroot in #( |
1500 | yes) |
1501 | - if test "$GCC" = yes; then |
1502 | + if test yes = "$GCC"; then |
1503 | lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
1504 | fi |
1505 | ;; #( |
1506 | @@ -5676,8 +5713,8 @@ |
1507 | no|'') |
1508 | ;; #( |
1509 | *) |
1510 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 |
1511 | -$as_echo "${with_sysroot}" >&6; } |
1512 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 |
1513 | +$as_echo "$with_sysroot" >&6; } |
1514 | as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 |
1515 | ;; |
1516 | esac |
1517 | @@ -5689,18 +5726,99 @@ |
1518 | |
1519 | |
1520 | |
1521 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 |
1522 | +$as_echo_n "checking for a working dd... " >&6; } |
1523 | +if ${ac_cv_path_lt_DD+:} false; then : |
1524 | + $as_echo_n "(cached) " >&6 |
1525 | +else |
1526 | + printf 0123456789abcdef0123456789abcdef >conftest.i |
1527 | +cat conftest.i conftest.i >conftest2.i |
1528 | +: ${lt_DD:=$DD} |
1529 | +if test -z "$lt_DD"; then |
1530 | + ac_path_lt_DD_found=false |
1531 | + # Loop through the user's path and test for each of PROGNAME-LIST |
1532 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1533 | +for as_dir in $PATH |
1534 | +do |
1535 | + IFS=$as_save_IFS |
1536 | + test -z "$as_dir" && as_dir=. |
1537 | + for ac_prog in dd; do |
1538 | + for ac_exec_ext in '' $ac_executable_extensions; do |
1539 | + ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext" |
1540 | + as_fn_executable_p "$ac_path_lt_DD" || continue |
1541 | +if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then |
1542 | + cmp -s conftest.i conftest.out \ |
1543 | + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: |
1544 | +fi |
1545 | + $ac_path_lt_DD_found && break 3 |
1546 | + done |
1547 | + done |
1548 | + done |
1549 | +IFS=$as_save_IFS |
1550 | + if test -z "$ac_cv_path_lt_DD"; then |
1551 | + : |
1552 | + fi |
1553 | +else |
1554 | + ac_cv_path_lt_DD=$lt_DD |
1555 | +fi |
1556 | + |
1557 | +rm -f conftest.i conftest2.i conftest.out |
1558 | +fi |
1559 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 |
1560 | +$as_echo "$ac_cv_path_lt_DD" >&6; } |
1561 | + |
1562 | + |
1563 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 |
1564 | +$as_echo_n "checking how to truncate binary pipes... " >&6; } |
1565 | +if ${lt_cv_truncate_bin+:} false; then : |
1566 | + $as_echo_n "(cached) " >&6 |
1567 | +else |
1568 | + printf 0123456789abcdef0123456789abcdef >conftest.i |
1569 | +cat conftest.i conftest.i >conftest2.i |
1570 | +lt_cv_truncate_bin= |
1571 | +if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then |
1572 | + cmp -s conftest.i conftest.out \ |
1573 | + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" |
1574 | +fi |
1575 | +rm -f conftest.i conftest2.i conftest.out |
1576 | +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" |
1577 | +fi |
1578 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 |
1579 | +$as_echo "$lt_cv_truncate_bin" >&6; } |
1580 | + |
1581 | + |
1582 | + |
1583 | + |
1584 | + |
1585 | + |
1586 | + |
1587 | +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. |
1588 | +func_cc_basename () |
1589 | +{ |
1590 | + for cc_temp in $*""; do |
1591 | + case $cc_temp in |
1592 | + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; |
1593 | + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; |
1594 | + \-*) ;; |
1595 | + *) break;; |
1596 | + esac |
1597 | + done |
1598 | + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` |
1599 | +} |
1600 | + |
1601 | # Check whether --enable-libtool-lock was given. |
1602 | if test "${enable_libtool_lock+set}" = set; then : |
1603 | enableval=$enable_libtool_lock; |
1604 | fi |
1605 | |
1606 | -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes |
1607 | +test no = "$enable_libtool_lock" || enable_libtool_lock=yes |
1608 | |
1609 | # Some flags need to be propagated to the compiler or linker for good |
1610 | # libtool support. |
1611 | case $host in |
1612 | ia64-*-hpux*) |
1613 | - # Find out which ABI we are using. |
1614 | + # Find out what ABI is being produced by ac_compile, and set mode |
1615 | + # options accordingly. |
1616 | echo 'int i;' > conftest.$ac_ext |
1617 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
1618 | (eval $ac_compile) 2>&5 |
1619 | @@ -5709,24 +5827,25 @@ |
1620 | test $ac_status = 0; }; then |
1621 | case `/usr/bin/file conftest.$ac_objext` in |
1622 | *ELF-32*) |
1623 | - HPUX_IA64_MODE="32" |
1624 | + HPUX_IA64_MODE=32 |
1625 | ;; |
1626 | *ELF-64*) |
1627 | - HPUX_IA64_MODE="64" |
1628 | + HPUX_IA64_MODE=64 |
1629 | ;; |
1630 | esac |
1631 | fi |
1632 | rm -rf conftest* |
1633 | ;; |
1634 | *-*-irix6*) |
1635 | - # Find out which ABI we are using. |
1636 | + # Find out what ABI is being produced by ac_compile, and set linker |
1637 | + # options accordingly. |
1638 | echo '#line '$LINENO' "configure"' > conftest.$ac_ext |
1639 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
1640 | (eval $ac_compile) 2>&5 |
1641 | ac_status=$? |
1642 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
1643 | test $ac_status = 0; }; then |
1644 | - if test "$lt_cv_prog_gnu_ld" = yes; then |
1645 | + if test yes = "$lt_cv_prog_gnu_ld"; then |
1646 | case `/usr/bin/file conftest.$ac_objext` in |
1647 | *32-bit*) |
1648 | LD="${LD-ld} -melf32bsmip" |
1649 | @@ -5755,9 +5874,50 @@ |
1650 | rm -rf conftest* |
1651 | ;; |
1652 | |
1653 | +mips64*-*linux*) |
1654 | + # Find out what ABI is being produced by ac_compile, and set linker |
1655 | + # options accordingly. |
1656 | + echo '#line '$LINENO' "configure"' > conftest.$ac_ext |
1657 | + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
1658 | + (eval $ac_compile) 2>&5 |
1659 | + ac_status=$? |
1660 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
1661 | + test $ac_status = 0; }; then |
1662 | + emul=elf |
1663 | + case `/usr/bin/file conftest.$ac_objext` in |
1664 | + *32-bit*) |
1665 | + emul="${emul}32" |
1666 | + ;; |
1667 | + *64-bit*) |
1668 | + emul="${emul}64" |
1669 | + ;; |
1670 | + esac |
1671 | + case `/usr/bin/file conftest.$ac_objext` in |
1672 | + *MSB*) |
1673 | + emul="${emul}btsmip" |
1674 | + ;; |
1675 | + *LSB*) |
1676 | + emul="${emul}ltsmip" |
1677 | + ;; |
1678 | + esac |
1679 | + case `/usr/bin/file conftest.$ac_objext` in |
1680 | + *N32*) |
1681 | + emul="${emul}n32" |
1682 | + ;; |
1683 | + esac |
1684 | + LD="${LD-ld} -m $emul" |
1685 | + fi |
1686 | + rm -rf conftest* |
1687 | + ;; |
1688 | + |
1689 | x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ |
1690 | s390*-*linux*|s390*-*tpf*|sparc*-*linux*) |
1691 | - # Find out which ABI we are using. |
1692 | + # Find out what ABI is being produced by ac_compile, and set linker |
1693 | + # options accordingly. Note that the listed cases only cover the |
1694 | + # situations where additional linker options are needed (such as when |
1695 | + # doing 32-bit compilation for a host where ld defaults to 64-bit, or |
1696 | + # vice versa); the common cases where no linker options are needed do |
1697 | + # not appear in the list. |
1698 | echo 'int i;' > conftest.$ac_ext |
1699 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
1700 | (eval $ac_compile) 2>&5 |
1701 | @@ -5780,10 +5940,10 @@ |
1702 | ;; |
1703 | esac |
1704 | ;; |
1705 | - powerpc64le-*) |
1706 | + powerpc64le-*linux*) |
1707 | LD="${LD-ld} -m elf32lppclinux" |
1708 | ;; |
1709 | - powerpc64-*) |
1710 | + powerpc64-*linux*) |
1711 | LD="${LD-ld} -m elf32ppclinux" |
1712 | ;; |
1713 | s390x-*linux*) |
1714 | @@ -5802,10 +5962,10 @@ |
1715 | x86_64-*linux*) |
1716 | LD="${LD-ld} -m elf_x86_64" |
1717 | ;; |
1718 | - powerpcle-*) |
1719 | + powerpcle-*linux*) |
1720 | LD="${LD-ld} -m elf64lppc" |
1721 | ;; |
1722 | - powerpc-*) |
1723 | + powerpc-*linux*) |
1724 | LD="${LD-ld} -m elf64ppc" |
1725 | ;; |
1726 | s390*-*linux*|s390*-*tpf*) |
1727 | @@ -5823,7 +5983,7 @@ |
1728 | |
1729 | *-*-sco3.2v5*) |
1730 | # On SCO OpenServer 5, we need -belf to get full-featured binaries. |
1731 | - SAVE_CFLAGS="$CFLAGS" |
1732 | + SAVE_CFLAGS=$CFLAGS |
1733 | CFLAGS="$CFLAGS -belf" |
1734 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 |
1735 | $as_echo_n "checking whether the C compiler needs -belf... " >&6; } |
1736 | @@ -5863,13 +6023,14 @@ |
1737 | fi |
1738 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 |
1739 | $as_echo "$lt_cv_cc_needs_belf" >&6; } |
1740 | - if test x"$lt_cv_cc_needs_belf" != x"yes"; then |
1741 | + if test yes != "$lt_cv_cc_needs_belf"; then |
1742 | # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf |
1743 | - CFLAGS="$SAVE_CFLAGS" |
1744 | + CFLAGS=$SAVE_CFLAGS |
1745 | fi |
1746 | ;; |
1747 | *-*solaris*) |
1748 | - # Find out which ABI we are using. |
1749 | + # Find out what ABI is being produced by ac_compile, and set linker |
1750 | + # options accordingly. |
1751 | echo 'int i;' > conftest.$ac_ext |
1752 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
1753 | (eval $ac_compile) 2>&5 |
1754 | @@ -5881,7 +6042,7 @@ |
1755 | case $lt_cv_prog_gnu_ld in |
1756 | yes*) |
1757 | case $host in |
1758 | - i?86-*-solaris*) |
1759 | + i?86-*-solaris*|x86_64-*-solaris*) |
1760 | LD="${LD-ld} -m elf_x86_64" |
1761 | ;; |
1762 | sparc*-*-solaris*) |
1763 | @@ -5890,7 +6051,7 @@ |
1764 | esac |
1765 | # GNU ld 2.21 introduced _sol2 emulations. Use them if available. |
1766 | if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then |
1767 | - LD="${LD-ld}_sol2" |
1768 | + LD=${LD-ld}_sol2 |
1769 | fi |
1770 | ;; |
1771 | *) |
1772 | @@ -5906,7 +6067,7 @@ |
1773 | ;; |
1774 | esac |
1775 | |
1776 | -need_locks="$enable_libtool_lock" |
1777 | +need_locks=$enable_libtool_lock |
1778 | |
1779 | if test -n "$ac_tool_prefix"; then |
1780 | # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. |
1781 | @@ -6017,7 +6178,7 @@ |
1782 | fi |
1783 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 |
1784 | $as_echo "$lt_cv_path_mainfest_tool" >&6; } |
1785 | -if test "x$lt_cv_path_mainfest_tool" != xyes; then |
1786 | +if test yes != "$lt_cv_path_mainfest_tool"; then |
1787 | MANIFEST_TOOL=: |
1788 | fi |
1789 | |
1790 | @@ -6520,7 +6681,7 @@ |
1791 | $as_echo_n "(cached) " >&6 |
1792 | else |
1793 | lt_cv_apple_cc_single_mod=no |
1794 | - if test -z "${LT_MULTI_MODULE}"; then |
1795 | + if test -z "$LT_MULTI_MODULE"; then |
1796 | # By default we will add the -single_module flag. You can override |
1797 | # by either setting the environment variable LT_MULTI_MODULE |
1798 | # non-empty at configure time, or by adding -multi_module to the |
1799 | @@ -6538,7 +6699,7 @@ |
1800 | cat conftest.err >&5 |
1801 | # Otherwise, if the output was created with a 0 exit code from |
1802 | # the compiler, it worked. |
1803 | - elif test -f libconftest.dylib && test $_lt_result -eq 0; then |
1804 | + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then |
1805 | lt_cv_apple_cc_single_mod=yes |
1806 | else |
1807 | cat conftest.err >&5 |
1808 | @@ -6577,7 +6738,7 @@ |
1809 | fi |
1810 | rm -f core conftest.err conftest.$ac_objext \ |
1811 | conftest$ac_exeext conftest.$ac_ext |
1812 | - LDFLAGS="$save_LDFLAGS" |
1813 | + LDFLAGS=$save_LDFLAGS |
1814 | |
1815 | fi |
1816 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 |
1817 | @@ -6606,7 +6767,7 @@ |
1818 | _lt_result=$? |
1819 | if test -s conftest.err && $GREP force_load conftest.err; then |
1820 | cat conftest.err >&5 |
1821 | - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then |
1822 | + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then |
1823 | lt_cv_ld_force_load=yes |
1824 | else |
1825 | cat conftest.err >&5 |
1826 | @@ -6619,32 +6780,32 @@ |
1827 | $as_echo "$lt_cv_ld_force_load" >&6; } |
1828 | case $host_os in |
1829 | rhapsody* | darwin1.[012]) |
1830 | - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; |
1831 | + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; |
1832 | darwin1.*) |
1833 | - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; |
1834 | + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; |
1835 | darwin*) # darwin 5.x on |
1836 | # if running on 10.5 or later, the deployment target defaults |
1837 | # to the OS version, if on x86, and 10.4, the deployment |
1838 | # target defaults to 10.4. Don't you love it? |
1839 | case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in |
1840 | 10.0,*86*-darwin8*|10.0,*-darwin[91]*) |
1841 | - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; |
1842 | - 10.[012]*) |
1843 | - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; |
1844 | + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; |
1845 | + 10.[012][,.]*) |
1846 | + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; |
1847 | 10.*) |
1848 | - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; |
1849 | + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; |
1850 | esac |
1851 | ;; |
1852 | esac |
1853 | - if test "$lt_cv_apple_cc_single_mod" = "yes"; then |
1854 | + if test yes = "$lt_cv_apple_cc_single_mod"; then |
1855 | _lt_dar_single_mod='$single_module' |
1856 | fi |
1857 | - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then |
1858 | - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' |
1859 | + if test yes = "$lt_cv_ld_exported_symbols_list"; then |
1860 | + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' |
1861 | else |
1862 | - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' |
1863 | + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' |
1864 | fi |
1865 | - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then |
1866 | + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then |
1867 | _lt_dsymutil='~$DSYMUTIL $lib || :' |
1868 | else |
1869 | _lt_dsymutil= |
1870 | @@ -6652,6 +6813,41 @@ |
1871 | ;; |
1872 | esac |
1873 | |
1874 | +# func_munge_path_list VARIABLE PATH |
1875 | +# ----------------------------------- |
1876 | +# VARIABLE is name of variable containing _space_ separated list of |
1877 | +# directories to be munged by the contents of PATH, which is string |
1878 | +# having a format: |
1879 | +# "DIR[:DIR]:" |
1880 | +# string "DIR[ DIR]" will be prepended to VARIABLE |
1881 | +# ":DIR[:DIR]" |
1882 | +# string "DIR[ DIR]" will be appended to VARIABLE |
1883 | +# "DIRP[:DIRP]::[DIRA:]DIRA" |
1884 | +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string |
1885 | +# "DIRA[ DIRA]" will be appended to VARIABLE |
1886 | +# "DIR[:DIR]" |
1887 | +# VARIABLE will be replaced by "DIR[ DIR]" |
1888 | +func_munge_path_list () |
1889 | +{ |
1890 | + case x$2 in |
1891 | + x) |
1892 | + ;; |
1893 | + *:) |
1894 | + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \S|@1\" |
1895 | + ;; |
1896 | + x:*) |
1897 | + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" |
1898 | + ;; |
1899 | + *::*) |
1900 | + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" |
1901 | + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" |
1902 | + ;; |
1903 | + *) |
1904 | + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" |
1905 | + ;; |
1906 | + esac |
1907 | +} |
1908 | + |
1909 | ac_ext=c |
1910 | ac_cpp='$CPP $CPPFLAGS' |
1911 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
1912 | @@ -6955,14 +7151,14 @@ |
1913 | *) |
1914 | enable_shared=no |
1915 | # Look at the argument we got. We use all the common list separators. |
1916 | - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," |
1917 | + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, |
1918 | for pkg in $enableval; do |
1919 | - IFS="$lt_save_ifs" |
1920 | + IFS=$lt_save_ifs |
1921 | if test "X$pkg" = "X$p"; then |
1922 | enable_shared=yes |
1923 | fi |
1924 | done |
1925 | - IFS="$lt_save_ifs" |
1926 | + IFS=$lt_save_ifs |
1927 | ;; |
1928 | esac |
1929 | else |
1930 | @@ -6986,14 +7182,14 @@ |
1931 | *) |
1932 | enable_static=no |
1933 | # Look at the argument we got. We use all the common list separators. |
1934 | - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," |
1935 | + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, |
1936 | for pkg in $enableval; do |
1937 | - IFS="$lt_save_ifs" |
1938 | + IFS=$lt_save_ifs |
1939 | if test "X$pkg" = "X$p"; then |
1940 | enable_static=yes |
1941 | fi |
1942 | done |
1943 | - IFS="$lt_save_ifs" |
1944 | + IFS=$lt_save_ifs |
1945 | ;; |
1946 | esac |
1947 | else |
1948 | @@ -7017,14 +7213,14 @@ |
1949 | *) |
1950 | pic_mode=default |
1951 | # Look at the argument we got. We use all the common list separators. |
1952 | - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," |
1953 | + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, |
1954 | for lt_pkg in $withval; do |
1955 | - IFS="$lt_save_ifs" |
1956 | + IFS=$lt_save_ifs |
1957 | if test "X$lt_pkg" = "X$lt_p"; then |
1958 | pic_mode=yes |
1959 | fi |
1960 | done |
1961 | - IFS="$lt_save_ifs" |
1962 | + IFS=$lt_save_ifs |
1963 | ;; |
1964 | esac |
1965 | else |
1966 | @@ -7032,8 +7228,6 @@ |
1967 | fi |
1968 | |
1969 | |
1970 | -test -z "$pic_mode" && pic_mode=default |
1971 | - |
1972 | |
1973 | |
1974 | |
1975 | @@ -7049,14 +7243,14 @@ |
1976 | *) |
1977 | enable_fast_install=no |
1978 | # Look at the argument we got. We use all the common list separators. |
1979 | - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," |
1980 | + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, |
1981 | for pkg in $enableval; do |
1982 | - IFS="$lt_save_ifs" |
1983 | + IFS=$lt_save_ifs |
1984 | if test "X$pkg" = "X$p"; then |
1985 | enable_fast_install=yes |
1986 | fi |
1987 | done |
1988 | - IFS="$lt_save_ifs" |
1989 | + IFS=$lt_save_ifs |
1990 | ;; |
1991 | esac |
1992 | else |
1993 | @@ -7070,11 +7264,63 @@ |
1994 | |
1995 | |
1996 | |
1997 | + shared_archive_member_spec= |
1998 | +case $host,$enable_shared in |
1999 | +power*-*-aix[5-9]*,yes) |
2000 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 |
2001 | +$as_echo_n "checking which variant of shared library versioning to provide... " >&6; } |
2002 | + |
2003 | +# Check whether --with-aix-soname was given. |
2004 | +if test "${with_aix_soname+set}" = set; then : |
2005 | + withval=$with_aix_soname; case $withval in |
2006 | + aix|svr4|both) |
2007 | + ;; |
2008 | + *) |
2009 | + as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5 |
2010 | + ;; |
2011 | + esac |
2012 | + lt_cv_with_aix_soname=$with_aix_soname |
2013 | +else |
2014 | + if ${lt_cv_with_aix_soname+:} false; then : |
2015 | + $as_echo_n "(cached) " >&6 |
2016 | +else |
2017 | + lt_cv_with_aix_soname=aix |
2018 | +fi |
2019 | + |
2020 | + with_aix_soname=$lt_cv_with_aix_soname |
2021 | +fi |
2022 | + |
2023 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 |
2024 | +$as_echo "$with_aix_soname" >&6; } |
2025 | + if test aix != "$with_aix_soname"; then |
2026 | + # For the AIX way of multilib, we name the shared archive member |
2027 | + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', |
2028 | + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. |
2029 | + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, |
2030 | + # the AIX toolchain works better with OBJECT_MODE set (default 32). |
2031 | + if test 64 = "${OBJECT_MODE-32}"; then |
2032 | + shared_archive_member_spec=shr_64 |
2033 | + else |
2034 | + shared_archive_member_spec=shr |
2035 | + fi |
2036 | + fi |
2037 | + ;; |
2038 | +*) |
2039 | + with_aix_soname=aix |
2040 | + ;; |
2041 | +esac |
2042 | + |
2043 | + |
2044 | + |
2045 | + |
2046 | + |
2047 | + |
2048 | + |
2049 | |
2050 | |
2051 | |
2052 | # This can be used to rebuild libtool when needed |
2053 | -LIBTOOL_DEPS="$ltmain" |
2054 | +LIBTOOL_DEPS=$ltmain |
2055 | |
2056 | # Always use our own libtool. |
2057 | LIBTOOL='$(SHELL) $(top_builddir)/libtool' |
2058 | @@ -7123,7 +7369,7 @@ |
2059 | |
2060 | |
2061 | |
2062 | -if test -n "${ZSH_VERSION+set}" ; then |
2063 | +if test -n "${ZSH_VERSION+set}"; then |
2064 | setopt NO_GLOB_SUBST |
2065 | fi |
2066 | |
2067 | @@ -7162,7 +7408,7 @@ |
2068 | # AIX sometimes has problems with the GCC collect2 program. For some |
2069 | # reason, if we set the COLLECT_NAMES environment variable, the problems |
2070 | # vanish in a puff of smoke. |
2071 | - if test "X${COLLECT_NAMES+set}" != Xset; then |
2072 | + if test set != "${COLLECT_NAMES+set}"; then |
2073 | COLLECT_NAMES= |
2074 | export COLLECT_NAMES |
2075 | fi |
2076 | @@ -7173,14 +7419,14 @@ |
2077 | ofile=libtool |
2078 | can_build_shared=yes |
2079 | |
2080 | -# All known linkers require a `.a' archive for static linking (except MSVC, |
2081 | +# All known linkers require a '.a' archive for static linking (except MSVC, |
2082 | # which needs '.lib'). |
2083 | libext=a |
2084 | |
2085 | -with_gnu_ld="$lt_cv_prog_gnu_ld" |
2086 | +with_gnu_ld=$lt_cv_prog_gnu_ld |
2087 | |
2088 | -old_CC="$CC" |
2089 | -old_CFLAGS="$CFLAGS" |
2090 | +old_CC=$CC |
2091 | +old_CFLAGS=$CFLAGS |
2092 | |
2093 | # Set sane defaults for various variables |
2094 | test -z "$CC" && CC=cc |
2095 | @@ -7189,15 +7435,8 @@ |
2096 | test -z "$LD" && LD=ld |
2097 | test -z "$ac_objext" && ac_objext=o |
2098 | |
2099 | -for cc_temp in $compiler""; do |
2100 | - case $cc_temp in |
2101 | - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; |
2102 | - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; |
2103 | - \-*) ;; |
2104 | - *) break;; |
2105 | - esac |
2106 | -done |
2107 | -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` |
2108 | +func_cc_basename $compiler |
2109 | +cc_basename=$func_cc_basename_result |
2110 | |
2111 | |
2112 | # Only perform the check for file, if the check method requires it |
2113 | @@ -7212,22 +7451,22 @@ |
2114 | else |
2115 | case $MAGIC_CMD in |
2116 | [\\/*] | ?:[\\/]*) |
2117 | - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. |
2118 | + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. |
2119 | ;; |
2120 | *) |
2121 | - lt_save_MAGIC_CMD="$MAGIC_CMD" |
2122 | - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR |
2123 | + lt_save_MAGIC_CMD=$MAGIC_CMD |
2124 | + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR |
2125 | ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" |
2126 | for ac_dir in $ac_dummy; do |
2127 | - IFS="$lt_save_ifs" |
2128 | + IFS=$lt_save_ifs |
2129 | test -z "$ac_dir" && ac_dir=. |
2130 | - if test -f $ac_dir/${ac_tool_prefix}file; then |
2131 | - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" |
2132 | + if test -f "$ac_dir/${ac_tool_prefix}file"; then |
2133 | + lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file" |
2134 | if test -n "$file_magic_test_file"; then |
2135 | case $deplibs_check_method in |
2136 | "file_magic "*) |
2137 | file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` |
2138 | - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" |
2139 | + MAGIC_CMD=$lt_cv_path_MAGIC_CMD |
2140 | if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | |
2141 | $EGREP "$file_magic_regex" > /dev/null; then |
2142 | : |
2143 | @@ -7250,13 +7489,13 @@ |
2144 | break |
2145 | fi |
2146 | done |
2147 | - IFS="$lt_save_ifs" |
2148 | - MAGIC_CMD="$lt_save_MAGIC_CMD" |
2149 | + IFS=$lt_save_ifs |
2150 | + MAGIC_CMD=$lt_save_MAGIC_CMD |
2151 | ;; |
2152 | esac |
2153 | fi |
2154 | |
2155 | -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" |
2156 | +MAGIC_CMD=$lt_cv_path_MAGIC_CMD |
2157 | if test -n "$MAGIC_CMD"; then |
2158 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 |
2159 | $as_echo "$MAGIC_CMD" >&6; } |
2160 | @@ -7278,22 +7517,22 @@ |
2161 | else |
2162 | case $MAGIC_CMD in |
2163 | [\\/*] | ?:[\\/]*) |
2164 | - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. |
2165 | + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. |
2166 | ;; |
2167 | *) |
2168 | - lt_save_MAGIC_CMD="$MAGIC_CMD" |
2169 | - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR |
2170 | + lt_save_MAGIC_CMD=$MAGIC_CMD |
2171 | + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR |
2172 | ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" |
2173 | for ac_dir in $ac_dummy; do |
2174 | - IFS="$lt_save_ifs" |
2175 | + IFS=$lt_save_ifs |
2176 | test -z "$ac_dir" && ac_dir=. |
2177 | - if test -f $ac_dir/file; then |
2178 | - lt_cv_path_MAGIC_CMD="$ac_dir/file" |
2179 | + if test -f "$ac_dir/file"; then |
2180 | + lt_cv_path_MAGIC_CMD=$ac_dir/"file" |
2181 | if test -n "$file_magic_test_file"; then |
2182 | case $deplibs_check_method in |
2183 | "file_magic "*) |
2184 | file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` |
2185 | - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" |
2186 | + MAGIC_CMD=$lt_cv_path_MAGIC_CMD |
2187 | if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | |
2188 | $EGREP "$file_magic_regex" > /dev/null; then |
2189 | : |
2190 | @@ -7316,13 +7555,13 @@ |
2191 | break |
2192 | fi |
2193 | done |
2194 | - IFS="$lt_save_ifs" |
2195 | - MAGIC_CMD="$lt_save_MAGIC_CMD" |
2196 | + IFS=$lt_save_ifs |
2197 | + MAGIC_CMD=$lt_save_MAGIC_CMD |
2198 | ;; |
2199 | esac |
2200 | fi |
2201 | |
2202 | -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" |
2203 | +MAGIC_CMD=$lt_cv_path_MAGIC_CMD |
2204 | if test -n "$MAGIC_CMD"; then |
2205 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 |
2206 | $as_echo "$MAGIC_CMD" >&6; } |
2207 | @@ -7343,7 +7582,7 @@ |
2208 | |
2209 | # Use C for the default configuration in the libtool script |
2210 | |
2211 | -lt_save_CC="$CC" |
2212 | +lt_save_CC=$CC |
2213 | ac_ext=c |
2214 | ac_cpp='$CPP $CPPFLAGS' |
2215 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
2216 | @@ -7405,7 +7644,7 @@ |
2217 | |
2218 | lt_prog_compiler_no_builtin_flag= |
2219 | |
2220 | -if test "$GCC" = yes; then |
2221 | +if test yes = "$GCC"; then |
2222 | case $cc_basename in |
2223 | nvcc*) |
2224 | lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; |
2225 | @@ -7421,7 +7660,7 @@ |
2226 | lt_cv_prog_compiler_rtti_exceptions=no |
2227 | ac_outfile=conftest.$ac_objext |
2228 | echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
2229 | - lt_compiler_flag="-fno-rtti -fno-exceptions" |
2230 | + lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment |
2231 | # Insert the option either (1) after the last *FLAGS variable, or |
2232 | # (2) before a word containing "conftest.", or (3) at the end. |
2233 | # Note that $ac_compile itself does not contain backslashes and begins |
2234 | @@ -7451,7 +7690,7 @@ |
2235 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 |
2236 | $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } |
2237 | |
2238 | -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then |
2239 | +if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then |
2240 | lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" |
2241 | else |
2242 | : |
2243 | @@ -7469,17 +7708,18 @@ |
2244 | lt_prog_compiler_static= |
2245 | |
2246 | |
2247 | - if test "$GCC" = yes; then |
2248 | + if test yes = "$GCC"; then |
2249 | lt_prog_compiler_wl='-Wl,' |
2250 | lt_prog_compiler_static='-static' |
2251 | |
2252 | case $host_os in |
2253 | aix*) |
2254 | # All AIX code is PIC. |
2255 | - if test "$host_cpu" = ia64; then |
2256 | + if test ia64 = "$host_cpu"; then |
2257 | # AIX 5 now supports IA64 processor |
2258 | lt_prog_compiler_static='-Bstatic' |
2259 | fi |
2260 | + lt_prog_compiler_pic='-fPIC' |
2261 | ;; |
2262 | |
2263 | amigaos*) |
2264 | @@ -7490,8 +7730,8 @@ |
2265 | ;; |
2266 | m68k) |
2267 | # FIXME: we need at least 68020 code to build shared libraries, but |
2268 | - # adding the `-m68020' flag to GCC prevents building anything better, |
2269 | - # like `-m68040'. |
2270 | + # adding the '-m68020' flag to GCC prevents building anything better, |
2271 | + # like '-m68040'. |
2272 | lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' |
2273 | ;; |
2274 | esac |
2275 | @@ -7507,6 +7747,11 @@ |
2276 | # Although the cygwin gcc ignores -fPIC, still need this for old-style |
2277 | # (--disable-auto-import) libraries |
2278 | lt_prog_compiler_pic='-DDLL_EXPORT' |
2279 | + case $host_os in |
2280 | + os2*) |
2281 | + lt_prog_compiler_static='$wl-static' |
2282 | + ;; |
2283 | + esac |
2284 | ;; |
2285 | |
2286 | darwin* | rhapsody*) |
2287 | @@ -7577,7 +7822,7 @@ |
2288 | case $host_os in |
2289 | aix*) |
2290 | lt_prog_compiler_wl='-Wl,' |
2291 | - if test "$host_cpu" = ia64; then |
2292 | + if test ia64 = "$host_cpu"; then |
2293 | # AIX 5 now supports IA64 processor |
2294 | lt_prog_compiler_static='-Bstatic' |
2295 | else |
2296 | @@ -7585,10 +7830,29 @@ |
2297 | fi |
2298 | ;; |
2299 | |
2300 | + darwin* | rhapsody*) |
2301 | + # PIC is the default on this platform |
2302 | + # Common symbols not allowed in MH_DYLIB files |
2303 | + lt_prog_compiler_pic='-fno-common' |
2304 | + case $cc_basename in |
2305 | + nagfor*) |
2306 | + # NAG Fortran compiler |
2307 | + lt_prog_compiler_wl='-Wl,-Wl,,' |
2308 | + lt_prog_compiler_pic='-PIC' |
2309 | + lt_prog_compiler_static='-Bstatic' |
2310 | + ;; |
2311 | + esac |
2312 | + ;; |
2313 | + |
2314 | mingw* | cygwin* | pw32* | os2* | cegcc*) |
2315 | # This hack is so that the source file can tell whether it is being |
2316 | # built for inclusion in a dll (and should export symbols for example). |
2317 | lt_prog_compiler_pic='-DDLL_EXPORT' |
2318 | + case $host_os in |
2319 | + os2*) |
2320 | + lt_prog_compiler_static='$wl-static' |
2321 | + ;; |
2322 | + esac |
2323 | ;; |
2324 | |
2325 | hpux9* | hpux10* | hpux11*) |
2326 | @@ -7604,7 +7868,7 @@ |
2327 | ;; |
2328 | esac |
2329 | # Is there a better lt_prog_compiler_static that works with the bundled CC? |
2330 | - lt_prog_compiler_static='${wl}-a ${wl}archive' |
2331 | + lt_prog_compiler_static='$wl-a ${wl}archive' |
2332 | ;; |
2333 | |
2334 | irix5* | irix6* | nonstopux*) |
2335 | @@ -7615,7 +7879,7 @@ |
2336 | |
2337 | linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) |
2338 | case $cc_basename in |
2339 | - # old Intel for x86_64 which still supported -KPIC. |
2340 | + # old Intel for x86_64, which still supported -KPIC. |
2341 | ecc*) |
2342 | lt_prog_compiler_wl='-Wl,' |
2343 | lt_prog_compiler_pic='-KPIC' |
2344 | @@ -7640,6 +7904,12 @@ |
2345 | lt_prog_compiler_pic='-PIC' |
2346 | lt_prog_compiler_static='-Bstatic' |
2347 | ;; |
2348 | + tcc*) |
2349 | + # Fabrice Bellard et al's Tiny C Compiler |
2350 | + lt_prog_compiler_wl='-Wl,' |
2351 | + lt_prog_compiler_pic='-fPIC' |
2352 | + lt_prog_compiler_static='-static' |
2353 | + ;; |
2354 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
2355 | # Portland Group compilers (*not* the Pentium gcc compiler, |
2356 | # which looks to be a dead project) |
2357 | @@ -7737,7 +8007,7 @@ |
2358 | ;; |
2359 | |
2360 | sysv4*MP*) |
2361 | - if test -d /usr/nec ;then |
2362 | + if test -d /usr/nec; then |
2363 | lt_prog_compiler_pic='-Kconform_pic' |
2364 | lt_prog_compiler_static='-Bstatic' |
2365 | fi |
2366 | @@ -7766,7 +8036,7 @@ |
2367 | fi |
2368 | |
2369 | case $host_os in |
2370 | - # For platforms which do not support PIC, -DPIC is meaningless: |
2371 | + # For platforms that do not support PIC, -DPIC is meaningless: |
2372 | *djgpp*) |
2373 | lt_prog_compiler_pic= |
2374 | ;; |
2375 | @@ -7798,7 +8068,7 @@ |
2376 | lt_cv_prog_compiler_pic_works=no |
2377 | ac_outfile=conftest.$ac_objext |
2378 | echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
2379 | - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" |
2380 | + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment |
2381 | # Insert the option either (1) after the last *FLAGS variable, or |
2382 | # (2) before a word containing "conftest.", or (3) at the end. |
2383 | # Note that $ac_compile itself does not contain backslashes and begins |
2384 | @@ -7828,7 +8098,7 @@ |
2385 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 |
2386 | $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } |
2387 | |
2388 | -if test x"$lt_cv_prog_compiler_pic_works" = xyes; then |
2389 | +if test yes = "$lt_cv_prog_compiler_pic_works"; then |
2390 | case $lt_prog_compiler_pic in |
2391 | "" | " "*) ;; |
2392 | *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; |
2393 | @@ -7860,7 +8130,7 @@ |
2394 | $as_echo_n "(cached) " >&6 |
2395 | else |
2396 | lt_cv_prog_compiler_static_works=no |
2397 | - save_LDFLAGS="$LDFLAGS" |
2398 | + save_LDFLAGS=$LDFLAGS |
2399 | LDFLAGS="$LDFLAGS $lt_tmp_static_flag" |
2400 | echo "$lt_simple_link_test_code" > conftest.$ac_ext |
2401 | if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then |
2402 | @@ -7879,13 +8149,13 @@ |
2403 | fi |
2404 | fi |
2405 | $RM -r conftest* |
2406 | - LDFLAGS="$save_LDFLAGS" |
2407 | + LDFLAGS=$save_LDFLAGS |
2408 | |
2409 | fi |
2410 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 |
2411 | $as_echo "$lt_cv_prog_compiler_static_works" >&6; } |
2412 | |
2413 | -if test x"$lt_cv_prog_compiler_static_works" = xyes; then |
2414 | +if test yes = "$lt_cv_prog_compiler_static_works"; then |
2415 | : |
2416 | else |
2417 | lt_prog_compiler_static= |
2418 | @@ -8005,8 +8275,8 @@ |
2419 | |
2420 | |
2421 | |
2422 | -hard_links="nottested" |
2423 | -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then |
2424 | +hard_links=nottested |
2425 | +if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then |
2426 | # do not overwrite the value of need_locks provided by the user |
2427 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 |
2428 | $as_echo_n "checking if we can lock with hard links... " >&6; } |
2429 | @@ -8018,9 +8288,9 @@ |
2430 | ln conftest.a conftest.b 2>/dev/null && hard_links=no |
2431 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 |
2432 | $as_echo "$hard_links" >&6; } |
2433 | - if test "$hard_links" = no; then |
2434 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 |
2435 | -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} |
2436 | + if test no = "$hard_links"; then |
2437 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 |
2438 | +$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} |
2439 | need_locks=warn |
2440 | fi |
2441 | else |
2442 | @@ -8063,9 +8333,9 @@ |
2443 | # included in the symbol list |
2444 | include_expsyms= |
2445 | # exclude_expsyms can be an extended regexp of symbols to exclude |
2446 | - # it will be wrapped by ` (' and `)$', so one must not match beginning or |
2447 | - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', |
2448 | - # as well as any symbol that contains `d'. |
2449 | + # it will be wrapped by ' (' and ')$', so one must not match beginning or |
2450 | + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', |
2451 | + # as well as any symbol that contains 'd'. |
2452 | exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' |
2453 | # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out |
2454 | # platforms (ab)use it in PIC code, but their linkers get confused if |
2455 | @@ -8080,7 +8350,7 @@ |
2456 | # FIXME: the MSVC++ port hasn't been tested in a loooong time |
2457 | # When not using gcc, we currently assume that we are using |
2458 | # Microsoft Visual C++. |
2459 | - if test "$GCC" != yes; then |
2460 | + if test yes != "$GCC"; then |
2461 | with_gnu_ld=no |
2462 | fi |
2463 | ;; |
2464 | @@ -8088,12 +8358,9 @@ |
2465 | # we just hope/assume this is gcc and not c89 (= MSVC++) |
2466 | with_gnu_ld=yes |
2467 | ;; |
2468 | - openbsd*) |
2469 | + openbsd* | bitrig*) |
2470 | with_gnu_ld=no |
2471 | ;; |
2472 | - linux* | k*bsd*-gnu | gnu*) |
2473 | - link_all_deplibs=no |
2474 | - ;; |
2475 | esac |
2476 | |
2477 | ld_shlibs=yes |
2478 | @@ -8101,7 +8368,7 @@ |
2479 | # On some targets, GNU ld is compatible enough with the native linker |
2480 | # that we're better off using the native interface for both. |
2481 | lt_use_gnu_ld_interface=no |
2482 | - if test "$with_gnu_ld" = yes; then |
2483 | + if test yes = "$with_gnu_ld"; then |
2484 | case $host_os in |
2485 | aix*) |
2486 | # The AIX port of GNU ld has always aspired to compatibility |
2487 | @@ -8123,24 +8390,24 @@ |
2488 | esac |
2489 | fi |
2490 | |
2491 | - if test "$lt_use_gnu_ld_interface" = yes; then |
2492 | + if test yes = "$lt_use_gnu_ld_interface"; then |
2493 | # If archive_cmds runs LD, not CC, wlarc should be empty |
2494 | - wlarc='${wl}' |
2495 | + wlarc='$wl' |
2496 | |
2497 | # Set some defaults for GNU ld with shared library support. These |
2498 | # are reset later if shared libraries are not supported. Putting them |
2499 | # here allows them to be overridden if necessary. |
2500 | runpath_var=LD_RUN_PATH |
2501 | - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
2502 | - export_dynamic_flag_spec='${wl}--export-dynamic' |
2503 | + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' |
2504 | + export_dynamic_flag_spec='$wl--export-dynamic' |
2505 | # ancient GNU ld didn't support --whole-archive et. al. |
2506 | if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then |
2507 | - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' |
2508 | + whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' |
2509 | else |
2510 | whole_archive_flag_spec= |
2511 | fi |
2512 | supports_anon_versioning=no |
2513 | - case `$LD -v 2>&1` in |
2514 | + case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in |
2515 | *GNU\ gold*) supports_anon_versioning=yes ;; |
2516 | *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 |
2517 | *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... |
2518 | @@ -8153,7 +8420,7 @@ |
2519 | case $host_os in |
2520 | aix[3-9]*) |
2521 | # On AIX/PPC, the GNU linker is very broken |
2522 | - if test "$host_cpu" != ia64; then |
2523 | + if test ia64 != "$host_cpu"; then |
2524 | ld_shlibs=no |
2525 | cat <<_LT_EOF 1>&2 |
2526 | |
2527 | @@ -8172,7 +8439,7 @@ |
2528 | case $host_cpu in |
2529 | powerpc) |
2530 | # see comment about AmigaOS4 .so support |
2531 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
2532 | + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' |
2533 | archive_expsym_cmds='' |
2534 | ;; |
2535 | m68k) |
2536 | @@ -8188,7 +8455,7 @@ |
2537 | allow_undefined_flag=unsupported |
2538 | # Joseph Beckenbach <jrb3@best.com> says some releases of gcc |
2539 | # support --undefined. This deserves some investigation. FIXME |
2540 | - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
2541 | + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' |
2542 | else |
2543 | ld_shlibs=no |
2544 | fi |
2545 | @@ -8198,7 +8465,7 @@ |
2546 | # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, |
2547 | # as there is no search path for DLLs. |
2548 | hardcode_libdir_flag_spec='-L$libdir' |
2549 | - export_dynamic_flag_spec='${wl}--export-all-symbols' |
2550 | + export_dynamic_flag_spec='$wl--export-all-symbols' |
2551 | allow_undefined_flag=unsupported |
2552 | always_export_symbols=no |
2553 | enable_shared_with_static_runtimes=yes |
2554 | @@ -8206,61 +8473,89 @@ |
2555 | exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
2556 | |
2557 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
2558 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
2559 | - # If the export-symbols file already is a .def file (1st line |
2560 | - # is EXPORTS), use it as is; otherwise, prepend... |
2561 | - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
2562 | - cp $export_symbols $output_objdir/$soname.def; |
2563 | - else |
2564 | - echo EXPORTS > $output_objdir/$soname.def; |
2565 | - cat $export_symbols >> $output_objdir/$soname.def; |
2566 | - fi~ |
2567 | - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
2568 | + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
2569 | + # If the export-symbols file already is a .def file, use it as |
2570 | + # is; otherwise, prepend EXPORTS... |
2571 | + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then |
2572 | + cp $export_symbols $output_objdir/$soname.def; |
2573 | + else |
2574 | + echo EXPORTS > $output_objdir/$soname.def; |
2575 | + cat $export_symbols >> $output_objdir/$soname.def; |
2576 | + fi~ |
2577 | + $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 | else |
2579 | ld_shlibs=no |
2580 | fi |
2581 | ;; |
2582 | |
2583 | haiku*) |
2584 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
2585 | + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' |
2586 | link_all_deplibs=yes |
2587 | ;; |
2588 | |
2589 | + os2*) |
2590 | + hardcode_libdir_flag_spec='-L$libdir' |
2591 | + hardcode_minus_L=yes |
2592 | + allow_undefined_flag=unsupported |
2593 | + shrext_cmds=.dll |
2594 | + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ |
2595 | + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ |
2596 | + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ |
2597 | + $ECHO EXPORTS >> $output_objdir/$libname.def~ |
2598 | + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ |
2599 | + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ |
2600 | + emximp -o $lib $output_objdir/$libname.def' |
2601 | + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ |
2602 | + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ |
2603 | + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ |
2604 | + $ECHO EXPORTS >> $output_objdir/$libname.def~ |
2605 | + prefix_cmds="$SED"~ |
2606 | + if test EXPORTS = "`$SED 1q $export_symbols`"; then |
2607 | + prefix_cmds="$prefix_cmds -e 1d"; |
2608 | + fi~ |
2609 | + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ |
2610 | + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ |
2611 | + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ |
2612 | + emximp -o $lib $output_objdir/$libname.def' |
2613 | + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' |
2614 | + enable_shared_with_static_runtimes=yes |
2615 | + ;; |
2616 | + |
2617 | interix[3-9]*) |
2618 | hardcode_direct=no |
2619 | hardcode_shlibpath_var=no |
2620 | - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' |
2621 | - export_dynamic_flag_spec='${wl}-E' |
2622 | + hardcode_libdir_flag_spec='$wl-rpath,$libdir' |
2623 | + export_dynamic_flag_spec='$wl-E' |
2624 | # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. |
2625 | # Instead, shared libraries are loaded at an image base (0x10000000 by |
2626 | # default) and relocated if they conflict, which is a slow very memory |
2627 | # consuming and fragmenting process. To avoid this, we pick a random, |
2628 | # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link |
2629 | # time. Moving up from 0x10000000 also allows more sbrk(2) space. |
2630 | - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' |
2631 | - 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' |
2632 | + 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 | + 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 | ;; |
2635 | |
2636 | gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) |
2637 | tmp_diet=no |
2638 | - if test "$host_os" = linux-dietlibc; then |
2639 | + if test linux-dietlibc = "$host_os"; then |
2640 | case $cc_basename in |
2641 | diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) |
2642 | esac |
2643 | fi |
2644 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ |
2645 | - && test "$tmp_diet" = no |
2646 | + && test no = "$tmp_diet" |
2647 | then |
2648 | tmp_addflag=' $pic_flag' |
2649 | tmp_sharedflag='-shared' |
2650 | case $cc_basename,$host_cpu in |
2651 | pgcc*) # Portland Group C compiler |
2652 | - 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' |
2653 | + 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 | tmp_addflag=' $pic_flag' |
2655 | ;; |
2656 | pgf77* | pgf90* | pgf95* | pgfortran*) |
2657 | # Portland Group f77 and f90 compilers |
2658 | - 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' |
2659 | + 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 | tmp_addflag=' $pic_flag -Mnomain' ;; |
2661 | ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 |
2662 | tmp_addflag=' -i_dynamic' ;; |
2663 | @@ -8271,42 +8566,47 @@ |
2664 | lf95*) # Lahey Fortran 8.1 |
2665 | whole_archive_flag_spec= |
2666 | tmp_sharedflag='--shared' ;; |
2667 | + nagfor*) # NAGFOR 5.3 |
2668 | + tmp_sharedflag='-Wl,-shared' ;; |
2669 | xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) |
2670 | tmp_sharedflag='-qmkshrobj' |
2671 | tmp_addflag= ;; |
2672 | nvcc*) # Cuda Compiler Driver 2.2 |
2673 | - 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' |
2674 | + 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 | compiler_needs_object=yes |
2676 | ;; |
2677 | esac |
2678 | case `$CC -V 2>&1 | sed 5q` in |
2679 | *Sun\ C*) # Sun C 5.9 |
2680 | - 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' |
2681 | + 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 | compiler_needs_object=yes |
2683 | tmp_sharedflag='-G' ;; |
2684 | *Sun\ F*) # Sun Fortran 8.3 |
2685 | tmp_sharedflag='-G' ;; |
2686 | esac |
2687 | - archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
2688 | + archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' |
2689 | |
2690 | - if test "x$supports_anon_versioning" = xyes; then |
2691 | + if test yes = "$supports_anon_versioning"; then |
2692 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
2693 | - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
2694 | - echo "local: *; };" >> $output_objdir/$libname.ver~ |
2695 | - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' |
2696 | + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
2697 | + echo "local: *; };" >> $output_objdir/$libname.ver~ |
2698 | + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' |
2699 | fi |
2700 | |
2701 | case $cc_basename in |
2702 | + tcc*) |
2703 | + export_dynamic_flag_spec='-rdynamic' |
2704 | + ;; |
2705 | xlf* | bgf* | bgxlf* | mpixlf*) |
2706 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself |
2707 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
2708 | - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
2709 | + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' |
2710 | archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
2711 | - if test "x$supports_anon_versioning" = xyes; then |
2712 | + if test yes = "$supports_anon_versioning"; then |
2713 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
2714 | - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
2715 | - echo "local: *; };" >> $output_objdir/$libname.ver~ |
2716 | - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
2717 | + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
2718 | + echo "local: *; };" >> $output_objdir/$libname.ver~ |
2719 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
2720 | fi |
2721 | ;; |
2722 | esac |
2723 | @@ -8315,13 +8615,13 @@ |
2724 | fi |
2725 | ;; |
2726 | |
2727 | - netbsd* | netbsdelf*-gnu) |
2728 | + netbsd*) |
2729 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
2730 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
2731 | wlarc= |
2732 | else |
2733 | - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
2734 | - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
2735 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' |
2736 | + 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 | fi |
2738 | ;; |
2739 | |
2740 | @@ -8339,8 +8639,8 @@ |
2741 | |
2742 | _LT_EOF |
2743 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
2744 | - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
2745 | - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
2746 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' |
2747 | + 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 | else |
2749 | ld_shlibs=no |
2750 | fi |
2751 | @@ -8352,7 +8652,7 @@ |
2752 | ld_shlibs=no |
2753 | cat <<_LT_EOF 1>&2 |
2754 | |
2755 | -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not |
2756 | +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot |
2757 | *** reliably create shared libraries on SCO systems. Therefore, libtool |
2758 | *** is disabling shared libraries support. We urge you to upgrade GNU |
2759 | *** binutils to release 2.16.91.0.3 or newer. Another option is to modify |
2760 | @@ -8367,9 +8667,9 @@ |
2761 | # DT_RUNPATH tag from executables and libraries. But doing so |
2762 | # requires that you compile everything twice, which is a pain. |
2763 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
2764 | - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
2765 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
2766 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
2767 | + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' |
2768 | + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' |
2769 | + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' |
2770 | else |
2771 | ld_shlibs=no |
2772 | fi |
2773 | @@ -8386,15 +8686,15 @@ |
2774 | |
2775 | *) |
2776 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
2777 | - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
2778 | - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
2779 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' |
2780 | + 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 | else |
2782 | ld_shlibs=no |
2783 | fi |
2784 | ;; |
2785 | esac |
2786 | |
2787 | - if test "$ld_shlibs" = no; then |
2788 | + if test no = "$ld_shlibs"; then |
2789 | runpath_var= |
2790 | hardcode_libdir_flag_spec= |
2791 | export_dynamic_flag_spec= |
2792 | @@ -8410,7 +8710,7 @@ |
2793 | # Note: this linker hardcodes the directories in LIBPATH if there |
2794 | # are no directories specified by -L. |
2795 | hardcode_minus_L=yes |
2796 | - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then |
2797 | + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then |
2798 | # Neither direct hardcoding nor static linking is supported with a |
2799 | # broken collect2. |
2800 | hardcode_direct=unsupported |
2801 | @@ -8418,34 +8718,57 @@ |
2802 | ;; |
2803 | |
2804 | aix[4-9]*) |
2805 | - if test "$host_cpu" = ia64; then |
2806 | + if test ia64 = "$host_cpu"; then |
2807 | # On IA64, the linker does run time linking by default, so we don't |
2808 | # have to do anything special. |
2809 | aix_use_runtimelinking=no |
2810 | exp_sym_flag='-Bexport' |
2811 | - no_entry_flag="" |
2812 | + no_entry_flag= |
2813 | else |
2814 | # If we're using GNU nm, then we don't want the "-C" option. |
2815 | - # -C means demangle to AIX nm, but means don't demangle with GNU nm |
2816 | - # Also, AIX nm treats weak defined symbols like other global |
2817 | - # defined symbols, whereas GNU nm marks them as "W". |
2818 | + # -C means demangle to GNU nm, but means don't demangle to AIX nm. |
2819 | + # Without the "-l" option, or with the "-B" option, AIX nm treats |
2820 | + # weak defined symbols like other global defined symbols, whereas |
2821 | + # GNU nm marks them as "W". |
2822 | + # While the 'weak' keyword is ignored in the Export File, we need |
2823 | + # it in the Import File for the 'aix-soname' feature, so we have |
2824 | + # to replace the "-B" option with "-P" for AIX nm. |
2825 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then |
2826 | - 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' |
2827 | + 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 | else |
2829 | - 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' |
2830 | + 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 | fi |
2832 | aix_use_runtimelinking=no |
2833 | |
2834 | # Test if we are trying to use run time linking or normal |
2835 | # AIX style linking. If -brtl is somewhere in LDFLAGS, we |
2836 | - # need to do runtime linking. |
2837 | + # have runtime linking enabled, and use it for executables. |
2838 | + # For shared libraries, we enable/disable runtime linking |
2839 | + # depending on the kind of the shared library created - |
2840 | + # when "with_aix_soname,aix_use_runtimelinking" is: |
2841 | + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables |
2842 | + # "aix,yes" lib.so shared, rtl:yes, for executables |
2843 | + # lib.a static archive |
2844 | + # "both,no" lib.so.V(shr.o) shared, rtl:yes |
2845 | + # lib.a(lib.so.V) shared, rtl:no, for executables |
2846 | + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables |
2847 | + # lib.a(lib.so.V) shared, rtl:no |
2848 | + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables |
2849 | + # lib.a static archive |
2850 | case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) |
2851 | for ld_flag in $LDFLAGS; do |
2852 | - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then |
2853 | + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then |
2854 | aix_use_runtimelinking=yes |
2855 | break |
2856 | fi |
2857 | done |
2858 | + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then |
2859 | + # With aix-soname=svr4, we create the lib.so.V shared archives only, |
2860 | + # so we don't have lib.a shared libs to link our executables. |
2861 | + # We have to force runtime linking in this case. |
2862 | + aix_use_runtimelinking=yes |
2863 | + LDFLAGS="$LDFLAGS -Wl,-brtl" |
2864 | + fi |
2865 | ;; |
2866 | esac |
2867 | |
2868 | @@ -8464,13 +8787,21 @@ |
2869 | hardcode_direct_absolute=yes |
2870 | hardcode_libdir_separator=':' |
2871 | link_all_deplibs=yes |
2872 | - file_list_spec='${wl}-f,' |
2873 | + file_list_spec='$wl-f,' |
2874 | + case $with_aix_soname,$aix_use_runtimelinking in |
2875 | + aix,*) ;; # traditional, no import file |
2876 | + svr4,* | *,yes) # use import file |
2877 | + # The Import File defines what to hardcode. |
2878 | + hardcode_direct=no |
2879 | + hardcode_direct_absolute=no |
2880 | + ;; |
2881 | + esac |
2882 | |
2883 | - if test "$GCC" = yes; then |
2884 | + if test yes = "$GCC"; then |
2885 | case $host_os in aix4.[012]|aix4.[012].*) |
2886 | # We only want to do this on AIX 4.2 and lower, the check |
2887 | # below for broken collect2 doesn't work under 4.3+ |
2888 | - collect2name=`${CC} -print-prog-name=collect2` |
2889 | + collect2name=`$CC -print-prog-name=collect2` |
2890 | if test -f "$collect2name" && |
2891 | strings "$collect2name" | $GREP resolve_lib_name >/dev/null |
2892 | then |
2893 | @@ -8489,36 +8820,42 @@ |
2894 | ;; |
2895 | esac |
2896 | shared_flag='-shared' |
2897 | - if test "$aix_use_runtimelinking" = yes; then |
2898 | - shared_flag="$shared_flag "'${wl}-G' |
2899 | + if test yes = "$aix_use_runtimelinking"; then |
2900 | + shared_flag="$shared_flag "'$wl-G' |
2901 | fi |
2902 | - link_all_deplibs=no |
2903 | + # Need to ensure runtime linking is disabled for the traditional |
2904 | + # shared library, or the linker may eventually find shared libraries |
2905 | + # /with/ Import File - we do not want to mix them. |
2906 | + shared_flag_aix='-shared' |
2907 | + shared_flag_svr4='-shared $wl-G' |
2908 | else |
2909 | # not using gcc |
2910 | - if test "$host_cpu" = ia64; then |
2911 | + if test ia64 = "$host_cpu"; then |
2912 | # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release |
2913 | # chokes on -Wl,-G. The following line is correct: |
2914 | shared_flag='-G' |
2915 | else |
2916 | - if test "$aix_use_runtimelinking" = yes; then |
2917 | - shared_flag='${wl}-G' |
2918 | + if test yes = "$aix_use_runtimelinking"; then |
2919 | + shared_flag='$wl-G' |
2920 | else |
2921 | - shared_flag='${wl}-bM:SRE' |
2922 | + shared_flag='$wl-bM:SRE' |
2923 | fi |
2924 | + shared_flag_aix='$wl-bM:SRE' |
2925 | + shared_flag_svr4='$wl-G' |
2926 | fi |
2927 | fi |
2928 | |
2929 | - export_dynamic_flag_spec='${wl}-bexpall' |
2930 | + export_dynamic_flag_spec='$wl-bexpall' |
2931 | # It seems that -bexpall does not export symbols beginning with |
2932 | # underscore (_), so it is better to generate a list of symbols to export. |
2933 | always_export_symbols=yes |
2934 | - if test "$aix_use_runtimelinking" = yes; then |
2935 | + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then |
2936 | # Warning - without using the other runtime loading flags (-brtl), |
2937 | # -berok will link without error, but may produce a broken library. |
2938 | allow_undefined_flag='-berok' |
2939 | # Determine the default libpath from the value encoded in an |
2940 | # empty executable. |
2941 | - if test "${lt_cv_aix_libpath+set}" = set; then |
2942 | + if test set = "${lt_cv_aix_libpath+set}"; then |
2943 | aix_libpath=$lt_cv_aix_libpath |
2944 | else |
2945 | if ${lt_cv_aix_libpath_+:} false; then : |
2946 | @@ -8553,7 +8890,7 @@ |
2947 | rm -f core conftest.err conftest.$ac_objext \ |
2948 | conftest$ac_exeext conftest.$ac_ext |
2949 | if test -z "$lt_cv_aix_libpath_"; then |
2950 | - lt_cv_aix_libpath_="/usr/lib:/lib" |
2951 | + lt_cv_aix_libpath_=/usr/lib:/lib |
2952 | fi |
2953 | |
2954 | fi |
2955 | @@ -8561,17 +8898,17 @@ |
2956 | aix_libpath=$lt_cv_aix_libpath_ |
2957 | fi |
2958 | |
2959 | - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
2960 | - 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" |
2961 | + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" |
2962 | + 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 | else |
2964 | - if test "$host_cpu" = ia64; then |
2965 | - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' |
2966 | + if test ia64 = "$host_cpu"; then |
2967 | + hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib' |
2968 | allow_undefined_flag="-z nodefs" |
2969 | - 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" |
2970 | + 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 | else |
2972 | # Determine the default libpath from the value encoded in an |
2973 | # empty executable. |
2974 | - if test "${lt_cv_aix_libpath+set}" = set; then |
2975 | + if test set = "${lt_cv_aix_libpath+set}"; then |
2976 | aix_libpath=$lt_cv_aix_libpath |
2977 | else |
2978 | if ${lt_cv_aix_libpath_+:} false; then : |
2979 | @@ -8606,7 +8943,7 @@ |
2980 | rm -f core conftest.err conftest.$ac_objext \ |
2981 | conftest$ac_exeext conftest.$ac_ext |
2982 | if test -z "$lt_cv_aix_libpath_"; then |
2983 | - lt_cv_aix_libpath_="/usr/lib:/lib" |
2984 | + lt_cv_aix_libpath_=/usr/lib:/lib |
2985 | fi |
2986 | |
2987 | fi |
2988 | @@ -8614,21 +8951,33 @@ |
2989 | aix_libpath=$lt_cv_aix_libpath_ |
2990 | fi |
2991 | |
2992 | - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
2993 | + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" |
2994 | # Warning - without using the other run time loading flags, |
2995 | # -berok will link without error, but may produce a broken library. |
2996 | - no_undefined_flag=' ${wl}-bernotok' |
2997 | - allow_undefined_flag=' ${wl}-berok' |
2998 | - if test "$with_gnu_ld" = yes; then |
2999 | + no_undefined_flag=' $wl-bernotok' |
3000 | + allow_undefined_flag=' $wl-berok' |
3001 | + if test yes = "$with_gnu_ld"; then |
3002 | # We only use this code for GNU lds that support --whole-archive. |
3003 | - whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' |
3004 | + whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive' |
3005 | else |
3006 | # Exported symbols can be pulled into shared objects from archives |
3007 | whole_archive_flag_spec='$convenience' |
3008 | fi |
3009 | archive_cmds_need_lc=yes |
3010 | - # This is similar to how AIX traditionally builds its shared libraries. |
3011 | - 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' |
3012 | + archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' |
3013 | + # -brtl affects multiple linker settings, -berok does not and is overridden later |
3014 | + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`' |
3015 | + if test svr4 != "$with_aix_soname"; then |
3016 | + # This is similar to how AIX traditionally builds its shared libraries. |
3017 | + 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 | + fi |
3019 | + if test aix != "$with_aix_soname"; then |
3020 | + 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 | + else |
3022 | + # used by -dlpreopen to get the symbols |
3023 | + archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir' |
3024 | + fi |
3025 | + archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d' |
3026 | fi |
3027 | fi |
3028 | ;; |
3029 | @@ -8637,7 +8986,7 @@ |
3030 | case $host_cpu in |
3031 | powerpc) |
3032 | # see comment about AmigaOS4 .so support |
3033 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
3034 | + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' |
3035 | archive_expsym_cmds='' |
3036 | ;; |
3037 | m68k) |
3038 | @@ -8667,16 +9016,17 @@ |
3039 | # Tell ltmain to make .lib files, not .a files. |
3040 | libext=lib |
3041 | # Tell ltmain to make .dll files, not .so files. |
3042 | - shrext_cmds=".dll" |
3043 | + shrext_cmds=.dll |
3044 | # FIXME: Setting linknames here is a bad hack. |
3045 | - archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
3046 | - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
3047 | - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
3048 | - else |
3049 | - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
3050 | - fi~ |
3051 | - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
3052 | - linknames=' |
3053 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' |
3054 | + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then |
3055 | + cp "$export_symbols" "$output_objdir/$soname.def"; |
3056 | + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; |
3057 | + else |
3058 | + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; |
3059 | + fi~ |
3060 | + $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 | + linknames=' |
3062 | # The linker will not automatically build a static lib if we build a DLL. |
3063 | # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
3064 | enable_shared_with_static_runtimes=yes |
3065 | @@ -8685,18 +9035,18 @@ |
3066 | # Don't use ranlib |
3067 | old_postinstall_cmds='chmod 644 $oldlib' |
3068 | postlink_cmds='lt_outputfile="@OUTPUT@"~ |
3069 | - lt_tool_outputfile="@TOOL_OUTPUT@"~ |
3070 | - case $lt_outputfile in |
3071 | - *.exe|*.EXE) ;; |
3072 | - *) |
3073 | - lt_outputfile="$lt_outputfile.exe" |
3074 | - lt_tool_outputfile="$lt_tool_outputfile.exe" |
3075 | - ;; |
3076 | - esac~ |
3077 | - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
3078 | - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
3079 | - $RM "$lt_outputfile.manifest"; |
3080 | - fi' |
3081 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
3082 | + case $lt_outputfile in |
3083 | + *.exe|*.EXE) ;; |
3084 | + *) |
3085 | + lt_outputfile=$lt_outputfile.exe |
3086 | + lt_tool_outputfile=$lt_tool_outputfile.exe |
3087 | + ;; |
3088 | + esac~ |
3089 | + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then |
3090 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
3091 | + $RM "$lt_outputfile.manifest"; |
3092 | + fi' |
3093 | ;; |
3094 | *) |
3095 | # Assume MSVC wrapper |
3096 | @@ -8705,7 +9055,7 @@ |
3097 | # Tell ltmain to make .lib files, not .a files. |
3098 | libext=lib |
3099 | # Tell ltmain to make .dll files, not .so files. |
3100 | - shrext_cmds=".dll" |
3101 | + shrext_cmds=.dll |
3102 | # FIXME: Setting linknames here is a bad hack. |
3103 | archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
3104 | # The linker will automatically build a .lib file if we build a DLL. |
3105 | @@ -8724,24 +9074,24 @@ |
3106 | hardcode_direct=no |
3107 | hardcode_automatic=yes |
3108 | hardcode_shlibpath_var=unsupported |
3109 | - if test "$lt_cv_ld_force_load" = "yes"; then |
3110 | - 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\"`' |
3111 | + if test yes = "$lt_cv_ld_force_load"; then |
3112 | + 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 | |
3114 | else |
3115 | whole_archive_flag_spec='' |
3116 | fi |
3117 | link_all_deplibs=yes |
3118 | - allow_undefined_flag="$_lt_dar_allow_undefined" |
3119 | + allow_undefined_flag=$_lt_dar_allow_undefined |
3120 | case $cc_basename in |
3121 | - ifort*) _lt_dar_can_shared=yes ;; |
3122 | + ifort*|nagfor*) _lt_dar_can_shared=yes ;; |
3123 | *) _lt_dar_can_shared=$GCC ;; |
3124 | esac |
3125 | - if test "$_lt_dar_can_shared" = "yes"; then |
3126 | + if test yes = "$_lt_dar_can_shared"; then |
3127 | output_verbose_link_cmd=func_echo_all |
3128 | - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" |
3129 | - module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" |
3130 | - 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}" |
3131 | - 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}" |
3132 | + 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 | + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" |
3134 | + 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 | + 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 | |
3137 | else |
3138 | ld_shlibs=no |
3139 | @@ -8783,33 +9133,33 @@ |
3140 | ;; |
3141 | |
3142 | hpux9*) |
3143 | - if test "$GCC" = yes; then |
3144 | - 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' |
3145 | + if test yes = "$GCC"; then |
3146 | + 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 | else |
3148 | - 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' |
3149 | + 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 | fi |
3151 | - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' |
3152 | + hardcode_libdir_flag_spec='$wl+b $wl$libdir' |
3153 | hardcode_libdir_separator=: |
3154 | hardcode_direct=yes |
3155 | |
3156 | # hardcode_minus_L: Not really in the search PATH, |
3157 | # but as the default location of the library. |
3158 | hardcode_minus_L=yes |
3159 | - export_dynamic_flag_spec='${wl}-E' |
3160 | + export_dynamic_flag_spec='$wl-E' |
3161 | ;; |
3162 | |
3163 | hpux10*) |
3164 | - if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
3165 | - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
3166 | + if test yes,no = "$GCC,$with_gnu_ld"; then |
3167 | + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
3168 | else |
3169 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
3170 | fi |
3171 | - if test "$with_gnu_ld" = no; then |
3172 | - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' |
3173 | + if test no = "$with_gnu_ld"; then |
3174 | + hardcode_libdir_flag_spec='$wl+b $wl$libdir' |
3175 | hardcode_libdir_separator=: |
3176 | hardcode_direct=yes |
3177 | hardcode_direct_absolute=yes |
3178 | - export_dynamic_flag_spec='${wl}-E' |
3179 | + export_dynamic_flag_spec='$wl-E' |
3180 | # hardcode_minus_L: Not really in the search PATH, |
3181 | # but as the default location of the library. |
3182 | hardcode_minus_L=yes |
3183 | @@ -8817,25 +9167,25 @@ |
3184 | ;; |
3185 | |
3186 | hpux11*) |
3187 | - if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
3188 | + if test yes,no = "$GCC,$with_gnu_ld"; then |
3189 | case $host_cpu in |
3190 | hppa*64*) |
3191 | - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
3192 | + archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' |
3193 | ;; |
3194 | ia64*) |
3195 | - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
3196 | + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
3197 | ;; |
3198 | *) |
3199 | - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
3200 | + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
3201 | ;; |
3202 | esac |
3203 | else |
3204 | case $host_cpu in |
3205 | hppa*64*) |
3206 | - archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
3207 | + archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' |
3208 | ;; |
3209 | ia64*) |
3210 | - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
3211 | + archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
3212 | ;; |
3213 | *) |
3214 | |
3215 | @@ -8847,7 +9197,7 @@ |
3216 | $as_echo_n "(cached) " >&6 |
3217 | else |
3218 | lt_cv_prog_compiler__b=no |
3219 | - save_LDFLAGS="$LDFLAGS" |
3220 | + save_LDFLAGS=$LDFLAGS |
3221 | LDFLAGS="$LDFLAGS -b" |
3222 | echo "$lt_simple_link_test_code" > conftest.$ac_ext |
3223 | if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then |
3224 | @@ -8866,14 +9216,14 @@ |
3225 | fi |
3226 | fi |
3227 | $RM -r conftest* |
3228 | - LDFLAGS="$save_LDFLAGS" |
3229 | + LDFLAGS=$save_LDFLAGS |
3230 | |
3231 | fi |
3232 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 |
3233 | $as_echo "$lt_cv_prog_compiler__b" >&6; } |
3234 | |
3235 | -if test x"$lt_cv_prog_compiler__b" = xyes; then |
3236 | - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
3237 | +if test yes = "$lt_cv_prog_compiler__b"; then |
3238 | + archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
3239 | else |
3240 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
3241 | fi |
3242 | @@ -8881,8 +9231,8 @@ |
3243 | ;; |
3244 | esac |
3245 | fi |
3246 | - if test "$with_gnu_ld" = no; then |
3247 | - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' |
3248 | + if test no = "$with_gnu_ld"; then |
3249 | + hardcode_libdir_flag_spec='$wl+b $wl$libdir' |
3250 | hardcode_libdir_separator=: |
3251 | |
3252 | case $host_cpu in |
3253 | @@ -8893,7 +9243,7 @@ |
3254 | *) |
3255 | hardcode_direct=yes |
3256 | hardcode_direct_absolute=yes |
3257 | - export_dynamic_flag_spec='${wl}-E' |
3258 | + export_dynamic_flag_spec='$wl-E' |
3259 | |
3260 | # hardcode_minus_L: Not really in the search PATH, |
3261 | # but as the default location of the library. |
3262 | @@ -8904,8 +9254,8 @@ |
3263 | ;; |
3264 | |
3265 | irix5* | irix6* | nonstopux*) |
3266 | - if test "$GCC" = yes; then |
3267 | - 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' |
3268 | + if test yes = "$GCC"; then |
3269 | + 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 | # Try to use the -exported_symbol ld option, if it does not |
3271 | # work, assume that -exports_file does not work either and |
3272 | # implicitly export all symbols. |
3273 | @@ -8915,8 +9265,8 @@ |
3274 | if ${lt_cv_irix_exported_symbol+:} false; then : |
3275 | $as_echo_n "(cached) " >&6 |
3276 | else |
3277 | - save_LDFLAGS="$LDFLAGS" |
3278 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
3279 | + save_LDFLAGS=$LDFLAGS |
3280 | + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" |
3281 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3282 | /* end confdefs.h. */ |
3283 | int foo (void) { return 0; } |
3284 | @@ -8928,25 +9278,35 @@ |
3285 | fi |
3286 | rm -f core conftest.err conftest.$ac_objext \ |
3287 | conftest$ac_exeext conftest.$ac_ext |
3288 | - LDFLAGS="$save_LDFLAGS" |
3289 | + LDFLAGS=$save_LDFLAGS |
3290 | fi |
3291 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 |
3292 | $as_echo "$lt_cv_irix_exported_symbol" >&6; } |
3293 | - if test "$lt_cv_irix_exported_symbol" = yes; then |
3294 | - 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' |
3295 | + if test yes = "$lt_cv_irix_exported_symbol"; then |
3296 | + 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 | fi |
3298 | else |
3299 | - 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' |
3300 | - 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' |
3301 | + 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 | + 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 | fi |
3304 | archive_cmds_need_lc='no' |
3305 | - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
3306 | + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' |
3307 | hardcode_libdir_separator=: |
3308 | inherit_rpath=yes |
3309 | link_all_deplibs=yes |
3310 | ;; |
3311 | |
3312 | - netbsd* | netbsdelf*-gnu) |
3313 | + linux*) |
3314 | + case $cc_basename in |
3315 | + tcc*) |
3316 | + # Fabrice Bellard et al's Tiny C Compiler |
3317 | + ld_shlibs=yes |
3318 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
3319 | + ;; |
3320 | + esac |
3321 | + ;; |
3322 | + |
3323 | + netbsd*) |
3324 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
3325 | archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out |
3326 | else |
3327 | @@ -8960,7 +9320,7 @@ |
3328 | newsos6) |
3329 | archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' |
3330 | hardcode_direct=yes |
3331 | - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
3332 | + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' |
3333 | hardcode_libdir_separator=: |
3334 | hardcode_shlibpath_var=no |
3335 | ;; |
3336 | @@ -8968,27 +9328,19 @@ |
3337 | *nto* | *qnx*) |
3338 | ;; |
3339 | |
3340 | - openbsd*) |
3341 | + openbsd* | bitrig*) |
3342 | if test -f /usr/libexec/ld.so; then |
3343 | hardcode_direct=yes |
3344 | hardcode_shlibpath_var=no |
3345 | hardcode_direct_absolute=yes |
3346 | - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then |
3347 | + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then |
3348 | archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
3349 | - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' |
3350 | - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' |
3351 | - export_dynamic_flag_spec='${wl}-E' |
3352 | + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' |
3353 | + hardcode_libdir_flag_spec='$wl-rpath,$libdir' |
3354 | + export_dynamic_flag_spec='$wl-E' |
3355 | else |
3356 | - case $host_os in |
3357 | - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) |
3358 | - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
3359 | - hardcode_libdir_flag_spec='-R$libdir' |
3360 | - ;; |
3361 | - *) |
3362 | - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
3363 | - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' |
3364 | - ;; |
3365 | - esac |
3366 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
3367 | + hardcode_libdir_flag_spec='$wl-rpath,$libdir' |
3368 | fi |
3369 | else |
3370 | ld_shlibs=no |
3371 | @@ -8999,33 +9351,53 @@ |
3372 | hardcode_libdir_flag_spec='-L$libdir' |
3373 | hardcode_minus_L=yes |
3374 | allow_undefined_flag=unsupported |
3375 | - 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' |
3376 | - old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' |
3377 | + shrext_cmds=.dll |
3378 | + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ |
3379 | + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ |
3380 | + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ |
3381 | + $ECHO EXPORTS >> $output_objdir/$libname.def~ |
3382 | + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ |
3383 | + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ |
3384 | + emximp -o $lib $output_objdir/$libname.def' |
3385 | + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ |
3386 | + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ |
3387 | + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ |
3388 | + $ECHO EXPORTS >> $output_objdir/$libname.def~ |
3389 | + prefix_cmds="$SED"~ |
3390 | + if test EXPORTS = "`$SED 1q $export_symbols`"; then |
3391 | + prefix_cmds="$prefix_cmds -e 1d"; |
3392 | + fi~ |
3393 | + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ |
3394 | + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ |
3395 | + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ |
3396 | + emximp -o $lib $output_objdir/$libname.def' |
3397 | + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' |
3398 | + enable_shared_with_static_runtimes=yes |
3399 | ;; |
3400 | |
3401 | osf3*) |
3402 | - if test "$GCC" = yes; then |
3403 | - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
3404 | - 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' |
3405 | + if test yes = "$GCC"; then |
3406 | + allow_undefined_flag=' $wl-expect_unresolved $wl\*' |
3407 | + 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 | else |
3409 | allow_undefined_flag=' -expect_unresolved \*' |
3410 | - 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' |
3411 | + 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 | fi |
3413 | archive_cmds_need_lc='no' |
3414 | - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
3415 | + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' |
3416 | hardcode_libdir_separator=: |
3417 | ;; |
3418 | |
3419 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
3420 | - if test "$GCC" = yes; then |
3421 | - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
3422 | - 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' |
3423 | - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
3424 | + if test yes = "$GCC"; then |
3425 | + allow_undefined_flag=' $wl-expect_unresolved $wl\*' |
3426 | + 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 | + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' |
3428 | else |
3429 | allow_undefined_flag=' -expect_unresolved \*' |
3430 | - 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' |
3431 | + 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 | 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~ |
3433 | - $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' |
3434 | + $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 | |
3436 | # Both c and cxx compiler support -rpath directly |
3437 | hardcode_libdir_flag_spec='-rpath $libdir' |
3438 | @@ -9036,24 +9408,24 @@ |
3439 | |
3440 | solaris*) |
3441 | no_undefined_flag=' -z defs' |
3442 | - if test "$GCC" = yes; then |
3443 | - wlarc='${wl}' |
3444 | - archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
3445 | + if test yes = "$GCC"; then |
3446 | + wlarc='$wl' |
3447 | + archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' |
3448 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
3449 | - $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' |
3450 | + $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 | else |
3452 | case `$CC -V 2>&1` in |
3453 | *"Compilers 5.0"*) |
3454 | wlarc='' |
3455 | - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' |
3456 | + archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' |
3457 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
3458 | - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' |
3459 | + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' |
3460 | ;; |
3461 | *) |
3462 | - wlarc='${wl}' |
3463 | - archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' |
3464 | + wlarc='$wl' |
3465 | + archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' |
3466 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
3467 | - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
3468 | + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
3469 | ;; |
3470 | esac |
3471 | fi |
3472 | @@ -9063,11 +9435,11 @@ |
3473 | solaris2.[0-5] | solaris2.[0-5].*) ;; |
3474 | *) |
3475 | # The compiler driver will combine and reorder linker options, |
3476 | - # but understands `-z linker_flag'. GCC discards it without `$wl', |
3477 | + # but understands '-z linker_flag'. GCC discards it without '$wl', |
3478 | # but is careful enough not to reorder. |
3479 | # Supported since Solaris 2.6 (maybe 2.5.1?) |
3480 | - if test "$GCC" = yes; then |
3481 | - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' |
3482 | + if test yes = "$GCC"; then |
3483 | + whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' |
3484 | else |
3485 | whole_archive_flag_spec='-z allextract$convenience -z defaultextract' |
3486 | fi |
3487 | @@ -9077,10 +9449,10 @@ |
3488 | ;; |
3489 | |
3490 | sunos4*) |
3491 | - if test "x$host_vendor" = xsequent; then |
3492 | + if test sequent = "$host_vendor"; then |
3493 | # Use $CC to link under sequent, because it throws in some extra .o |
3494 | # files that make .init and .fini sections work. |
3495 | - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' |
3496 | + archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' |
3497 | else |
3498 | archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' |
3499 | fi |
3500 | @@ -9129,43 +9501,43 @@ |
3501 | ;; |
3502 | |
3503 | sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) |
3504 | - no_undefined_flag='${wl}-z,text' |
3505 | + no_undefined_flag='$wl-z,text' |
3506 | archive_cmds_need_lc=no |
3507 | hardcode_shlibpath_var=no |
3508 | runpath_var='LD_RUN_PATH' |
3509 | |
3510 | - if test "$GCC" = yes; then |
3511 | - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
3512 | - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
3513 | + if test yes = "$GCC"; then |
3514 | + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
3515 | + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
3516 | else |
3517 | - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
3518 | - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
3519 | + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
3520 | + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
3521 | fi |
3522 | ;; |
3523 | |
3524 | sysv5* | sco3.2v5* | sco5v6*) |
3525 | - # Note: We can NOT use -z defs as we might desire, because we do not |
3526 | + # Note: We CANNOT use -z defs as we might desire, because we do not |
3527 | # link with -lc, and that would cause any symbols used from libc to |
3528 | # always be unresolved, which means just about no library would |
3529 | # ever link correctly. If we're not using GNU ld we use -z text |
3530 | # though, which does catch some bad symbols but isn't as heavy-handed |
3531 | # as -z defs. |
3532 | - no_undefined_flag='${wl}-z,text' |
3533 | - allow_undefined_flag='${wl}-z,nodefs' |
3534 | + no_undefined_flag='$wl-z,text' |
3535 | + allow_undefined_flag='$wl-z,nodefs' |
3536 | archive_cmds_need_lc=no |
3537 | hardcode_shlibpath_var=no |
3538 | - hardcode_libdir_flag_spec='${wl}-R,$libdir' |
3539 | + hardcode_libdir_flag_spec='$wl-R,$libdir' |
3540 | hardcode_libdir_separator=':' |
3541 | link_all_deplibs=yes |
3542 | - export_dynamic_flag_spec='${wl}-Bexport' |
3543 | + export_dynamic_flag_spec='$wl-Bexport' |
3544 | runpath_var='LD_RUN_PATH' |
3545 | |
3546 | - if test "$GCC" = yes; then |
3547 | - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
3548 | - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
3549 | + if test yes = "$GCC"; then |
3550 | + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
3551 | + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
3552 | else |
3553 | - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
3554 | - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
3555 | + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
3556 | + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
3557 | fi |
3558 | ;; |
3559 | |
3560 | @@ -9180,10 +9552,10 @@ |
3561 | ;; |
3562 | esac |
3563 | |
3564 | - if test x$host_vendor = xsni; then |
3565 | + if test sni = "$host_vendor"; then |
3566 | case $host in |
3567 | sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) |
3568 | - export_dynamic_flag_spec='${wl}-Blargedynsym' |
3569 | + export_dynamic_flag_spec='$wl-Blargedynsym' |
3570 | ;; |
3571 | esac |
3572 | fi |
3573 | @@ -9191,7 +9563,7 @@ |
3574 | |
3575 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 |
3576 | $as_echo "$ld_shlibs" >&6; } |
3577 | -test "$ld_shlibs" = no && can_build_shared=no |
3578 | +test no = "$ld_shlibs" && can_build_shared=no |
3579 | |
3580 | with_gnu_ld=$with_gnu_ld |
3581 | |
3582 | @@ -9217,7 +9589,7 @@ |
3583 | # Assume -lc should be added |
3584 | archive_cmds_need_lc=yes |
3585 | |
3586 | - if test "$enable_shared" = yes && test "$GCC" = yes; then |
3587 | + if test yes,yes = "$GCC,$enable_shared"; then |
3588 | case $archive_cmds in |
3589 | *'~'*) |
3590 | # FIXME: we may have to deal with multi-command sequences. |
3591 | @@ -9432,14 +9804,14 @@ |
3592 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 |
3593 | $as_echo_n "checking dynamic linker characteristics... " >&6; } |
3594 | |
3595 | -if test "$GCC" = yes; then |
3596 | +if test yes = "$GCC"; then |
3597 | case $host_os in |
3598 | - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; |
3599 | - *) lt_awk_arg="/^libraries:/" ;; |
3600 | + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; |
3601 | + *) lt_awk_arg='/^libraries:/' ;; |
3602 | esac |
3603 | case $host_os in |
3604 | - mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; |
3605 | - *) lt_sed_strip_eq="s,=/,/,g" ;; |
3606 | + mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;; |
3607 | + *) lt_sed_strip_eq='s|=/|/|g' ;; |
3608 | esac |
3609 | lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` |
3610 | case $lt_search_path_spec in |
3611 | @@ -9455,28 +9827,35 @@ |
3612 | ;; |
3613 | esac |
3614 | # Ok, now we have the path, separated by spaces, we can step through it |
3615 | - # and add multilib dir if necessary. |
3616 | + # and add multilib dir if necessary... |
3617 | lt_tmp_lt_search_path_spec= |
3618 | - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` |
3619 | + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` |
3620 | + # ...but if some path component already ends with the multilib dir we assume |
3621 | + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). |
3622 | + case "$lt_multi_os_dir; $lt_search_path_spec " in |
3623 | + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) |
3624 | + lt_multi_os_dir= |
3625 | + ;; |
3626 | + esac |
3627 | for lt_sys_path in $lt_search_path_spec; do |
3628 | - if test -d "$lt_sys_path/$lt_multi_os_dir"; then |
3629 | - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" |
3630 | - else |
3631 | + if test -d "$lt_sys_path$lt_multi_os_dir"; then |
3632 | + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" |
3633 | + elif test -n "$lt_multi_os_dir"; then |
3634 | test -d "$lt_sys_path" && \ |
3635 | lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" |
3636 | fi |
3637 | done |
3638 | lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' |
3639 | -BEGIN {RS=" "; FS="/|\n";} { |
3640 | - lt_foo=""; |
3641 | - lt_count=0; |
3642 | +BEGIN {RS = " "; FS = "/|\n";} { |
3643 | + lt_foo = ""; |
3644 | + lt_count = 0; |
3645 | for (lt_i = NF; lt_i > 0; lt_i--) { |
3646 | if ($lt_i != "" && $lt_i != ".") { |
3647 | if ($lt_i == "..") { |
3648 | lt_count++; |
3649 | } else { |
3650 | if (lt_count == 0) { |
3651 | - lt_foo="/" $lt_i lt_foo; |
3652 | + lt_foo = "/" $lt_i lt_foo; |
3653 | } else { |
3654 | lt_count--; |
3655 | } |
3656 | @@ -9490,7 +9869,7 @@ |
3657 | # for these hosts. |
3658 | case $host_os in |
3659 | mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ |
3660 | - $SED 's,/\([A-Za-z]:\),\1,g'` ;; |
3661 | + $SED 's|/\([A-Za-z]:\)|\1|g'` ;; |
3662 | esac |
3663 | sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` |
3664 | else |
3665 | @@ -9499,7 +9878,7 @@ |
3666 | library_names_spec= |
3667 | libname_spec='lib$name' |
3668 | soname_spec= |
3669 | -shrext_cmds=".so" |
3670 | +shrext_cmds=.so |
3671 | postinstall_cmds= |
3672 | postuninstall_cmds= |
3673 | finish_cmds= |
3674 | @@ -9516,14 +9895,16 @@ |
3675 | # flags to be left without arguments |
3676 | need_version=unknown |
3677 | |
3678 | + |
3679 | + |
3680 | case $host_os in |
3681 | aix3*) |
3682 | version_type=linux # correct to gnu/linux during the next big refactor |
3683 | - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' |
3684 | + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' |
3685 | shlibpath_var=LIBPATH |
3686 | |
3687 | # AIX 3 has no versioning support, so we append a major version to the name. |
3688 | - soname_spec='${libname}${release}${shared_ext}$major' |
3689 | + soname_spec='$libname$release$shared_ext$major' |
3690 | ;; |
3691 | |
3692 | aix[4-9]*) |
3693 | @@ -9531,41 +9912,91 @@ |
3694 | need_lib_prefix=no |
3695 | need_version=no |
3696 | hardcode_into_libs=yes |
3697 | - if test "$host_cpu" = ia64; then |
3698 | + if test ia64 = "$host_cpu"; then |
3699 | # AIX 5 supports IA64 |
3700 | - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' |
3701 | + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' |
3702 | shlibpath_var=LD_LIBRARY_PATH |
3703 | else |
3704 | # With GCC up to 2.95.x, collect2 would create an import file |
3705 | # for dependence libraries. The import file would start with |
3706 | - # the line `#! .'. This would cause the generated library to |
3707 | - # depend on `.', always an invalid library. This was fixed in |
3708 | + # the line '#! .'. This would cause the generated library to |
3709 | + # depend on '.', always an invalid library. This was fixed in |
3710 | # development snapshots of GCC prior to 3.0. |
3711 | case $host_os in |
3712 | aix4 | aix4.[01] | aix4.[01].*) |
3713 | if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' |
3714 | echo ' yes ' |
3715 | - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then |
3716 | + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then |
3717 | : |
3718 | else |
3719 | can_build_shared=no |
3720 | fi |
3721 | ;; |
3722 | esac |
3723 | - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct |
3724 | + # Using Import Files as archive members, it is possible to support |
3725 | + # filename-based versioning of shared library archives on AIX. While |
3726 | + # this would work for both with and without runtime linking, it will |
3727 | + # prevent static linking of such archives. So we do filename-based |
3728 | + # shared library versioning with .so extension only, which is used |
3729 | + # when both runtime linking and shared linking is enabled. |
3730 | + # Unfortunately, runtime linking may impact performance, so we do |
3731 | + # not want this to be the default eventually. Also, we use the |
3732 | + # versioned .so libs for executables only if there is the -brtl |
3733 | + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. |
3734 | + # To allow for filename-based versioning support, we need to create |
3735 | + # libNAME.so.V as an archive file, containing: |
3736 | + # *) an Import File, referring to the versioned filename of the |
3737 | + # archive as well as the shared archive member, telling the |
3738 | + # bitwidth (32 or 64) of that shared object, and providing the |
3739 | + # list of exported symbols of that shared object, eventually |
3740 | + # decorated with the 'weak' keyword |
3741 | + # *) the shared object with the F_LOADONLY flag set, to really avoid |
3742 | + # it being seen by the linker. |
3743 | + # At run time we better use the real file rather than another symlink, |
3744 | + # but for link time we create the symlink libNAME.so -> libNAME.so.V |
3745 | + |
3746 | + case $with_aix_soname,$aix_use_runtimelinking in |
3747 | + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct |
3748 | # soname into executable. Probably we can add versioning support to |
3749 | # collect2, so additional links can be useful in future. |
3750 | - if test "$aix_use_runtimelinking" = yes; then |
3751 | + aix,yes) # traditional libtool |
3752 | + dynamic_linker='AIX unversionable lib.so' |
3753 | # If using run time linking (on AIX 4.2 or later) use lib<name>.so |
3754 | # instead of lib<name>.a to let people know that these are not |
3755 | # typical AIX shared libraries. |
3756 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3757 | - else |
3758 | + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
3759 | + ;; |
3760 | + aix,no) # traditional AIX only |
3761 | + dynamic_linker='AIX lib.a(lib.so.V)' |
3762 | # We preserve .a as extension for shared libraries through AIX4.2 |
3763 | # and later when we are not doing run time linking. |
3764 | - library_names_spec='${libname}${release}.a $libname.a' |
3765 | - soname_spec='${libname}${release}${shared_ext}$major' |
3766 | - fi |
3767 | + library_names_spec='$libname$release.a $libname.a' |
3768 | + soname_spec='$libname$release$shared_ext$major' |
3769 | + ;; |
3770 | + svr4,*) # full svr4 only |
3771 | + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)" |
3772 | + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' |
3773 | + # We do not specify a path in Import Files, so LIBPATH fires. |
3774 | + shlibpath_overrides_runpath=yes |
3775 | + ;; |
3776 | + *,yes) # both, prefer svr4 |
3777 | + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)" |
3778 | + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' |
3779 | + # unpreferred sharedlib libNAME.a needs extra handling |
3780 | + 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 | + 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 | + # We do not specify a path in Import Files, so LIBPATH fires. |
3783 | + shlibpath_overrides_runpath=yes |
3784 | + ;; |
3785 | + *,no) # both, prefer aix |
3786 | + dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)" |
3787 | + library_names_spec='$libname$release.a $libname.a' |
3788 | + soname_spec='$libname$release$shared_ext$major' |
3789 | + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling |
3790 | + 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 | + 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 | + ;; |
3793 | + esac |
3794 | shlibpath_var=LIBPATH |
3795 | fi |
3796 | ;; |
3797 | @@ -9575,18 +10006,18 @@ |
3798 | powerpc) |
3799 | # Since July 2007 AmigaOS4 officially supports .so libraries. |
3800 | # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. |
3801 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3802 | + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
3803 | ;; |
3804 | m68k) |
3805 | library_names_spec='$libname.ixlibrary $libname.a' |
3806 | # Create ${libname}_ixlibrary.a entries in /sys/libs. |
3807 | - 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' |
3808 | + 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 | ;; |
3810 | esac |
3811 | ;; |
3812 | |
3813 | beos*) |
3814 | - library_names_spec='${libname}${shared_ext}' |
3815 | + library_names_spec='$libname$shared_ext' |
3816 | dynamic_linker="$host_os ld.so" |
3817 | shlibpath_var=LIBRARY_PATH |
3818 | ;; |
3819 | @@ -9594,8 +10025,8 @@ |
3820 | bsdi[45]*) |
3821 | version_type=linux # correct to gnu/linux during the next big refactor |
3822 | need_version=no |
3823 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3824 | - soname_spec='${libname}${release}${shared_ext}$major' |
3825 | + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
3826 | + soname_spec='$libname$release$shared_ext$major' |
3827 | finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' |
3828 | shlibpath_var=LD_LIBRARY_PATH |
3829 | sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" |
3830 | @@ -9607,7 +10038,7 @@ |
3831 | |
3832 | cygwin* | mingw* | pw32* | cegcc*) |
3833 | version_type=windows |
3834 | - shrext_cmds=".dll" |
3835 | + shrext_cmds=.dll |
3836 | need_version=no |
3837 | need_lib_prefix=no |
3838 | |
3839 | @@ -9616,8 +10047,8 @@ |
3840 | # gcc |
3841 | library_names_spec='$libname.dll.a' |
3842 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
3843 | - postinstall_cmds='base_file=`basename \${file}`~ |
3844 | - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
3845 | + postinstall_cmds='base_file=`basename \$file`~ |
3846 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ |
3847 | dldir=$destdir/`dirname \$dlpath`~ |
3848 | test -d \$dldir || mkdir -p \$dldir~ |
3849 | $install_prog $dir/$dlname \$dldir/$dlname~ |
3850 | @@ -9633,17 +10064,17 @@ |
3851 | case $host_os in |
3852 | cygwin*) |
3853 | # Cygwin DLLs use 'cyg' prefix rather than 'lib' |
3854 | - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
3855 | + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' |
3856 | |
3857 | sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" |
3858 | ;; |
3859 | mingw* | cegcc*) |
3860 | # MinGW DLLs use traditional 'lib' prefix |
3861 | - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
3862 | + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' |
3863 | ;; |
3864 | pw32*) |
3865 | # pw32 DLLs use 'pw' prefix rather than 'lib' |
3866 | - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
3867 | + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' |
3868 | ;; |
3869 | esac |
3870 | dynamic_linker='Win32 ld.exe' |
3871 | @@ -9652,8 +10083,8 @@ |
3872 | *,cl*) |
3873 | # Native MSVC |
3874 | libname_spec='$name' |
3875 | - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
3876 | - library_names_spec='${libname}.dll.lib' |
3877 | + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' |
3878 | + library_names_spec='$libname.dll.lib' |
3879 | |
3880 | case $build_os in |
3881 | mingw*) |
3882 | @@ -9680,7 +10111,7 @@ |
3883 | sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
3884 | ;; |
3885 | *) |
3886 | - sys_lib_search_path_spec="$LIB" |
3887 | + sys_lib_search_path_spec=$LIB |
3888 | if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
3889 | # It is most probably a Windows format PATH. |
3890 | sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
3891 | @@ -9693,8 +10124,8 @@ |
3892 | esac |
3893 | |
3894 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
3895 | - postinstall_cmds='base_file=`basename \${file}`~ |
3896 | - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
3897 | + postinstall_cmds='base_file=`basename \$file`~ |
3898 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ |
3899 | dldir=$destdir/`dirname \$dlpath`~ |
3900 | test -d \$dldir || mkdir -p \$dldir~ |
3901 | $install_prog $dir/$dlname \$dldir/$dlname' |
3902 | @@ -9707,7 +10138,7 @@ |
3903 | |
3904 | *) |
3905 | # Assume MSVC wrapper |
3906 | - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
3907 | + library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' |
3908 | dynamic_linker='Win32 ld.exe' |
3909 | ;; |
3910 | esac |
3911 | @@ -9720,8 +10151,8 @@ |
3912 | version_type=darwin |
3913 | need_lib_prefix=no |
3914 | need_version=no |
3915 | - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' |
3916 | - soname_spec='${libname}${release}${major}$shared_ext' |
3917 | + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' |
3918 | + soname_spec='$libname$release$major$shared_ext' |
3919 | shlibpath_overrides_runpath=yes |
3920 | shlibpath_var=DYLD_LIBRARY_PATH |
3921 | shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' |
3922 | @@ -9734,8 +10165,8 @@ |
3923 | version_type=linux # correct to gnu/linux during the next big refactor |
3924 | need_lib_prefix=no |
3925 | need_version=no |
3926 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' |
3927 | - soname_spec='${libname}${release}${shared_ext}$major' |
3928 | + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
3929 | + soname_spec='$libname$release$shared_ext$major' |
3930 | shlibpath_var=LD_LIBRARY_PATH |
3931 | ;; |
3932 | |
3933 | @@ -9753,12 +10184,13 @@ |
3934 | version_type=freebsd-$objformat |
3935 | case $version_type in |
3936 | freebsd-elf*) |
3937 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
3938 | + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
3939 | + soname_spec='$libname$release$shared_ext$major' |
3940 | need_version=no |
3941 | need_lib_prefix=no |
3942 | ;; |
3943 | freebsd-*) |
3944 | - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
3945 | + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' |
3946 | need_version=yes |
3947 | ;; |
3948 | esac |
3949 | @@ -9788,10 +10220,10 @@ |
3950 | need_lib_prefix=no |
3951 | need_version=no |
3952 | dynamic_linker="$host_os runtime_loader" |
3953 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
3954 | - soname_spec='${libname}${release}${shared_ext}$major' |
3955 | + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
3956 | + soname_spec='$libname$release$shared_ext$major' |
3957 | shlibpath_var=LIBRARY_PATH |
3958 | - shlibpath_overrides_runpath=yes |
3959 | + shlibpath_overrides_runpath=no |
3960 | sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' |
3961 | hardcode_into_libs=yes |
3962 | ;; |
3963 | @@ -9809,14 +10241,15 @@ |
3964 | dynamic_linker="$host_os dld.so" |
3965 | shlibpath_var=LD_LIBRARY_PATH |
3966 | shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. |
3967 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3968 | - soname_spec='${libname}${release}${shared_ext}$major' |
3969 | - if test "X$HPUX_IA64_MODE" = X32; then |
3970 | + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
3971 | + soname_spec='$libname$release$shared_ext$major' |
3972 | + if test 32 = "$HPUX_IA64_MODE"; then |
3973 | sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" |
3974 | + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 |
3975 | else |
3976 | sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" |
3977 | + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 |
3978 | fi |
3979 | - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec |
3980 | ;; |
3981 | hppa*64*) |
3982 | shrext_cmds='.sl' |
3983 | @@ -9824,8 +10257,8 @@ |
3984 | dynamic_linker="$host_os dld.sl" |
3985 | shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH |
3986 | shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. |
3987 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3988 | - soname_spec='${libname}${release}${shared_ext}$major' |
3989 | + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
3990 | + soname_spec='$libname$release$shared_ext$major' |
3991 | sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" |
3992 | sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec |
3993 | ;; |
3994 | @@ -9834,8 +10267,8 @@ |
3995 | dynamic_linker="$host_os dld.sl" |
3996 | shlibpath_var=SHLIB_PATH |
3997 | shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH |
3998 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3999 | - soname_spec='${libname}${release}${shared_ext}$major' |
4000 | + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
4001 | + soname_spec='$libname$release$shared_ext$major' |
4002 | ;; |
4003 | esac |
4004 | # HP-UX runs *really* slowly unless shared libraries are mode 555, ... |
4005 | @@ -9848,8 +10281,8 @@ |
4006 | version_type=linux # correct to gnu/linux during the next big refactor |
4007 | need_lib_prefix=no |
4008 | need_version=no |
4009 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
4010 | - soname_spec='${libname}${release}${shared_ext}$major' |
4011 | + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
4012 | + soname_spec='$libname$release$shared_ext$major' |
4013 | dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' |
4014 | shlibpath_var=LD_LIBRARY_PATH |
4015 | shlibpath_overrides_runpath=no |
4016 | @@ -9860,7 +10293,7 @@ |
4017 | case $host_os in |
4018 | nonstopux*) version_type=nonstopux ;; |
4019 | *) |
4020 | - if test "$lt_cv_prog_gnu_ld" = yes; then |
4021 | + if test yes = "$lt_cv_prog_gnu_ld"; then |
4022 | version_type=linux # correct to gnu/linux during the next big refactor |
4023 | else |
4024 | version_type=irix |
4025 | @@ -9868,8 +10301,8 @@ |
4026 | esac |
4027 | need_lib_prefix=no |
4028 | need_version=no |
4029 | - soname_spec='${libname}${release}${shared_ext}$major' |
4030 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' |
4031 | + soname_spec='$libname$release$shared_ext$major' |
4032 | + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' |
4033 | case $host_os in |
4034 | irix5* | nonstopux*) |
4035 | libsuff= shlibsuff= |
4036 | @@ -9888,8 +10321,8 @@ |
4037 | esac |
4038 | shlibpath_var=LD_LIBRARY${shlibsuff}_PATH |
4039 | shlibpath_overrides_runpath=no |
4040 | - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" |
4041 | - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" |
4042 | + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" |
4043 | + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" |
4044 | hardcode_into_libs=yes |
4045 | ;; |
4046 | |
4047 | @@ -9898,13 +10331,33 @@ |
4048 | dynamic_linker=no |
4049 | ;; |
4050 | |
4051 | +linux*android*) |
4052 | + version_type=none # Android doesn't support versioned libraries. |
4053 | + need_lib_prefix=no |
4054 | + need_version=no |
4055 | + library_names_spec='$libname$release$shared_ext' |
4056 | + soname_spec='$libname$release$shared_ext' |
4057 | + finish_cmds= |
4058 | + shlibpath_var=LD_LIBRARY_PATH |
4059 | + shlibpath_overrides_runpath=yes |
4060 | + |
4061 | + # This implies no fast_install, which is unacceptable. |
4062 | + # Some rework will be needed to allow for fast_install |
4063 | + # before this can be enabled. |
4064 | + hardcode_into_libs=yes |
4065 | + |
4066 | + dynamic_linker='Android linker' |
4067 | + # Don't embed -rpath directories since the linker doesn't support them. |
4068 | + hardcode_libdir_flag_spec='-L$libdir' |
4069 | + ;; |
4070 | + |
4071 | # This must be glibc/ELF. |
4072 | linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) |
4073 | version_type=linux # correct to gnu/linux during the next big refactor |
4074 | need_lib_prefix=no |
4075 | need_version=no |
4076 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4077 | - soname_spec='${libname}${release}${shared_ext}$major' |
4078 | + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
4079 | + soname_spec='$libname$release$shared_ext$major' |
4080 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' |
4081 | shlibpath_var=LD_LIBRARY_PATH |
4082 | shlibpath_overrides_runpath=no |
4083 | @@ -9948,7 +10401,12 @@ |
4084 | # before this can be enabled. |
4085 | hardcode_into_libs=yes |
4086 | |
4087 | - # Append ld.so.conf contents to the search path |
4088 | + # Ideally, we could use ldconfig to report *all* directores which are |
4089 | + # searched for libraries, however this is still not possible. Aside from not |
4090 | + # being certain /sbin/ldconfig is available, command |
4091 | + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, |
4092 | + # even though it is searched at run-time. Try to do the best guess by |
4093 | + # appending ld.so.conf contents (and includes) to the search path. |
4094 | if test -f /etc/ld.so.conf; then |
4095 | 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 | sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" |
4097 | @@ -9963,29 +10421,17 @@ |
4098 | dynamic_linker='GNU/Linux ld.so' |
4099 | ;; |
4100 | |
4101 | -netbsdelf*-gnu) |
4102 | - version_type=linux |
4103 | - need_lib_prefix=no |
4104 | - need_version=no |
4105 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
4106 | - soname_spec='${libname}${release}${shared_ext}$major' |
4107 | - shlibpath_var=LD_LIBRARY_PATH |
4108 | - shlibpath_overrides_runpath=no |
4109 | - hardcode_into_libs=yes |
4110 | - dynamic_linker='NetBSD ld.elf_so' |
4111 | - ;; |
4112 | - |
4113 | netbsd*) |
4114 | version_type=sunos |
4115 | need_lib_prefix=no |
4116 | need_version=no |
4117 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
4118 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' |
4119 | + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' |
4120 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' |
4121 | dynamic_linker='NetBSD (a.out) ld.so' |
4122 | else |
4123 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
4124 | - soname_spec='${libname}${release}${shared_ext}$major' |
4125 | + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
4126 | + soname_spec='$libname$release$shared_ext$major' |
4127 | dynamic_linker='NetBSD ld.elf_so' |
4128 | fi |
4129 | shlibpath_var=LD_LIBRARY_PATH |
4130 | @@ -9995,7 +10441,7 @@ |
4131 | |
4132 | newsos6) |
4133 | version_type=linux # correct to gnu/linux during the next big refactor |
4134 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4135 | + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
4136 | shlibpath_var=LD_LIBRARY_PATH |
4137 | shlibpath_overrides_runpath=yes |
4138 | ;; |
4139 | @@ -10004,58 +10450,68 @@ |
4140 | version_type=qnx |
4141 | need_lib_prefix=no |
4142 | need_version=no |
4143 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4144 | - soname_spec='${libname}${release}${shared_ext}$major' |
4145 | + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
4146 | + soname_spec='$libname$release$shared_ext$major' |
4147 | shlibpath_var=LD_LIBRARY_PATH |
4148 | shlibpath_overrides_runpath=no |
4149 | hardcode_into_libs=yes |
4150 | dynamic_linker='ldqnx.so' |
4151 | ;; |
4152 | |
4153 | -openbsd*) |
4154 | +openbsd* | bitrig*) |
4155 | version_type=sunos |
4156 | - sys_lib_dlsearch_path_spec="/usr/lib" |
4157 | + sys_lib_dlsearch_path_spec=/usr/lib |
4158 | need_lib_prefix=no |
4159 | - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. |
4160 | - case $host_os in |
4161 | - openbsd3.3 | openbsd3.3.*) need_version=yes ;; |
4162 | - *) need_version=no ;; |
4163 | - esac |
4164 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' |
4165 | + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then |
4166 | + need_version=no |
4167 | + else |
4168 | + need_version=yes |
4169 | + fi |
4170 | + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' |
4171 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' |
4172 | shlibpath_var=LD_LIBRARY_PATH |
4173 | - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then |
4174 | - case $host_os in |
4175 | - openbsd2.[89] | openbsd2.[89].*) |
4176 | - shlibpath_overrides_runpath=no |
4177 | - ;; |
4178 | - *) |
4179 | - shlibpath_overrides_runpath=yes |
4180 | - ;; |
4181 | - esac |
4182 | - else |
4183 | - shlibpath_overrides_runpath=yes |
4184 | - fi |
4185 | + shlibpath_overrides_runpath=yes |
4186 | ;; |
4187 | |
4188 | os2*) |
4189 | libname_spec='$name' |
4190 | - shrext_cmds=".dll" |
4191 | + version_type=windows |
4192 | + shrext_cmds=.dll |
4193 | + need_version=no |
4194 | need_lib_prefix=no |
4195 | - library_names_spec='$libname${shared_ext} $libname.a' |
4196 | + # OS/2 can only load a DLL with a base name of 8 characters or less. |
4197 | + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; |
4198 | + v=$($ECHO $release$versuffix | tr -d .-); |
4199 | + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); |
4200 | + $ECHO $n$v`$shared_ext' |
4201 | + library_names_spec='${libname}_dll.$libext' |
4202 | dynamic_linker='OS/2 ld.exe' |
4203 | - shlibpath_var=LIBPATH |
4204 | + shlibpath_var=BEGINLIBPATH |
4205 | + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" |
4206 | + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec |
4207 | + postinstall_cmds='base_file=`basename \$file`~ |
4208 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ |
4209 | + dldir=$destdir/`dirname \$dlpath`~ |
4210 | + test -d \$dldir || mkdir -p \$dldir~ |
4211 | + $install_prog $dir/$dlname \$dldir/$dlname~ |
4212 | + chmod a+x \$dldir/$dlname~ |
4213 | + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then |
4214 | + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; |
4215 | + fi' |
4216 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ |
4217 | + dlpath=$dir/\$dldll~ |
4218 | + $RM \$dlpath' |
4219 | ;; |
4220 | |
4221 | osf3* | osf4* | osf5*) |
4222 | version_type=osf |
4223 | need_lib_prefix=no |
4224 | need_version=no |
4225 | - soname_spec='${libname}${release}${shared_ext}$major' |
4226 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4227 | + soname_spec='$libname$release$shared_ext$major' |
4228 | + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
4229 | shlibpath_var=LD_LIBRARY_PATH |
4230 | sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" |
4231 | - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" |
4232 | + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec |
4233 | ;; |
4234 | |
4235 | rdos*) |
4236 | @@ -10066,8 +10522,8 @@ |
4237 | version_type=linux # correct to gnu/linux during the next big refactor |
4238 | need_lib_prefix=no |
4239 | need_version=no |
4240 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4241 | - soname_spec='${libname}${release}${shared_ext}$major' |
4242 | + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
4243 | + soname_spec='$libname$release$shared_ext$major' |
4244 | shlibpath_var=LD_LIBRARY_PATH |
4245 | shlibpath_overrides_runpath=yes |
4246 | hardcode_into_libs=yes |
4247 | @@ -10077,11 +10533,11 @@ |
4248 | |
4249 | sunos4*) |
4250 | version_type=sunos |
4251 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' |
4252 | + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' |
4253 | finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' |
4254 | shlibpath_var=LD_LIBRARY_PATH |
4255 | shlibpath_overrides_runpath=yes |
4256 | - if test "$with_gnu_ld" = yes; then |
4257 | + if test yes = "$with_gnu_ld"; then |
4258 | need_lib_prefix=no |
4259 | fi |
4260 | need_version=yes |
4261 | @@ -10089,8 +10545,8 @@ |
4262 | |
4263 | sysv4 | sysv4.3*) |
4264 | version_type=linux # correct to gnu/linux during the next big refactor |
4265 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4266 | - soname_spec='${libname}${release}${shared_ext}$major' |
4267 | + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
4268 | + soname_spec='$libname$release$shared_ext$major' |
4269 | shlibpath_var=LD_LIBRARY_PATH |
4270 | case $host_vendor in |
4271 | sni) |
4272 | @@ -10111,24 +10567,24 @@ |
4273 | ;; |
4274 | |
4275 | sysv4*MP*) |
4276 | - if test -d /usr/nec ;then |
4277 | + if test -d /usr/nec; then |
4278 | version_type=linux # correct to gnu/linux during the next big refactor |
4279 | - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' |
4280 | - soname_spec='$libname${shared_ext}.$major' |
4281 | + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' |
4282 | + soname_spec='$libname$shared_ext.$major' |
4283 | shlibpath_var=LD_LIBRARY_PATH |
4284 | fi |
4285 | ;; |
4286 | |
4287 | sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) |
4288 | - version_type=freebsd-elf |
4289 | + version_type=sco |
4290 | need_lib_prefix=no |
4291 | need_version=no |
4292 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
4293 | - soname_spec='${libname}${release}${shared_ext}$major' |
4294 | + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' |
4295 | + soname_spec='$libname$release$shared_ext$major' |
4296 | shlibpath_var=LD_LIBRARY_PATH |
4297 | shlibpath_overrides_runpath=yes |
4298 | hardcode_into_libs=yes |
4299 | - if test "$with_gnu_ld" = yes; then |
4300 | + if test yes = "$with_gnu_ld"; then |
4301 | sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' |
4302 | else |
4303 | sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' |
4304 | @@ -10146,7 +10602,7 @@ |
4305 | version_type=linux # correct to gnu/linux during the next big refactor |
4306 | need_lib_prefix=no |
4307 | need_version=no |
4308 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4309 | + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
4310 | shlibpath_var=LD_LIBRARY_PATH |
4311 | shlibpath_overrides_runpath=no |
4312 | hardcode_into_libs=yes |
4313 | @@ -10154,8 +10610,8 @@ |
4314 | |
4315 | uts4*) |
4316 | version_type=linux # correct to gnu/linux during the next big refactor |
4317 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4318 | - soname_spec='${libname}${release}${shared_ext}$major' |
4319 | + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
4320 | + soname_spec='$libname$release$shared_ext$major' |
4321 | shlibpath_var=LD_LIBRARY_PATH |
4322 | ;; |
4323 | |
4324 | @@ -10165,19 +10621,27 @@ |
4325 | esac |
4326 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 |
4327 | $as_echo "$dynamic_linker" >&6; } |
4328 | -test "$dynamic_linker" = no && can_build_shared=no |
4329 | +test no = "$dynamic_linker" && can_build_shared=no |
4330 | |
4331 | variables_saved_for_relink="PATH $shlibpath_var $runpath_var" |
4332 | -if test "$GCC" = yes; then |
4333 | +if test yes = "$GCC"; then |
4334 | variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" |
4335 | fi |
4336 | |
4337 | -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then |
4338 | - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" |
4339 | -fi |
4340 | -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then |
4341 | - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" |
4342 | -fi |
4343 | +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then |
4344 | + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec |
4345 | +fi |
4346 | + |
4347 | +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then |
4348 | + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec |
4349 | +fi |
4350 | + |
4351 | +# lt_cv_sys_lib... is unaugmented for libtool script decls... |
4352 | +lt_cv_sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec |
4353 | + |
4354 | +# ..but sys_lib_... needs LT_SYS_LIBRARY_PATH munging for |
4355 | +# LT_SYS_DLSEARCH_PATH macro in ltdl.m4 to work with the correct paths: |
4356 | +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" |
4357 | |
4358 | |
4359 | |
4360 | @@ -10275,15 +10739,15 @@ |
4361 | hardcode_action= |
4362 | if test -n "$hardcode_libdir_flag_spec" || |
4363 | test -n "$runpath_var" || |
4364 | - test "X$hardcode_automatic" = "Xyes" ; then |
4365 | + test yes = "$hardcode_automatic"; then |
4366 | |
4367 | # We can hardcode non-existent directories. |
4368 | - if test "$hardcode_direct" != no && |
4369 | + if test no != "$hardcode_direct" && |
4370 | # If the only mechanism to avoid hardcoding is shlibpath_var, we |
4371 | # have to relink, otherwise we might link with an installed library |
4372 | # when we should be linking with a yet-to-be-installed one |
4373 | - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && |
4374 | - test "$hardcode_minus_L" != no; then |
4375 | + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" && |
4376 | + test no != "$hardcode_minus_L"; then |
4377 | # Linking always hardcodes the temporary library directory. |
4378 | hardcode_action=relink |
4379 | else |
4380 | @@ -10298,12 +10762,12 @@ |
4381 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 |
4382 | $as_echo "$hardcode_action" >&6; } |
4383 | |
4384 | -if test "$hardcode_action" = relink || |
4385 | - test "$inherit_rpath" = yes; then |
4386 | +if test relink = "$hardcode_action" || |
4387 | + test yes = "$inherit_rpath"; then |
4388 | # Fast installation is not supported |
4389 | enable_fast_install=no |
4390 | -elif test "$shlibpath_overrides_runpath" = yes || |
4391 | - test "$enable_shared" = no; then |
4392 | +elif test yes = "$shlibpath_overrides_runpath" || |
4393 | + test no = "$enable_shared"; then |
4394 | # Fast installation is not necessary |
4395 | enable_fast_install=needless |
4396 | fi |
4397 | @@ -10313,7 +10777,7 @@ |
4398 | |
4399 | |
4400 | |
4401 | - if test "x$enable_dlopen" != xyes; then |
4402 | + if test yes != "$enable_dlopen"; then |
4403 | enable_dlopen=unknown |
4404 | enable_dlopen_self=unknown |
4405 | enable_dlopen_self_static=unknown |
4406 | @@ -10323,23 +10787,23 @@ |
4407 | |
4408 | case $host_os in |
4409 | beos*) |
4410 | - lt_cv_dlopen="load_add_on" |
4411 | + lt_cv_dlopen=load_add_on |
4412 | lt_cv_dlopen_libs= |
4413 | lt_cv_dlopen_self=yes |
4414 | ;; |
4415 | |
4416 | mingw* | pw32* | cegcc*) |
4417 | - lt_cv_dlopen="LoadLibrary" |
4418 | + lt_cv_dlopen=LoadLibrary |
4419 | lt_cv_dlopen_libs= |
4420 | ;; |
4421 | |
4422 | cygwin*) |
4423 | - lt_cv_dlopen="dlopen" |
4424 | + lt_cv_dlopen=dlopen |
4425 | lt_cv_dlopen_libs= |
4426 | ;; |
4427 | |
4428 | darwin*) |
4429 | - # if libdl is installed we need to link against it |
4430 | + # if libdl is installed we need to link against it |
4431 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 |
4432 | $as_echo_n "checking for dlopen in -ldl... " >&6; } |
4433 | if ${ac_cv_lib_dl_dlopen+:} false; then : |
4434 | @@ -10377,10 +10841,10 @@ |
4435 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 |
4436 | $as_echo "$ac_cv_lib_dl_dlopen" >&6; } |
4437 | if test "x$ac_cv_lib_dl_dlopen" = xyes; then : |
4438 | - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" |
4439 | + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl |
4440 | else |
4441 | |
4442 | - lt_cv_dlopen="dyld" |
4443 | + lt_cv_dlopen=dyld |
4444 | lt_cv_dlopen_libs= |
4445 | lt_cv_dlopen_self=yes |
4446 | |
4447 | @@ -10388,10 +10852,18 @@ |
4448 | |
4449 | ;; |
4450 | |
4451 | + tpf*) |
4452 | + # Don't try to run any link tests for TPF. We know it's impossible |
4453 | + # because TPF is a cross-compiler, and we know how we open DSOs. |
4454 | + lt_cv_dlopen=dlopen |
4455 | + lt_cv_dlopen_libs= |
4456 | + lt_cv_dlopen_self=no |
4457 | + ;; |
4458 | + |
4459 | *) |
4460 | ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" |
4461 | if test "x$ac_cv_func_shl_load" = xyes; then : |
4462 | - lt_cv_dlopen="shl_load" |
4463 | + lt_cv_dlopen=shl_load |
4464 | else |
4465 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 |
4466 | $as_echo_n "checking for shl_load in -ldld... " >&6; } |
4467 | @@ -10430,11 +10902,11 @@ |
4468 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 |
4469 | $as_echo "$ac_cv_lib_dld_shl_load" >&6; } |
4470 | if test "x$ac_cv_lib_dld_shl_load" = xyes; then : |
4471 | - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" |
4472 | + lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld |
4473 | else |
4474 | ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" |
4475 | if test "x$ac_cv_func_dlopen" = xyes; then : |
4476 | - lt_cv_dlopen="dlopen" |
4477 | + lt_cv_dlopen=dlopen |
4478 | else |
4479 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 |
4480 | $as_echo_n "checking for dlopen in -ldl... " >&6; } |
4481 | @@ -10473,7 +10945,7 @@ |
4482 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 |
4483 | $as_echo "$ac_cv_lib_dl_dlopen" >&6; } |
4484 | if test "x$ac_cv_lib_dl_dlopen" = xyes; then : |
4485 | - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" |
4486 | + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl |
4487 | else |
4488 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 |
4489 | $as_echo_n "checking for dlopen in -lsvld... " >&6; } |
4490 | @@ -10512,7 +10984,7 @@ |
4491 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 |
4492 | $as_echo "$ac_cv_lib_svld_dlopen" >&6; } |
4493 | if test "x$ac_cv_lib_svld_dlopen" = xyes; then : |
4494 | - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" |
4495 | + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld |
4496 | else |
4497 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 |
4498 | $as_echo_n "checking for dld_link in -ldld... " >&6; } |
4499 | @@ -10551,7 +11023,7 @@ |
4500 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 |
4501 | $as_echo "$ac_cv_lib_dld_dld_link" >&6; } |
4502 | if test "x$ac_cv_lib_dld_dld_link" = xyes; then : |
4503 | - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" |
4504 | + lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld |
4505 | fi |
4506 | |
4507 | |
4508 | @@ -10572,21 +11044,21 @@ |
4509 | ;; |
4510 | esac |
4511 | |
4512 | - if test "x$lt_cv_dlopen" != xno; then |
4513 | + if test no = "$lt_cv_dlopen"; then |
4514 | + enable_dlopen=no |
4515 | + else |
4516 | enable_dlopen=yes |
4517 | - else |
4518 | - enable_dlopen=no |
4519 | fi |
4520 | |
4521 | case $lt_cv_dlopen in |
4522 | dlopen) |
4523 | - save_CPPFLAGS="$CPPFLAGS" |
4524 | - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" |
4525 | + save_CPPFLAGS=$CPPFLAGS |
4526 | + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" |
4527 | |
4528 | - save_LDFLAGS="$LDFLAGS" |
4529 | + save_LDFLAGS=$LDFLAGS |
4530 | wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" |
4531 | |
4532 | - save_LIBS="$LIBS" |
4533 | + save_LIBS=$LIBS |
4534 | LIBS="$lt_cv_dlopen_libs $LIBS" |
4535 | |
4536 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 |
4537 | @@ -10594,7 +11066,7 @@ |
4538 | if ${lt_cv_dlopen_self+:} false; then : |
4539 | $as_echo_n "(cached) " >&6 |
4540 | else |
4541 | - if test "$cross_compiling" = yes; then : |
4542 | + if test yes = "$cross_compiling"; then : |
4543 | lt_cv_dlopen_self=cross |
4544 | else |
4545 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
4546 | @@ -10641,9 +11113,9 @@ |
4547 | # endif |
4548 | #endif |
4549 | |
4550 | -/* When -fvisbility=hidden is used, assume the code has been annotated |
4551 | +/* When -fvisibility=hidden is used, assume the code has been annotated |
4552 | correspondingly for the symbols needed. */ |
4553 | -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
4554 | +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
4555 | int fnord () __attribute__((visibility("default"))); |
4556 | #endif |
4557 | |
4558 | @@ -10673,7 +11145,7 @@ |
4559 | (eval $ac_link) 2>&5 |
4560 | ac_status=$? |
4561 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
4562 | - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then |
4563 | + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then |
4564 | (./conftest; exit; ) >&5 2>/dev/null |
4565 | lt_status=$? |
4566 | case x$lt_status in |
4567 | @@ -10693,14 +11165,14 @@ |
4568 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 |
4569 | $as_echo "$lt_cv_dlopen_self" >&6; } |
4570 | |
4571 | - if test "x$lt_cv_dlopen_self" = xyes; then |
4572 | + if test yes = "$lt_cv_dlopen_self"; then |
4573 | wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" |
4574 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 |
4575 | $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } |
4576 | if ${lt_cv_dlopen_self_static+:} false; then : |
4577 | $as_echo_n "(cached) " >&6 |
4578 | else |
4579 | - if test "$cross_compiling" = yes; then : |
4580 | + if test yes = "$cross_compiling"; then : |
4581 | lt_cv_dlopen_self_static=cross |
4582 | else |
4583 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
4584 | @@ -10747,9 +11219,9 @@ |
4585 | # endif |
4586 | #endif |
4587 | |
4588 | -/* When -fvisbility=hidden is used, assume the code has been annotated |
4589 | +/* When -fvisibility=hidden is used, assume the code has been annotated |
4590 | correspondingly for the symbols needed. */ |
4591 | -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
4592 | +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
4593 | int fnord () __attribute__((visibility("default"))); |
4594 | #endif |
4595 | |
4596 | @@ -10779,7 +11251,7 @@ |
4597 | (eval $ac_link) 2>&5 |
4598 | ac_status=$? |
4599 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
4600 | - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then |
4601 | + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then |
4602 | (./conftest; exit; ) >&5 2>/dev/null |
4603 | lt_status=$? |
4604 | case x$lt_status in |
4605 | @@ -10800,9 +11272,9 @@ |
4606 | $as_echo "$lt_cv_dlopen_self_static" >&6; } |
4607 | fi |
4608 | |
4609 | - CPPFLAGS="$save_CPPFLAGS" |
4610 | - LDFLAGS="$save_LDFLAGS" |
4611 | - LIBS="$save_LIBS" |
4612 | + CPPFLAGS=$save_CPPFLAGS |
4613 | + LDFLAGS=$save_LDFLAGS |
4614 | + LIBS=$save_LIBS |
4615 | ;; |
4616 | esac |
4617 | |
4618 | @@ -10846,7 +11318,7 @@ |
4619 | # FIXME - insert some real tests, host_os isn't really good enough |
4620 | case $host_os in |
4621 | darwin*) |
4622 | - if test -n "$STRIP" ; then |
4623 | + if test -n "$STRIP"; then |
4624 | striplib="$STRIP -x" |
4625 | old_striplib="$STRIP -S" |
4626 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
4627 | @@ -10874,7 +11346,7 @@ |
4628 | |
4629 | |
4630 | |
4631 | - # Report which library types will actually be built |
4632 | + # Report what library types will actually be built |
4633 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 |
4634 | $as_echo_n "checking if libtool supports shared libraries... " >&6; } |
4635 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 |
4636 | @@ -10882,13 +11354,13 @@ |
4637 | |
4638 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 |
4639 | $as_echo_n "checking whether to build shared libraries... " >&6; } |
4640 | - test "$can_build_shared" = "no" && enable_shared=no |
4641 | + test no = "$can_build_shared" && enable_shared=no |
4642 | |
4643 | # On AIX, shared libraries and static libraries use the same namespace, and |
4644 | # are all built from PIC. |
4645 | case $host_os in |
4646 | aix3*) |
4647 | - test "$enable_shared" = yes && enable_static=no |
4648 | + test yes = "$enable_shared" && enable_static=no |
4649 | if test -n "$RANLIB"; then |
4650 | archive_cmds="$archive_cmds~\$RANLIB \$lib" |
4651 | postinstall_cmds='$RANLIB $lib' |
4652 | @@ -10896,8 +11368,12 @@ |
4653 | ;; |
4654 | |
4655 | aix[4-9]*) |
4656 | - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then |
4657 | - test "$enable_shared" = yes && enable_static=no |
4658 | + if test ia64 != "$host_cpu"; then |
4659 | + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in |
4660 | + yes,aix,yes) ;; # shared object as lib.so file only |
4661 | + yes,svr4,*) ;; # shared object as lib.so archive member only |
4662 | + yes,*) enable_static=no ;; # shared object in lib.a archive as well |
4663 | + esac |
4664 | fi |
4665 | ;; |
4666 | esac |
4667 | @@ -10907,7 +11383,7 @@ |
4668 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 |
4669 | $as_echo_n "checking whether to build static libraries... " >&6; } |
4670 | # Make sure either enable_shared or enable_static is yes. |
4671 | - test "$enable_shared" = yes || enable_static=yes |
4672 | + test yes = "$enable_shared" || enable_static=yes |
4673 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 |
4674 | $as_echo "$enable_static" >&6; } |
4675 | |
4676 | @@ -10921,7 +11397,7 @@ |
4677 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
4678 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
4679 | |
4680 | -CC="$lt_save_CC" |
4681 | +CC=$lt_save_CC |
4682 | |
4683 | |
4684 | |
4685 | @@ -10946,6 +11422,21 @@ |
4686 | |
4687 | |
4688 | |
4689 | +# If library source has changed since last release, increment revision |
4690 | +# If public symbols have been added, removed or changed since last release, |
4691 | +# increment current and set revision to 0 |
4692 | +# If public symbols have been added since last release, increment age |
4693 | +# If public symbols have been removed since last release, set age to 0 |
4694 | + |
4695 | + |
4696 | + |
4697 | +LT_CURRENT=0 |
4698 | +LT_REVISION=0 |
4699 | +LT_AGE=0 |
4700 | + |
4701 | + |
4702 | + |
4703 | + |
4704 | am__api_version='1.14' |
4705 | |
4706 | # Find a good install program. We prefer a C program (faster), |
4707 | @@ -11450,7 +11941,7 @@ |
4708 | |
4709 | # Define the identity of the package. |
4710 | PACKAGE='caribou' |
4711 | - VERSION='0.4.15' |
4712 | + VERSION='0.4.17' |
4713 | |
4714 | |
4715 | cat >>confdefs.h <<_ACEOF |
4716 | @@ -11671,7 +12162,6 @@ |
4717 | fi |
4718 | fi |
4719 | |
4720 | - |
4721 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 |
4722 | $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } |
4723 | # Check whether --enable-maintainer-mode was given. |
4724 | @@ -15423,7 +15913,7 @@ |
4725 | # report actual input values of CONFIG_FILES etc. instead of their |
4726 | # values after options handling. |
4727 | ac_log=" |
4728 | -This file was extended by caribou $as_me 0.4.15, which was |
4729 | +This file was extended by caribou $as_me 0.4.17, which was |
4730 | generated by GNU Autoconf 2.69. Invocation command line was |
4731 | |
4732 | CONFIG_FILES = $CONFIG_FILES |
4733 | @@ -15480,7 +15970,7 @@ |
4734 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
4735 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
4736 | ac_cs_version="\\ |
4737 | -caribou config.status 0.4.15 |
4738 | +caribou config.status 0.4.17 |
4739 | configured by $0, generated by GNU Autoconf 2.69, |
4740 | with options \\"\$ac_cs_config\\" |
4741 | |
4742 | @@ -15603,6 +16093,7 @@ |
4743 | enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' |
4744 | pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' |
4745 | enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' |
4746 | +shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`' |
4747 | SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' |
4748 | ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' |
4749 | PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' |
4750 | @@ -15652,10 +16143,13 @@ |
4751 | GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' |
4752 | lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' |
4753 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
4754 | +lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`' |
4755 | 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 | 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 | +lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`' |
4758 | nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' |
4759 | lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' |
4760 | +lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`' |
4761 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' |
4762 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' |
4763 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' |
4764 | @@ -15720,7 +16214,7 @@ |
4765 | finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' |
4766 | hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' |
4767 | sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' |
4768 | -sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' |
4769 | +lt_cv_sys_lib_dlsearch_path_spec='`$ECHO "$lt_cv_sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' |
4770 | hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' |
4771 | enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' |
4772 | enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' |
4773 | @@ -15771,9 +16265,12 @@ |
4774 | compiler \ |
4775 | lt_cv_sys_global_symbol_pipe \ |
4776 | lt_cv_sys_global_symbol_to_cdecl \ |
4777 | +lt_cv_sys_global_symbol_to_import \ |
4778 | lt_cv_sys_global_symbol_to_c_name_address \ |
4779 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
4780 | +lt_cv_nm_interface \ |
4781 | nm_file_list_spec \ |
4782 | +lt_cv_truncate_bin \ |
4783 | lt_prog_compiler_no_builtin_flag \ |
4784 | lt_prog_compiler_pic \ |
4785 | lt_prog_compiler_wl \ |
4786 | @@ -15808,7 +16305,7 @@ |
4787 | striplib; do |
4788 | case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in |
4789 | *[\\\\\\\`\\"\\\$]*) |
4790 | - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" |
4791 | + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes |
4792 | ;; |
4793 | *) |
4794 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" |
4795 | @@ -15835,10 +16332,10 @@ |
4796 | postuninstall_cmds \ |
4797 | finish_cmds \ |
4798 | sys_lib_search_path_spec \ |
4799 | -sys_lib_dlsearch_path_spec; do |
4800 | +lt_cv_sys_lib_dlsearch_path_spec; do |
4801 | case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in |
4802 | *[\\\\\\\`\\"\\\$]*) |
4803 | - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" |
4804 | + 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 | ;; |
4806 | *) |
4807 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" |
4808 | @@ -15847,19 +16344,16 @@ |
4809 | done |
4810 | |
4811 | ac_aux_dir='$ac_aux_dir' |
4812 | -xsi_shell='$xsi_shell' |
4813 | -lt_shell_append='$lt_shell_append' |
4814 | |
4815 | -# See if we are running on zsh, and set the options which allow our |
4816 | +# See if we are running on zsh, and set the options that allow our |
4817 | # commands through without removal of \ escapes INIT. |
4818 | -if test -n "\${ZSH_VERSION+set}" ; then |
4819 | +if test -n "\${ZSH_VERSION+set}"; then |
4820 | setopt NO_GLOB_SUBST |
4821 | fi |
4822 | |
4823 | |
4824 | PACKAGE='$PACKAGE' |
4825 | VERSION='$VERSION' |
4826 | - TIMESTAMP='$TIMESTAMP' |
4827 | RM='$RM' |
4828 | ofile='$ofile' |
4829 | |
4830 | @@ -16335,55 +16829,53 @@ |
4831 | case $ac_file$ac_mode in |
4832 | "libtool":C) |
4833 | |
4834 | - # See if we are running on zsh, and set the options which allow our |
4835 | + # See if we are running on zsh, and set the options that allow our |
4836 | # commands through without removal of \ escapes. |
4837 | - if test -n "${ZSH_VERSION+set}" ; then |
4838 | + if test -n "${ZSH_VERSION+set}"; then |
4839 | setopt NO_GLOB_SUBST |
4840 | fi |
4841 | |
4842 | - cfgfile="${ofile}T" |
4843 | + cfgfile=${ofile}T |
4844 | trap "$RM \"$cfgfile\"; exit 1" 1 2 15 |
4845 | $RM "$cfgfile" |
4846 | |
4847 | cat <<_LT_EOF >> "$cfgfile" |
4848 | #! $SHELL |
4849 | - |
4850 | -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. |
4851 | -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION |
4852 | +# Generated automatically by $as_me ($PACKAGE) $VERSION |
4853 | # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: |
4854 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
4855 | -# |
4856 | -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
4857 | -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
4858 | -# Foundation, Inc. |
4859 | -# Written by Gordon Matzigkeit, 1996 |
4860 | -# |
4861 | -# This file is part of GNU Libtool. |
4862 | -# |
4863 | -# GNU Libtool is free software; you can redistribute it and/or |
4864 | -# modify it under the terms of the GNU General Public License as |
4865 | -# published by the Free Software Foundation; either version 2 of |
4866 | -# the License, or (at your option) any later version. |
4867 | -# |
4868 | -# As a special exception to the GNU General Public License, |
4869 | -# if you distribute this file as part of a program or library that |
4870 | -# is built using GNU Libtool, you may include this file under the |
4871 | -# same distribution terms that you use for the rest of that program. |
4872 | -# |
4873 | -# GNU Libtool is distributed in the hope that it will be useful, |
4874 | -# but WITHOUT ANY WARRANTY; without even the implied warranty of |
4875 | + |
4876 | +# Provide generalized library-building support services. |
4877 | +# Written by Gordon Matzigkeit, 1996 |
4878 | + |
4879 | +# Copyright (C) 2014 Free Software Foundation, Inc. |
4880 | +# This is free software; see the source for copying conditions. There is NO |
4881 | +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
4882 | + |
4883 | +# GNU Libtool is free software; you can redistribute it and/or modify |
4884 | +# it under the terms of the GNU General Public License as published by |
4885 | +# the Free Software Foundation; either version 2 of of the License, or |
4886 | +# (at your option) any later version. |
4887 | +# |
4888 | +# As a special exception to the GNU General Public License, if you |
4889 | +# distribute this file as part of a program or library that is built |
4890 | +# using GNU Libtool, you may include this file under the same |
4891 | +# distribution terms that you use for the rest of that program. |
4892 | +# |
4893 | +# GNU Libtool is distributed in the hope that it will be useful, but |
4894 | +# WITHOUT ANY WARRANTY; without even the implied warranty of |
4895 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
4896 | # GNU General Public License for more details. |
4897 | # |
4898 | # You should have received a copy of the GNU General Public License |
4899 | -# along with GNU Libtool; see the file COPYING. If not, a copy |
4900 | -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or |
4901 | -# obtained by writing to the Free Software Foundation, Inc., |
4902 | -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
4903 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
4904 | |
4905 | |
4906 | # The names of the tagged configurations supported by this script. |
4907 | -available_tags="" |
4908 | +available_tags='' |
4909 | + |
4910 | +# Configured defaults for sys_lib_dlsearch_path munging. |
4911 | +: \${LT_SYS_LIBRARY_PATH="$LT_SYS_LIBRARY_PATH"} |
4912 | |
4913 | # ### BEGIN LIBTOOL CONFIG |
4914 | |
4915 | @@ -16403,6 +16895,9 @@ |
4916 | # Whether or not to optimize for fast installation. |
4917 | fast_install=$enable_fast_install |
4918 | |
4919 | +# Shared archive member basename,for filename based shared library versioning on AIX. |
4920 | +shared_archive_member_spec=$shared_archive_member_spec |
4921 | + |
4922 | # Shell to use when invoking shell scripts. |
4923 | SHELL=$lt_SHELL |
4924 | |
4925 | @@ -16520,18 +17015,27 @@ |
4926 | # Transform the output of nm in a proper C declaration. |
4927 | global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl |
4928 | |
4929 | +# Transform the output of nm into a list of symbols to manually relocate. |
4930 | +global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import |
4931 | + |
4932 | # Transform the output of nm in a C name address pair. |
4933 | global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
4934 | |
4935 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
4936 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
4937 | |
4938 | +# The name lister interface. |
4939 | +nm_interface=$lt_lt_cv_nm_interface |
4940 | + |
4941 | # Specify filename containing input files for \$NM. |
4942 | nm_file_list_spec=$lt_nm_file_list_spec |
4943 | |
4944 | -# The root where to search for dependent libraries,and in which our libraries should be installed. |
4945 | +# The root where to search for dependent libraries,and where our libraries should be installed. |
4946 | lt_sysroot=$lt_sysroot |
4947 | |
4948 | +# Command to truncate a binary pipe. |
4949 | +lt_truncate_bin=$lt_lt_cv_truncate_bin |
4950 | + |
4951 | # The name of the directory that contains temporary libtool files. |
4952 | objdir=$objdir |
4953 | |
4954 | @@ -16623,7 +17127,7 @@ |
4955 | sys_lib_search_path_spec=$lt_sys_lib_search_path_spec |
4956 | |
4957 | # Run-time system search path for libraries. |
4958 | -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec |
4959 | +sys_lib_dlsearch_path_spec=$lt_lt_cv_sys_lib_dlsearch_path_spec |
4960 | |
4961 | # Whether dlopen is supported. |
4962 | dlopen_support=$enable_dlopen |
4963 | @@ -16716,13 +17220,13 @@ |
4964 | # Whether we need a single "-rpath" flag with a separated argument. |
4965 | hardcode_libdir_separator=$lt_hardcode_libdir_separator |
4966 | |
4967 | -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes |
4968 | +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes |
4969 | # DIR into the resulting binary. |
4970 | hardcode_direct=$hardcode_direct |
4971 | |
4972 | -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes |
4973 | +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes |
4974 | # DIR into the resulting binary and the resulting library dependency is |
4975 | -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the |
4976 | +# "absolute",i.e impossible to change by setting \$shlibpath_var if the |
4977 | # library is relocated. |
4978 | hardcode_direct_absolute=$hardcode_direct_absolute |
4979 | |
4980 | @@ -16774,13 +17278,71 @@ |
4981 | |
4982 | _LT_EOF |
4983 | |
4984 | + cat <<'_LT_EOF' >> "$cfgfile" |
4985 | +## -------------------------------------- ## |
4986 | +## Shell functions shared with configure. ## |
4987 | +## -------------------------------------- ## |
4988 | + |
4989 | +# func_munge_path_list VARIABLE PATH |
4990 | +# ----------------------------------- |
4991 | +# VARIABLE is name of variable containing _space_ separated list of |
4992 | +# directories to be munged by the contents of PATH, which is string |
4993 | +# having a format: |
4994 | +# "DIR[:DIR]:" |
4995 | +# string "DIR[ DIR]" will be prepended to VARIABLE |
4996 | +# ":DIR[:DIR]" |
4997 | +# string "DIR[ DIR]" will be appended to VARIABLE |
4998 | +# "DIRP[:DIRP]::[DIRA:]DIRA" |
4999 | +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string |
5000 | +# "DIRA[ DIRA]" will be appended to VARIABLE |
The diff has been truncated for viewing.
Thanks. Uploaded.