Merge lp:~fginther/ginn/oneiric-0.2.4.1-libgeis-rename into lp:ginn/oneiric
- oneiric-0.2.4.1-libgeis-rename
- Merge into oneiric
Proposed by
Francis Ginther
Status: | Merged |
---|---|
Merged at revision: | 13 |
Proposed branch: | lp:~fginther/ginn/oneiric-0.2.4.1-libgeis-rename |
Merge into: | lp:ginn/oneiric |
Diff against target: |
16270 lines (+5988/-3340) 13 files modified
ChangeLog (+23/-0) Makefile.in (+3/-1) aclocal.m4 (+1286/-803) config-aux/config.guess (+120/-105) config-aux/config.sub (+101/-55) config-aux/ltmain.sh (+2619/-1390) configure (+1813/-977) configure.ac (+2/-2) debian/changelog (+10/-0) debian/control (+4/-4) debian/watch (+1/-1) etc/Makefile.in (+3/-1) src/Makefile.in (+3/-1) |
To merge this branch: | bzr merge lp:~fginther/ginn/oneiric-0.2.4.1-libgeis-rename |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chase Douglas (community) | Approve | ||
Daniel d'Andrada | Pending | ||
Review via email: mp+121088@code.launchpad.net |
Commit message
* New upstream microrelease, bug fixes only
- Depend on renamed libgeis package (LP: #1040871)
* Updated debian/watch file for series change
* Rename dependency on libgeis-dev
* Updated Standards-Version to 3.9.2 in debian/control
Description of the change
Renamed the dependency on libgeis (from libutouch-geis). Incorporated upstream source which was also updated to rename the libgeis dependency.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'ChangeLog' |
2 | --- ChangeLog 2011-02-03 13:54:56 +0000 |
3 | +++ ChangeLog 2012-08-23 20:59:19 +0000 |
4 | @@ -1,4 +1,27 @@ |
5 | ------------------------------------------------------------ |
6 | +revno: 84 |
7 | +tags: 0.2.4.1 |
8 | +committer: Francis Ginther <francis.ginther@canonical.com> |
9 | +branch nick: 0.2.4 |
10 | +timestamp: Sat 2012-08-18 09:20:56 -0500 |
11 | +message: |
12 | + Release version 0.2.4.1 |
13 | +------------------------------------------------------------ |
14 | +revno: 83 |
15 | +committer: Francis Ginther <francis.ginther@canonical.com> |
16 | +branch nick: 0.2.4 |
17 | +timestamp: Sat 2012-08-18 09:19:36 -0500 |
18 | +message: |
19 | + Update to build against renamed geis package |
20 | +------------------------------------------------------------ |
21 | +revno: 82 [merge] |
22 | +committer: Mohamed-ikbel Boulabiar <boulabiar@gmail.com> |
23 | +branch nick: ginn |
24 | +timestamp: Fri 2011-02-04 15:32:32 +0100 |
25 | +message: |
26 | + Merge Stephen license Fix, |
27 | + Version 0.2.4 |
28 | +------------------------------------------------------------ |
29 | revno: 81 |
30 | committer: Mohamed-ikbel Boulabiar <boulabiar@gmail.com> |
31 | branch nick: ginn |
32 | |
33 | === modified file 'Makefile.in' |
34 | --- Makefile.in 2010-12-10 16:59:27 +0000 |
35 | +++ Makefile.in 2012-08-23 20:59:19 +0000 |
36 | @@ -144,6 +144,7 @@ |
37 | CYGPATH_W = @CYGPATH_W@ |
38 | DEFS = @DEFS@ |
39 | DEPDIR = @DEPDIR@ |
40 | +DLLTOOL = @DLLTOOL@ |
41 | DSYMUTIL = @DSYMUTIL@ |
42 | DUMPBIN = @DUMPBIN@ |
43 | ECHO_C = @ECHO_C@ |
44 | @@ -171,6 +172,7 @@ |
45 | LTLIBOBJS = @LTLIBOBJS@ |
46 | MAINT = @MAINT@ |
47 | MAKEINFO = @MAKEINFO@ |
48 | +MANIFEST_TOOL = @MANIFEST_TOOL@ |
49 | MKDIR_P = @MKDIR_P@ |
50 | NM = @NM@ |
51 | NMEDIT = @NMEDIT@ |
52 | @@ -205,6 +207,7 @@ |
53 | abs_srcdir = @abs_srcdir@ |
54 | abs_top_builddir = @abs_top_builddir@ |
55 | abs_top_srcdir = @abs_top_srcdir@ |
56 | +ac_ct_AR = @ac_ct_AR@ |
57 | ac_ct_CC = @ac_ct_CC@ |
58 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
59 | am__include = @am__include@ |
60 | @@ -237,7 +240,6 @@ |
61 | libexecdir = @libexecdir@ |
62 | localedir = @localedir@ |
63 | localstatedir = @localstatedir@ |
64 | -lt_ECHO = @lt_ECHO@ |
65 | mandir = @mandir@ |
66 | mkdir_p = @mkdir_p@ |
67 | oldincludedir = @oldincludedir@ |
68 | |
69 | === modified file 'aclocal.m4' |
70 | --- aclocal.m4 2011-02-03 13:54:56 +0000 |
71 | +++ aclocal.m4 2012-08-23 20:59:19 +0000 |
72 | @@ -13,8 +13,8 @@ |
73 | |
74 | m4_ifndef([AC_AUTOCONF_VERSION], |
75 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
76 | -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, |
77 | -[m4_warning([this file was generated for autoconf 2.67. |
78 | +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, |
79 | +[m4_warning([this file was generated for autoconf 2.68. |
80 | You have another version of autoconf. It may work, but is not guaranteed to. |
81 | If you have problems, you may need to regenerate the build system entirely. |
82 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
83 | @@ -22,7 +22,8 @@ |
84 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
85 | # |
86 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
87 | -# 2006, 2007, 2008 Free Software Foundation, Inc. |
88 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
89 | +# Inc. |
90 | # Written by Gordon Matzigkeit, 1996 |
91 | # |
92 | # This file is free software; the Free Software Foundation gives |
93 | @@ -31,7 +32,8 @@ |
94 | |
95 | m4_define([_LT_COPYING], [dnl |
96 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
97 | -# 2006, 2007, 2008 Free Software Foundation, Inc. |
98 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
99 | +# Inc. |
100 | # Written by Gordon Matzigkeit, 1996 |
101 | # |
102 | # This file is part of GNU Libtool. |
103 | @@ -58,7 +60,7 @@ |
104 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
105 | ]) |
106 | |
107 | -# serial 56 LT_INIT |
108 | +# serial 57 LT_INIT |
109 | |
110 | |
111 | # LT_PREREQ(VERSION) |
112 | @@ -87,6 +89,7 @@ |
113 | # ------------------ |
114 | AC_DEFUN([LT_INIT], |
115 | [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT |
116 | +AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl |
117 | AC_BEFORE([$0], [LT_LANG])dnl |
118 | AC_BEFORE([$0], [LT_OUTPUT])dnl |
119 | AC_BEFORE([$0], [LTDL_INIT])dnl |
120 | @@ -103,6 +106,8 @@ |
121 | AC_REQUIRE([LTOBSOLETE_VERSION])dnl |
122 | m4_require([_LT_PROG_LTMAIN])dnl |
123 | |
124 | +_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) |
125 | + |
126 | dnl Parse OPTIONS |
127 | _LT_SET_OPTIONS([$0], [$1]) |
128 | |
129 | @@ -139,7 +144,7 @@ |
130 | *) break;; |
131 | esac |
132 | done |
133 | -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` |
134 | +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` |
135 | ]) |
136 | |
137 | |
138 | @@ -159,6 +164,9 @@ |
139 | m4_defun([_LT_SETUP], |
140 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl |
141 | AC_REQUIRE([AC_CANONICAL_BUILD])dnl |
142 | +AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl |
143 | +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl |
144 | + |
145 | _LT_DECL([], [host_alias], [0], [The host system])dnl |
146 | _LT_DECL([], [host], [0])dnl |
147 | _LT_DECL([], [host_os], [0])dnl |
148 | @@ -181,10 +189,13 @@ |
149 | dnl |
150 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
151 | m4_require([_LT_CHECK_SHELL_FEATURES])dnl |
152 | +m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl |
153 | m4_require([_LT_CMD_RELOAD])dnl |
154 | m4_require([_LT_CHECK_MAGIC_METHOD])dnl |
155 | +m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl |
156 | m4_require([_LT_CMD_OLD_ARCHIVE])dnl |
157 | m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl |
158 | +m4_require([_LT_WITH_SYSROOT])dnl |
159 | |
160 | _LT_CONFIG_LIBTOOL_INIT([ |
161 | # See if we are running on zsh, and set the options which allow our |
162 | @@ -200,7 +211,6 @@ |
163 | _LT_CHECK_OBJDIR |
164 | |
165 | m4_require([_LT_TAG_COMPILER])dnl |
166 | -_LT_PROG_ECHO_BACKSLASH |
167 | |
168 | case $host_os in |
169 | aix3*) |
170 | @@ -214,23 +224,6 @@ |
171 | ;; |
172 | esac |
173 | |
174 | -# Sed substitution that helps us do robust quoting. It backslashifies |
175 | -# metacharacters that are still active within double-quoted strings. |
176 | -sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' |
177 | - |
178 | -# Same as above, but do not quote variable references. |
179 | -double_quote_subst='s/\([["`\\]]\)/\\\1/g' |
180 | - |
181 | -# Sed substitution to delay expansion of an escaped shell variable in a |
182 | -# double_quote_subst'ed string. |
183 | -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' |
184 | - |
185 | -# Sed substitution to delay expansion of an escaped single quote. |
186 | -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' |
187 | - |
188 | -# Sed substitution to avoid accidental globbing in evaled expressions |
189 | -no_glob_subst='s/\*/\\\*/g' |
190 | - |
191 | # Global variables: |
192 | ofile=libtool |
193 | can_build_shared=yes |
194 | @@ -271,6 +264,28 @@ |
195 | ])# _LT_SETUP |
196 | |
197 | |
198 | +# _LT_PREPARE_SED_QUOTE_VARS |
199 | +# -------------------------- |
200 | +# Define a few sed substitution that help us do robust quoting. |
201 | +m4_defun([_LT_PREPARE_SED_QUOTE_VARS], |
202 | +[# Backslashify metacharacters that are still active within |
203 | +# double-quoted strings. |
204 | +sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' |
205 | + |
206 | +# Same as above, but do not quote variable references. |
207 | +double_quote_subst='s/\([["`\\]]\)/\\\1/g' |
208 | + |
209 | +# Sed substitution to delay expansion of an escaped shell variable in a |
210 | +# double_quote_subst'ed string. |
211 | +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' |
212 | + |
213 | +# Sed substitution to delay expansion of an escaped single quote. |
214 | +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' |
215 | + |
216 | +# Sed substitution to avoid accidental globbing in evaled expressions |
217 | +no_glob_subst='s/\*/\\\*/g' |
218 | +]) |
219 | + |
220 | # _LT_PROG_LTMAIN |
221 | # --------------- |
222 | # Note that this code is called both from `configure', and `config.status' |
223 | @@ -423,7 +438,7 @@ |
224 | # declaration there will have the same value as in `configure'. VARNAME |
225 | # must have a single quote delimited value for this to work. |
226 | m4_define([_LT_CONFIG_STATUS_DECLARE], |
227 | -[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) |
228 | +[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) |
229 | |
230 | |
231 | # _LT_CONFIG_STATUS_DECLARATIONS |
232 | @@ -433,7 +448,7 @@ |
233 | # embedded single quotes properly. In configure, this macro expands |
234 | # each variable declared with _LT_DECL (and _LT_TAGDECL) into: |
235 | # |
236 | -# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`' |
237 | +# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`' |
238 | m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], |
239 | [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), |
240 | [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) |
241 | @@ -532,12 +547,20 @@ |
242 | LTCFLAGS='$LTCFLAGS' |
243 | compiler='$compiler_DEFAULT' |
244 | |
245 | +# A function that is used when there is no print builtin or printf. |
246 | +func_fallback_echo () |
247 | +{ |
248 | + eval 'cat <<_LTECHO_EOF |
249 | +\$[]1 |
250 | +_LTECHO_EOF' |
251 | +} |
252 | + |
253 | # Quote evaled strings. |
254 | for var in lt_decl_all_varnames([[ \ |
255 | ]], lt_decl_quote_varnames); do |
256 | - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in |
257 | + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in |
258 | *[[\\\\\\\`\\"\\\$]]*) |
259 | - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" |
260 | + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" |
261 | ;; |
262 | *) |
263 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" |
264 | @@ -548,9 +571,9 @@ |
265 | # Double-quote double-evaled strings. |
266 | for var in lt_decl_all_varnames([[ \ |
267 | ]], lt_decl_dquote_varnames); do |
268 | - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in |
269 | + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in |
270 | *[[\\\\\\\`\\"\\\$]]*) |
271 | - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" |
272 | + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" |
273 | ;; |
274 | *) |
275 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" |
276 | @@ -558,16 +581,38 @@ |
277 | esac |
278 | done |
279 | |
280 | -# Fix-up fallback echo if it was mangled by the above quoting rules. |
281 | -case \$lt_ECHO in |
282 | -*'\\\[$]0 --fallback-echo"')dnl " |
283 | - lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` |
284 | - ;; |
285 | -esac |
286 | - |
287 | _LT_OUTPUT_LIBTOOL_INIT |
288 | ]) |
289 | |
290 | +# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) |
291 | +# ------------------------------------ |
292 | +# Generate a child script FILE with all initialization necessary to |
293 | +# reuse the environment learned by the parent script, and make the |
294 | +# file executable. If COMMENT is supplied, it is inserted after the |
295 | +# `#!' sequence but before initialization text begins. After this |
296 | +# macro, additional text can be appended to FILE to form the body of |
297 | +# the child script. The macro ends with non-zero status if the |
298 | +# file could not be fully written (such as if the disk is full). |
299 | +m4_ifdef([AS_INIT_GENERATED], |
300 | +[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], |
301 | +[m4_defun([_LT_GENERATED_FILE_INIT], |
302 | +[m4_require([AS_PREPARE])]dnl |
303 | +[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl |
304 | +[lt_write_fail=0 |
305 | +cat >$1 <<_ASEOF || lt_write_fail=1 |
306 | +#! $SHELL |
307 | +# Generated by $as_me. |
308 | +$2 |
309 | +SHELL=\${CONFIG_SHELL-$SHELL} |
310 | +export SHELL |
311 | +_ASEOF |
312 | +cat >>$1 <<\_ASEOF || lt_write_fail=1 |
313 | +AS_SHELL_SANITIZE |
314 | +_AS_PREPARE |
315 | +exec AS_MESSAGE_FD>&1 |
316 | +_ASEOF |
317 | +test $lt_write_fail = 0 && chmod +x $1[]dnl |
318 | +m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT |
319 | |
320 | # LT_OUTPUT |
321 | # --------- |
322 | @@ -577,20 +622,11 @@ |
323 | AC_DEFUN([LT_OUTPUT], |
324 | [: ${CONFIG_LT=./config.lt} |
325 | AC_MSG_NOTICE([creating $CONFIG_LT]) |
326 | -cat >"$CONFIG_LT" <<_LTEOF |
327 | -#! $SHELL |
328 | -# Generated by $as_me. |
329 | -# Run this file to recreate a libtool stub with the current configuration. |
330 | +_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], |
331 | +[# Run this file to recreate a libtool stub with the current configuration.]) |
332 | |
333 | +cat >>"$CONFIG_LT" <<\_LTEOF |
334 | lt_cl_silent=false |
335 | -SHELL=\${CONFIG_SHELL-$SHELL} |
336 | -_LTEOF |
337 | - |
338 | -cat >>"$CONFIG_LT" <<\_LTEOF |
339 | -AS_SHELL_SANITIZE |
340 | -_AS_PREPARE |
341 | - |
342 | -exec AS_MESSAGE_FD>&1 |
343 | exec AS_MESSAGE_LOG_FD>>config.log |
344 | { |
345 | echo |
346 | @@ -616,7 +652,7 @@ |
347 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) |
348 | configured by $[0], generated by m4_PACKAGE_STRING. |
349 | |
350 | -Copyright (C) 2008 Free Software Foundation, Inc. |
351 | +Copyright (C) 2010 Free Software Foundation, Inc. |
352 | This config.lt script is free software; the Free Software Foundation |
353 | gives unlimited permision to copy, distribute and modify it." |
354 | |
355 | @@ -661,15 +697,13 @@ |
356 | # appending to config.log, which fails on DOS, as config.log is still kept |
357 | # open by configure. Here we exec the FD to /dev/null, effectively closing |
358 | # config.log, so it can be properly (re)opened and appended to by config.lt. |
359 | -if test "$no_create" != yes; then |
360 | - lt_cl_success=: |
361 | - test "$silent" = yes && |
362 | - lt_config_lt_args="$lt_config_lt_args --quiet" |
363 | - exec AS_MESSAGE_LOG_FD>/dev/null |
364 | - $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false |
365 | - exec AS_MESSAGE_LOG_FD>>config.log |
366 | - $lt_cl_success || AS_EXIT(1) |
367 | -fi |
368 | +lt_cl_success=: |
369 | +test "$silent" = yes && |
370 | + lt_config_lt_args="$lt_config_lt_args --quiet" |
371 | +exec AS_MESSAGE_LOG_FD>/dev/null |
372 | +$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false |
373 | +exec AS_MESSAGE_LOG_FD>>config.log |
374 | +$lt_cl_success || AS_EXIT(1) |
375 | ])# LT_OUTPUT |
376 | |
377 | |
378 | @@ -732,15 +766,12 @@ |
379 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
380 | # text mode, it properly converts lines to CR/LF. This bash problem |
381 | # is reportedly fixed, but why not run on old versions too? |
382 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
383 | - || (rm -f "$cfgfile"; exit 1) |
384 | - |
385 | - _LT_PROG_XSI_SHELLFNS |
386 | - |
387 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
388 | - || (rm -f "$cfgfile"; exit 1) |
389 | - |
390 | - mv -f "$cfgfile" "$ofile" || |
391 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
392 | + || (rm -f "$cfgfile"; exit 1) |
393 | + |
394 | + _LT_PROG_REPLACE_SHELLFNS |
395 | + |
396 | + mv -f "$cfgfile" "$ofile" || |
397 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
398 | chmod +x "$ofile" |
399 | ], |
400 | @@ -846,11 +877,13 @@ |
401 | AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) |
402 | AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) |
403 | AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) |
404 | +AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) |
405 | dnl aclocal-1.4 backwards compatibility: |
406 | dnl AC_DEFUN([AC_LIBTOOL_CXX], []) |
407 | dnl AC_DEFUN([AC_LIBTOOL_F77], []) |
408 | dnl AC_DEFUN([AC_LIBTOOL_FC], []) |
409 | dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) |
410 | +dnl AC_DEFUN([AC_LIBTOOL_RC], []) |
411 | |
412 | |
413 | # _LT_TAG_COMPILER |
414 | @@ -955,6 +988,31 @@ |
415 | [lt_cv_ld_exported_symbols_list=no]) |
416 | LDFLAGS="$save_LDFLAGS" |
417 | ]) |
418 | + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], |
419 | + [lt_cv_ld_force_load=no |
420 | + cat > conftest.c << _LT_EOF |
421 | +int forced_loaded() { return 2;} |
422 | +_LT_EOF |
423 | + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD |
424 | + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD |
425 | + echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD |
426 | + $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD |
427 | + echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD |
428 | + $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD |
429 | + cat > conftest.c << _LT_EOF |
430 | +int main() { return 0;} |
431 | +_LT_EOF |
432 | + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD |
433 | + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err |
434 | + _lt_result=$? |
435 | + if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then |
436 | + lt_cv_ld_force_load=yes |
437 | + else |
438 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
439 | + fi |
440 | + rm -f conftest.err libconftest.a conftest conftest.c |
441 | + rm -rf conftest.dSYM |
442 | + ]) |
443 | case $host_os in |
444 | rhapsody* | darwin1.[[012]]) |
445 | _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; |
446 | @@ -982,7 +1040,7 @@ |
447 | else |
448 | _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' |
449 | fi |
450 | - if test "$DSYMUTIL" != ":"; then |
451 | + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then |
452 | _lt_dsymutil='~$DSYMUTIL $lib || :' |
453 | else |
454 | _lt_dsymutil= |
455 | @@ -1002,7 +1060,11 @@ |
456 | _LT_TAGVAR(hardcode_direct, $1)=no |
457 | _LT_TAGVAR(hardcode_automatic, $1)=yes |
458 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
459 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='' |
460 | + if test "$lt_cv_ld_force_load" = "yes"; then |
461 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' |
462 | + else |
463 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='' |
464 | + fi |
465 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
466 | _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" |
467 | case $cc_basename in |
468 | @@ -1010,7 +1072,7 @@ |
469 | *) _lt_dar_can_shared=$GCC ;; |
470 | esac |
471 | if test "$_lt_dar_can_shared" = "yes"; then |
472 | - output_verbose_link_cmd=echo |
473 | + output_verbose_link_cmd=func_echo_all |
474 | _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" |
475 | _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" |
476 | _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" |
477 | @@ -1026,203 +1088,142 @@ |
478 | fi |
479 | ]) |
480 | |
481 | -# _LT_SYS_MODULE_PATH_AIX |
482 | -# ----------------------- |
483 | +# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) |
484 | +# ---------------------------------- |
485 | # Links a minimal program and checks the executable |
486 | # for the system default hardcoded library path. In most cases, |
487 | # this is /usr/lib:/lib, but when the MPI compilers are used |
488 | # the location of the communication and MPI libs are included too. |
489 | # If we don't find anything, use the default library path according |
490 | # to the aix ld manual. |
491 | +# Store the results from the different compilers for each TAGNAME. |
492 | +# Allow to override them for all tags through lt_cv_aix_libpath. |
493 | m4_defun([_LT_SYS_MODULE_PATH_AIX], |
494 | [m4_require([_LT_DECL_SED])dnl |
495 | -AC_LINK_IFELSE(AC_LANG_PROGRAM,[ |
496 | -lt_aix_libpath_sed=' |
497 | - /Import File Strings/,/^$/ { |
498 | - /^0/ { |
499 | - s/^0 *\(.*\)$/\1/ |
500 | - p |
501 | - } |
502 | - }' |
503 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
504 | -# Check for a 64-bit object if we didn't find anything. |
505 | -if test -z "$aix_libpath"; then |
506 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
507 | -fi],[]) |
508 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
509 | +if test "${lt_cv_aix_libpath+set}" = set; then |
510 | + aix_libpath=$lt_cv_aix_libpath |
511 | +else |
512 | + AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], |
513 | + [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ |
514 | + lt_aix_libpath_sed='[ |
515 | + /Import File Strings/,/^$/ { |
516 | + /^0/ { |
517 | + s/^0 *\([^ ]*\) *$/\1/ |
518 | + p |
519 | + } |
520 | + }]' |
521 | + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
522 | + # Check for a 64-bit object if we didn't find anything. |
523 | + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then |
524 | + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
525 | + fi],[]) |
526 | + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then |
527 | + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" |
528 | + fi |
529 | + ]) |
530 | + aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) |
531 | +fi |
532 | ])# _LT_SYS_MODULE_PATH_AIX |
533 | |
534 | |
535 | # _LT_SHELL_INIT(ARG) |
536 | # ------------------- |
537 | m4_define([_LT_SHELL_INIT], |
538 | -[ifdef([AC_DIVERSION_NOTICE], |
539 | - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], |
540 | - [AC_DIVERT_PUSH(NOTICE)]) |
541 | -$1 |
542 | -AC_DIVERT_POP |
543 | -])# _LT_SHELL_INIT |
544 | +[m4_divert_text([M4SH-INIT], [$1 |
545 | +])])# _LT_SHELL_INIT |
546 | + |
547 | |
548 | |
549 | # _LT_PROG_ECHO_BACKSLASH |
550 | # ----------------------- |
551 | -# Add some code to the start of the generated configure script which |
552 | -# will find an echo command which doesn't interpret backslashes. |
553 | +# Find how we can fake an echo command that does not interpret backslash. |
554 | +# In particular, with Autoconf 2.60 or later we add some code to the start |
555 | +# of the generated configure script which will find a shell with a builtin |
556 | +# printf (which we can use as an echo command). |
557 | m4_defun([_LT_PROG_ECHO_BACKSLASH], |
558 | -[_LT_SHELL_INIT([ |
559 | -# Check that we are running under the correct shell. |
560 | -SHELL=${CONFIG_SHELL-/bin/sh} |
561 | - |
562 | -case X$lt_ECHO in |
563 | -X*--fallback-echo) |
564 | - # Remove one level of quotation (which was required for Make). |
565 | - ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` |
566 | - ;; |
567 | +[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' |
568 | +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO |
569 | +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
570 | + |
571 | +AC_MSG_CHECKING([how to print strings]) |
572 | +# Test print first, because it will be a builtin if present. |
573 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
574 | + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
575 | + ECHO='print -r --' |
576 | +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
577 | + ECHO='printf %s\n' |
578 | +else |
579 | + # Use this function as a fallback that always works. |
580 | + func_fallback_echo () |
581 | + { |
582 | + eval 'cat <<_LTECHO_EOF |
583 | +$[]1 |
584 | +_LTECHO_EOF' |
585 | + } |
586 | + ECHO='func_fallback_echo' |
587 | +fi |
588 | + |
589 | +# func_echo_all arg... |
590 | +# Invoke $ECHO with all args, space-separated. |
591 | +func_echo_all () |
592 | +{ |
593 | + $ECHO "$*" |
594 | +} |
595 | + |
596 | +case "$ECHO" in |
597 | + printf*) AC_MSG_RESULT([printf]) ;; |
598 | + print*) AC_MSG_RESULT([print -r]) ;; |
599 | + *) AC_MSG_RESULT([cat]) ;; |
600 | esac |
601 | |
602 | -ECHO=${lt_ECHO-echo} |
603 | -if test "X[$]1" = X--no-reexec; then |
604 | - # Discard the --no-reexec flag, and continue. |
605 | - shift |
606 | -elif test "X[$]1" = X--fallback-echo; then |
607 | - # Avoid inline document here, it may be left over |
608 | - : |
609 | -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then |
610 | - # Yippee, $ECHO works! |
611 | - : |
612 | -else |
613 | - # Restart under the correct shell. |
614 | - exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} |
615 | -fi |
616 | - |
617 | -if test "X[$]1" = X--fallback-echo; then |
618 | - # used as fallback echo |
619 | - shift |
620 | - cat <<_LT_EOF |
621 | -[$]* |
622 | -_LT_EOF |
623 | - exit 0 |
624 | -fi |
625 | - |
626 | -# The HP-UX ksh and POSIX shell print the target directory to stdout |
627 | -# if CDPATH is set. |
628 | -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
629 | - |
630 | -if test -z "$lt_ECHO"; then |
631 | - if test "X${echo_test_string+set}" != Xset; then |
632 | - # find a string as large as possible, as long as the shell can cope with it |
633 | - for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do |
634 | - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... |
635 | - if { echo_test_string=`eval $cmd`; } 2>/dev/null && |
636 | - { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null |
637 | - then |
638 | - break |
639 | - fi |
640 | - done |
641 | - fi |
642 | - |
643 | - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && |
644 | - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && |
645 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
646 | - : |
647 | - else |
648 | - # The Solaris, AIX, and Digital Unix default echo programs unquote |
649 | - # backslashes. This makes it impossible to quote backslashes using |
650 | - # echo "$something" | sed 's/\\/\\\\/g' |
651 | - # |
652 | - # So, first we look for a working echo in the user's PATH. |
653 | - |
654 | - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR |
655 | - for dir in $PATH /usr/ucb; do |
656 | - IFS="$lt_save_ifs" |
657 | - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && |
658 | - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && |
659 | - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && |
660 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
661 | - ECHO="$dir/echo" |
662 | - break |
663 | - fi |
664 | - done |
665 | - IFS="$lt_save_ifs" |
666 | - |
667 | - if test "X$ECHO" = Xecho; then |
668 | - # We didn't find a better echo, so look for alternatives. |
669 | - if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && |
670 | - echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && |
671 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
672 | - # This shell has a builtin print -r that does the trick. |
673 | - ECHO='print -r' |
674 | - elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && |
675 | - test "X$CONFIG_SHELL" != X/bin/ksh; then |
676 | - # If we have ksh, try running configure again with it. |
677 | - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} |
678 | - export ORIGINAL_CONFIG_SHELL |
679 | - CONFIG_SHELL=/bin/ksh |
680 | - export CONFIG_SHELL |
681 | - exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} |
682 | - else |
683 | - # Try using printf. |
684 | - ECHO='printf %s\n' |
685 | - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && |
686 | - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && |
687 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
688 | - # Cool, printf works |
689 | - : |
690 | - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && |
691 | - test "X$echo_testing_string" = 'X\t' && |
692 | - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && |
693 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
694 | - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL |
695 | - export CONFIG_SHELL |
696 | - SHELL="$CONFIG_SHELL" |
697 | - export SHELL |
698 | - ECHO="$CONFIG_SHELL [$]0 --fallback-echo" |
699 | - elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && |
700 | - test "X$echo_testing_string" = 'X\t' && |
701 | - echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && |
702 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
703 | - ECHO="$CONFIG_SHELL [$]0 --fallback-echo" |
704 | - else |
705 | - # maybe with a smaller string... |
706 | - prev=: |
707 | - |
708 | - for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do |
709 | - if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null |
710 | - then |
711 | - break |
712 | - fi |
713 | - prev="$cmd" |
714 | - done |
715 | - |
716 | - if test "$prev" != 'sed 50q "[$]0"'; then |
717 | - echo_test_string=`eval $prev` |
718 | - export echo_test_string |
719 | - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} |
720 | - else |
721 | - # Oops. We lost completely, so just stick with echo. |
722 | - ECHO=echo |
723 | - fi |
724 | - fi |
725 | - fi |
726 | - fi |
727 | - fi |
728 | -fi |
729 | - |
730 | -# Copy echo and quote the copy suitably for passing to libtool from |
731 | -# the Makefile, instead of quoting the original, which is used later. |
732 | -lt_ECHO=$ECHO |
733 | -if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then |
734 | - lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" |
735 | -fi |
736 | - |
737 | -AC_SUBST(lt_ECHO) |
738 | -]) |
739 | +m4_ifdef([_AS_DETECT_SUGGESTED], |
740 | +[_AS_DETECT_SUGGESTED([ |
741 | + test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( |
742 | + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' |
743 | + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO |
744 | + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
745 | + PATH=/empty FPATH=/empty; export PATH FPATH |
746 | + test "X`printf %s $ECHO`" = "X$ECHO" \ |
747 | + || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) |
748 | + |
749 | _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) |
750 | -_LT_DECL([], [ECHO], [1], |
751 | - [An echo program that does not interpret backslashes]) |
752 | +_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) |
753 | ])# _LT_PROG_ECHO_BACKSLASH |
754 | |
755 | |
756 | +# _LT_WITH_SYSROOT |
757 | +# ---------------- |
758 | +AC_DEFUN([_LT_WITH_SYSROOT], |
759 | +[AC_MSG_CHECKING([for sysroot]) |
760 | +AC_ARG_WITH([sysroot], |
761 | +[ --with-sysroot[=DIR] Search for dependent libraries within DIR |
762 | + (or the compiler's sysroot if not specified).], |
763 | +[], [with_sysroot=no]) |
764 | + |
765 | +dnl lt_sysroot will always be passed unquoted. We quote it here |
766 | +dnl in case the user passed a directory name. |
767 | +lt_sysroot= |
768 | +case ${with_sysroot} in #( |
769 | + yes) |
770 | + if test "$GCC" = yes; then |
771 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
772 | + fi |
773 | + ;; #( |
774 | + /*) |
775 | + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` |
776 | + ;; #( |
777 | + no|'') |
778 | + ;; #( |
779 | + *) |
780 | + AC_MSG_RESULT([${with_sysroot}]) |
781 | + AC_MSG_ERROR([The sysroot must be an absolute path.]) |
782 | + ;; |
783 | +esac |
784 | + |
785 | + AC_MSG_RESULT([${lt_sysroot:-no}]) |
786 | +_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl |
787 | +[dependent libraries, and in which our libraries should be installed.])]) |
788 | + |
789 | # _LT_ENABLE_LOCK |
790 | # --------------- |
791 | m4_defun([_LT_ENABLE_LOCK], |
792 | @@ -1251,7 +1252,7 @@ |
793 | ;; |
794 | *-*-irix6*) |
795 | # Find out which ABI we are using. |
796 | - echo '[#]line __oline__ "configure"' > conftest.$ac_ext |
797 | + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext |
798 | if AC_TRY_EVAL(ac_compile); then |
799 | if test "$lt_cv_prog_gnu_ld" = yes; then |
800 | case `/usr/bin/file conftest.$ac_objext` in |
801 | @@ -1369,14 +1370,47 @@ |
802 | ])# _LT_ENABLE_LOCK |
803 | |
804 | |
805 | +# _LT_PROG_AR |
806 | +# ----------- |
807 | +m4_defun([_LT_PROG_AR], |
808 | +[AC_CHECK_TOOLS(AR, [ar], false) |
809 | +: ${AR=ar} |
810 | +: ${AR_FLAGS=cru} |
811 | +_LT_DECL([], [AR], [1], [The archiver]) |
812 | +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) |
813 | + |
814 | +AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], |
815 | + [lt_cv_ar_at_file=no |
816 | + AC_COMPILE_IFELSE([AC_LANG_PROGRAM], |
817 | + [echo conftest.$ac_objext > conftest.lst |
818 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' |
819 | + AC_TRY_EVAL([lt_ar_try]) |
820 | + if test "$ac_status" -eq 0; then |
821 | + # Ensure the archiver fails upon bogus file names. |
822 | + rm -f conftest.$ac_objext libconftest.a |
823 | + AC_TRY_EVAL([lt_ar_try]) |
824 | + if test "$ac_status" -ne 0; then |
825 | + lt_cv_ar_at_file=@ |
826 | + fi |
827 | + fi |
828 | + rm -f conftest.* libconftest.a |
829 | + ]) |
830 | + ]) |
831 | + |
832 | +if test "x$lt_cv_ar_at_file" = xno; then |
833 | + archiver_list_spec= |
834 | +else |
835 | + archiver_list_spec=$lt_cv_ar_at_file |
836 | +fi |
837 | +_LT_DECL([], [archiver_list_spec], [1], |
838 | + [How to feed a file listing to the archiver]) |
839 | +])# _LT_PROG_AR |
840 | + |
841 | + |
842 | # _LT_CMD_OLD_ARCHIVE |
843 | # ------------------- |
844 | m4_defun([_LT_CMD_OLD_ARCHIVE], |
845 | -[AC_CHECK_TOOL(AR, ar, false) |
846 | -test -z "$AR" && AR=ar |
847 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
848 | -_LT_DECL([], [AR], [1], [The archiver]) |
849 | -_LT_DECL([], [AR_FLAGS], [1]) |
850 | +[_LT_PROG_AR |
851 | |
852 | AC_CHECK_TOOL(STRIP, strip, :) |
853 | test -z "$STRIP" && STRIP=: |
854 | @@ -1403,10 +1437,19 @@ |
855 | esac |
856 | old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" |
857 | fi |
858 | + |
859 | +case $host_os in |
860 | + darwin*) |
861 | + lock_old_archive_extraction=yes ;; |
862 | + *) |
863 | + lock_old_archive_extraction=no ;; |
864 | +esac |
865 | _LT_DECL([], [old_postinstall_cmds], [2]) |
866 | _LT_DECL([], [old_postuninstall_cmds], [2]) |
867 | _LT_TAGDECL([], [old_archive_cmds], [2], |
868 | [Commands used to build an old-style archive]) |
869 | +_LT_DECL([], [lock_old_archive_extraction], [0], |
870 | + [Whether to use a lock for old archive extraction]) |
871 | ])# _LT_CMD_OLD_ARCHIVE |
872 | |
873 | |
874 | @@ -1431,15 +1474,15 @@ |
875 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
876 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ |
877 | -e 's:$: $lt_compiler_flag:'` |
878 | - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
879 | + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
880 | (eval "$lt_compile" 2>conftest.err) |
881 | ac_status=$? |
882 | cat conftest.err >&AS_MESSAGE_LOG_FD |
883 | - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
884 | + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
885 | if (exit $ac_status) && test -s "$ac_outfile"; then |
886 | # The compiler can only warn and ignore the option if not recognized |
887 | # So say no if there are warnings other than the usual output. |
888 | - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp |
889 | + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp |
890 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
891 | if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then |
892 | $2=yes |
893 | @@ -1479,7 +1522,7 @@ |
894 | if test -s conftest.err; then |
895 | # Append any errors to the config.log. |
896 | cat conftest.err 1>&AS_MESSAGE_LOG_FD |
897 | - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp |
898 | + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp |
899 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
900 | if diff conftest.exp conftest.er2 >/dev/null; then |
901 | $2=yes |
902 | @@ -1542,6 +1585,11 @@ |
903 | lt_cv_sys_max_cmd_len=8192; |
904 | ;; |
905 | |
906 | + mint*) |
907 | + # On MiNT this can take a long time and run out of memory. |
908 | + lt_cv_sys_max_cmd_len=8192; |
909 | + ;; |
910 | + |
911 | amigaos*) |
912 | # On AmigaOS with pdksh, this test takes hours, literally. |
913 | # So we just punt and use a minimum line length of 8192. |
914 | @@ -1606,8 +1654,8 @@ |
915 | # If test is not a shell built-in, we'll probably end up computing a |
916 | # maximum length that is only half of the actual maximum length, but |
917 | # we can't tell. |
918 | - while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ |
919 | - = "XX$teststring$teststring"; } >/dev/null 2>&1 && |
920 | + while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ |
921 | + = "X$teststring$teststring"; } >/dev/null 2>&1 && |
922 | test $i != 17 # 1/2 MB should be enough |
923 | do |
924 | i=`expr $i + 1` |
925 | @@ -1658,7 +1706,7 @@ |
926 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
927 | lt_status=$lt_dlunknown |
928 | cat > conftest.$ac_ext <<_LT_EOF |
929 | -[#line __oline__ "configure" |
930 | +[#line $LINENO "configure" |
931 | #include "confdefs.h" |
932 | |
933 | #if HAVE_DLFCN_H |
934 | @@ -1699,7 +1747,13 @@ |
935 | # endif |
936 | #endif |
937 | |
938 | -void fnord() { int i=42;} |
939 | +/* When -fvisbility=hidden is used, assume the code has been annotated |
940 | + correspondingly for the symbols needed. */ |
941 | +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
942 | +int fnord () __attribute__((visibility("default"))); |
943 | +#endif |
944 | + |
945 | +int fnord () { return 42; } |
946 | int main () |
947 | { |
948 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
949 | @@ -1708,7 +1762,11 @@ |
950 | if (self) |
951 | { |
952 | if (dlsym (self,"fnord")) status = $lt_dlno_uscore; |
953 | - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; |
954 | + else |
955 | + { |
956 | + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; |
957 | + else puts (dlerror ()); |
958 | + } |
959 | /* dlclose (self); */ |
960 | } |
961 | else |
962 | @@ -1884,16 +1942,16 @@ |
963 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
964 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ |
965 | -e 's:$: $lt_compiler_flag:'` |
966 | - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
967 | + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
968 | (eval "$lt_compile" 2>out/conftest.err) |
969 | ac_status=$? |
970 | cat out/conftest.err >&AS_MESSAGE_LOG_FD |
971 | - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
972 | + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
973 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
974 | then |
975 | # The compiler can only warn and ignore the option if not recognized |
976 | # So say no if there are warnings |
977 | - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp |
978 | + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp |
979 | $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 |
980 | if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then |
981 | _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes |
982 | @@ -2052,6 +2110,7 @@ |
983 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
984 | m4_require([_LT_DECL_OBJDUMP])dnl |
985 | m4_require([_LT_DECL_SED])dnl |
986 | +m4_require([_LT_CHECK_SHELL_FEATURES])dnl |
987 | AC_MSG_CHECKING([dynamic linker characteristics]) |
988 | m4_if([$1], |
989 | [], [ |
990 | @@ -2060,16 +2119,23 @@ |
991 | darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; |
992 | *) lt_awk_arg="/^libraries:/" ;; |
993 | esac |
994 | - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` |
995 | - if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then |
996 | + case $host_os in |
997 | + mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; |
998 | + *) lt_sed_strip_eq="s,=/,/,g" ;; |
999 | + esac |
1000 | + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` |
1001 | + case $lt_search_path_spec in |
1002 | + *\;*) |
1003 | # if the path contains ";" then we assume it to be the separator |
1004 | # otherwise default to the standard path separator (i.e. ":") - it is |
1005 | # assumed that no part of a normal pathname contains ";" but that should |
1006 | # okay in the real world where ";" in dirpaths is itself problematic. |
1007 | - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` |
1008 | - else |
1009 | - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
1010 | - fi |
1011 | + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` |
1012 | + ;; |
1013 | + *) |
1014 | + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` |
1015 | + ;; |
1016 | + esac |
1017 | # Ok, now we have the path, separated by spaces, we can step through it |
1018 | # and add multilib dir if necessary. |
1019 | lt_tmp_lt_search_path_spec= |
1020 | @@ -2082,7 +2148,7 @@ |
1021 | lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" |
1022 | fi |
1023 | done |
1024 | - lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' |
1025 | + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' |
1026 | BEGIN {RS=" "; FS="/|\n";} { |
1027 | lt_foo=""; |
1028 | lt_count=0; |
1029 | @@ -2102,7 +2168,13 @@ |
1030 | if (lt_foo != "") { lt_freq[[lt_foo]]++; } |
1031 | if (lt_freq[[lt_foo]] == 1) { print lt_foo; } |
1032 | }'` |
1033 | - sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` |
1034 | + # AWK program above erroneously prepends '/' to C:/dos/paths |
1035 | + # for these hosts. |
1036 | + case $host_os in |
1037 | + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ |
1038 | + $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; |
1039 | + esac |
1040 | + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` |
1041 | else |
1042 | sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" |
1043 | fi]) |
1044 | @@ -2190,7 +2262,7 @@ |
1045 | m68k) |
1046 | library_names_spec='$libname.ixlibrary $libname.a' |
1047 | # Create ${libname}_ixlibrary.a entries in /sys/libs. |
1048 | - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' |
1049 | + 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' |
1050 | ;; |
1051 | esac |
1052 | ;; |
1053 | @@ -2221,8 +2293,9 @@ |
1054 | need_version=no |
1055 | need_lib_prefix=no |
1056 | |
1057 | - case $GCC,$host_os in |
1058 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
1059 | + case $GCC,$cc_basename in |
1060 | + yes,*) |
1061 | + # gcc |
1062 | library_names_spec='$libname.dll.a' |
1063 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
1064 | postinstall_cmds='base_file=`basename \${file}`~ |
1065 | @@ -2243,36 +2316,83 @@ |
1066 | cygwin*) |
1067 | # Cygwin DLLs use 'cyg' prefix rather than 'lib' |
1068 | soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
1069 | - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" |
1070 | +m4_if([$1], [],[ |
1071 | + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) |
1072 | ;; |
1073 | mingw* | cegcc*) |
1074 | # MinGW DLLs use traditional 'lib' prefix |
1075 | soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
1076 | - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` |
1077 | - if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then |
1078 | - # It is most probably a Windows format PATH printed by |
1079 | - # mingw gcc, but we are running on Cygwin. Gcc prints its search |
1080 | - # path with ; separators, and with drive letters. We can handle the |
1081 | - # drive letters (cygwin fileutils understands them), so leave them, |
1082 | - # especially as we might pass files found there to a mingw objdump, |
1083 | - # which wouldn't understand a cygwinified path. Ahh. |
1084 | - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
1085 | - else |
1086 | - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
1087 | - fi |
1088 | ;; |
1089 | pw32*) |
1090 | # pw32 DLLs use 'pw' prefix rather than 'lib' |
1091 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
1092 | ;; |
1093 | esac |
1094 | + dynamic_linker='Win32 ld.exe' |
1095 | + ;; |
1096 | + |
1097 | + *,cl*) |
1098 | + # Native MSVC |
1099 | + libname_spec='$name' |
1100 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
1101 | + library_names_spec='${libname}.dll.lib' |
1102 | + |
1103 | + case $build_os in |
1104 | + mingw*) |
1105 | + sys_lib_search_path_spec= |
1106 | + lt_save_ifs=$IFS |
1107 | + IFS=';' |
1108 | + for lt_path in $LIB |
1109 | + do |
1110 | + IFS=$lt_save_ifs |
1111 | + # Let DOS variable expansion print the short 8.3 style file name. |
1112 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
1113 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
1114 | + done |
1115 | + IFS=$lt_save_ifs |
1116 | + # Convert to MSYS style. |
1117 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` |
1118 | + ;; |
1119 | + cygwin*) |
1120 | + # Convert to unix form, then to dos form, then back to unix form |
1121 | + # but this time dos style (no spaces!) so that the unix form looks |
1122 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
1123 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
1124 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
1125 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
1126 | + ;; |
1127 | + *) |
1128 | + sys_lib_search_path_spec="$LIB" |
1129 | + if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then |
1130 | + # It is most probably a Windows format PATH. |
1131 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
1132 | + else |
1133 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
1134 | + fi |
1135 | + # FIXME: find the short name or the path components, as spaces are |
1136 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
1137 | + ;; |
1138 | + esac |
1139 | + |
1140 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
1141 | + postinstall_cmds='base_file=`basename \${file}`~ |
1142 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
1143 | + dldir=$destdir/`dirname \$dlpath`~ |
1144 | + test -d \$dldir || mkdir -p \$dldir~ |
1145 | + $install_prog $dir/$dlname \$dldir/$dlname' |
1146 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
1147 | + dlpath=$dir/\$dldll~ |
1148 | + $RM \$dlpath' |
1149 | + shlibpath_overrides_runpath=yes |
1150 | + dynamic_linker='Win32 link.exe' |
1151 | ;; |
1152 | |
1153 | *) |
1154 | + # Assume MSVC wrapper |
1155 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' |
1156 | + dynamic_linker='Win32 ld.exe' |
1157 | ;; |
1158 | esac |
1159 | - dynamic_linker='Win32 ld.exe' |
1160 | # FIXME: first we should search . and the directory the executable is in |
1161 | shlibpath_var=PATH |
1162 | ;; |
1163 | @@ -2356,6 +2476,20 @@ |
1164 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
1165 | soname_spec='${libname}${release}${shared_ext}$major' |
1166 | shlibpath_var=LD_LIBRARY_PATH |
1167 | + shlibpath_overrides_runpath=no |
1168 | + hardcode_into_libs=yes |
1169 | + ;; |
1170 | + |
1171 | +haiku*) |
1172 | + version_type=linux |
1173 | + need_lib_prefix=no |
1174 | + need_version=no |
1175 | + dynamic_linker="$host_os runtime_loader" |
1176 | + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
1177 | + soname_spec='${libname}${release}${shared_ext}$major' |
1178 | + shlibpath_var=LIBRARY_PATH |
1179 | + shlibpath_overrides_runpath=yes |
1180 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' |
1181 | hardcode_into_libs=yes |
1182 | ;; |
1183 | |
1184 | @@ -2401,8 +2535,10 @@ |
1185 | soname_spec='${libname}${release}${shared_ext}$major' |
1186 | ;; |
1187 | esac |
1188 | - # HP-UX runs *really* slowly unless shared libraries are mode 555. |
1189 | + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... |
1190 | postinstall_cmds='chmod 555 $lib' |
1191 | + # or fails outright, so override atomically: |
1192 | + install_override_mode=555 |
1193 | ;; |
1194 | |
1195 | interix[[3-9]]*) |
1196 | @@ -2469,16 +2605,21 @@ |
1197 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' |
1198 | shlibpath_var=LD_LIBRARY_PATH |
1199 | shlibpath_overrides_runpath=no |
1200 | + |
1201 | # Some binutils ld are patched to set DT_RUNPATH |
1202 | - save_LDFLAGS=$LDFLAGS |
1203 | - save_libdir=$libdir |
1204 | - eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ |
1205 | - LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" |
1206 | - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], |
1207 | - [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], |
1208 | - [shlibpath_overrides_runpath=yes])]) |
1209 | - LDFLAGS=$save_LDFLAGS |
1210 | - libdir=$save_libdir |
1211 | + AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], |
1212 | + [lt_cv_shlibpath_overrides_runpath=no |
1213 | + save_LDFLAGS=$LDFLAGS |
1214 | + save_libdir=$libdir |
1215 | + eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ |
1216 | + LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" |
1217 | + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], |
1218 | + [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], |
1219 | + [lt_cv_shlibpath_overrides_runpath=yes])]) |
1220 | + LDFLAGS=$save_LDFLAGS |
1221 | + libdir=$save_libdir |
1222 | + ]) |
1223 | + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath |
1224 | |
1225 | # This implies no fast_install, which is unacceptable. |
1226 | # Some rework will be needed to allow for fast_install |
1227 | @@ -2487,7 +2628,7 @@ |
1228 | |
1229 | # Append ld.so.conf contents to the search path |
1230 | if test -f /etc/ld.so.conf; then |
1231 | - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` |
1232 | + 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' ' '` |
1233 | sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" |
1234 | fi |
1235 | |
1236 | @@ -2732,6 +2873,8 @@ |
1237 | The last name is the one that the linker finds with -lNAME]]) |
1238 | _LT_DECL([], [soname_spec], [1], |
1239 | [[The coded name of the library, if different from the real name]]) |
1240 | +_LT_DECL([], [install_override_mode], [1], |
1241 | + [Permission mode override for installation of shared libraries]) |
1242 | _LT_DECL([], [postinstall_cmds], [2], |
1243 | [Command to use after installation of a shared archive]) |
1244 | _LT_DECL([], [postuninstall_cmds], [2], |
1245 | @@ -2844,6 +2987,7 @@ |
1246 | AC_REQUIRE([AC_CANONICAL_BUILD])dnl |
1247 | m4_require([_LT_DECL_SED])dnl |
1248 | m4_require([_LT_DECL_EGREP])dnl |
1249 | +m4_require([_LT_PROG_ECHO_BACKSLASH])dnl |
1250 | |
1251 | AC_ARG_WITH([gnu-ld], |
1252 | [AS_HELP_STRING([--with-gnu-ld], |
1253 | @@ -2965,6 +3109,11 @@ |
1254 | esac |
1255 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
1256 | case $host_os in |
1257 | + cygwin* | mingw* | pw32* | cegcc*) |
1258 | + if test "$GCC" != yes; then |
1259 | + reload_cmds=false |
1260 | + fi |
1261 | + ;; |
1262 | darwin*) |
1263 | if test "$GCC" = yes; then |
1264 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
1265 | @@ -2973,8 +3122,8 @@ |
1266 | fi |
1267 | ;; |
1268 | esac |
1269 | -_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl |
1270 | -_LT_DECL([], [reload_cmds], [2])dnl |
1271 | +_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl |
1272 | +_LT_TAGDECL([], [reload_cmds], [2])dnl |
1273 | ])# _LT_CMD_RELOAD |
1274 | |
1275 | |
1276 | @@ -3026,16 +3175,18 @@ |
1277 | # Base MSYS/MinGW do not provide the 'file' command needed by |
1278 | # func_win32_libid shell function, so use a weaker test based on 'objdump', |
1279 | # unless we find 'file', for example because we are cross-compiling. |
1280 | - if ( file / ) >/dev/null 2>&1; then |
1281 | + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. |
1282 | + if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then |
1283 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
1284 | lt_cv_file_magic_cmd='func_win32_libid' |
1285 | else |
1286 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
1287 | + # Keep this pattern in sync with the one in func_win32_libid. |
1288 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
1289 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
1290 | fi |
1291 | ;; |
1292 | |
1293 | -cegcc) |
1294 | +cegcc*) |
1295 | # use the weaker test based on 'objdump'. See mingw*. |
1296 | lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' |
1297 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
1298 | @@ -3065,6 +3216,10 @@ |
1299 | lt_cv_deplibs_check_method=pass_all |
1300 | ;; |
1301 | |
1302 | +haiku*) |
1303 | + lt_cv_deplibs_check_method=pass_all |
1304 | + ;; |
1305 | + |
1306 | hpux10.20* | hpux11*) |
1307 | lt_cv_file_magic_cmd=/usr/bin/file |
1308 | case $host_cpu in |
1309 | @@ -3073,11 +3228,11 @@ |
1310 | lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so |
1311 | ;; |
1312 | hppa*64*) |
1313 | - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] |
1314 | + [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] |
1315 | lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl |
1316 | ;; |
1317 | *) |
1318 | - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' |
1319 | + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' |
1320 | lt_cv_file_magic_test_file=/usr/lib/libc.sl |
1321 | ;; |
1322 | esac |
1323 | @@ -3177,6 +3332,21 @@ |
1324 | ;; |
1325 | esac |
1326 | ]) |
1327 | + |
1328 | +file_magic_glob= |
1329 | +want_nocaseglob=no |
1330 | +if test "$build" = "$host"; then |
1331 | + case $host_os in |
1332 | + mingw* | pw32*) |
1333 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
1334 | + want_nocaseglob=yes |
1335 | + else |
1336 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` |
1337 | + fi |
1338 | + ;; |
1339 | + esac |
1340 | +fi |
1341 | + |
1342 | file_magic_cmd=$lt_cv_file_magic_cmd |
1343 | deplibs_check_method=$lt_cv_deplibs_check_method |
1344 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
1345 | @@ -3184,7 +3354,11 @@ |
1346 | _LT_DECL([], [deplibs_check_method], [1], |
1347 | [Method to check whether dependent libraries are shared objects]) |
1348 | _LT_DECL([], [file_magic_cmd], [1], |
1349 | - [Command to use when deplibs_check_method == "file_magic"]) |
1350 | + [Command to use when deplibs_check_method = "file_magic"]) |
1351 | +_LT_DECL([], [file_magic_glob], [1], |
1352 | + [How to find potential files when deplibs_check_method = "file_magic"]) |
1353 | +_LT_DECL([], [want_nocaseglob], [1], |
1354 | + [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) |
1355 | ])# _LT_CHECK_MAGIC_METHOD |
1356 | |
1357 | |
1358 | @@ -3241,7 +3415,19 @@ |
1359 | NM="$lt_cv_path_NM" |
1360 | else |
1361 | # Didn't find any BSD compatible name lister, look for dumpbin. |
1362 | - AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) |
1363 | + if test -n "$DUMPBIN"; then : |
1364 | + # Let the user override the test. |
1365 | + else |
1366 | + AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) |
1367 | + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in |
1368 | + *COFF*) |
1369 | + DUMPBIN="$DUMPBIN -symbols" |
1370 | + ;; |
1371 | + *) |
1372 | + DUMPBIN=: |
1373 | + ;; |
1374 | + esac |
1375 | + fi |
1376 | AC_SUBST([DUMPBIN]) |
1377 | if test "$DUMPBIN" != ":"; then |
1378 | NM="$DUMPBIN" |
1379 | @@ -3254,13 +3440,13 @@ |
1380 | AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], |
1381 | [lt_cv_nm_interface="BSD nm" |
1382 | echo "int some_variable = 0;" > conftest.$ac_ext |
1383 | - (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) |
1384 | + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) |
1385 | (eval "$ac_compile" 2>conftest.err) |
1386 | cat conftest.err >&AS_MESSAGE_LOG_FD |
1387 | - (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) |
1388 | + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) |
1389 | (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) |
1390 | cat conftest.err >&AS_MESSAGE_LOG_FD |
1391 | - (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) |
1392 | + (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) |
1393 | cat conftest.out >&AS_MESSAGE_LOG_FD |
1394 | if $GREP 'External.*some_variable' conftest.out > /dev/null; then |
1395 | lt_cv_nm_interface="MS dumpbin" |
1396 | @@ -3275,6 +3461,67 @@ |
1397 | dnl AC_DEFUN([AM_PROG_NM], []) |
1398 | dnl AC_DEFUN([AC_PROG_NM], []) |
1399 | |
1400 | +# _LT_CHECK_SHAREDLIB_FROM_LINKLIB |
1401 | +# -------------------------------- |
1402 | +# how to determine the name of the shared library |
1403 | +# associated with a specific link library. |
1404 | +# -- PORTME fill in with the dynamic library characteristics |
1405 | +m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], |
1406 | +[m4_require([_LT_DECL_EGREP]) |
1407 | +m4_require([_LT_DECL_OBJDUMP]) |
1408 | +m4_require([_LT_DECL_DLLTOOL]) |
1409 | +AC_CACHE_CHECK([how to associate runtime and link libraries], |
1410 | +lt_cv_sharedlib_from_linklib_cmd, |
1411 | +[lt_cv_sharedlib_from_linklib_cmd='unknown' |
1412 | + |
1413 | +case $host_os in |
1414 | +cygwin* | mingw* | pw32* | cegcc*) |
1415 | + # two different shell functions defined in ltmain.sh |
1416 | + # decide which to use based on capabilities of $DLLTOOL |
1417 | + case `$DLLTOOL --help 2>&1` in |
1418 | + *--identify-strict*) |
1419 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
1420 | + ;; |
1421 | + *) |
1422 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
1423 | + ;; |
1424 | + esac |
1425 | + ;; |
1426 | +*) |
1427 | + # fallback: assume linklib IS sharedlib |
1428 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
1429 | + ;; |
1430 | +esac |
1431 | +]) |
1432 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
1433 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
1434 | + |
1435 | +_LT_DECL([], [sharedlib_from_linklib_cmd], [1], |
1436 | + [Command to associate shared and link libraries]) |
1437 | +])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB |
1438 | + |
1439 | + |
1440 | +# _LT_PATH_MANIFEST_TOOL |
1441 | +# ---------------------- |
1442 | +# locate the manifest tool |
1443 | +m4_defun([_LT_PATH_MANIFEST_TOOL], |
1444 | +[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) |
1445 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
1446 | +AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], |
1447 | + [lt_cv_path_mainfest_tool=no |
1448 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD |
1449 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
1450 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
1451 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
1452 | + lt_cv_path_mainfest_tool=yes |
1453 | + fi |
1454 | + rm -f conftest*]) |
1455 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
1456 | + MANIFEST_TOOL=: |
1457 | +fi |
1458 | +_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl |
1459 | +])# _LT_PATH_MANIFEST_TOOL |
1460 | + |
1461 | |
1462 | # LT_LIB_M |
1463 | # -------- |
1464 | @@ -3283,7 +3530,7 @@ |
1465 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl |
1466 | LIBM= |
1467 | case $host in |
1468 | -*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) |
1469 | +*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) |
1470 | # These system don't have libm, or don't need it |
1471 | ;; |
1472 | *-ncr-sysv4.3*) |
1473 | @@ -3311,7 +3558,12 @@ |
1474 | _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= |
1475 | |
1476 | if test "$GCC" = yes; then |
1477 | - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' |
1478 | + case $cc_basename in |
1479 | + nvcc*) |
1480 | + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; |
1481 | + *) |
1482 | + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; |
1483 | + esac |
1484 | |
1485 | _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], |
1486 | lt_cv_prog_compiler_rtti_exceptions, |
1487 | @@ -3328,6 +3580,7 @@ |
1488 | m4_defun([_LT_CMD_GLOBAL_SYMBOLS], |
1489 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl |
1490 | AC_REQUIRE([AC_PROG_CC])dnl |
1491 | +AC_REQUIRE([AC_PROG_AWK])dnl |
1492 | AC_REQUIRE([LT_PATH_NM])dnl |
1493 | AC_REQUIRE([LT_PATH_LD])dnl |
1494 | m4_require([_LT_DECL_SED])dnl |
1495 | @@ -3395,8 +3648,8 @@ |
1496 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
1497 | |
1498 | # Transform an extracted symbol line into symbol name and symbol address |
1499 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" |
1500 | -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'" |
1501 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" |
1502 | +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'" |
1503 | |
1504 | # Handle CRLF in mingw tool chain |
1505 | opt_cr= |
1506 | @@ -3432,6 +3685,7 @@ |
1507 | else |
1508 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
1509 | fi |
1510 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
1511 | |
1512 | # Check to see that the pipe works correctly. |
1513 | pipe_works=no |
1514 | @@ -3453,7 +3707,7 @@ |
1515 | if AC_TRY_EVAL(ac_compile); then |
1516 | # Now try to grab the symbols. |
1517 | nlist=conftest.nm |
1518 | - if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then |
1519 | + if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then |
1520 | # Try sorting and uniquifying the output. |
1521 | if sort "$nlist" | uniq > "$nlist"T; then |
1522 | mv -f "$nlist"T "$nlist" |
1523 | @@ -3465,6 +3719,18 @@ |
1524 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
1525 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
1526 | cat <<_LT_EOF > conftest.$ac_ext |
1527 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
1528 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
1529 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
1530 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
1531 | +# define LT@&t@_DLSYM_CONST |
1532 | +#elif defined(__osf__) |
1533 | +/* This system does not cope well with relocations in const data. */ |
1534 | +# define LT@&t@_DLSYM_CONST |
1535 | +#else |
1536 | +# define LT@&t@_DLSYM_CONST const |
1537 | +#endif |
1538 | + |
1539 | #ifdef __cplusplus |
1540 | extern "C" { |
1541 | #endif |
1542 | @@ -3476,7 +3742,7 @@ |
1543 | cat <<_LT_EOF >> conftest.$ac_ext |
1544 | |
1545 | /* The mapping between symbol names and symbols. */ |
1546 | -const struct { |
1547 | +LT@&t@_DLSYM_CONST struct { |
1548 | const char *name; |
1549 | void *address; |
1550 | } |
1551 | @@ -3502,15 +3768,15 @@ |
1552 | _LT_EOF |
1553 | # Now try linking the two files. |
1554 | mv conftest.$ac_objext conftstm.$ac_objext |
1555 | - lt_save_LIBS="$LIBS" |
1556 | - lt_save_CFLAGS="$CFLAGS" |
1557 | + lt_globsym_save_LIBS=$LIBS |
1558 | + lt_globsym_save_CFLAGS=$CFLAGS |
1559 | LIBS="conftstm.$ac_objext" |
1560 | CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" |
1561 | if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then |
1562 | pipe_works=yes |
1563 | fi |
1564 | - LIBS="$lt_save_LIBS" |
1565 | - CFLAGS="$lt_save_CFLAGS" |
1566 | + LIBS=$lt_globsym_save_LIBS |
1567 | + CFLAGS=$lt_globsym_save_CFLAGS |
1568 | else |
1569 | echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD |
1570 | fi |
1571 | @@ -3543,6 +3809,13 @@ |
1572 | AC_MSG_RESULT(ok) |
1573 | fi |
1574 | |
1575 | +# Response file support. |
1576 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
1577 | + nm_file_list_spec='@' |
1578 | +elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then |
1579 | + nm_file_list_spec='@' |
1580 | +fi |
1581 | + |
1582 | _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], |
1583 | [Take the output of nm and produce a listing of raw symbols and C names]) |
1584 | _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], |
1585 | @@ -3553,6 +3826,8 @@ |
1586 | _LT_DECL([global_symbol_to_c_name_address_lib_prefix], |
1587 | [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], |
1588 | [Transform the output of nm in a C name address pair when lib prefix is needed]) |
1589 | +_LT_DECL([], [nm_file_list_spec], [1], |
1590 | + [Specify filename containing input files for $NM]) |
1591 | ]) # _LT_CMD_GLOBAL_SYMBOLS |
1592 | |
1593 | |
1594 | @@ -3564,7 +3839,6 @@ |
1595 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
1596 | _LT_TAGVAR(lt_prog_compiler_static, $1)= |
1597 | |
1598 | -AC_MSG_CHECKING([for $compiler option to produce PIC]) |
1599 | m4_if([$1], [CXX], [ |
1600 | # C++ specific cases for pic, static, wl, etc. |
1601 | if test "$GXX" = yes; then |
1602 | @@ -3615,6 +3889,11 @@ |
1603 | # DJGPP does not support shared libraries at all |
1604 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
1605 | ;; |
1606 | + haiku*) |
1607 | + # PIC is the default for Haiku. |
1608 | + # The "-static" flag exists, but is broken. |
1609 | + _LT_TAGVAR(lt_prog_compiler_static, $1)= |
1610 | + ;; |
1611 | interix[[3-9]]*) |
1612 | # Interix 3.x gcc -fpic/-fPIC options generate broken code. |
1613 | # Instead, we relocate shared libraries at runtime. |
1614 | @@ -3664,6 +3943,12 @@ |
1615 | ;; |
1616 | esac |
1617 | ;; |
1618 | + mingw* | cygwin* | os2* | pw32* | cegcc*) |
1619 | + # This hack is so that the source file can tell whether it is being |
1620 | + # built for inclusion in a dll (and should export symbols for example). |
1621 | + m4_if([$1], [GCJ], [], |
1622 | + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) |
1623 | + ;; |
1624 | dgux*) |
1625 | case $cc_basename in |
1626 | ec++*) |
1627 | @@ -3753,8 +4038,8 @@ |
1628 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
1629 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
1630 | ;; |
1631 | - xlc* | xlC*) |
1632 | - # IBM XL 8.0 on PPC |
1633 | + xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) |
1634 | + # IBM XL 8.0, 9.0 on PPC and BlueGene |
1635 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
1636 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' |
1637 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' |
1638 | @@ -3816,7 +4101,7 @@ |
1639 | ;; |
1640 | solaris*) |
1641 | case $cc_basename in |
1642 | - CC*) |
1643 | + CC* | sunCC*) |
1644 | # Sun C++ 4.2, 5.x and Centerline C++ |
1645 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
1646 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
1647 | @@ -3920,6 +4205,12 @@ |
1648 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' |
1649 | ;; |
1650 | |
1651 | + haiku*) |
1652 | + # PIC is the default for Haiku. |
1653 | + # The "-static" flag exists, but is broken. |
1654 | + _LT_TAGVAR(lt_prog_compiler_static, $1)= |
1655 | + ;; |
1656 | + |
1657 | hpux*) |
1658 | # PIC is the default for 64-bit PA HP-UX, but not for 32-bit |
1659 | # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag |
1660 | @@ -3962,6 +4253,13 @@ |
1661 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
1662 | ;; |
1663 | esac |
1664 | + |
1665 | + case $cc_basename in |
1666 | + nvcc*) # Cuda Compiler Driver 2.2 |
1667 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' |
1668 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' |
1669 | + ;; |
1670 | + esac |
1671 | else |
1672 | # PORTME Check for flag to pass linker flags through the system compiler. |
1673 | case $host_os in |
1674 | @@ -4025,7 +4323,13 @@ |
1675 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' |
1676 | _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' |
1677 | ;; |
1678 | - pgcc* | pgf77* | pgf90* | pgf95*) |
1679 | + nagfor*) |
1680 | + # NAG Fortran compiler |
1681 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' |
1682 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' |
1683 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
1684 | + ;; |
1685 | + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
1686 | # Portland Group compilers (*not* the Pentium gcc compiler, |
1687 | # which looks to be a dead project) |
1688 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
1689 | @@ -4037,26 +4341,26 @@ |
1690 | # All Alpha code is PIC. |
1691 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
1692 | ;; |
1693 | - xl*) |
1694 | - # IBM XL C 8.0/Fortran 10.1 on PPC |
1695 | + xl* | bgxl* | bgf* | mpixl*) |
1696 | + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene |
1697 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
1698 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' |
1699 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' |
1700 | ;; |
1701 | *) |
1702 | case `$CC -V 2>&1 | sed 5q` in |
1703 | + *Sun\ F* | *Sun*Fortran*) |
1704 | + # Sun Fortran 8.3 passes all unrecognized flags to the linker |
1705 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
1706 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
1707 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='' |
1708 | + ;; |
1709 | *Sun\ C*) |
1710 | # Sun C 5.9 |
1711 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
1712 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
1713 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
1714 | ;; |
1715 | - *Sun\ F*) |
1716 | - # Sun Fortran 8.3 passes all unrecognized flags to the linker |
1717 | - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
1718 | - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
1719 | - _LT_TAGVAR(lt_prog_compiler_wl, $1)='' |
1720 | - ;; |
1721 | esac |
1722 | ;; |
1723 | esac |
1724 | @@ -4087,7 +4391,7 @@ |
1725 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
1726 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
1727 | case $cc_basename in |
1728 | - f77* | f90* | f95*) |
1729 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
1730 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; |
1731 | *) |
1732 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; |
1733 | @@ -4144,9 +4448,11 @@ |
1734 | _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" |
1735 | ;; |
1736 | esac |
1737 | -AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) |
1738 | -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], |
1739 | - [How to pass a linker flag through the compiler]) |
1740 | + |
1741 | +AC_CACHE_CHECK([for $compiler option to produce PIC], |
1742 | + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], |
1743 | + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) |
1744 | +_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) |
1745 | |
1746 | # |
1747 | # Check to make sure the PIC flag actually works. |
1748 | @@ -4165,6 +4471,8 @@ |
1749 | _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], |
1750 | [Additional compiler flags for building library objects]) |
1751 | |
1752 | +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], |
1753 | + [How to pass a linker flag through the compiler]) |
1754 | # |
1755 | # Check to make sure the static flag actually works. |
1756 | # |
1757 | @@ -4185,6 +4493,7 @@ |
1758 | m4_defun([_LT_LINKER_SHLIBS], |
1759 | [AC_REQUIRE([LT_PATH_LD])dnl |
1760 | AC_REQUIRE([LT_PATH_NM])dnl |
1761 | +m4_require([_LT_PATH_MANIFEST_TOOL])dnl |
1762 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
1763 | m4_require([_LT_DECL_EGREP])dnl |
1764 | m4_require([_LT_DECL_SED])dnl |
1765 | @@ -4193,30 +4502,38 @@ |
1766 | AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) |
1767 | m4_if([$1], [CXX], [ |
1768 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
1769 | + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] |
1770 | case $host_os in |
1771 | aix[[4-9]]*) |
1772 | # If we're using GNU nm, then we don't want the "-C" option. |
1773 | # -C means demangle to AIX nm, but means don't demangle with GNU nm |
1774 | + # Also, AIX nm treats weak defined symbols like other global defined |
1775 | + # symbols, whereas GNU nm marks them as "W". |
1776 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then |
1777 | - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
1778 | + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
1779 | else |
1780 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
1781 | fi |
1782 | ;; |
1783 | pw32*) |
1784 | _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" |
1785 | - ;; |
1786 | + ;; |
1787 | cygwin* | mingw* | cegcc*) |
1788 | - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' |
1789 | - ;; |
1790 | - linux* | k*bsd*-gnu) |
1791 | + case $cc_basename in |
1792 | + cl*) ;; |
1793 | + *) |
1794 | + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' |
1795 | + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] |
1796 | + ;; |
1797 | + esac |
1798 | + ;; |
1799 | + linux* | k*bsd*-gnu | gnu*) |
1800 | _LT_TAGVAR(link_all_deplibs, $1)=no |
1801 | - ;; |
1802 | + ;; |
1803 | *) |
1804 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
1805 | - ;; |
1806 | + ;; |
1807 | esac |
1808 | - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] |
1809 | ], [ |
1810 | runpath_var= |
1811 | _LT_TAGVAR(allow_undefined_flag, $1)= |
1812 | @@ -4276,13 +4593,39 @@ |
1813 | openbsd*) |
1814 | with_gnu_ld=no |
1815 | ;; |
1816 | - linux* | k*bsd*-gnu) |
1817 | + linux* | k*bsd*-gnu | gnu*) |
1818 | _LT_TAGVAR(link_all_deplibs, $1)=no |
1819 | ;; |
1820 | esac |
1821 | |
1822 | _LT_TAGVAR(ld_shlibs, $1)=yes |
1823 | + |
1824 | + # On some targets, GNU ld is compatible enough with the native linker |
1825 | + # that we're better off using the native interface for both. |
1826 | + lt_use_gnu_ld_interface=no |
1827 | if test "$with_gnu_ld" = yes; then |
1828 | + case $host_os in |
1829 | + aix*) |
1830 | + # The AIX port of GNU ld has always aspired to compatibility |
1831 | + # with the native linker. However, as the warning in the GNU ld |
1832 | + # block says, versions before 2.19.5* couldn't really create working |
1833 | + # shared libraries, regardless of the interface used. |
1834 | + case `$LD -v 2>&1` in |
1835 | + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; |
1836 | + *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; |
1837 | + *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; |
1838 | + *) |
1839 | + lt_use_gnu_ld_interface=yes |
1840 | + ;; |
1841 | + esac |
1842 | + ;; |
1843 | + *) |
1844 | + lt_use_gnu_ld_interface=yes |
1845 | + ;; |
1846 | + esac |
1847 | + fi |
1848 | + |
1849 | + if test "$lt_use_gnu_ld_interface" = yes; then |
1850 | # If archive_cmds runs LD, not CC, wlarc should be empty |
1851 | wlarc='${wl}' |
1852 | |
1853 | @@ -4316,11 +4659,12 @@ |
1854 | _LT_TAGVAR(ld_shlibs, $1)=no |
1855 | cat <<_LT_EOF 1>&2 |
1856 | |
1857 | -*** Warning: the GNU linker, at least up to release 2.9.1, is reported |
1858 | +*** Warning: the GNU linker, at least up to release 2.19, is reported |
1859 | *** to be unable to reliably create shared libraries on AIX. |
1860 | *** Therefore, libtool is disabling shared libraries support. If you |
1861 | -*** really care for shared libraries, you may want to modify your PATH |
1862 | -*** so that a non-GNU linker is found, and then restart. |
1863 | +*** really care for shared libraries, you may want to install binutils |
1864 | +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. |
1865 | +*** You will then need to restart the configuration process. |
1866 | |
1867 | _LT_EOF |
1868 | fi |
1869 | @@ -4356,10 +4700,12 @@ |
1870 | # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, |
1871 | # as there is no search path for DLLs. |
1872 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
1873 | + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' |
1874 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
1875 | _LT_TAGVAR(always_export_symbols, $1)=no |
1876 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
1877 | - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' |
1878 | + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' |
1879 | + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] |
1880 | |
1881 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
1882 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
1883 | @@ -4377,6 +4723,11 @@ |
1884 | fi |
1885 | ;; |
1886 | |
1887 | + haiku*) |
1888 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
1889 | + _LT_TAGVAR(link_all_deplibs, $1)=yes |
1890 | + ;; |
1891 | + |
1892 | interix[[3-9]]*) |
1893 | _LT_TAGVAR(hardcode_direct, $1)=no |
1894 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
1895 | @@ -4402,15 +4753,16 @@ |
1896 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ |
1897 | && test "$tmp_diet" = no |
1898 | then |
1899 | - tmp_addflag= |
1900 | + tmp_addflag=' $pic_flag' |
1901 | tmp_sharedflag='-shared' |
1902 | case $cc_basename,$host_cpu in |
1903 | pgcc*) # Portland Group C compiler |
1904 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
1905 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
1906 | tmp_addflag=' $pic_flag' |
1907 | ;; |
1908 | - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers |
1909 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
1910 | + pgf77* | pgf90* | pgf95* | pgfortran*) |
1911 | + # Portland Group f77 and f90 compilers |
1912 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
1913 | tmp_addflag=' $pic_flag -Mnomain' ;; |
1914 | ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 |
1915 | tmp_addflag=' -i_dynamic' ;; |
1916 | @@ -4421,13 +4773,17 @@ |
1917 | lf95*) # Lahey Fortran 8.1 |
1918 | _LT_TAGVAR(whole_archive_flag_spec, $1)= |
1919 | tmp_sharedflag='--shared' ;; |
1920 | - xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) |
1921 | + xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) |
1922 | tmp_sharedflag='-qmkshrobj' |
1923 | tmp_addflag= ;; |
1924 | + nvcc*) # Cuda Compiler Driver 2.2 |
1925 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
1926 | + _LT_TAGVAR(compiler_needs_object, $1)=yes |
1927 | + ;; |
1928 | esac |
1929 | case `$CC -V 2>&1 | sed 5q` in |
1930 | *Sun\ C*) # Sun C 5.9 |
1931 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
1932 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
1933 | _LT_TAGVAR(compiler_needs_object, $1)=yes |
1934 | tmp_sharedflag='-G' ;; |
1935 | *Sun\ F*) # Sun Fortran 8.3 |
1936 | @@ -4443,17 +4799,17 @@ |
1937 | fi |
1938 | |
1939 | case $cc_basename in |
1940 | - xlf*) |
1941 | + xlf* | bgf* | bgxlf* | mpixlf*) |
1942 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself |
1943 | _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' |
1944 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
1945 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' |
1946 | - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
1947 | + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
1948 | if test "x$supports_anon_versioning" = xyes; then |
1949 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ |
1950 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
1951 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
1952 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
1953 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
1954 | fi |
1955 | ;; |
1956 | esac |
1957 | @@ -4467,8 +4823,8 @@ |
1958 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
1959 | wlarc= |
1960 | else |
1961 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
1962 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
1963 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
1964 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
1965 | fi |
1966 | ;; |
1967 | |
1968 | @@ -4486,8 +4842,8 @@ |
1969 | |
1970 | _LT_EOF |
1971 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
1972 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
1973 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
1974 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
1975 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
1976 | else |
1977 | _LT_TAGVAR(ld_shlibs, $1)=no |
1978 | fi |
1979 | @@ -4533,8 +4889,8 @@ |
1980 | |
1981 | *) |
1982 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
1983 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
1984 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
1985 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
1986 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
1987 | else |
1988 | _LT_TAGVAR(ld_shlibs, $1)=no |
1989 | fi |
1990 | @@ -4574,8 +4930,10 @@ |
1991 | else |
1992 | # If we're using GNU nm, then we don't want the "-C" option. |
1993 | # -C means demangle to AIX nm, but means don't demangle with GNU nm |
1994 | + # Also, AIX nm treats weak defined symbols like other global |
1995 | + # defined symbols, whereas GNU nm marks them as "W". |
1996 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then |
1997 | - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
1998 | + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
1999 | else |
2000 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
2001 | fi |
2002 | @@ -4663,9 +5021,9 @@ |
2003 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' |
2004 | # Determine the default libpath from the value encoded in an |
2005 | # empty executable. |
2006 | - _LT_SYS_MODULE_PATH_AIX |
2007 | + _LT_SYS_MODULE_PATH_AIX([$1]) |
2008 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
2009 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
2010 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
2011 | else |
2012 | if test "$host_cpu" = ia64; then |
2013 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' |
2014 | @@ -4674,14 +5032,19 @@ |
2015 | else |
2016 | # Determine the default libpath from the value encoded in an |
2017 | # empty executable. |
2018 | - _LT_SYS_MODULE_PATH_AIX |
2019 | + _LT_SYS_MODULE_PATH_AIX([$1]) |
2020 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
2021 | # Warning - without using the other run time loading flags, |
2022 | # -berok will link without error, but may produce a broken library. |
2023 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' |
2024 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' |
2025 | - # Exported symbols can be pulled into shared objects from archives |
2026 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' |
2027 | + if test "$with_gnu_ld" = yes; then |
2028 | + # We only use this code for GNU lds that support --whole-archive. |
2029 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' |
2030 | + else |
2031 | + # Exported symbols can be pulled into shared objects from archives |
2032 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' |
2033 | + fi |
2034 | _LT_TAGVAR(archive_cmds_need_lc, $1)=yes |
2035 | # This is similar to how AIX traditionally builds its shared libraries. |
2036 | _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' |
2037 | @@ -4713,20 +5076,63 @@ |
2038 | # Microsoft Visual C++. |
2039 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
2040 | # no search path for DLLs. |
2041 | - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
2042 | - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
2043 | - # Tell ltmain to make .lib files, not .a files. |
2044 | - libext=lib |
2045 | - # Tell ltmain to make .dll files, not .so files. |
2046 | - shrext_cmds=".dll" |
2047 | - # FIXME: Setting linknames here is a bad hack. |
2048 | - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' |
2049 | - # The linker will automatically build a .lib file if we build a DLL. |
2050 | - _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
2051 | - # FIXME: Should let the user specify the lib program. |
2052 | - _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' |
2053 | - _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' |
2054 | - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
2055 | + case $cc_basename in |
2056 | + cl*) |
2057 | + # Native MSVC |
2058 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
2059 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
2060 | + _LT_TAGVAR(always_export_symbols, $1)=yes |
2061 | + _LT_TAGVAR(file_list_spec, $1)='@' |
2062 | + # Tell ltmain to make .lib files, not .a files. |
2063 | + libext=lib |
2064 | + # Tell ltmain to make .dll files, not .so files. |
2065 | + shrext_cmds=".dll" |
2066 | + # FIXME: Setting linknames here is a bad hack. |
2067 | + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
2068 | + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
2069 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
2070 | + else |
2071 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
2072 | + fi~ |
2073 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
2074 | + linknames=' |
2075 | + # The linker will not automatically build a static lib if we build a DLL. |
2076 | + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
2077 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
2078 | + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' |
2079 | + # Don't use ranlib |
2080 | + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' |
2081 | + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ |
2082 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
2083 | + case $lt_outputfile in |
2084 | + *.exe|*.EXE) ;; |
2085 | + *) |
2086 | + lt_outputfile="$lt_outputfile.exe" |
2087 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
2088 | + ;; |
2089 | + esac~ |
2090 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
2091 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
2092 | + $RM "$lt_outputfile.manifest"; |
2093 | + fi' |
2094 | + ;; |
2095 | + *) |
2096 | + # Assume MSVC wrapper |
2097 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
2098 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
2099 | + # Tell ltmain to make .lib files, not .a files. |
2100 | + libext=lib |
2101 | + # Tell ltmain to make .dll files, not .so files. |
2102 | + shrext_cmds=".dll" |
2103 | + # FIXME: Setting linknames here is a bad hack. |
2104 | + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
2105 | + # The linker will automatically build a .lib file if we build a DLL. |
2106 | + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
2107 | + # FIXME: Should let the user specify the lib program. |
2108 | + _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' |
2109 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
2110 | + ;; |
2111 | + esac |
2112 | ;; |
2113 | |
2114 | darwin* | rhapsody*) |
2115 | @@ -4764,7 +5170,7 @@ |
2116 | |
2117 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
2118 | freebsd* | dragonfly*) |
2119 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
2120 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
2121 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' |
2122 | _LT_TAGVAR(hardcode_direct, $1)=yes |
2123 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
2124 | @@ -4772,7 +5178,7 @@ |
2125 | |
2126 | hpux9*) |
2127 | if test "$GCC" = yes; then |
2128 | - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
2129 | + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
2130 | else |
2131 | _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
2132 | fi |
2133 | @@ -4787,8 +5193,8 @@ |
2134 | ;; |
2135 | |
2136 | hpux10*) |
2137 | - if test "$GCC" = yes -a "$with_gnu_ld" = no; then |
2138 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
2139 | + if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
2140 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
2141 | else |
2142 | _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
2143 | fi |
2144 | @@ -4806,16 +5212,16 @@ |
2145 | ;; |
2146 | |
2147 | hpux11*) |
2148 | - if test "$GCC" = yes -a "$with_gnu_ld" = no; then |
2149 | + if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
2150 | case $host_cpu in |
2151 | hppa*64*) |
2152 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
2153 | ;; |
2154 | ia64*) |
2155 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
2156 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
2157 | ;; |
2158 | *) |
2159 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
2160 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
2161 | ;; |
2162 | esac |
2163 | else |
2164 | @@ -4827,7 +5233,14 @@ |
2165 | _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
2166 | ;; |
2167 | *) |
2168 | - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
2169 | + m4_if($1, [], [ |
2170 | + # Older versions of the 11.00 compiler do not understand -b yet |
2171 | + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) |
2172 | + _LT_LINKER_OPTION([if $CC understands -b], |
2173 | + _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], |
2174 | + [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], |
2175 | + [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], |
2176 | + [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) |
2177 | ;; |
2178 | esac |
2179 | fi |
2180 | @@ -4855,19 +5268,34 @@ |
2181 | |
2182 | irix5* | irix6* | nonstopux*) |
2183 | if test "$GCC" = yes; then |
2184 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
2185 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
2186 | # Try to use the -exported_symbol ld option, if it does not |
2187 | # work, assume that -exports_file does not work either and |
2188 | # implicitly export all symbols. |
2189 | - save_LDFLAGS="$LDFLAGS" |
2190 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
2191 | - AC_LINK_IFELSE(int foo(void) {}, |
2192 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
2193 | - ) |
2194 | - LDFLAGS="$save_LDFLAGS" |
2195 | + # This should be the same for all languages, so no per-tag cache variable. |
2196 | + AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], |
2197 | + [lt_cv_irix_exported_symbol], |
2198 | + [save_LDFLAGS="$LDFLAGS" |
2199 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
2200 | + AC_LINK_IFELSE( |
2201 | + [AC_LANG_SOURCE( |
2202 | + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], |
2203 | + [C++], [[int foo (void) { return 0; }]], |
2204 | + [Fortran 77], [[ |
2205 | + subroutine foo |
2206 | + end]], |
2207 | + [Fortran], [[ |
2208 | + subroutine foo |
2209 | + end]])])], |
2210 | + [lt_cv_irix_exported_symbol=yes], |
2211 | + [lt_cv_irix_exported_symbol=no]) |
2212 | + LDFLAGS="$save_LDFLAGS"]) |
2213 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
2214 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
2215 | + fi |
2216 | else |
2217 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
2218 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' |
2219 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
2220 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' |
2221 | fi |
2222 | _LT_TAGVAR(archive_cmds_need_lc, $1)='no' |
2223 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
2224 | @@ -4929,17 +5357,17 @@ |
2225 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
2226 | _LT_TAGVAR(hardcode_minus_L, $1)=yes |
2227 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
2228 | - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' |
2229 | + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' |
2230 | _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' |
2231 | ;; |
2232 | |
2233 | osf3*) |
2234 | if test "$GCC" = yes; then |
2235 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
2236 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
2237 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
2238 | else |
2239 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
2240 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
2241 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
2242 | fi |
2243 | _LT_TAGVAR(archive_cmds_need_lc, $1)='no' |
2244 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
2245 | @@ -4949,13 +5377,13 @@ |
2246 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
2247 | if test "$GCC" = yes; then |
2248 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
2249 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
2250 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
2251 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
2252 | else |
2253 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
2254 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
2255 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
2256 | _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ |
2257 | - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' |
2258 | + $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' |
2259 | |
2260 | # Both c and cxx compiler support -rpath directly |
2261 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' |
2262 | @@ -4968,9 +5396,9 @@ |
2263 | _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' |
2264 | if test "$GCC" = yes; then |
2265 | wlarc='${wl}' |
2266 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
2267 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
2268 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
2269 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
2270 | + $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' |
2271 | else |
2272 | case `$CC -V 2>&1` in |
2273 | *"Compilers 5.0"*) |
2274 | @@ -5146,36 +5574,38 @@ |
2275 | # Test whether the compiler implicitly links with -lc since on some |
2276 | # systems, -lgcc has to come before -lc. If gcc already passes -lc |
2277 | # to ld, don't add -lc before -lgcc. |
2278 | - AC_MSG_CHECKING([whether -lc should be explicitly linked in]) |
2279 | - $RM conftest* |
2280 | - echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
2281 | + AC_CACHE_CHECK([whether -lc should be explicitly linked in], |
2282 | + [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), |
2283 | + [$RM conftest* |
2284 | + echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
2285 | |
2286 | - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then |
2287 | - soname=conftest |
2288 | - lib=conftest |
2289 | - libobjs=conftest.$ac_objext |
2290 | - deplibs= |
2291 | - wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) |
2292 | - pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) |
2293 | - compiler_flags=-v |
2294 | - linker_flags=-v |
2295 | - verstring= |
2296 | - output_objdir=. |
2297 | - libname=conftest |
2298 | - lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) |
2299 | - _LT_TAGVAR(allow_undefined_flag, $1)= |
2300 | - if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) |
2301 | - then |
2302 | - _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
2303 | - else |
2304 | - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes |
2305 | - fi |
2306 | - _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag |
2307 | - else |
2308 | - cat conftest.err 1>&5 |
2309 | - fi |
2310 | - $RM conftest* |
2311 | - AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) |
2312 | + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then |
2313 | + soname=conftest |
2314 | + lib=conftest |
2315 | + libobjs=conftest.$ac_objext |
2316 | + deplibs= |
2317 | + wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) |
2318 | + pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) |
2319 | + compiler_flags=-v |
2320 | + linker_flags=-v |
2321 | + verstring= |
2322 | + output_objdir=. |
2323 | + libname=conftest |
2324 | + lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) |
2325 | + _LT_TAGVAR(allow_undefined_flag, $1)= |
2326 | + if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) |
2327 | + then |
2328 | + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no |
2329 | + else |
2330 | + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes |
2331 | + fi |
2332 | + _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag |
2333 | + else |
2334 | + cat conftest.err 1>&5 |
2335 | + fi |
2336 | + $RM conftest* |
2337 | + ]) |
2338 | + _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) |
2339 | ;; |
2340 | esac |
2341 | fi |
2342 | @@ -5240,8 +5670,6 @@ |
2343 | to runtime path list]) |
2344 | _LT_TAGDECL([], [link_all_deplibs], [0], |
2345 | [Whether libtool must link a program against all its dependency libraries]) |
2346 | -_LT_TAGDECL([], [fix_srcfile_path], [1], |
2347 | - [Fix the shell variable $srcfile for the compiler]) |
2348 | _LT_TAGDECL([], [always_export_symbols], [0], |
2349 | [Set to "yes" if exported symbols are required]) |
2350 | _LT_TAGDECL([], [export_symbols_cmds], [2], |
2351 | @@ -5252,6 +5680,8 @@ |
2352 | [Symbols that must always be exported]) |
2353 | _LT_TAGDECL([], [prelink_cmds], [2], |
2354 | [Commands necessary for linking programs (against libraries) with templates]) |
2355 | +_LT_TAGDECL([], [postlink_cmds], [2], |
2356 | + [Commands necessary for finishing linking programs]) |
2357 | _LT_TAGDECL([], [file_list_spec], [1], |
2358 | [Specify filename containing input files]) |
2359 | dnl FIXME: Not yet implemented |
2360 | @@ -5341,14 +5771,15 @@ |
2361 | ])# _LT_LANG_C_CONFIG |
2362 | |
2363 | |
2364 | -# _LT_PROG_CXX |
2365 | -# ------------ |
2366 | -# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ |
2367 | -# compiler, we have our own version here. |
2368 | -m4_defun([_LT_PROG_CXX], |
2369 | -[ |
2370 | -pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) |
2371 | -AC_PROG_CXX |
2372 | +# _LT_LANG_CXX_CONFIG([TAG]) |
2373 | +# -------------------------- |
2374 | +# Ensure that the configuration variables for a C++ compiler are suitably |
2375 | +# defined. These variables are subsequently used by _LT_CONFIG to write |
2376 | +# the compiler configuration to `libtool'. |
2377 | +m4_defun([_LT_LANG_CXX_CONFIG], |
2378 | +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
2379 | +m4_require([_LT_DECL_EGREP])dnl |
2380 | +m4_require([_LT_PATH_MANIFEST_TOOL])dnl |
2381 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && |
2382 | ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || |
2383 | (test "X$CXX" != "Xg++"))) ; then |
2384 | @@ -5356,22 +5787,6 @@ |
2385 | else |
2386 | _lt_caught_CXX_error=yes |
2387 | fi |
2388 | -popdef([AC_MSG_ERROR]) |
2389 | -])# _LT_PROG_CXX |
2390 | - |
2391 | -dnl aclocal-1.4 backwards compatibility: |
2392 | -dnl AC_DEFUN([_LT_PROG_CXX], []) |
2393 | - |
2394 | - |
2395 | -# _LT_LANG_CXX_CONFIG([TAG]) |
2396 | -# -------------------------- |
2397 | -# Ensure that the configuration variables for a C++ compiler are suitably |
2398 | -# defined. These variables are subsequently used by _LT_CONFIG to write |
2399 | -# the compiler configuration to `libtool'. |
2400 | -m4_defun([_LT_LANG_CXX_CONFIG], |
2401 | -[AC_REQUIRE([_LT_PROG_CXX])dnl |
2402 | -m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
2403 | -m4_require([_LT_DECL_EGREP])dnl |
2404 | |
2405 | AC_LANG_PUSH(C++) |
2406 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
2407 | @@ -5393,6 +5808,8 @@ |
2408 | _LT_TAGVAR(module_expsym_cmds, $1)= |
2409 | _LT_TAGVAR(link_all_deplibs, $1)=unknown |
2410 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
2411 | +_LT_TAGVAR(reload_flag, $1)=$reload_flag |
2412 | +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds |
2413 | _LT_TAGVAR(no_undefined_flag, $1)= |
2414 | _LT_TAGVAR(whole_archive_flag_spec, $1)= |
2415 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no |
2416 | @@ -5424,6 +5841,7 @@ |
2417 | |
2418 | # Allow CC to be a program name with arguments. |
2419 | lt_save_CC=$CC |
2420 | + lt_save_CFLAGS=$CFLAGS |
2421 | lt_save_LD=$LD |
2422 | lt_save_GCC=$GCC |
2423 | GCC=$GXX |
2424 | @@ -5441,6 +5859,7 @@ |
2425 | fi |
2426 | test -z "${LDCXX+set}" || LD=$LDCXX |
2427 | CC=${CXX-"c++"} |
2428 | + CFLAGS=$CXXFLAGS |
2429 | compiler=$CC |
2430 | _LT_TAGVAR(compiler, $1)=$CC |
2431 | _LT_CC_BASENAME([$compiler]) |
2432 | @@ -5462,8 +5881,8 @@ |
2433 | # Check if GNU C++ uses GNU ld as the underlying linker, since the |
2434 | # archiving commands below assume that GNU ld is being used. |
2435 | if test "$with_gnu_ld" = yes; then |
2436 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' |
2437 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
2438 | + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' |
2439 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
2440 | |
2441 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
2442 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
2443 | @@ -5495,7 +5914,7 @@ |
2444 | # Commands to make compiler produce verbose output that lists |
2445 | # what "hidden" libraries, object files and flags are used when |
2446 | # linking a shared library. |
2447 | - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' |
2448 | + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
2449 | |
2450 | else |
2451 | GXX=no |
2452 | @@ -5604,10 +6023,10 @@ |
2453 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' |
2454 | # Determine the default libpath from the value encoded in an empty |
2455 | # executable. |
2456 | - _LT_SYS_MODULE_PATH_AIX |
2457 | + _LT_SYS_MODULE_PATH_AIX([$1]) |
2458 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
2459 | |
2460 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
2461 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
2462 | else |
2463 | if test "$host_cpu" = ia64; then |
2464 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' |
2465 | @@ -5616,14 +6035,19 @@ |
2466 | else |
2467 | # Determine the default libpath from the value encoded in an |
2468 | # empty executable. |
2469 | - _LT_SYS_MODULE_PATH_AIX |
2470 | + _LT_SYS_MODULE_PATH_AIX([$1]) |
2471 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
2472 | # Warning - without using the other run time loading flags, |
2473 | # -berok will link without error, but may produce a broken library. |
2474 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' |
2475 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' |
2476 | - # Exported symbols can be pulled into shared objects from archives |
2477 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' |
2478 | + if test "$with_gnu_ld" = yes; then |
2479 | + # We only use this code for GNU lds that support --whole-archive. |
2480 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' |
2481 | + else |
2482 | + # Exported symbols can be pulled into shared objects from archives |
2483 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' |
2484 | + fi |
2485 | _LT_TAGVAR(archive_cmds_need_lc, $1)=yes |
2486 | # This is similar to how AIX traditionally builds its shared |
2487 | # libraries. |
2488 | @@ -5653,28 +6077,75 @@ |
2489 | ;; |
2490 | |
2491 | cygwin* | mingw* | pw32* | cegcc*) |
2492 | - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, |
2493 | - # as there is no search path for DLLs. |
2494 | - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
2495 | - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
2496 | - _LT_TAGVAR(always_export_symbols, $1)=no |
2497 | - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
2498 | + case $GXX,$cc_basename in |
2499 | + ,cl* | no,cl*) |
2500 | + # Native MSVC |
2501 | + # hardcode_libdir_flag_spec is actually meaningless, as there is |
2502 | + # no search path for DLLs. |
2503 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
2504 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
2505 | + _LT_TAGVAR(always_export_symbols, $1)=yes |
2506 | + _LT_TAGVAR(file_list_spec, $1)='@' |
2507 | + # Tell ltmain to make .lib files, not .a files. |
2508 | + libext=lib |
2509 | + # Tell ltmain to make .dll files, not .so files. |
2510 | + shrext_cmds=".dll" |
2511 | + # FIXME: Setting linknames here is a bad hack. |
2512 | + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
2513 | + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
2514 | + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
2515 | + else |
2516 | + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
2517 | + fi~ |
2518 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
2519 | + linknames=' |
2520 | + # The linker will not automatically build a static lib if we build a DLL. |
2521 | + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
2522 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
2523 | + # Don't use ranlib |
2524 | + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' |
2525 | + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ |
2526 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
2527 | + case $lt_outputfile in |
2528 | + *.exe|*.EXE) ;; |
2529 | + *) |
2530 | + lt_outputfile="$lt_outputfile.exe" |
2531 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
2532 | + ;; |
2533 | + esac~ |
2534 | + func_to_tool_file "$lt_outputfile"~ |
2535 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
2536 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
2537 | + $RM "$lt_outputfile.manifest"; |
2538 | + fi' |
2539 | + ;; |
2540 | + *) |
2541 | + # g++ |
2542 | + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, |
2543 | + # as there is no search path for DLLs. |
2544 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
2545 | + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' |
2546 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
2547 | + _LT_TAGVAR(always_export_symbols, $1)=no |
2548 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
2549 | |
2550 | - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
2551 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
2552 | - # If the export-symbols file already is a .def file (1st line |
2553 | - # is EXPORTS), use it as is; otherwise, prepend... |
2554 | - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
2555 | - cp $export_symbols $output_objdir/$soname.def; |
2556 | - else |
2557 | - echo EXPORTS > $output_objdir/$soname.def; |
2558 | - cat $export_symbols >> $output_objdir/$soname.def; |
2559 | - fi~ |
2560 | - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
2561 | - else |
2562 | - _LT_TAGVAR(ld_shlibs, $1)=no |
2563 | - fi |
2564 | - ;; |
2565 | + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
2566 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
2567 | + # If the export-symbols file already is a .def file (1st line |
2568 | + # is EXPORTS), use it as is; otherwise, prepend... |
2569 | + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
2570 | + cp $export_symbols $output_objdir/$soname.def; |
2571 | + else |
2572 | + echo EXPORTS > $output_objdir/$soname.def; |
2573 | + cat $export_symbols >> $output_objdir/$soname.def; |
2574 | + fi~ |
2575 | + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
2576 | + else |
2577 | + _LT_TAGVAR(ld_shlibs, $1)=no |
2578 | + fi |
2579 | + ;; |
2580 | + esac |
2581 | + ;; |
2582 | darwin* | rhapsody*) |
2583 | _LT_DARWIN_LINKER_FEATURES($1) |
2584 | ;; |
2585 | @@ -5716,6 +6187,11 @@ |
2586 | gnu*) |
2587 | ;; |
2588 | |
2589 | + haiku*) |
2590 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
2591 | + _LT_TAGVAR(link_all_deplibs, $1)=yes |
2592 | + ;; |
2593 | + |
2594 | hpux9*) |
2595 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' |
2596 | _LT_TAGVAR(hardcode_libdir_separator, $1)=: |
2597 | @@ -5740,11 +6216,11 @@ |
2598 | # explicitly linking system object files so we need to strip them |
2599 | # from the output so that they don't get included in the library |
2600 | # dependencies. |
2601 | - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' |
2602 | + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' |
2603 | ;; |
2604 | *) |
2605 | if test "$GXX" = yes; then |
2606 | - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
2607 | + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
2608 | else |
2609 | # FIXME: insert proper C++ library support |
2610 | _LT_TAGVAR(ld_shlibs, $1)=no |
2611 | @@ -5805,7 +6281,7 @@ |
2612 | # explicitly linking system object files so we need to strip them |
2613 | # from the output so that they don't get included in the library |
2614 | # dependencies. |
2615 | - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' |
2616 | + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' |
2617 | ;; |
2618 | *) |
2619 | if test "$GXX" = yes; then |
2620 | @@ -5815,10 +6291,10 @@ |
2621 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
2622 | ;; |
2623 | ia64*) |
2624 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
2625 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
2626 | ;; |
2627 | *) |
2628 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
2629 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
2630 | ;; |
2631 | esac |
2632 | fi |
2633 | @@ -5848,7 +6324,7 @@ |
2634 | case $cc_basename in |
2635 | CC*) |
2636 | # SGI C++ |
2637 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
2638 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
2639 | |
2640 | # Archives containing C++ object files must be created using |
2641 | # "CC -ar", where "CC" is the IRIX C++ compiler. This is |
2642 | @@ -5859,9 +6335,9 @@ |
2643 | *) |
2644 | if test "$GXX" = yes; then |
2645 | if test "$with_gnu_ld" = no; then |
2646 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
2647 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
2648 | else |
2649 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' |
2650 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' |
2651 | fi |
2652 | fi |
2653 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
2654 | @@ -5890,7 +6366,7 @@ |
2655 | # explicitly linking system object files so we need to strip them |
2656 | # from the output so that they don't get included in the library |
2657 | # dependencies. |
2658 | - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' |
2659 | + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' |
2660 | |
2661 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' |
2662 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
2663 | @@ -5927,26 +6403,26 @@ |
2664 | pgCC* | pgcpp*) |
2665 | # Portland Group C++ compiler |
2666 | case `$CC -V` in |
2667 | - *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) |
2668 | + *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) |
2669 | _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ |
2670 | rm -rf $tpldir~ |
2671 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ |
2672 | - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' |
2673 | + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' |
2674 | _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ |
2675 | rm -rf $tpldir~ |
2676 | $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ |
2677 | - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ |
2678 | + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ |
2679 | $RANLIB $oldlib' |
2680 | _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ |
2681 | rm -rf $tpldir~ |
2682 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
2683 | - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
2684 | + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
2685 | _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ |
2686 | rm -rf $tpldir~ |
2687 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
2688 | - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' |
2689 | + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' |
2690 | ;; |
2691 | - *) # Version 6 will use weak symbols |
2692 | + *) # Version 6 and above use weak symbols |
2693 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
2694 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' |
2695 | ;; |
2696 | @@ -5954,7 +6430,7 @@ |
2697 | |
2698 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' |
2699 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
2700 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
2701 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
2702 | ;; |
2703 | cxx*) |
2704 | # Compaq C++ |
2705 | @@ -5973,9 +6449,9 @@ |
2706 | # explicitly linking system object files so we need to strip them |
2707 | # from the output so that they don't get included in the library |
2708 | # dependencies. |
2709 | - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' |
2710 | + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' |
2711 | ;; |
2712 | - xl*) |
2713 | + xl* | mpixl* | bgxl*) |
2714 | # IBM XL 8.0 on PPC, with GNU ld |
2715 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
2716 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
2717 | @@ -5995,13 +6471,13 @@ |
2718 | _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
2719 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' |
2720 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' |
2721 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
2722 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
2723 | _LT_TAGVAR(compiler_needs_object, $1)=yes |
2724 | |
2725 | # Not sure whether something based on |
2726 | # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 |
2727 | # would be better. |
2728 | - output_verbose_link_cmd='echo' |
2729 | + output_verbose_link_cmd='func_echo_all' |
2730 | |
2731 | # Archives containing C++ object files must be created using |
2732 | # "CC -xar", where "CC" is the Sun C++ compiler. This is |
2733 | @@ -6070,7 +6546,7 @@ |
2734 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' |
2735 | _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' |
2736 | fi |
2737 | - output_verbose_link_cmd=echo |
2738 | + output_verbose_link_cmd=func_echo_all |
2739 | else |
2740 | _LT_TAGVAR(ld_shlibs, $1)=no |
2741 | fi |
2742 | @@ -6105,15 +6581,15 @@ |
2743 | case $host in |
2744 | osf3*) |
2745 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
2746 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
2747 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
2748 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
2749 | ;; |
2750 | *) |
2751 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
2752 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
2753 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
2754 | _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ |
2755 | echo "-hidden">> $lib.exp~ |
2756 | - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ |
2757 | + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ |
2758 | $RM $lib.exp' |
2759 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' |
2760 | ;; |
2761 | @@ -6129,17 +6605,17 @@ |
2762 | # explicitly linking system object files so we need to strip them |
2763 | # from the output so that they don't get included in the library |
2764 | # dependencies. |
2765 | - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' |
2766 | + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' |
2767 | ;; |
2768 | *) |
2769 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
2770 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
2771 | case $host in |
2772 | osf3*) |
2773 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
2774 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
2775 | ;; |
2776 | *) |
2777 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
2778 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
2779 | ;; |
2780 | esac |
2781 | |
2782 | @@ -6149,7 +6625,7 @@ |
2783 | # Commands to make compiler produce verbose output that lists |
2784 | # what "hidden" libraries, object files and flags are used when |
2785 | # linking a shared library. |
2786 | - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' |
2787 | + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
2788 | |
2789 | else |
2790 | # FIXME: insert proper C++ library support |
2791 | @@ -6185,7 +6661,7 @@ |
2792 | |
2793 | solaris*) |
2794 | case $cc_basename in |
2795 | - CC*) |
2796 | + CC* | sunCC*) |
2797 | # Sun C++ 4.2, 5.x and Centerline C++ |
2798 | _LT_TAGVAR(archive_cmds_need_lc,$1)=yes |
2799 | _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' |
2800 | @@ -6206,7 +6682,7 @@ |
2801 | esac |
2802 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
2803 | |
2804 | - output_verbose_link_cmd='echo' |
2805 | + output_verbose_link_cmd='func_echo_all' |
2806 | |
2807 | # Archives containing C++ object files must be created using |
2808 | # "CC -xar", where "CC" is the Sun C++ compiler. This is |
2809 | @@ -6226,14 +6702,14 @@ |
2810 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
2811 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' |
2812 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then |
2813 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' |
2814 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' |
2815 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
2816 | - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' |
2817 | + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' |
2818 | |
2819 | # Commands to make compiler produce verbose output that lists |
2820 | # what "hidden" libraries, object files and flags are used when |
2821 | # linking a shared library. |
2822 | - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' |
2823 | + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
2824 | else |
2825 | # g++ 2.7 appears to require `-G' NOT `-shared' on this |
2826 | # platform. |
2827 | @@ -6244,7 +6720,7 @@ |
2828 | # Commands to make compiler produce verbose output that lists |
2829 | # what "hidden" libraries, object files and flags are used when |
2830 | # linking a shared library. |
2831 | - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' |
2832 | + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
2833 | fi |
2834 | |
2835 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' |
2836 | @@ -6298,6 +6774,10 @@ |
2837 | CC*) |
2838 | _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
2839 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
2840 | + _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ |
2841 | + '"$_LT_TAGVAR(old_archive_cmds, $1)" |
2842 | + _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ |
2843 | + '"$_LT_TAGVAR(reload_cmds, $1)" |
2844 | ;; |
2845 | *) |
2846 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
2847 | @@ -6353,6 +6833,7 @@ |
2848 | fi # test -n "$compiler" |
2849 | |
2850 | CC=$lt_save_CC |
2851 | + CFLAGS=$lt_save_CFLAGS |
2852 | LDCXX=$LD |
2853 | LD=$lt_save_LD |
2854 | GCC=$lt_save_GCC |
2855 | @@ -6367,6 +6848,29 @@ |
2856 | ])# _LT_LANG_CXX_CONFIG |
2857 | |
2858 | |
2859 | +# _LT_FUNC_STRIPNAME_CNF |
2860 | +# ---------------------- |
2861 | +# func_stripname_cnf prefix suffix name |
2862 | +# strip PREFIX and SUFFIX off of NAME. |
2863 | +# PREFIX and SUFFIX must not contain globbing or regex special |
2864 | +# characters, hashes, percent signs, but SUFFIX may contain a leading |
2865 | +# dot (in which case that matches only a dot). |
2866 | +# |
2867 | +# This function is identical to the (non-XSI) version of func_stripname, |
2868 | +# except this one can be used by m4 code that may be executed by configure, |
2869 | +# rather than the libtool script. |
2870 | +m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl |
2871 | +AC_REQUIRE([_LT_DECL_SED]) |
2872 | +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) |
2873 | +func_stripname_cnf () |
2874 | +{ |
2875 | + case ${2} in |
2876 | + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
2877 | + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
2878 | + esac |
2879 | +} # func_stripname_cnf |
2880 | +])# _LT_FUNC_STRIPNAME_CNF |
2881 | + |
2882 | # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) |
2883 | # --------------------------------- |
2884 | # Figure out "hidden" library dependencies from verbose |
2885 | @@ -6375,6 +6879,7 @@ |
2886 | # objects, libraries and library flags. |
2887 | m4_defun([_LT_SYS_HIDDEN_LIBDEPS], |
2888 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
2889 | +AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl |
2890 | # Dependencies to place before and after the object being linked: |
2891 | _LT_TAGVAR(predep_objects, $1)= |
2892 | _LT_TAGVAR(postdep_objects, $1)= |
2893 | @@ -6425,6 +6930,13 @@ |
2894 | }; |
2895 | _LT_EOF |
2896 | ]) |
2897 | + |
2898 | +_lt_libdeps_save_CFLAGS=$CFLAGS |
2899 | +case "$CC $CFLAGS " in #( |
2900 | +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; |
2901 | +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; |
2902 | +esac |
2903 | + |
2904 | dnl Parse the compiler output and extract the necessary |
2905 | dnl objects, libraries and library flags. |
2906 | if AC_TRY_EVAL(ac_compile); then |
2907 | @@ -6436,7 +6948,7 @@ |
2908 | pre_test_object_deps_done=no |
2909 | |
2910 | for p in `eval "$output_verbose_link_cmd"`; do |
2911 | - case $p in |
2912 | + case ${prev}${p} in |
2913 | |
2914 | -L* | -R* | -l*) |
2915 | # Some compilers place space between "-{L,R}" and the path. |
2916 | @@ -6445,13 +6957,22 @@ |
2917 | test $p = "-R"; then |
2918 | prev=$p |
2919 | continue |
2920 | - else |
2921 | - prev= |
2922 | fi |
2923 | |
2924 | + # Expand the sysroot to ease extracting the directories later. |
2925 | + if test -z "$prev"; then |
2926 | + case $p in |
2927 | + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; |
2928 | + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; |
2929 | + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; |
2930 | + esac |
2931 | + fi |
2932 | + case $p in |
2933 | + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; |
2934 | + esac |
2935 | if test "$pre_test_object_deps_done" = no; then |
2936 | - case $p in |
2937 | - -L* | -R*) |
2938 | + case ${prev} in |
2939 | + -L | -R) |
2940 | # Internal compiler library paths should come after those |
2941 | # provided the user. The postdeps already come after the |
2942 | # user supplied libs so there is no need to process them. |
2943 | @@ -6471,8 +6992,10 @@ |
2944 | _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" |
2945 | fi |
2946 | fi |
2947 | + prev= |
2948 | ;; |
2949 | |
2950 | + *.lto.$objext) ;; # Ignore GCC LTO objects |
2951 | *.$objext) |
2952 | # This assumes that the test object file only shows up |
2953 | # once in the compiler output. |
2954 | @@ -6508,6 +7031,7 @@ |
2955 | fi |
2956 | |
2957 | $RM -f confest.$objext |
2958 | +CFLAGS=$_lt_libdeps_save_CFLAGS |
2959 | |
2960 | # PORTME: override above test on systems where it is broken |
2961 | m4_if([$1], [CXX], |
2962 | @@ -6544,7 +7068,7 @@ |
2963 | |
2964 | solaris*) |
2965 | case $cc_basename in |
2966 | - CC*) |
2967 | + CC* | sunCC*) |
2968 | # The more standards-conforming stlport4 library is |
2969 | # incompatible with the Cstd library. Avoid specifying |
2970 | # it if it's in CXXFLAGS. Ignore libCrun as |
2971 | @@ -6588,32 +7112,16 @@ |
2972 | ])# _LT_SYS_HIDDEN_LIBDEPS |
2973 | |
2974 | |
2975 | -# _LT_PROG_F77 |
2976 | -# ------------ |
2977 | -# Since AC_PROG_F77 is broken, in that it returns the empty string |
2978 | -# if there is no fortran compiler, we have our own version here. |
2979 | -m4_defun([_LT_PROG_F77], |
2980 | -[ |
2981 | -pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) |
2982 | -AC_PROG_F77 |
2983 | -if test -z "$F77" || test "X$F77" = "Xno"; then |
2984 | - _lt_disable_F77=yes |
2985 | -fi |
2986 | -popdef([AC_MSG_ERROR]) |
2987 | -])# _LT_PROG_F77 |
2988 | - |
2989 | -dnl aclocal-1.4 backwards compatibility: |
2990 | -dnl AC_DEFUN([_LT_PROG_F77], []) |
2991 | - |
2992 | - |
2993 | # _LT_LANG_F77_CONFIG([TAG]) |
2994 | # -------------------------- |
2995 | # Ensure that the configuration variables for a Fortran 77 compiler are |
2996 | # suitably defined. These variables are subsequently used by _LT_CONFIG |
2997 | # to write the compiler configuration to `libtool'. |
2998 | m4_defun([_LT_LANG_F77_CONFIG], |
2999 | -[AC_REQUIRE([_LT_PROG_F77])dnl |
3000 | -AC_LANG_PUSH(Fortran 77) |
3001 | +[AC_LANG_PUSH(Fortran 77) |
3002 | +if test -z "$F77" || test "X$F77" = "Xno"; then |
3003 | + _lt_disable_F77=yes |
3004 | +fi |
3005 | |
3006 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
3007 | _LT_TAGVAR(allow_undefined_flag, $1)= |
3008 | @@ -6632,6 +7140,8 @@ |
3009 | _LT_TAGVAR(module_expsym_cmds, $1)= |
3010 | _LT_TAGVAR(link_all_deplibs, $1)=unknown |
3011 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
3012 | +_LT_TAGVAR(reload_flag, $1)=$reload_flag |
3013 | +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds |
3014 | _LT_TAGVAR(no_undefined_flag, $1)= |
3015 | _LT_TAGVAR(whole_archive_flag_spec, $1)= |
3016 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no |
3017 | @@ -6671,7 +7181,9 @@ |
3018 | # Allow CC to be a program name with arguments. |
3019 | lt_save_CC="$CC" |
3020 | lt_save_GCC=$GCC |
3021 | + lt_save_CFLAGS=$CFLAGS |
3022 | CC=${F77-"f77"} |
3023 | + CFLAGS=$FFLAGS |
3024 | compiler=$CC |
3025 | _LT_TAGVAR(compiler, $1)=$CC |
3026 | _LT_CC_BASENAME([$compiler]) |
3027 | @@ -6725,38 +7237,24 @@ |
3028 | |
3029 | GCC=$lt_save_GCC |
3030 | CC="$lt_save_CC" |
3031 | + CFLAGS="$lt_save_CFLAGS" |
3032 | fi # test "$_lt_disable_F77" != yes |
3033 | |
3034 | AC_LANG_POP |
3035 | ])# _LT_LANG_F77_CONFIG |
3036 | |
3037 | |
3038 | -# _LT_PROG_FC |
3039 | -# ----------- |
3040 | -# Since AC_PROG_FC is broken, in that it returns the empty string |
3041 | -# if there is no fortran compiler, we have our own version here. |
3042 | -m4_defun([_LT_PROG_FC], |
3043 | -[ |
3044 | -pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) |
3045 | -AC_PROG_FC |
3046 | -if test -z "$FC" || test "X$FC" = "Xno"; then |
3047 | - _lt_disable_FC=yes |
3048 | -fi |
3049 | -popdef([AC_MSG_ERROR]) |
3050 | -])# _LT_PROG_FC |
3051 | - |
3052 | -dnl aclocal-1.4 backwards compatibility: |
3053 | -dnl AC_DEFUN([_LT_PROG_FC], []) |
3054 | - |
3055 | - |
3056 | # _LT_LANG_FC_CONFIG([TAG]) |
3057 | # ------------------------- |
3058 | # Ensure that the configuration variables for a Fortran compiler are |
3059 | # suitably defined. These variables are subsequently used by _LT_CONFIG |
3060 | # to write the compiler configuration to `libtool'. |
3061 | m4_defun([_LT_LANG_FC_CONFIG], |
3062 | -[AC_REQUIRE([_LT_PROG_FC])dnl |
3063 | -AC_LANG_PUSH(Fortran) |
3064 | +[AC_LANG_PUSH(Fortran) |
3065 | + |
3066 | +if test -z "$FC" || test "X$FC" = "Xno"; then |
3067 | + _lt_disable_FC=yes |
3068 | +fi |
3069 | |
3070 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
3071 | _LT_TAGVAR(allow_undefined_flag, $1)= |
3072 | @@ -6775,6 +7273,8 @@ |
3073 | _LT_TAGVAR(module_expsym_cmds, $1)= |
3074 | _LT_TAGVAR(link_all_deplibs, $1)=unknown |
3075 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
3076 | +_LT_TAGVAR(reload_flag, $1)=$reload_flag |
3077 | +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds |
3078 | _LT_TAGVAR(no_undefined_flag, $1)= |
3079 | _LT_TAGVAR(whole_archive_flag_spec, $1)= |
3080 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no |
3081 | @@ -6814,7 +7314,9 @@ |
3082 | # Allow CC to be a program name with arguments. |
3083 | lt_save_CC="$CC" |
3084 | lt_save_GCC=$GCC |
3085 | + lt_save_CFLAGS=$CFLAGS |
3086 | CC=${FC-"f95"} |
3087 | + CFLAGS=$FCFLAGS |
3088 | compiler=$CC |
3089 | GCC=$ac_cv_fc_compiler_gnu |
3090 | |
3091 | @@ -6870,7 +7372,8 @@ |
3092 | fi # test -n "$compiler" |
3093 | |
3094 | GCC=$lt_save_GCC |
3095 | - CC="$lt_save_CC" |
3096 | + CC=$lt_save_CC |
3097 | + CFLAGS=$lt_save_CFLAGS |
3098 | fi # test "$_lt_disable_FC" != yes |
3099 | |
3100 | AC_LANG_POP |
3101 | @@ -6907,10 +7410,12 @@ |
3102 | _LT_LINKER_BOILERPLATE |
3103 | |
3104 | # Allow CC to be a program name with arguments. |
3105 | -lt_save_CC="$CC" |
3106 | +lt_save_CC=$CC |
3107 | +lt_save_CFLAGS=$CFLAGS |
3108 | lt_save_GCC=$GCC |
3109 | GCC=yes |
3110 | CC=${GCJ-"gcj"} |
3111 | +CFLAGS=$GCJFLAGS |
3112 | compiler=$CC |
3113 | _LT_TAGVAR(compiler, $1)=$CC |
3114 | _LT_TAGVAR(LD, $1)="$LD" |
3115 | @@ -6920,6 +7425,8 @@ |
3116 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
3117 | |
3118 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
3119 | +_LT_TAGVAR(reload_flag, $1)=$reload_flag |
3120 | +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds |
3121 | |
3122 | if test -n "$compiler"; then |
3123 | _LT_COMPILER_NO_RTTI($1) |
3124 | @@ -6935,7 +7442,8 @@ |
3125 | AC_LANG_RESTORE |
3126 | |
3127 | GCC=$lt_save_GCC |
3128 | -CC="$lt_save_CC" |
3129 | +CC=$lt_save_CC |
3130 | +CFLAGS=$lt_save_CFLAGS |
3131 | ])# _LT_LANG_GCJ_CONFIG |
3132 | |
3133 | |
3134 | @@ -6970,9 +7478,11 @@ |
3135 | |
3136 | # Allow CC to be a program name with arguments. |
3137 | lt_save_CC="$CC" |
3138 | +lt_save_CFLAGS=$CFLAGS |
3139 | lt_save_GCC=$GCC |
3140 | GCC= |
3141 | CC=${RC-"windres"} |
3142 | +CFLAGS= |
3143 | compiler=$CC |
3144 | _LT_TAGVAR(compiler, $1)=$CC |
3145 | _LT_CC_BASENAME([$compiler]) |
3146 | @@ -6985,7 +7495,8 @@ |
3147 | |
3148 | GCC=$lt_save_GCC |
3149 | AC_LANG_RESTORE |
3150 | -CC="$lt_save_CC" |
3151 | +CC=$lt_save_CC |
3152 | +CFLAGS=$lt_save_CFLAGS |
3153 | ])# _LT_LANG_RC_CONFIG |
3154 | |
3155 | |
3156 | @@ -7044,6 +7555,15 @@ |
3157 | AC_SUBST([OBJDUMP]) |
3158 | ]) |
3159 | |
3160 | +# _LT_DECL_DLLTOOL |
3161 | +# ---------------- |
3162 | +# Ensure DLLTOOL variable is set. |
3163 | +m4_defun([_LT_DECL_DLLTOOL], |
3164 | +[AC_CHECK_TOOL(DLLTOOL, dlltool, false) |
3165 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
3166 | +_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) |
3167 | +AC_SUBST([DLLTOOL]) |
3168 | +]) |
3169 | |
3170 | # _LT_DECL_SED |
3171 | # ------------ |
3172 | @@ -7135,8 +7655,8 @@ |
3173 | # Try some XSI features |
3174 | xsi_shell=no |
3175 | ( _lt_dummy="a/b/c" |
3176 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
3177 | - = c,a/b,, \ |
3178 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
3179 | + = c,a/b,b/c, \ |
3180 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
3181 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
3182 | && xsi_shell=yes |
3183 | @@ -7175,222 +7695,177 @@ |
3184 | ])# _LT_CHECK_SHELL_FEATURES |
3185 | |
3186 | |
3187 | -# _LT_PROG_XSI_SHELLFNS |
3188 | -# --------------------- |
3189 | -# Bourne and XSI compatible variants of some useful shell functions. |
3190 | -m4_defun([_LT_PROG_XSI_SHELLFNS], |
3191 | -[case $xsi_shell in |
3192 | - yes) |
3193 | - cat << \_LT_EOF >> "$cfgfile" |
3194 | - |
3195 | -# func_dirname file append nondir_replacement |
3196 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
3197 | -# otherwise set result to NONDIR_REPLACEMENT. |
3198 | -func_dirname () |
3199 | -{ |
3200 | - case ${1} in |
3201 | - */*) func_dirname_result="${1%/*}${2}" ;; |
3202 | - * ) func_dirname_result="${3}" ;; |
3203 | - esac |
3204 | -} |
3205 | - |
3206 | -# func_basename file |
3207 | -func_basename () |
3208 | -{ |
3209 | - func_basename_result="${1##*/}" |
3210 | -} |
3211 | - |
3212 | -# func_dirname_and_basename file append nondir_replacement |
3213 | -# perform func_basename and func_dirname in a single function |
3214 | -# call: |
3215 | -# dirname: Compute the dirname of FILE. If nonempty, |
3216 | -# add APPEND to the result, otherwise set result |
3217 | -# to NONDIR_REPLACEMENT. |
3218 | -# value returned in "$func_dirname_result" |
3219 | -# basename: Compute filename of FILE. |
3220 | -# value retuned in "$func_basename_result" |
3221 | -# Implementation must be kept synchronized with func_dirname |
3222 | -# and func_basename. For efficiency, we do not delegate to |
3223 | -# those functions but instead duplicate the functionality here. |
3224 | -func_dirname_and_basename () |
3225 | -{ |
3226 | - case ${1} in |
3227 | - */*) func_dirname_result="${1%/*}${2}" ;; |
3228 | - * ) func_dirname_result="${3}" ;; |
3229 | - esac |
3230 | - func_basename_result="${1##*/}" |
3231 | -} |
3232 | - |
3233 | -# func_stripname prefix suffix name |
3234 | -# strip PREFIX and SUFFIX off of NAME. |
3235 | -# PREFIX and SUFFIX must not contain globbing or regex special |
3236 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
3237 | -# dot (in which case that matches only a dot). |
3238 | -func_stripname () |
3239 | -{ |
3240 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
3241 | - # positional parameters, so assign one to ordinary parameter first. |
3242 | - func_stripname_result=${3} |
3243 | - func_stripname_result=${func_stripname_result#"${1}"} |
3244 | - func_stripname_result=${func_stripname_result%"${2}"} |
3245 | -} |
3246 | - |
3247 | -# func_opt_split |
3248 | -func_opt_split () |
3249 | -{ |
3250 | - func_opt_split_opt=${1%%=*} |
3251 | - func_opt_split_arg=${1#*=} |
3252 | -} |
3253 | - |
3254 | -# func_lo2o object |
3255 | -func_lo2o () |
3256 | -{ |
3257 | - case ${1} in |
3258 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
3259 | - *) func_lo2o_result=${1} ;; |
3260 | - esac |
3261 | -} |
3262 | - |
3263 | -# func_xform libobj-or-source |
3264 | -func_xform () |
3265 | -{ |
3266 | - func_xform_result=${1%.*}.lo |
3267 | -} |
3268 | - |
3269 | -# func_arith arithmetic-term... |
3270 | -func_arith () |
3271 | -{ |
3272 | - func_arith_result=$(( $[*] )) |
3273 | -} |
3274 | - |
3275 | -# func_len string |
3276 | -# STRING may not start with a hyphen. |
3277 | -func_len () |
3278 | -{ |
3279 | - func_len_result=${#1} |
3280 | -} |
3281 | - |
3282 | -_LT_EOF |
3283 | - ;; |
3284 | - *) # Bourne compatible functions. |
3285 | - cat << \_LT_EOF >> "$cfgfile" |
3286 | - |
3287 | -# func_dirname file append nondir_replacement |
3288 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
3289 | -# otherwise set result to NONDIR_REPLACEMENT. |
3290 | -func_dirname () |
3291 | -{ |
3292 | - # Extract subdirectory from the argument. |
3293 | - func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` |
3294 | - if test "X$func_dirname_result" = "X${1}"; then |
3295 | - func_dirname_result="${3}" |
3296 | - else |
3297 | - func_dirname_result="$func_dirname_result${2}" |
3298 | - fi |
3299 | -} |
3300 | - |
3301 | -# func_basename file |
3302 | -func_basename () |
3303 | -{ |
3304 | - func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` |
3305 | -} |
3306 | - |
3307 | -dnl func_dirname_and_basename |
3308 | -dnl A portable version of this function is already defined in general.m4sh |
3309 | -dnl so there is no need for it here. |
3310 | - |
3311 | -# func_stripname prefix suffix name |
3312 | -# strip PREFIX and SUFFIX off of NAME. |
3313 | -# PREFIX and SUFFIX must not contain globbing or regex special |
3314 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
3315 | -# dot (in which case that matches only a dot). |
3316 | -# func_strip_suffix prefix name |
3317 | -func_stripname () |
3318 | -{ |
3319 | - case ${2} in |
3320 | - .*) func_stripname_result=`$ECHO "X${3}" \ |
3321 | - | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; |
3322 | - *) func_stripname_result=`$ECHO "X${3}" \ |
3323 | - | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; |
3324 | - esac |
3325 | -} |
3326 | - |
3327 | -# sed scripts: |
3328 | -my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' |
3329 | -my_sed_long_arg='1s/^-[[^=]]*=//' |
3330 | - |
3331 | -# func_opt_split |
3332 | -func_opt_split () |
3333 | -{ |
3334 | - func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` |
3335 | - func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` |
3336 | -} |
3337 | - |
3338 | -# func_lo2o object |
3339 | -func_lo2o () |
3340 | -{ |
3341 | - func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` |
3342 | -} |
3343 | - |
3344 | -# func_xform libobj-or-source |
3345 | -func_xform () |
3346 | -{ |
3347 | - func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` |
3348 | -} |
3349 | - |
3350 | -# func_arith arithmetic-term... |
3351 | -func_arith () |
3352 | -{ |
3353 | - func_arith_result=`expr "$[@]"` |
3354 | -} |
3355 | - |
3356 | -# func_len string |
3357 | -# STRING may not start with a hyphen. |
3358 | -func_len () |
3359 | -{ |
3360 | - func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` |
3361 | -} |
3362 | - |
3363 | -_LT_EOF |
3364 | -esac |
3365 | - |
3366 | -case $lt_shell_append in |
3367 | - yes) |
3368 | - cat << \_LT_EOF >> "$cfgfile" |
3369 | - |
3370 | -# func_append var value |
3371 | -# Append VALUE to the end of shell variable VAR. |
3372 | -func_append () |
3373 | -{ |
3374 | - eval "$[1]+=\$[2]" |
3375 | -} |
3376 | -_LT_EOF |
3377 | - ;; |
3378 | - *) |
3379 | - cat << \_LT_EOF >> "$cfgfile" |
3380 | - |
3381 | -# func_append var value |
3382 | -# Append VALUE to the end of shell variable VAR. |
3383 | -func_append () |
3384 | -{ |
3385 | - eval "$[1]=\$$[1]\$[2]" |
3386 | -} |
3387 | - |
3388 | -_LT_EOF |
3389 | - ;; |
3390 | - esac |
3391 | -]) |
3392 | +# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) |
3393 | +# ------------------------------------------------------ |
3394 | +# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and |
3395 | +# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. |
3396 | +m4_defun([_LT_PROG_FUNCTION_REPLACE], |
3397 | +[dnl { |
3398 | +sed -e '/^$1 ()$/,/^} # $1 /c\ |
3399 | +$1 ()\ |
3400 | +{\ |
3401 | +m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) |
3402 | +} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ |
3403 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
3404 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
3405 | +test 0 -eq $? || _lt_function_replace_fail=: |
3406 | +]) |
3407 | + |
3408 | + |
3409 | +# _LT_PROG_REPLACE_SHELLFNS |
3410 | +# ------------------------- |
3411 | +# Replace existing portable implementations of several shell functions with |
3412 | +# equivalent extended shell implementations where those features are available.. |
3413 | +m4_defun([_LT_PROG_REPLACE_SHELLFNS], |
3414 | +[if test x"$xsi_shell" = xyes; then |
3415 | + _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl |
3416 | + case ${1} in |
3417 | + */*) func_dirname_result="${1%/*}${2}" ;; |
3418 | + * ) func_dirname_result="${3}" ;; |
3419 | + esac]) |
3420 | + |
3421 | + _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl |
3422 | + func_basename_result="${1##*/}"]) |
3423 | + |
3424 | + _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl |
3425 | + case ${1} in |
3426 | + */*) func_dirname_result="${1%/*}${2}" ;; |
3427 | + * ) func_dirname_result="${3}" ;; |
3428 | + esac |
3429 | + func_basename_result="${1##*/}"]) |
3430 | + |
3431 | + _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl |
3432 | + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
3433 | + # positional parameters, so assign one to ordinary parameter first. |
3434 | + func_stripname_result=${3} |
3435 | + func_stripname_result=${func_stripname_result#"${1}"} |
3436 | + func_stripname_result=${func_stripname_result%"${2}"}]) |
3437 | + |
3438 | + _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl |
3439 | + func_split_long_opt_name=${1%%=*} |
3440 | + func_split_long_opt_arg=${1#*=}]) |
3441 | + |
3442 | + _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl |
3443 | + func_split_short_opt_arg=${1#??} |
3444 | + func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) |
3445 | + |
3446 | + _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl |
3447 | + case ${1} in |
3448 | + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
3449 | + *) func_lo2o_result=${1} ;; |
3450 | + esac]) |
3451 | + |
3452 | + _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) |
3453 | + |
3454 | + _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) |
3455 | + |
3456 | + _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) |
3457 | +fi |
3458 | + |
3459 | +if test x"$lt_shell_append" = xyes; then |
3460 | + _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) |
3461 | + |
3462 | + _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl |
3463 | + func_quote_for_eval "${2}" |
3464 | +dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ |
3465 | + eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) |
3466 | + |
3467 | + # Save a `func_append' function call where possible by direct use of '+=' |
3468 | + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ |
3469 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
3470 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
3471 | + test 0 -eq $? || _lt_function_replace_fail=: |
3472 | +else |
3473 | + # Save a `func_append' function call even when '+=' is not available |
3474 | + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ |
3475 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
3476 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
3477 | + test 0 -eq $? || _lt_function_replace_fail=: |
3478 | +fi |
3479 | + |
3480 | +if test x"$_lt_function_replace_fail" = x":"; then |
3481 | + AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) |
3482 | +fi |
3483 | +]) |
3484 | + |
3485 | +# _LT_PATH_CONVERSION_FUNCTIONS |
3486 | +# ----------------------------- |
3487 | +# Determine which file name conversion functions should be used by |
3488 | +# func_to_host_file (and, implicitly, by func_to_host_path). These are needed |
3489 | +# for certain cross-compile configurations and native mingw. |
3490 | +m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], |
3491 | +[AC_REQUIRE([AC_CANONICAL_HOST])dnl |
3492 | +AC_REQUIRE([AC_CANONICAL_BUILD])dnl |
3493 | +AC_MSG_CHECKING([how to convert $build file names to $host format]) |
3494 | +AC_CACHE_VAL(lt_cv_to_host_file_cmd, |
3495 | +[case $host in |
3496 | + *-*-mingw* ) |
3497 | + case $build in |
3498 | + *-*-mingw* ) # actually msys |
3499 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
3500 | + ;; |
3501 | + *-*-cygwin* ) |
3502 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
3503 | + ;; |
3504 | + * ) # otherwise, assume *nix |
3505 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
3506 | + ;; |
3507 | + esac |
3508 | + ;; |
3509 | + *-*-cygwin* ) |
3510 | + case $build in |
3511 | + *-*-mingw* ) # actually msys |
3512 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
3513 | + ;; |
3514 | + *-*-cygwin* ) |
3515 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
3516 | + ;; |
3517 | + * ) # otherwise, assume *nix |
3518 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
3519 | + ;; |
3520 | + esac |
3521 | + ;; |
3522 | + * ) # unhandled hosts (and "normal" native builds) |
3523 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
3524 | + ;; |
3525 | +esac |
3526 | +]) |
3527 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
3528 | +AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) |
3529 | +_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], |
3530 | + [0], [convert $build file names to $host format])dnl |
3531 | + |
3532 | +AC_MSG_CHECKING([how to convert $build file names to toolchain format]) |
3533 | +AC_CACHE_VAL(lt_cv_to_tool_file_cmd, |
3534 | +[#assume ordinary cross tools, or native build. |
3535 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
3536 | +case $host in |
3537 | + *-*-mingw* ) |
3538 | + case $build in |
3539 | + *-*-mingw* ) # actually msys |
3540 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
3541 | + ;; |
3542 | + esac |
3543 | + ;; |
3544 | +esac |
3545 | +]) |
3546 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
3547 | +AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) |
3548 | +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], |
3549 | + [0], [convert $build files to toolchain format])dnl |
3550 | +])# _LT_PATH_CONVERSION_FUNCTIONS |
3551 | |
3552 | # Helper functions for option handling. -*- Autoconf -*- |
3553 | # |
3554 | -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. |
3555 | +# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, |
3556 | +# Inc. |
3557 | # Written by Gary V. Vaughan, 2004 |
3558 | # |
3559 | # This file is free software; the Free Software Foundation gives |
3560 | # unlimited permission to copy and/or distribute it, with or without |
3561 | # modifications, as long as this notice is preserved. |
3562 | |
3563 | -# serial 6 ltoptions.m4 |
3564 | +# serial 7 ltoptions.m4 |
3565 | |
3566 | # This is to help aclocal find these macros, as it can't see m4_define. |
3567 | AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) |
3568 | @@ -7505,7 +7980,7 @@ |
3569 | [enable_win32_dll=yes |
3570 | |
3571 | case $host in |
3572 | -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) |
3573 | +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) |
3574 | AC_CHECK_TOOL(AS, as, false) |
3575 | AC_CHECK_TOOL(DLLTOOL, dlltool, false) |
3576 | AC_CHECK_TOOL(OBJDUMP, objdump, false) |
3577 | @@ -7513,13 +7988,13 @@ |
3578 | esac |
3579 | |
3580 | test -z "$AS" && AS=as |
3581 | -_LT_DECL([], [AS], [0], [Assembler program])dnl |
3582 | +_LT_DECL([], [AS], [1], [Assembler program])dnl |
3583 | |
3584 | test -z "$DLLTOOL" && DLLTOOL=dlltool |
3585 | -_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl |
3586 | +_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl |
3587 | |
3588 | test -z "$OBJDUMP" && OBJDUMP=objdump |
3589 | -_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl |
3590 | +_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl |
3591 | ])# win32-dll |
3592 | |
3593 | AU_DEFUN([AC_LIBTOOL_WIN32_DLL], |
3594 | @@ -7877,31 +8352,31 @@ |
3595 | # unlimited permission to copy and/or distribute it, with or without |
3596 | # modifications, as long as this notice is preserved. |
3597 | |
3598 | -# Generated from ltversion.in. |
3599 | +# @configure_input@ |
3600 | |
3601 | -# serial 3017 ltversion.m4 |
3602 | +# serial 3293 ltversion.m4 |
3603 | # This file is part of GNU Libtool |
3604 | |
3605 | -m4_define([LT_PACKAGE_VERSION], [2.2.6b]) |
3606 | -m4_define([LT_PACKAGE_REVISION], [1.3017]) |
3607 | +m4_define([LT_PACKAGE_VERSION], [2.4]) |
3608 | +m4_define([LT_PACKAGE_REVISION], [1.3293]) |
3609 | |
3610 | AC_DEFUN([LTVERSION_VERSION], |
3611 | -[macro_version='2.2.6b' |
3612 | -macro_revision='1.3017' |
3613 | +[macro_version='2.4' |
3614 | +macro_revision='1.3293' |
3615 | _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) |
3616 | _LT_DECL(, macro_revision, 0) |
3617 | ]) |
3618 | |
3619 | # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- |
3620 | # |
3621 | -# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. |
3622 | +# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. |
3623 | # Written by Scott James Remnant, 2004. |
3624 | # |
3625 | # This file is free software; the Free Software Foundation gives |
3626 | # unlimited permission to copy and/or distribute it, with or without |
3627 | # modifications, as long as this notice is preserved. |
3628 | |
3629 | -# serial 4 lt~obsolete.m4 |
3630 | +# serial 5 lt~obsolete.m4 |
3631 | |
3632 | # These exist entirely to fool aclocal when bootstrapping libtool. |
3633 | # |
3634 | @@ -7971,7 +8446,6 @@ |
3635 | m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) |
3636 | m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) |
3637 | m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) |
3638 | -m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) |
3639 | m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) |
3640 | m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) |
3641 | m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) |
3642 | @@ -7984,6 +8458,13 @@ |
3643 | m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) |
3644 | m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) |
3645 | m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) |
3646 | +m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) |
3647 | +m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) |
3648 | +m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) |
3649 | +m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) |
3650 | +m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) |
3651 | +m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) |
3652 | +m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) |
3653 | |
3654 | # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- |
3655 | # serial 1 (pkg-config-0.24) |
3656 | @@ -8013,7 +8494,8 @@ |
3657 | # ---------------------------------- |
3658 | AC_DEFUN([PKG_PROG_PKG_CONFIG], |
3659 | [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) |
3660 | -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) |
3661 | +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) |
3662 | +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) |
3663 | AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) |
3664 | AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) |
3665 | AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) |
3666 | @@ -8059,7 +8541,8 @@ |
3667 | pkg_cv_[]$1="$$1" |
3668 | elif test -n "$PKG_CONFIG"; then |
3669 | PKG_CHECK_EXISTS([$3], |
3670 | - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], |
3671 | + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` |
3672 | + test "x$?" != "x0" && pkg_failed=yes ], |
3673 | [pkg_failed=yes]) |
3674 | else |
3675 | pkg_failed=untried |
3676 | @@ -8107,9 +8590,9 @@ |
3677 | AC_MSG_RESULT([no]) |
3678 | _PKG_SHORT_ERRORS_SUPPORTED |
3679 | if test $_pkg_short_errors_supported = yes; then |
3680 | - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` |
3681 | + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` |
3682 | else |
3683 | - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` |
3684 | + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` |
3685 | fi |
3686 | # Put the nasty error message in config.log where it belongs |
3687 | echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD |
3688 | |
3689 | === modified file 'config-aux/config.guess' |
3690 | --- config-aux/config.guess 2010-12-10 16:59:27 +0000 |
3691 | +++ config-aux/config.guess 2012-08-23 20:59:19 +0000 |
3692 | @@ -1,10 +1,10 @@ |
3693 | #! /bin/sh |
3694 | # Attempt to guess a canonical system name. |
3695 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
3696 | -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
3697 | -# Free Software Foundation, Inc. |
3698 | +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
3699 | +# 2011 Free Software Foundation, Inc. |
3700 | |
3701 | -timestamp='2009-12-30' |
3702 | +timestamp='2011-05-11' |
3703 | |
3704 | # This file is free software; you can redistribute it and/or modify it |
3705 | # under the terms of the GNU General Public License as published by |
3706 | @@ -57,7 +57,7 @@ |
3707 | |
3708 | Originally written by Per Bothner. |
3709 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
3710 | -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free |
3711 | +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free |
3712 | Software Foundation, Inc. |
3713 | |
3714 | This is free software; see the source for copying conditions. There is NO |
3715 | @@ -181,7 +181,7 @@ |
3716 | fi |
3717 | ;; |
3718 | *) |
3719 | - os=netbsd |
3720 | + os=netbsd |
3721 | ;; |
3722 | esac |
3723 | # The OS release |
3724 | @@ -224,7 +224,7 @@ |
3725 | UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` |
3726 | ;; |
3727 | *5.*) |
3728 | - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` |
3729 | + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` |
3730 | ;; |
3731 | esac |
3732 | # According to Compaq, /usr/sbin/psrinfo has been available on |
3733 | @@ -270,7 +270,10 @@ |
3734 | # A Xn.n version is an unreleased experimental baselevel. |
3735 | # 1.2 uses "1.2" for uname -r. |
3736 | echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
3737 | - exit ;; |
3738 | + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. |
3739 | + exitcode=$? |
3740 | + trap '' 0 |
3741 | + exit $exitcode ;; |
3742 | Alpha\ *:Windows_NT*:*) |
3743 | # How do we know it's Interix rather than the generic POSIX subsystem? |
3744 | # Should we change UNAME_MACHINE based on the output of uname instead |
3745 | @@ -296,7 +299,7 @@ |
3746 | echo s390-ibm-zvmoe |
3747 | exit ;; |
3748 | *:OS400:*:*) |
3749 | - echo powerpc-ibm-os400 |
3750 | + echo powerpc-ibm-os400 |
3751 | exit ;; |
3752 | arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) |
3753 | echo arm-acorn-riscix${UNAME_RELEASE} |
3754 | @@ -395,23 +398,23 @@ |
3755 | # MiNT. But MiNT is downward compatible to TOS, so this should |
3756 | # be no problem. |
3757 | atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) |
3758 | - echo m68k-atari-mint${UNAME_RELEASE} |
3759 | + echo m68k-atari-mint${UNAME_RELEASE} |
3760 | exit ;; |
3761 | atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) |
3762 | echo m68k-atari-mint${UNAME_RELEASE} |
3763 | - exit ;; |
3764 | + exit ;; |
3765 | *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) |
3766 | - echo m68k-atari-mint${UNAME_RELEASE} |
3767 | + echo m68k-atari-mint${UNAME_RELEASE} |
3768 | exit ;; |
3769 | milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) |
3770 | - echo m68k-milan-mint${UNAME_RELEASE} |
3771 | - exit ;; |
3772 | + echo m68k-milan-mint${UNAME_RELEASE} |
3773 | + exit ;; |
3774 | hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) |
3775 | - echo m68k-hades-mint${UNAME_RELEASE} |
3776 | - exit ;; |
3777 | + echo m68k-hades-mint${UNAME_RELEASE} |
3778 | + exit ;; |
3779 | *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) |
3780 | - echo m68k-unknown-mint${UNAME_RELEASE} |
3781 | - exit ;; |
3782 | + echo m68k-unknown-mint${UNAME_RELEASE} |
3783 | + exit ;; |
3784 | m68k:machten:*:*) |
3785 | echo m68k-apple-machten${UNAME_RELEASE} |
3786 | exit ;; |
3787 | @@ -481,8 +484,8 @@ |
3788 | echo m88k-motorola-sysv3 |
3789 | exit ;; |
3790 | AViiON:dgux:*:*) |
3791 | - # DG/UX returns AViiON for all architectures |
3792 | - UNAME_PROCESSOR=`/usr/bin/uname -p` |
3793 | + # DG/UX returns AViiON for all architectures |
3794 | + UNAME_PROCESSOR=`/usr/bin/uname -p` |
3795 | if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] |
3796 | then |
3797 | if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ |
3798 | @@ -495,7 +498,7 @@ |
3799 | else |
3800 | echo i586-dg-dgux${UNAME_RELEASE} |
3801 | fi |
3802 | - exit ;; |
3803 | + exit ;; |
3804 | M88*:DolphinOS:*:*) # DolphinOS (SVR3) |
3805 | echo m88k-dolphin-sysv3 |
3806 | exit ;; |
3807 | @@ -552,7 +555,7 @@ |
3808 | echo rs6000-ibm-aix3.2 |
3809 | fi |
3810 | exit ;; |
3811 | - *:AIX:*:[456]) |
3812 | + *:AIX:*:[4567]) |
3813 | IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` |
3814 | if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then |
3815 | IBM_ARCH=rs6000 |
3816 | @@ -595,52 +598,52 @@ |
3817 | 9000/[678][0-9][0-9]) |
3818 | if [ -x /usr/bin/getconf ]; then |
3819 | sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` |
3820 | - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` |
3821 | - case "${sc_cpu_version}" in |
3822 | - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 |
3823 | - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 |
3824 | - 532) # CPU_PA_RISC2_0 |
3825 | - case "${sc_kernel_bits}" in |
3826 | - 32) HP_ARCH="hppa2.0n" ;; |
3827 | - 64) HP_ARCH="hppa2.0w" ;; |
3828 | + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` |
3829 | + case "${sc_cpu_version}" in |
3830 | + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 |
3831 | + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 |
3832 | + 532) # CPU_PA_RISC2_0 |
3833 | + case "${sc_kernel_bits}" in |
3834 | + 32) HP_ARCH="hppa2.0n" ;; |
3835 | + 64) HP_ARCH="hppa2.0w" ;; |
3836 | '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 |
3837 | - esac ;; |
3838 | - esac |
3839 | + esac ;; |
3840 | + esac |
3841 | fi |
3842 | if [ "${HP_ARCH}" = "" ]; then |
3843 | eval $set_cc_for_build |
3844 | - sed 's/^ //' << EOF >$dummy.c |
3845 | - |
3846 | - #define _HPUX_SOURCE |
3847 | - #include <stdlib.h> |
3848 | - #include <unistd.h> |
3849 | - |
3850 | - int main () |
3851 | - { |
3852 | - #if defined(_SC_KERNEL_BITS) |
3853 | - long bits = sysconf(_SC_KERNEL_BITS); |
3854 | - #endif |
3855 | - long cpu = sysconf (_SC_CPU_VERSION); |
3856 | - |
3857 | - switch (cpu) |
3858 | - { |
3859 | - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; |
3860 | - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; |
3861 | - case CPU_PA_RISC2_0: |
3862 | - #if defined(_SC_KERNEL_BITS) |
3863 | - switch (bits) |
3864 | - { |
3865 | - case 64: puts ("hppa2.0w"); break; |
3866 | - case 32: puts ("hppa2.0n"); break; |
3867 | - default: puts ("hppa2.0"); break; |
3868 | - } break; |
3869 | - #else /* !defined(_SC_KERNEL_BITS) */ |
3870 | - puts ("hppa2.0"); break; |
3871 | - #endif |
3872 | - default: puts ("hppa1.0"); break; |
3873 | - } |
3874 | - exit (0); |
3875 | - } |
3876 | + sed 's/^ //' << EOF >$dummy.c |
3877 | + |
3878 | + #define _HPUX_SOURCE |
3879 | + #include <stdlib.h> |
3880 | + #include <unistd.h> |
3881 | + |
3882 | + int main () |
3883 | + { |
3884 | + #if defined(_SC_KERNEL_BITS) |
3885 | + long bits = sysconf(_SC_KERNEL_BITS); |
3886 | + #endif |
3887 | + long cpu = sysconf (_SC_CPU_VERSION); |
3888 | + |
3889 | + switch (cpu) |
3890 | + { |
3891 | + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; |
3892 | + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; |
3893 | + case CPU_PA_RISC2_0: |
3894 | + #if defined(_SC_KERNEL_BITS) |
3895 | + switch (bits) |
3896 | + { |
3897 | + case 64: puts ("hppa2.0w"); break; |
3898 | + case 32: puts ("hppa2.0n"); break; |
3899 | + default: puts ("hppa2.0"); break; |
3900 | + } break; |
3901 | + #else /* !defined(_SC_KERNEL_BITS) */ |
3902 | + puts ("hppa2.0"); break; |
3903 | + #endif |
3904 | + default: puts ("hppa1.0"); break; |
3905 | + } |
3906 | + exit (0); |
3907 | + } |
3908 | EOF |
3909 | (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` |
3910 | test -z "$HP_ARCH" && HP_ARCH=hppa |
3911 | @@ -731,22 +734,22 @@ |
3912 | exit ;; |
3913 | C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) |
3914 | echo c1-convex-bsd |
3915 | - exit ;; |
3916 | + exit ;; |
3917 | C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) |
3918 | if getsysinfo -f scalar_acc |
3919 | then echo c32-convex-bsd |
3920 | else echo c2-convex-bsd |
3921 | fi |
3922 | - exit ;; |
3923 | + exit ;; |
3924 | C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) |
3925 | echo c34-convex-bsd |
3926 | - exit ;; |
3927 | + exit ;; |
3928 | C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) |
3929 | echo c38-convex-bsd |
3930 | - exit ;; |
3931 | + exit ;; |
3932 | C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) |
3933 | echo c4-convex-bsd |
3934 | - exit ;; |
3935 | + exit ;; |
3936 | CRAY*Y-MP:*:*:*) |
3937 | echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
3938 | exit ;; |
3939 | @@ -770,14 +773,14 @@ |
3940 | exit ;; |
3941 | F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) |
3942 | FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
3943 | - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
3944 | - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` |
3945 | - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
3946 | - exit ;; |
3947 | + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
3948 | + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` |
3949 | + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
3950 | + exit ;; |
3951 | 5000:UNIX_System_V:4.*:*) |
3952 | - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
3953 | - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` |
3954 | - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
3955 | + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
3956 | + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` |
3957 | + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
3958 | exit ;; |
3959 | i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) |
3960 | echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} |
3961 | @@ -805,14 +808,14 @@ |
3962 | echo ${UNAME_MACHINE}-pc-mingw32 |
3963 | exit ;; |
3964 | i*:windows32*:*) |
3965 | - # uname -m includes "-pc" on this system. |
3966 | - echo ${UNAME_MACHINE}-mingw32 |
3967 | + # uname -m includes "-pc" on this system. |
3968 | + echo ${UNAME_MACHINE}-mingw32 |
3969 | exit ;; |
3970 | i*:PW*:*) |
3971 | echo ${UNAME_MACHINE}-pc-pw32 |
3972 | exit ;; |
3973 | *:Interix*:*) |
3974 | - case ${UNAME_MACHINE} in |
3975 | + case ${UNAME_MACHINE} in |
3976 | x86) |
3977 | echo i586-pc-interix${UNAME_RELEASE} |
3978 | exit ;; |
3979 | @@ -867,7 +870,7 @@ |
3980 | EV6) UNAME_MACHINE=alphaev6 ;; |
3981 | EV67) UNAME_MACHINE=alphaev67 ;; |
3982 | EV68*) UNAME_MACHINE=alphaev68 ;; |
3983 | - esac |
3984 | + esac |
3985 | objdump --private-headers /bin/sh | grep -q ld.so.1 |
3986 | if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi |
3987 | echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} |
3988 | @@ -879,7 +882,13 @@ |
3989 | then |
3990 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
3991 | else |
3992 | - echo ${UNAME_MACHINE}-unknown-linux-gnueabi |
3993 | + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ |
3994 | + | grep -q __ARM_PCS_VFP |
3995 | + then |
3996 | + echo ${UNAME_MACHINE}-unknown-linux-gnueabi |
3997 | + else |
3998 | + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf |
3999 | + fi |
4000 | fi |
4001 | exit ;; |
4002 | avr32*:Linux:*:*) |
4003 | @@ -892,7 +901,7 @@ |
4004 | echo crisv32-axis-linux-gnu |
4005 | exit ;; |
4006 | frv:Linux:*:*) |
4007 | - echo frv-unknown-linux-gnu |
4008 | + echo frv-unknown-linux-gnu |
4009 | exit ;; |
4010 | i*86:Linux:*:*) |
4011 | LIBC=gnu |
4012 | @@ -960,7 +969,7 @@ |
4013 | echo ${UNAME_MACHINE}-ibm-linux |
4014 | exit ;; |
4015 | sh64*:Linux:*:*) |
4016 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
4017 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
4018 | exit ;; |
4019 | sh*:Linux:*:*) |
4020 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
4021 | @@ -968,6 +977,9 @@ |
4022 | sparc:Linux:*:* | sparc64:Linux:*:*) |
4023 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
4024 | exit ;; |
4025 | + tile*:Linux:*:*) |
4026 | + echo ${UNAME_MACHINE}-tilera-linux-gnu |
4027 | + exit ;; |
4028 | vax:Linux:*:*) |
4029 | echo ${UNAME_MACHINE}-dec-linux-gnu |
4030 | exit ;; |
4031 | @@ -975,7 +987,7 @@ |
4032 | echo x86_64-unknown-linux-gnu |
4033 | exit ;; |
4034 | xtensa*:Linux:*:*) |
4035 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
4036 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
4037 | exit ;; |
4038 | i*86:DYNIX/ptx:4*:*) |
4039 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. |
4040 | @@ -984,11 +996,11 @@ |
4041 | echo i386-sequent-sysv4 |
4042 | exit ;; |
4043 | i*86:UNIX_SV:4.2MP:2.*) |
4044 | - # Unixware is an offshoot of SVR4, but it has its own version |
4045 | - # number series starting with 2... |
4046 | - # I am not positive that other SVR4 systems won't match this, |
4047 | + # Unixware is an offshoot of SVR4, but it has its own version |
4048 | + # number series starting with 2... |
4049 | + # I am not positive that other SVR4 systems won't match this, |
4050 | # I just have to hope. -- rms. |
4051 | - # Use sysv4.2uw... so that sysv4* matches it. |
4052 | + # Use sysv4.2uw... so that sysv4* matches it. |
4053 | echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} |
4054 | exit ;; |
4055 | i*86:OS/2:*:*) |
4056 | @@ -1020,7 +1032,7 @@ |
4057 | fi |
4058 | exit ;; |
4059 | i*86:*:5:[678]*) |
4060 | - # UnixWare 7.x, OpenUNIX and OpenServer 6. |
4061 | + # UnixWare 7.x, OpenUNIX and OpenServer 6. |
4062 | case `/bin/uname -X | grep "^Machine"` in |
4063 | *486*) UNAME_MACHINE=i486 ;; |
4064 | *Pentium) UNAME_MACHINE=i586 ;; |
4065 | @@ -1048,13 +1060,13 @@ |
4066 | exit ;; |
4067 | pc:*:*:*) |
4068 | # Left here for compatibility: |
4069 | - # uname -m prints for DJGPP always 'pc', but it prints nothing about |
4070 | - # the processor, so we play safe by assuming i586. |
4071 | + # uname -m prints for DJGPP always 'pc', but it prints nothing about |
4072 | + # the processor, so we play safe by assuming i586. |
4073 | # Note: whatever this is, it MUST be the same as what config.sub |
4074 | # prints for the "djgpp" host, or else GDB configury will decide that |
4075 | # this is a cross-build. |
4076 | echo i586-pc-msdosdjgpp |
4077 | - exit ;; |
4078 | + exit ;; |
4079 | Intel:Mach:3*:*) |
4080 | echo i386-pc-mach3 |
4081 | exit ;; |
4082 | @@ -1089,8 +1101,8 @@ |
4083 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ |
4084 | && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; |
4085 | 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) |
4086 | - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
4087 | - && { echo i486-ncr-sysv4; exit; } ;; |
4088 | + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
4089 | + && { echo i486-ncr-sysv4; exit; } ;; |
4090 | NCR*:*:4.2:* | MPRAS*:*:4.2:*) |
4091 | OS_REL='.3' |
4092 | test -r /etc/.relid \ |
4093 | @@ -1133,10 +1145,10 @@ |
4094 | echo ns32k-sni-sysv |
4095 | fi |
4096 | exit ;; |
4097 | - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort |
4098 | - # says <Richard.M.Bartel@ccMail.Census.GOV> |
4099 | - echo i586-unisys-sysv4 |
4100 | - exit ;; |
4101 | + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort |
4102 | + # says <Richard.M.Bartel@ccMail.Census.GOV> |
4103 | + echo i586-unisys-sysv4 |
4104 | + exit ;; |
4105 | *:UNIX_System_V:4*:FTX*) |
4106 | # From Gerald Hewes <hewes@openmarket.com>. |
4107 | # How about differentiating between stratus architectures? -djm |
4108 | @@ -1162,11 +1174,11 @@ |
4109 | exit ;; |
4110 | R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) |
4111 | if [ -d /usr/nec ]; then |
4112 | - echo mips-nec-sysv${UNAME_RELEASE} |
4113 | + echo mips-nec-sysv${UNAME_RELEASE} |
4114 | else |
4115 | - echo mips-unknown-sysv${UNAME_RELEASE} |
4116 | + echo mips-unknown-sysv${UNAME_RELEASE} |
4117 | fi |
4118 | - exit ;; |
4119 | + exit ;; |
4120 | BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. |
4121 | echo powerpc-be-beos |
4122 | exit ;; |
4123 | @@ -1231,6 +1243,9 @@ |
4124 | *:QNX:*:4*) |
4125 | echo i386-pc-qnx |
4126 | exit ;; |
4127 | + NEO-?:NONSTOP_KERNEL:*:*) |
4128 | + echo neo-tandem-nsk${UNAME_RELEASE} |
4129 | + exit ;; |
4130 | NSE-?:NONSTOP_KERNEL:*:*) |
4131 | echo nse-tandem-nsk${UNAME_RELEASE} |
4132 | exit ;; |
4133 | @@ -1276,13 +1291,13 @@ |
4134 | echo pdp10-unknown-its |
4135 | exit ;; |
4136 | SEI:*:*:SEIUX) |
4137 | - echo mips-sei-seiux${UNAME_RELEASE} |
4138 | + echo mips-sei-seiux${UNAME_RELEASE} |
4139 | exit ;; |
4140 | *:DragonFly:*:*) |
4141 | echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` |
4142 | exit ;; |
4143 | *:*VMS:*:*) |
4144 | - UNAME_MACHINE=`(uname -p) 2>/dev/null` |
4145 | + UNAME_MACHINE=`(uname -p) 2>/dev/null` |
4146 | case "${UNAME_MACHINE}" in |
4147 | A*) echo alpha-dec-vms ; exit ;; |
4148 | I*) echo ia64-dec-vms ; exit ;; |
4149 | @@ -1322,11 +1337,11 @@ |
4150 | #include <sys/param.h> |
4151 | printf ("m68k-sony-newsos%s\n", |
4152 | #ifdef NEWSOS4 |
4153 | - "4" |
4154 | + "4" |
4155 | #else |
4156 | - "" |
4157 | + "" |
4158 | #endif |
4159 | - ); exit (0); |
4160 | + ); exit (0); |
4161 | #endif |
4162 | #endif |
4163 | |
4164 | |
4165 | === modified file 'config-aux/config.sub' |
4166 | --- config-aux/config.sub 2010-12-10 16:59:27 +0000 |
4167 | +++ config-aux/config.sub 2012-08-23 20:59:19 +0000 |
4168 | @@ -1,10 +1,10 @@ |
4169 | #! /bin/sh |
4170 | # Configuration validation subroutine script. |
4171 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
4172 | -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
4173 | -# Free Software Foundation, Inc. |
4174 | +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
4175 | +# 2011 Free Software Foundation, Inc. |
4176 | |
4177 | -timestamp='2010-01-22' |
4178 | +timestamp='2011-03-23' |
4179 | |
4180 | # This file is (in principle) common to ALL GNU software. |
4181 | # The presence of a machine in this file suggests that SOME GNU software |
4182 | @@ -76,7 +76,7 @@ |
4183 | GNU config.sub ($timestamp) |
4184 | |
4185 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
4186 | -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free |
4187 | +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free |
4188 | Software Foundation, Inc. |
4189 | |
4190 | This is free software; see the source for copying conditions. There is NO |
4191 | @@ -124,8 +124,9 @@ |
4192 | # Here we must recognize all the valid KERNEL-OS combinations. |
4193 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` |
4194 | case $maybe_os in |
4195 | - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ |
4196 | - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ |
4197 | + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ |
4198 | + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ |
4199 | + knetbsd*-gnu* | netbsd*-gnu* | \ |
4200 | kopensolaris*-gnu* | \ |
4201 | storm-chaos* | os2-emx* | rtmk-nova*) |
4202 | os=-$maybe_os |
4203 | @@ -157,8 +158,8 @@ |
4204 | os= |
4205 | basic_machine=$1 |
4206 | ;; |
4207 | - -bluegene*) |
4208 | - os=-cnk |
4209 | + -bluegene*) |
4210 | + os=-cnk |
4211 | ;; |
4212 | -sim | -cisco | -oki | -wec | -winbond) |
4213 | os= |
4214 | @@ -174,10 +175,10 @@ |
4215 | os=-chorusos |
4216 | basic_machine=$1 |
4217 | ;; |
4218 | - -chorusrdb) |
4219 | - os=-chorusrdb |
4220 | + -chorusrdb) |
4221 | + os=-chorusrdb |
4222 | basic_machine=$1 |
4223 | - ;; |
4224 | + ;; |
4225 | -hiux*) |
4226 | os=-hiuxwe2 |
4227 | ;; |
4228 | @@ -282,11 +283,13 @@ |
4229 | | moxie \ |
4230 | | mt \ |
4231 | | msp430 \ |
4232 | + | nds32 | nds32le | nds32be \ |
4233 | | nios | nios2 \ |
4234 | | ns16k | ns32k \ |
4235 | + | open8 \ |
4236 | | or32 \ |
4237 | | pdp10 | pdp11 | pj | pjl \ |
4238 | - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ |
4239 | + | powerpc | powerpc64 | powerpc64le | powerpcle \ |
4240 | | pyramid \ |
4241 | | rx \ |
4242 | | score \ |
4243 | @@ -294,15 +297,24 @@ |
4244 | | sh64 | sh64le \ |
4245 | | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ |
4246 | | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ |
4247 | - | spu | strongarm \ |
4248 | - | tahoe | thumb | tic4x | tic80 | tron \ |
4249 | + | spu \ |
4250 | + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ |
4251 | | ubicom32 \ |
4252 | | v850 | v850e \ |
4253 | | we32k \ |
4254 | - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ |
4255 | + | x86 | xc16x | xstormy16 | xtensa \ |
4256 | | z8k | z80) |
4257 | basic_machine=$basic_machine-unknown |
4258 | ;; |
4259 | + c54x) |
4260 | + basic_machine=tic54x-unknown |
4261 | + ;; |
4262 | + c55x) |
4263 | + basic_machine=tic55x-unknown |
4264 | + ;; |
4265 | + c6x) |
4266 | + basic_machine=tic6x-unknown |
4267 | + ;; |
4268 | m6811 | m68hc11 | m6812 | m68hc12 | picochip) |
4269 | # Motorola 68HC11/12. |
4270 | basic_machine=$basic_machine-unknown |
4271 | @@ -314,6 +326,18 @@ |
4272 | basic_machine=mt-unknown |
4273 | ;; |
4274 | |
4275 | + strongarm | thumb | xscale) |
4276 | + basic_machine=arm-unknown |
4277 | + ;; |
4278 | + |
4279 | + xscaleeb) |
4280 | + basic_machine=armeb-unknown |
4281 | + ;; |
4282 | + |
4283 | + xscaleel) |
4284 | + basic_machine=armel-unknown |
4285 | + ;; |
4286 | + |
4287 | # We use `pc' rather than `unknown' |
4288 | # because (1) that's what they normally are, and |
4289 | # (2) the word "unknown" tends to confuse beginning users. |
4290 | @@ -334,7 +358,7 @@ |
4291 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ |
4292 | | avr-* | avr32-* \ |
4293 | | bfin-* | bs2000-* \ |
4294 | - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ |
4295 | + | c[123]* | c30-* | [cjt]90-* | c4x-* \ |
4296 | | clipper-* | craynv-* | cydra-* \ |
4297 | | d10v-* | d30v-* | dlx-* \ |
4298 | | elxsi-* \ |
4299 | @@ -368,26 +392,28 @@ |
4300 | | mmix-* \ |
4301 | | mt-* \ |
4302 | | msp430-* \ |
4303 | + | nds32-* | nds32le-* | nds32be-* \ |
4304 | | nios-* | nios2-* \ |
4305 | | none-* | np1-* | ns16k-* | ns32k-* \ |
4306 | + | open8-* \ |
4307 | | orion-* \ |
4308 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ |
4309 | - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ |
4310 | + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ |
4311 | | pyramid-* \ |
4312 | | romp-* | rs6000-* | rx-* \ |
4313 | | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ |
4314 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ |
4315 | | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ |
4316 | | sparclite-* \ |
4317 | - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ |
4318 | - | tahoe-* | thumb-* \ |
4319 | + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ |
4320 | + | tahoe-* \ |
4321 | | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ |
4322 | | tile-* | tilegx-* \ |
4323 | | tron-* \ |
4324 | | ubicom32-* \ |
4325 | | v850-* | v850e-* | vax-* \ |
4326 | | we32k-* \ |
4327 | - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ |
4328 | + | x86-* | x86_64-* | xc16x-* | xps100-* \ |
4329 | | xstormy16-* | xtensa*-* \ |
4330 | | ymp-* \ |
4331 | | z8k-* | z80-*) |
4332 | @@ -412,7 +438,7 @@ |
4333 | basic_machine=a29k-amd |
4334 | os=-udi |
4335 | ;; |
4336 | - abacus) |
4337 | + abacus) |
4338 | basic_machine=abacus-unknown |
4339 | ;; |
4340 | adobe68k) |
4341 | @@ -482,11 +508,20 @@ |
4342 | basic_machine=powerpc-ibm |
4343 | os=-cnk |
4344 | ;; |
4345 | + c54x-*) |
4346 | + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` |
4347 | + ;; |
4348 | + c55x-*) |
4349 | + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` |
4350 | + ;; |
4351 | + c6x-*) |
4352 | + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` |
4353 | + ;; |
4354 | c90) |
4355 | basic_machine=c90-cray |
4356 | os=-unicos |
4357 | ;; |
4358 | - cegcc) |
4359 | + cegcc) |
4360 | basic_machine=arm-unknown |
4361 | os=-cegcc |
4362 | ;; |
4363 | @@ -518,7 +553,7 @@ |
4364 | basic_machine=craynv-cray |
4365 | os=-unicosmp |
4366 | ;; |
4367 | - cr16) |
4368 | + cr16 | cr16-*) |
4369 | basic_machine=cr16-unknown |
4370 | os=-elf |
4371 | ;; |
4372 | @@ -734,7 +769,7 @@ |
4373 | basic_machine=ns32k-utek |
4374 | os=-sysv |
4375 | ;; |
4376 | - microblaze) |
4377 | + microblaze) |
4378 | basic_machine=microblaze-xilinx |
4379 | ;; |
4380 | mingw32) |
4381 | @@ -841,6 +876,12 @@ |
4382 | np1) |
4383 | basic_machine=np1-gould |
4384 | ;; |
4385 | + neo-tandem) |
4386 | + basic_machine=neo-tandem |
4387 | + ;; |
4388 | + nse-tandem) |
4389 | + basic_machine=nse-tandem |
4390 | + ;; |
4391 | nsr-tandem) |
4392 | basic_machine=nsr-tandem |
4393 | ;; |
4394 | @@ -923,9 +964,10 @@ |
4395 | ;; |
4396 | power) basic_machine=power-ibm |
4397 | ;; |
4398 | - ppc) basic_machine=powerpc-unknown |
4399 | + ppc | ppcbe) basic_machine=powerpc-unknown |
4400 | ;; |
4401 | - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` |
4402 | + ppc-* | ppcbe-*) |
4403 | + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` |
4404 | ;; |
4405 | ppcle | powerpclittle | ppc-le | powerpc-little) |
4406 | basic_machine=powerpcle-unknown |
4407 | @@ -1019,6 +1061,9 @@ |
4408 | basic_machine=i860-stratus |
4409 | os=-sysv4 |
4410 | ;; |
4411 | + strongarm-* | thumb-*) |
4412 | + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` |
4413 | + ;; |
4414 | sun2) |
4415 | basic_machine=m68000-sun |
4416 | ;; |
4417 | @@ -1075,20 +1120,8 @@ |
4418 | basic_machine=t90-cray |
4419 | os=-unicos |
4420 | ;; |
4421 | - tic54x | c54x*) |
4422 | - basic_machine=tic54x-unknown |
4423 | - os=-coff |
4424 | - ;; |
4425 | - tic55x | c55x*) |
4426 | - basic_machine=tic55x-unknown |
4427 | - os=-coff |
4428 | - ;; |
4429 | - tic6x | c6x*) |
4430 | - basic_machine=tic6x-unknown |
4431 | - os=-coff |
4432 | - ;; |
4433 | - # This must be matched before tile*. |
4434 | - tilegx*) |
4435 | + # This must be matched before tile*. |
4436 | + tilegx*) |
4437 | basic_machine=tilegx-unknown |
4438 | os=-linux-gnu |
4439 | ;; |
4440 | @@ -1163,6 +1196,9 @@ |
4441 | xps | xps100) |
4442 | basic_machine=xps100-honeywell |
4443 | ;; |
4444 | + xscale-* | xscalee[bl]-*) |
4445 | + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` |
4446 | + ;; |
4447 | ymp) |
4448 | basic_machine=ymp-cray |
4449 | os=-unicos |
4450 | @@ -1260,11 +1296,11 @@ |
4451 | if [ x"$os" != x"" ] |
4452 | then |
4453 | case $os in |
4454 | - # First match some system type aliases |
4455 | - # that might get confused with valid system types. |
4456 | + # First match some system type aliases |
4457 | + # that might get confused with valid system types. |
4458 | # -solaris* is a basic system type, with this one exception. |
4459 | - -auroraux) |
4460 | - os=-auroraux |
4461 | + -auroraux) |
4462 | + os=-auroraux |
4463 | ;; |
4464 | -solaris1 | -solaris1.*) |
4465 | os=`echo $os | sed -e 's|solaris1|sunos4|'` |
4466 | @@ -1301,7 +1337,8 @@ |
4467 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ |
4468 | | -chorusos* | -chorusrdb* | -cegcc* \ |
4469 | | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
4470 | - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ |
4471 | + | -mingw32* | -linux-gnu* | -linux-android* \ |
4472 | + | -linux-newlib* | -linux-uclibc* \ |
4473 | | -uxpv* | -beos* | -mpeix* | -udk* \ |
4474 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
4475 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
4476 | @@ -1348,7 +1385,7 @@ |
4477 | -opened*) |
4478 | os=-openedition |
4479 | ;; |
4480 | - -os400*) |
4481 | + -os400*) |
4482 | os=-os400 |
4483 | ;; |
4484 | -wince*) |
4485 | @@ -1397,7 +1434,7 @@ |
4486 | -sinix*) |
4487 | os=-sysv4 |
4488 | ;; |
4489 | - -tpf*) |
4490 | + -tpf*) |
4491 | os=-tpf |
4492 | ;; |
4493 | -triton*) |
4494 | @@ -1442,8 +1479,8 @@ |
4495 | -dicos*) |
4496 | os=-dicos |
4497 | ;; |
4498 | - -nacl*) |
4499 | - ;; |
4500 | + -nacl*) |
4501 | + ;; |
4502 | -none) |
4503 | ;; |
4504 | *) |
4505 | @@ -1466,10 +1503,10 @@ |
4506 | # system, and we'll never get to this point. |
4507 | |
4508 | case $basic_machine in |
4509 | - score-*) |
4510 | + score-*) |
4511 | os=-elf |
4512 | ;; |
4513 | - spu-*) |
4514 | + spu-*) |
4515 | os=-elf |
4516 | ;; |
4517 | *-acorn) |
4518 | @@ -1481,8 +1518,17 @@ |
4519 | arm*-semi) |
4520 | os=-aout |
4521 | ;; |
4522 | - c4x-* | tic4x-*) |
4523 | - os=-coff |
4524 | + c4x-* | tic4x-*) |
4525 | + os=-coff |
4526 | + ;; |
4527 | + tic54x-*) |
4528 | + os=-coff |
4529 | + ;; |
4530 | + tic55x-*) |
4531 | + os=-coff |
4532 | + ;; |
4533 | + tic6x-*) |
4534 | + os=-coff |
4535 | ;; |
4536 | # This must come before the *-dec entry. |
4537 | pdp10-*) |
4538 | @@ -1509,7 +1555,7 @@ |
4539 | m68*-cisco) |
4540 | os=-aout |
4541 | ;; |
4542 | - mep-*) |
4543 | + mep-*) |
4544 | os=-elf |
4545 | ;; |
4546 | mips*-cisco) |
4547 | @@ -1536,7 +1582,7 @@ |
4548 | *-ibm) |
4549 | os=-aix |
4550 | ;; |
4551 | - *-knuth) |
4552 | + *-knuth) |
4553 | os=-mmixware |
4554 | ;; |
4555 | *-wec) |
4556 | |
4557 | === modified file 'config-aux/ltmain.sh' |
4558 | --- config-aux/ltmain.sh 2010-12-10 16:59:27 +0000 |
4559 | +++ config-aux/ltmain.sh 2012-08-23 20:59:19 +0000 |
4560 | @@ -1,9 +1,9 @@ |
4561 | -# Generated from ltmain.m4sh. |
4562 | |
4563 | -# ltmain.sh (GNU libtool) 2.2.6b |
4564 | +# libtool (GNU libtool) 2.4 |
4565 | # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 |
4566 | |
4567 | -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. |
4568 | +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, |
4569 | +# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
4570 | # This is free software; see the source for copying conditions. There is NO |
4571 | # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
4572 | |
4573 | @@ -32,50 +32,56 @@ |
4574 | # |
4575 | # Provide generalized library-building support services. |
4576 | # |
4577 | -# --config show all configuration variables |
4578 | -# --debug enable verbose shell tracing |
4579 | -# -n, --dry-run display commands without modifying any files |
4580 | -# --features display basic configuration information and exit |
4581 | -# --mode=MODE use operation mode MODE |
4582 | -# --preserve-dup-deps don't remove duplicate dependency libraries |
4583 | -# --quiet, --silent don't print informational messages |
4584 | -# --tag=TAG use configuration variables from tag TAG |
4585 | -# -v, --verbose print informational messages (default) |
4586 | -# --version print version information |
4587 | -# -h, --help print short or long help message |
4588 | +# --config show all configuration variables |
4589 | +# --debug enable verbose shell tracing |
4590 | +# -n, --dry-run display commands without modifying any files |
4591 | +# --features display basic configuration information and exit |
4592 | +# --mode=MODE use operation mode MODE |
4593 | +# --preserve-dup-deps don't remove duplicate dependency libraries |
4594 | +# --quiet, --silent don't print informational messages |
4595 | +# --no-quiet, --no-silent |
4596 | +# print informational messages (default) |
4597 | +# --tag=TAG use configuration variables from tag TAG |
4598 | +# -v, --verbose print more informational messages than default |
4599 | +# --no-verbose don't print the extra informational messages |
4600 | +# --version print version information |
4601 | +# -h, --help, --help-all print short, long, or detailed help message |
4602 | # |
4603 | # MODE must be one of the following: |
4604 | # |
4605 | -# clean remove files from the build directory |
4606 | -# compile compile a source file into a libtool object |
4607 | -# execute automatically set library path, then run a program |
4608 | -# finish complete the installation of libtool libraries |
4609 | -# install install libraries or executables |
4610 | -# link create a library or an executable |
4611 | -# uninstall remove libraries from an installed directory |
4612 | +# clean remove files from the build directory |
4613 | +# compile compile a source file into a libtool object |
4614 | +# execute automatically set library path, then run a program |
4615 | +# finish complete the installation of libtool libraries |
4616 | +# install install libraries or executables |
4617 | +# link create a library or an executable |
4618 | +# uninstall remove libraries from an installed directory |
4619 | # |
4620 | -# MODE-ARGS vary depending on the MODE. |
4621 | +# MODE-ARGS vary depending on the MODE. When passed as first option, |
4622 | +# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. |
4623 | # Try `$progname --help --mode=MODE' for a more detailed description of MODE. |
4624 | # |
4625 | # When reporting a bug, please describe a test case to reproduce it and |
4626 | # include the following information: |
4627 | # |
4628 | -# host-triplet: $host |
4629 | -# shell: $SHELL |
4630 | -# compiler: $LTCC |
4631 | -# compiler flags: $LTCFLAGS |
4632 | -# linker: $LD (gnu? $with_gnu_ld) |
4633 | -# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1 |
4634 | -# automake: $automake_version |
4635 | -# autoconf: $autoconf_version |
4636 | +# host-triplet: $host |
4637 | +# shell: $SHELL |
4638 | +# compiler: $LTCC |
4639 | +# compiler flags: $LTCFLAGS |
4640 | +# linker: $LD (gnu? $with_gnu_ld) |
4641 | +# $progname: (GNU libtool) 2.4 Debian-2.4-2ubuntu1 |
4642 | +# automake: $automake_version |
4643 | +# autoconf: $autoconf_version |
4644 | # |
4645 | # Report bugs to <bug-libtool@gnu.org>. |
4646 | +# GNU libtool home page: <http://www.gnu.org/software/libtool/>. |
4647 | +# General help using GNU software: <http://www.gnu.org/gethelp/>. |
4648 | |
4649 | -PROGRAM=ltmain.sh |
4650 | +PROGRAM=libtool |
4651 | PACKAGE=libtool |
4652 | -VERSION="2.2.6b Debian-2.2.6b-2ubuntu1" |
4653 | +VERSION="2.4 Debian-2.4-2ubuntu1" |
4654 | TIMESTAMP="" |
4655 | -package_revision=1.3017 |
4656 | +package_revision=1.3293 |
4657 | |
4658 | # Be Bourne compatible |
4659 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then |
4660 | @@ -91,10 +97,15 @@ |
4661 | BIN_SH=xpg4; export BIN_SH # for Tru64 |
4662 | DUALCASE=1; export DUALCASE # for MKS sh |
4663 | |
4664 | +# A function that is used when there is no print builtin or printf. |
4665 | +func_fallback_echo () |
4666 | +{ |
4667 | + eval 'cat <<_LTECHO_EOF |
4668 | +$1 |
4669 | +_LTECHO_EOF' |
4670 | +} |
4671 | + |
4672 | # NLS nuisances: We save the old values to restore during execute mode. |
4673 | -# Only set LANG and LC_ALL to C if already set. |
4674 | -# These must not be set unconditionally because not all systems understand |
4675 | -# e.g. LANG=C (notably SCO). |
4676 | lt_user_locale= |
4677 | lt_safe_locale= |
4678 | for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES |
4679 | @@ -107,15 +118,24 @@ |
4680 | lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" |
4681 | fi" |
4682 | done |
4683 | +LC_ALL=C |
4684 | +LANGUAGE=C |
4685 | +export LANGUAGE LC_ALL |
4686 | |
4687 | $lt_unset CDPATH |
4688 | |
4689 | |
4690 | +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh |
4691 | +# is ksh but when the shell is invoked as "sh" and the current value of |
4692 | +# the _XPG environment variable is not equal to 1 (one), the special |
4693 | +# positional parameter $0, within a function call, is the name of the |
4694 | +# function. |
4695 | +progpath="$0" |
4696 | |
4697 | |
4698 | |
4699 | : ${CP="cp -f"} |
4700 | -: ${ECHO="echo"} |
4701 | +test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} |
4702 | : ${EGREP="/bin/grep -E"} |
4703 | : ${FGREP="/bin/grep -F"} |
4704 | : ${GREP="/bin/grep"} |
4705 | @@ -144,6 +164,27 @@ |
4706 | dirname="s,/[^/]*$,," |
4707 | basename="s,^.*/,," |
4708 | |
4709 | +# func_dirname file append nondir_replacement |
4710 | +# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
4711 | +# otherwise set result to NONDIR_REPLACEMENT. |
4712 | +func_dirname () |
4713 | +{ |
4714 | + func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
4715 | + if test "X$func_dirname_result" = "X${1}"; then |
4716 | + func_dirname_result="${3}" |
4717 | + else |
4718 | + func_dirname_result="$func_dirname_result${2}" |
4719 | + fi |
4720 | +} # func_dirname may be replaced by extended shell implementation |
4721 | + |
4722 | + |
4723 | +# func_basename file |
4724 | +func_basename () |
4725 | +{ |
4726 | + func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
4727 | +} # func_basename may be replaced by extended shell implementation |
4728 | + |
4729 | + |
4730 | # func_dirname_and_basename file append nondir_replacement |
4731 | # perform func_basename and func_dirname in a single function |
4732 | # call: |
4733 | @@ -158,33 +199,183 @@ |
4734 | # those functions but instead duplicate the functionality here. |
4735 | func_dirname_and_basename () |
4736 | { |
4737 | - # Extract subdirectory from the argument. |
4738 | - func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` |
4739 | - if test "X$func_dirname_result" = "X${1}"; then |
4740 | - func_dirname_result="${3}" |
4741 | - else |
4742 | - func_dirname_result="$func_dirname_result${2}" |
4743 | - fi |
4744 | - func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` |
4745 | -} |
4746 | - |
4747 | -# Generated shell functions inserted here. |
4748 | - |
4749 | -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh |
4750 | -# is ksh but when the shell is invoked as "sh" and the current value of |
4751 | -# the _XPG environment variable is not equal to 1 (one), the special |
4752 | -# positional parameter $0, within a function call, is the name of the |
4753 | -# function. |
4754 | -progpath="$0" |
4755 | + # Extract subdirectory from the argument. |
4756 | + func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` |
4757 | + if test "X$func_dirname_result" = "X${1}"; then |
4758 | + func_dirname_result="${3}" |
4759 | + else |
4760 | + func_dirname_result="$func_dirname_result${2}" |
4761 | + fi |
4762 | + func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` |
4763 | +} # func_dirname_and_basename may be replaced by extended shell implementation |
4764 | + |
4765 | + |
4766 | +# func_stripname prefix suffix name |
4767 | +# strip PREFIX and SUFFIX off of NAME. |
4768 | +# PREFIX and SUFFIX must not contain globbing or regex special |
4769 | +# characters, hashes, percent signs, but SUFFIX may contain a leading |
4770 | +# dot (in which case that matches only a dot). |
4771 | +# func_strip_suffix prefix name |
4772 | +func_stripname () |
4773 | +{ |
4774 | + case ${2} in |
4775 | + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
4776 | + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
4777 | + esac |
4778 | +} # func_stripname may be replaced by extended shell implementation |
4779 | + |
4780 | + |
4781 | +# These SED scripts presuppose an absolute path with a trailing slash. |
4782 | +pathcar='s,^/\([^/]*\).*$,\1,' |
4783 | +pathcdr='s,^/[^/]*,,' |
4784 | +removedotparts=':dotsl |
4785 | + s@/\./@/@g |
4786 | + t dotsl |
4787 | + s,/\.$,/,' |
4788 | +collapseslashes='s@/\{1,\}@/@g' |
4789 | +finalslash='s,/*$,/,' |
4790 | + |
4791 | +# func_normal_abspath PATH |
4792 | +# Remove doubled-up and trailing slashes, "." path components, |
4793 | +# and cancel out any ".." path components in PATH after making |
4794 | +# it an absolute path. |
4795 | +# value returned in "$func_normal_abspath_result" |
4796 | +func_normal_abspath () |
4797 | +{ |
4798 | + # Start from root dir and reassemble the path. |
4799 | + func_normal_abspath_result= |
4800 | + func_normal_abspath_tpath=$1 |
4801 | + func_normal_abspath_altnamespace= |
4802 | + case $func_normal_abspath_tpath in |
4803 | + "") |
4804 | + # Empty path, that just means $cwd. |
4805 | + func_stripname '' '/' "`pwd`" |
4806 | + func_normal_abspath_result=$func_stripname_result |
4807 | + return |
4808 | + ;; |
4809 | + # The next three entries are used to spot a run of precisely |
4810 | + # two leading slashes without using negated character classes; |
4811 | + # we take advantage of case's first-match behaviour. |
4812 | + ///*) |
4813 | + # Unusual form of absolute path, do nothing. |
4814 | + ;; |
4815 | + //*) |
4816 | + # Not necessarily an ordinary path; POSIX reserves leading '//' |
4817 | + # and for example Cygwin uses it to access remote file shares |
4818 | + # over CIFS/SMB, so we conserve a leading double slash if found. |
4819 | + func_normal_abspath_altnamespace=/ |
4820 | + ;; |
4821 | + /*) |
4822 | + # Absolute path, do nothing. |
4823 | + ;; |
4824 | + *) |
4825 | + # Relative path, prepend $cwd. |
4826 | + func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath |
4827 | + ;; |
4828 | + esac |
4829 | + # Cancel out all the simple stuff to save iterations. We also want |
4830 | + # the path to end with a slash for ease of parsing, so make sure |
4831 | + # there is one (and only one) here. |
4832 | + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ |
4833 | + -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` |
4834 | + while :; do |
4835 | + # Processed it all yet? |
4836 | + if test "$func_normal_abspath_tpath" = / ; then |
4837 | + # If we ascended to the root using ".." the result may be empty now. |
4838 | + if test -z "$func_normal_abspath_result" ; then |
4839 | + func_normal_abspath_result=/ |
4840 | + fi |
4841 | + break |
4842 | + fi |
4843 | + func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ |
4844 | + -e "$pathcar"` |
4845 | + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ |
4846 | + -e "$pathcdr"` |
4847 | + # Figure out what to do with it |
4848 | + case $func_normal_abspath_tcomponent in |
4849 | + "") |
4850 | + # Trailing empty path component, ignore it. |
4851 | + ;; |
4852 | + ..) |
4853 | + # Parent dir; strip last assembled component from result. |
4854 | + func_dirname "$func_normal_abspath_result" |
4855 | + func_normal_abspath_result=$func_dirname_result |
4856 | + ;; |
4857 | + *) |
4858 | + # Actual path component, append it. |
4859 | + func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent |
4860 | + ;; |
4861 | + esac |
4862 | + done |
4863 | + # Restore leading double-slash if one was found on entry. |
4864 | + func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result |
4865 | +} |
4866 | + |
4867 | +# func_relative_path SRCDIR DSTDIR |
4868 | +# generates a relative path from SRCDIR to DSTDIR, with a trailing |
4869 | +# slash if non-empty, suitable for immediately appending a filename |
4870 | +# without needing to append a separator. |
4871 | +# value returned in "$func_relative_path_result" |
4872 | +func_relative_path () |
4873 | +{ |
4874 | + func_relative_path_result= |
4875 | + func_normal_abspath "$1" |
4876 | + func_relative_path_tlibdir=$func_normal_abspath_result |
4877 | + func_normal_abspath "$2" |
4878 | + func_relative_path_tbindir=$func_normal_abspath_result |
4879 | + |
4880 | + # Ascend the tree starting from libdir |
4881 | + while :; do |
4882 | + # check if we have found a prefix of bindir |
4883 | + case $func_relative_path_tbindir in |
4884 | + $func_relative_path_tlibdir) |
4885 | + # found an exact match |
4886 | + func_relative_path_tcancelled= |
4887 | + break |
4888 | + ;; |
4889 | + $func_relative_path_tlibdir*) |
4890 | + # found a matching prefix |
4891 | + func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" |
4892 | + func_relative_path_tcancelled=$func_stripname_result |
4893 | + if test -z "$func_relative_path_result"; then |
4894 | + func_relative_path_result=. |
4895 | + fi |
4896 | + break |
4897 | + ;; |
4898 | + *) |
4899 | + func_dirname $func_relative_path_tlibdir |
4900 | + func_relative_path_tlibdir=${func_dirname_result} |
4901 | + if test "x$func_relative_path_tlibdir" = x ; then |
4902 | + # Have to descend all the way to the root! |
4903 | + func_relative_path_result=../$func_relative_path_result |
4904 | + func_relative_path_tcancelled=$func_relative_path_tbindir |
4905 | + break |
4906 | + fi |
4907 | + func_relative_path_result=../$func_relative_path_result |
4908 | + ;; |
4909 | + esac |
4910 | + done |
4911 | + |
4912 | + # Now calculate path; take care to avoid doubling-up slashes. |
4913 | + func_stripname '' '/' "$func_relative_path_result" |
4914 | + func_relative_path_result=$func_stripname_result |
4915 | + func_stripname '/' '/' "$func_relative_path_tcancelled" |
4916 | + if test "x$func_stripname_result" != x ; then |
4917 | + func_relative_path_result=${func_relative_path_result}/${func_stripname_result} |
4918 | + fi |
4919 | + |
4920 | + # Normalisation. If bindir is libdir, return empty string, |
4921 | + # else relative path ending with a slash; either way, target |
4922 | + # file name can be directly appended. |
4923 | + if test ! -z "$func_relative_path_result"; then |
4924 | + func_stripname './' '' "$func_relative_path_result/" |
4925 | + func_relative_path_result=$func_stripname_result |
4926 | + fi |
4927 | +} |
4928 | |
4929 | # The name of this program: |
4930 | -# In the unlikely event $progname began with a '-', it would play havoc with |
4931 | -# func_echo (imagine progname=-n), so we prepend ./ in that case: |
4932 | func_dirname_and_basename "$progpath" |
4933 | progname=$func_basename_result |
4934 | -case $progname in |
4935 | - -*) progname=./$progname ;; |
4936 | -esac |
4937 | |
4938 | # Make sure we have an absolute path for reexecution: |
4939 | case $progpath in |
4940 | @@ -215,6 +406,15 @@ |
4941 | # Same as above, but do not quote variable references. |
4942 | double_quote_subst='s/\(["`\\]\)/\\\1/g' |
4943 | |
4944 | +# Sed substitution that turns a string into a regex matching for the |
4945 | +# string literally. |
4946 | +sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' |
4947 | + |
4948 | +# Sed substitution that converts a w32 file name or path |
4949 | +# which contains forward slashes, into one that contains |
4950 | +# (escaped) backslashes. A very naive implementation. |
4951 | +lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' |
4952 | + |
4953 | # Re-`\' parameter expansions in output of double_quote_subst that were |
4954 | # `\'-ed in input to the same. If an odd number of `\' preceded a '$' |
4955 | # in input to double_quote_subst, that '$' was protected from expansion. |
4956 | @@ -243,7 +443,7 @@ |
4957 | # name if it has been set yet. |
4958 | func_echo () |
4959 | { |
4960 | - $ECHO "$progname${mode+: }$mode: $*" |
4961 | + $ECHO "$progname: ${opt_mode+$opt_mode: }$*" |
4962 | } |
4963 | |
4964 | # func_verbose arg... |
4965 | @@ -258,18 +458,25 @@ |
4966 | : |
4967 | } |
4968 | |
4969 | +# func_echo_all arg... |
4970 | +# Invoke $ECHO with all args, space-separated. |
4971 | +func_echo_all () |
4972 | +{ |
4973 | + $ECHO "$*" |
4974 | +} |
4975 | + |
4976 | # func_error arg... |
4977 | # Echo program name prefixed message to standard error. |
4978 | func_error () |
4979 | { |
4980 | - $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 |
4981 | + $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 |
4982 | } |
4983 | |
4984 | # func_warning arg... |
4985 | # Echo program name prefixed warning message to standard error. |
4986 | func_warning () |
4987 | { |
4988 | - $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 |
4989 | + $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 |
4990 | |
4991 | # bash bug again: |
4992 | : |
4993 | @@ -326,9 +533,9 @@ |
4994 | case $my_directory_path in */*) ;; *) break ;; esac |
4995 | |
4996 | # ...otherwise throw away the child directory and loop |
4997 | - my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"` |
4998 | + my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` |
4999 | done |
5000 | - my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'` |
The diff has been truncated for viewing.
* The version will need to be ginn_0. 2.4.1-0ubuntu1~ oneiric1 since we will upload the same sources to precise as well.
Everything else looks good. Please fix the version and then push.