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