Merge lp:~fginther/ginn/oneiric-0.2.4.1-libgeis-rename into lp:ginn/oneiric
- oneiric-0.2.4.1-libgeis-rename
- Merge into oneiric
Proposed by
Francis Ginther
Status: | Merged |
---|---|
Merged at revision: | 13 |
Proposed branch: | lp:~fginther/ginn/oneiric-0.2.4.1-libgeis-rename |
Merge into: | lp:ginn/oneiric |
Diff against target: |
16270 lines (+5988/-3340) 13 files modified
ChangeLog (+23/-0) Makefile.in (+3/-1) aclocal.m4 (+1286/-803) config-aux/config.guess (+120/-105) config-aux/config.sub (+101/-55) config-aux/ltmain.sh (+2619/-1390) configure (+1813/-977) configure.ac (+2/-2) debian/changelog (+10/-0) debian/control (+4/-4) debian/watch (+1/-1) etc/Makefile.in (+3/-1) src/Makefile.in (+3/-1) |
To merge this branch: | bzr merge lp:~fginther/ginn/oneiric-0.2.4.1-libgeis-rename |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chase Douglas (community) | Approve | ||
Daniel d'Andrada | Pending | ||
Review via email: mp+121088@code.launchpad.net |
Commit message
* New upstream microrelease, bug fixes only
- Depend on renamed libgeis package (LP: #1040871)
* Updated debian/watch file for series change
* Rename dependency on libgeis-dev
* Updated Standards-Version to 3.9.2 in debian/control
Description of the change
Renamed the dependency on libgeis (from libutouch-geis). Incorporated upstream source which was also updated to rename the libgeis dependency.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'ChangeLog' | |||
2 | --- ChangeLog 2011-02-03 13:54:56 +0000 | |||
3 | +++ ChangeLog 2012-08-23 20:59:19 +0000 | |||
4 | @@ -1,4 +1,27 @@ | |||
5 | 1 | ------------------------------------------------------------ | 1 | ------------------------------------------------------------ |
6 | 2 | revno: 84 | ||
7 | 3 | tags: 0.2.4.1 | ||
8 | 4 | committer: Francis Ginther <francis.ginther@canonical.com> | ||
9 | 5 | branch nick: 0.2.4 | ||
10 | 6 | timestamp: Sat 2012-08-18 09:20:56 -0500 | ||
11 | 7 | message: | ||
12 | 8 | Release version 0.2.4.1 | ||
13 | 9 | ------------------------------------------------------------ | ||
14 | 10 | revno: 83 | ||
15 | 11 | committer: Francis Ginther <francis.ginther@canonical.com> | ||
16 | 12 | branch nick: 0.2.4 | ||
17 | 13 | timestamp: Sat 2012-08-18 09:19:36 -0500 | ||
18 | 14 | message: | ||
19 | 15 | Update to build against renamed geis package | ||
20 | 16 | ------------------------------------------------------------ | ||
21 | 17 | revno: 82 [merge] | ||
22 | 18 | committer: Mohamed-ikbel Boulabiar <boulabiar@gmail.com> | ||
23 | 19 | branch nick: ginn | ||
24 | 20 | timestamp: Fri 2011-02-04 15:32:32 +0100 | ||
25 | 21 | message: | ||
26 | 22 | Merge Stephen license Fix, | ||
27 | 23 | Version 0.2.4 | ||
28 | 24 | ------------------------------------------------------------ | ||
29 | 2 | revno: 81 | 25 | revno: 81 |
30 | 3 | committer: Mohamed-ikbel Boulabiar <boulabiar@gmail.com> | 26 | committer: Mohamed-ikbel Boulabiar <boulabiar@gmail.com> |
31 | 4 | branch nick: ginn | 27 | branch nick: ginn |
32 | 5 | 28 | ||
33 | === modified file 'Makefile.in' | |||
34 | --- Makefile.in 2010-12-10 16:59:27 +0000 | |||
35 | +++ Makefile.in 2012-08-23 20:59:19 +0000 | |||
36 | @@ -144,6 +144,7 @@ | |||
37 | 144 | CYGPATH_W = @CYGPATH_W@ | 144 | CYGPATH_W = @CYGPATH_W@ |
38 | 145 | DEFS = @DEFS@ | 145 | DEFS = @DEFS@ |
39 | 146 | DEPDIR = @DEPDIR@ | 146 | DEPDIR = @DEPDIR@ |
40 | 147 | DLLTOOL = @DLLTOOL@ | ||
41 | 147 | DSYMUTIL = @DSYMUTIL@ | 148 | DSYMUTIL = @DSYMUTIL@ |
42 | 148 | DUMPBIN = @DUMPBIN@ | 149 | DUMPBIN = @DUMPBIN@ |
43 | 149 | ECHO_C = @ECHO_C@ | 150 | ECHO_C = @ECHO_C@ |
44 | @@ -171,6 +172,7 @@ | |||
45 | 171 | LTLIBOBJS = @LTLIBOBJS@ | 172 | LTLIBOBJS = @LTLIBOBJS@ |
46 | 172 | MAINT = @MAINT@ | 173 | MAINT = @MAINT@ |
47 | 173 | MAKEINFO = @MAKEINFO@ | 174 | MAKEINFO = @MAKEINFO@ |
48 | 175 | MANIFEST_TOOL = @MANIFEST_TOOL@ | ||
49 | 174 | MKDIR_P = @MKDIR_P@ | 176 | MKDIR_P = @MKDIR_P@ |
50 | 175 | NM = @NM@ | 177 | NM = @NM@ |
51 | 176 | NMEDIT = @NMEDIT@ | 178 | NMEDIT = @NMEDIT@ |
52 | @@ -205,6 +207,7 @@ | |||
53 | 205 | abs_srcdir = @abs_srcdir@ | 207 | abs_srcdir = @abs_srcdir@ |
54 | 206 | abs_top_builddir = @abs_top_builddir@ | 208 | abs_top_builddir = @abs_top_builddir@ |
55 | 207 | abs_top_srcdir = @abs_top_srcdir@ | 209 | abs_top_srcdir = @abs_top_srcdir@ |
56 | 210 | ac_ct_AR = @ac_ct_AR@ | ||
57 | 208 | ac_ct_CC = @ac_ct_CC@ | 211 | ac_ct_CC = @ac_ct_CC@ |
58 | 209 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ | 212 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
59 | 210 | am__include = @am__include@ | 213 | am__include = @am__include@ |
60 | @@ -237,7 +240,6 @@ | |||
61 | 237 | libexecdir = @libexecdir@ | 240 | libexecdir = @libexecdir@ |
62 | 238 | localedir = @localedir@ | 241 | localedir = @localedir@ |
63 | 239 | localstatedir = @localstatedir@ | 242 | localstatedir = @localstatedir@ |
64 | 240 | lt_ECHO = @lt_ECHO@ | ||
65 | 241 | mandir = @mandir@ | 243 | mandir = @mandir@ |
66 | 242 | mkdir_p = @mkdir_p@ | 244 | mkdir_p = @mkdir_p@ |
67 | 243 | oldincludedir = @oldincludedir@ | 245 | oldincludedir = @oldincludedir@ |
68 | 244 | 246 | ||
69 | === modified file 'aclocal.m4' | |||
70 | --- aclocal.m4 2011-02-03 13:54:56 +0000 | |||
71 | +++ aclocal.m4 2012-08-23 20:59:19 +0000 | |||
72 | @@ -13,8 +13,8 @@ | |||
73 | 13 | 13 | ||
74 | 14 | m4_ifndef([AC_AUTOCONF_VERSION], | 14 | m4_ifndef([AC_AUTOCONF_VERSION], |
75 | 15 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | 15 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
78 | 16 | m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, | 16 | m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, |
79 | 17 | [m4_warning([this file was generated for autoconf 2.67. | 17 | [m4_warning([this file was generated for autoconf 2.68. |
80 | 18 | You have another version of autoconf. It may work, but is not guaranteed to. | 18 | You have another version of autoconf. It may work, but is not guaranteed to. |
81 | 19 | If you have problems, you may need to regenerate the build system entirely. | 19 | If you have problems, you may need to regenerate the build system entirely. |
82 | 20 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) | 20 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
83 | @@ -22,7 +22,8 @@ | |||
84 | 22 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- | 22 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
85 | 23 | # | 23 | # |
86 | 24 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 24 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
88 | 25 | # 2006, 2007, 2008 Free Software Foundation, Inc. | 25 | # 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
89 | 26 | # Inc. | ||
90 | 26 | # Written by Gordon Matzigkeit, 1996 | 27 | # Written by Gordon Matzigkeit, 1996 |
91 | 27 | # | 28 | # |
92 | 28 | # This file is free software; the Free Software Foundation gives | 29 | # This file is free software; the Free Software Foundation gives |
93 | @@ -31,7 +32,8 @@ | |||
94 | 31 | 32 | ||
95 | 32 | m4_define([_LT_COPYING], [dnl | 33 | m4_define([_LT_COPYING], [dnl |
96 | 33 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 34 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
98 | 34 | # 2006, 2007, 2008 Free Software Foundation, Inc. | 35 | # 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
99 | 36 | # Inc. | ||
100 | 35 | # Written by Gordon Matzigkeit, 1996 | 37 | # Written by Gordon Matzigkeit, 1996 |
101 | 36 | # | 38 | # |
102 | 37 | # This file is part of GNU Libtool. | 39 | # This file is part of GNU Libtool. |
103 | @@ -58,7 +60,7 @@ | |||
104 | 58 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | 60 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
105 | 59 | ]) | 61 | ]) |
106 | 60 | 62 | ||
108 | 61 | # serial 56 LT_INIT | 63 | # serial 57 LT_INIT |
109 | 62 | 64 | ||
110 | 63 | 65 | ||
111 | 64 | # LT_PREREQ(VERSION) | 66 | # LT_PREREQ(VERSION) |
112 | @@ -87,6 +89,7 @@ | |||
113 | 87 | # ------------------ | 89 | # ------------------ |
114 | 88 | AC_DEFUN([LT_INIT], | 90 | AC_DEFUN([LT_INIT], |
115 | 89 | [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT | 91 | [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT |
116 | 92 | AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl | ||
117 | 90 | AC_BEFORE([$0], [LT_LANG])dnl | 93 | AC_BEFORE([$0], [LT_LANG])dnl |
118 | 91 | AC_BEFORE([$0], [LT_OUTPUT])dnl | 94 | AC_BEFORE([$0], [LT_OUTPUT])dnl |
119 | 92 | AC_BEFORE([$0], [LTDL_INIT])dnl | 95 | AC_BEFORE([$0], [LTDL_INIT])dnl |
120 | @@ -103,6 +106,8 @@ | |||
121 | 103 | AC_REQUIRE([LTOBSOLETE_VERSION])dnl | 106 | AC_REQUIRE([LTOBSOLETE_VERSION])dnl |
122 | 104 | m4_require([_LT_PROG_LTMAIN])dnl | 107 | m4_require([_LT_PROG_LTMAIN])dnl |
123 | 105 | 108 | ||
124 | 109 | _LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) | ||
125 | 110 | |||
126 | 106 | dnl Parse OPTIONS | 111 | dnl Parse OPTIONS |
127 | 107 | _LT_SET_OPTIONS([$0], [$1]) | 112 | _LT_SET_OPTIONS([$0], [$1]) |
128 | 108 | 113 | ||
129 | @@ -139,7 +144,7 @@ | |||
130 | 139 | *) break;; | 144 | *) break;; |
131 | 140 | esac | 145 | esac |
132 | 141 | done | 146 | done |
134 | 142 | cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` | 147 | cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` |
135 | 143 | ]) | 148 | ]) |
136 | 144 | 149 | ||
137 | 145 | 150 | ||
138 | @@ -159,6 +164,9 @@ | |||
139 | 159 | m4_defun([_LT_SETUP], | 164 | m4_defun([_LT_SETUP], |
140 | 160 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl | 165 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl |
141 | 161 | AC_REQUIRE([AC_CANONICAL_BUILD])dnl | 166 | AC_REQUIRE([AC_CANONICAL_BUILD])dnl |
142 | 167 | AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl | ||
143 | 168 | AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl | ||
144 | 169 | |||
145 | 162 | _LT_DECL([], [host_alias], [0], [The host system])dnl | 170 | _LT_DECL([], [host_alias], [0], [The host system])dnl |
146 | 163 | _LT_DECL([], [host], [0])dnl | 171 | _LT_DECL([], [host], [0])dnl |
147 | 164 | _LT_DECL([], [host_os], [0])dnl | 172 | _LT_DECL([], [host_os], [0])dnl |
148 | @@ -181,10 +189,13 @@ | |||
149 | 181 | dnl | 189 | dnl |
150 | 182 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl | 190 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
151 | 183 | m4_require([_LT_CHECK_SHELL_FEATURES])dnl | 191 | m4_require([_LT_CHECK_SHELL_FEATURES])dnl |
152 | 192 | m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl | ||
153 | 184 | m4_require([_LT_CMD_RELOAD])dnl | 193 | m4_require([_LT_CMD_RELOAD])dnl |
154 | 185 | m4_require([_LT_CHECK_MAGIC_METHOD])dnl | 194 | m4_require([_LT_CHECK_MAGIC_METHOD])dnl |
155 | 195 | m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl | ||
156 | 186 | m4_require([_LT_CMD_OLD_ARCHIVE])dnl | 196 | m4_require([_LT_CMD_OLD_ARCHIVE])dnl |
157 | 187 | m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl | 197 | m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl |
158 | 198 | m4_require([_LT_WITH_SYSROOT])dnl | ||
159 | 188 | 199 | ||
160 | 189 | _LT_CONFIG_LIBTOOL_INIT([ | 200 | _LT_CONFIG_LIBTOOL_INIT([ |
161 | 190 | # See if we are running on zsh, and set the options which allow our | 201 | # See if we are running on zsh, and set the options which allow our |
162 | @@ -200,7 +211,6 @@ | |||
163 | 200 | _LT_CHECK_OBJDIR | 211 | _LT_CHECK_OBJDIR |
164 | 201 | 212 | ||
165 | 202 | m4_require([_LT_TAG_COMPILER])dnl | 213 | m4_require([_LT_TAG_COMPILER])dnl |
166 | 203 | _LT_PROG_ECHO_BACKSLASH | ||
167 | 204 | 214 | ||
168 | 205 | case $host_os in | 215 | case $host_os in |
169 | 206 | aix3*) | 216 | aix3*) |
170 | @@ -214,23 +224,6 @@ | |||
171 | 214 | ;; | 224 | ;; |
172 | 215 | esac | 225 | esac |
173 | 216 | 226 | ||
174 | 217 | # Sed substitution that helps us do robust quoting. It backslashifies | ||
175 | 218 | # metacharacters that are still active within double-quoted strings. | ||
176 | 219 | sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' | ||
177 | 220 | |||
178 | 221 | # Same as above, but do not quote variable references. | ||
179 | 222 | double_quote_subst='s/\([["`\\]]\)/\\\1/g' | ||
180 | 223 | |||
181 | 224 | # Sed substitution to delay expansion of an escaped shell variable in a | ||
182 | 225 | # double_quote_subst'ed string. | ||
183 | 226 | delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' | ||
184 | 227 | |||
185 | 228 | # Sed substitution to delay expansion of an escaped single quote. | ||
186 | 229 | delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' | ||
187 | 230 | |||
188 | 231 | # Sed substitution to avoid accidental globbing in evaled expressions | ||
189 | 232 | no_glob_subst='s/\*/\\\*/g' | ||
190 | 233 | |||
191 | 234 | # Global variables: | 227 | # Global variables: |
192 | 235 | ofile=libtool | 228 | ofile=libtool |
193 | 236 | can_build_shared=yes | 229 | can_build_shared=yes |
194 | @@ -271,6 +264,28 @@ | |||
195 | 271 | ])# _LT_SETUP | 264 | ])# _LT_SETUP |
196 | 272 | 265 | ||
197 | 273 | 266 | ||
198 | 267 | # _LT_PREPARE_SED_QUOTE_VARS | ||
199 | 268 | # -------------------------- | ||
200 | 269 | # Define a few sed substitution that help us do robust quoting. | ||
201 | 270 | m4_defun([_LT_PREPARE_SED_QUOTE_VARS], | ||
202 | 271 | [# Backslashify metacharacters that are still active within | ||
203 | 272 | # double-quoted strings. | ||
204 | 273 | sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' | ||
205 | 274 | |||
206 | 275 | # Same as above, but do not quote variable references. | ||
207 | 276 | double_quote_subst='s/\([["`\\]]\)/\\\1/g' | ||
208 | 277 | |||
209 | 278 | # Sed substitution to delay expansion of an escaped shell variable in a | ||
210 | 279 | # double_quote_subst'ed string. | ||
211 | 280 | delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' | ||
212 | 281 | |||
213 | 282 | # Sed substitution to delay expansion of an escaped single quote. | ||
214 | 283 | delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' | ||
215 | 284 | |||
216 | 285 | # Sed substitution to avoid accidental globbing in evaled expressions | ||
217 | 286 | no_glob_subst='s/\*/\\\*/g' | ||
218 | 287 | ]) | ||
219 | 288 | |||
220 | 274 | # _LT_PROG_LTMAIN | 289 | # _LT_PROG_LTMAIN |
221 | 275 | # --------------- | 290 | # --------------- |
222 | 276 | # Note that this code is called both from `configure', and `config.status' | 291 | # Note that this code is called both from `configure', and `config.status' |
223 | @@ -423,7 +438,7 @@ | |||
224 | 423 | # declaration there will have the same value as in `configure'. VARNAME | 438 | # declaration there will have the same value as in `configure'. VARNAME |
225 | 424 | # must have a single quote delimited value for this to work. | 439 | # must have a single quote delimited value for this to work. |
226 | 425 | m4_define([_LT_CONFIG_STATUS_DECLARE], | 440 | m4_define([_LT_CONFIG_STATUS_DECLARE], |
228 | 426 | [$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) | 441 | [$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) |
229 | 427 | 442 | ||
230 | 428 | 443 | ||
231 | 429 | # _LT_CONFIG_STATUS_DECLARATIONS | 444 | # _LT_CONFIG_STATUS_DECLARATIONS |
232 | @@ -433,7 +448,7 @@ | |||
233 | 433 | # embedded single quotes properly. In configure, this macro expands | 448 | # embedded single quotes properly. In configure, this macro expands |
234 | 434 | # each variable declared with _LT_DECL (and _LT_TAGDECL) into: | 449 | # each variable declared with _LT_DECL (and _LT_TAGDECL) into: |
235 | 435 | # | 450 | # |
237 | 436 | # <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`' | 451 | # <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`' |
238 | 437 | m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], | 452 | m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], |
239 | 438 | [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), | 453 | [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), |
240 | 439 | [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) | 454 | [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) |
241 | @@ -532,12 +547,20 @@ | |||
242 | 532 | LTCFLAGS='$LTCFLAGS' | 547 | LTCFLAGS='$LTCFLAGS' |
243 | 533 | compiler='$compiler_DEFAULT' | 548 | compiler='$compiler_DEFAULT' |
244 | 534 | 549 | ||
245 | 550 | # A function that is used when there is no print builtin or printf. | ||
246 | 551 | func_fallback_echo () | ||
247 | 552 | { | ||
248 | 553 | eval 'cat <<_LTECHO_EOF | ||
249 | 554 | \$[]1 | ||
250 | 555 | _LTECHO_EOF' | ||
251 | 556 | } | ||
252 | 557 | |||
253 | 535 | # Quote evaled strings. | 558 | # Quote evaled strings. |
254 | 536 | for var in lt_decl_all_varnames([[ \ | 559 | for var in lt_decl_all_varnames([[ \ |
255 | 537 | ]], lt_decl_quote_varnames); do | 560 | ]], lt_decl_quote_varnames); do |
257 | 538 | case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in | 561 | case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in |
258 | 539 | *[[\\\\\\\`\\"\\\$]]*) | 562 | *[[\\\\\\\`\\"\\\$]]*) |
260 | 540 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" | 563 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" |
261 | 541 | ;; | 564 | ;; |
262 | 542 | *) | 565 | *) |
263 | 543 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" | 566 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" |
264 | @@ -548,9 +571,9 @@ | |||
265 | 548 | # Double-quote double-evaled strings. | 571 | # Double-quote double-evaled strings. |
266 | 549 | for var in lt_decl_all_varnames([[ \ | 572 | for var in lt_decl_all_varnames([[ \ |
267 | 550 | ]], lt_decl_dquote_varnames); do | 573 | ]], lt_decl_dquote_varnames); do |
269 | 551 | case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in | 574 | case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in |
270 | 552 | *[[\\\\\\\`\\"\\\$]]*) | 575 | *[[\\\\\\\`\\"\\\$]]*) |
272 | 553 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" | 576 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" |
273 | 554 | ;; | 577 | ;; |
274 | 555 | *) | 578 | *) |
275 | 556 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" | 579 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" |
276 | @@ -558,16 +581,38 @@ | |||
277 | 558 | esac | 581 | esac |
278 | 559 | done | 582 | done |
279 | 560 | 583 | ||
280 | 561 | # Fix-up fallback echo if it was mangled by the above quoting rules. | ||
281 | 562 | case \$lt_ECHO in | ||
282 | 563 | *'\\\[$]0 --fallback-echo"')dnl " | ||
283 | 564 | lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` | ||
284 | 565 | ;; | ||
285 | 566 | esac | ||
286 | 567 | |||
287 | 568 | _LT_OUTPUT_LIBTOOL_INIT | 584 | _LT_OUTPUT_LIBTOOL_INIT |
288 | 569 | ]) | 585 | ]) |
289 | 570 | 586 | ||
290 | 587 | # _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) | ||
291 | 588 | # ------------------------------------ | ||
292 | 589 | # Generate a child script FILE with all initialization necessary to | ||
293 | 590 | # reuse the environment learned by the parent script, and make the | ||
294 | 591 | # file executable. If COMMENT is supplied, it is inserted after the | ||
295 | 592 | # `#!' sequence but before initialization text begins. After this | ||
296 | 593 | # macro, additional text can be appended to FILE to form the body of | ||
297 | 594 | # the child script. The macro ends with non-zero status if the | ||
298 | 595 | # file could not be fully written (such as if the disk is full). | ||
299 | 596 | m4_ifdef([AS_INIT_GENERATED], | ||
300 | 597 | [m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], | ||
301 | 598 | [m4_defun([_LT_GENERATED_FILE_INIT], | ||
302 | 599 | [m4_require([AS_PREPARE])]dnl | ||
303 | 600 | [m4_pushdef([AS_MESSAGE_LOG_FD])]dnl | ||
304 | 601 | [lt_write_fail=0 | ||
305 | 602 | cat >$1 <<_ASEOF || lt_write_fail=1 | ||
306 | 603 | #! $SHELL | ||
307 | 604 | # Generated by $as_me. | ||
308 | 605 | $2 | ||
309 | 606 | SHELL=\${CONFIG_SHELL-$SHELL} | ||
310 | 607 | export SHELL | ||
311 | 608 | _ASEOF | ||
312 | 609 | cat >>$1 <<\_ASEOF || lt_write_fail=1 | ||
313 | 610 | AS_SHELL_SANITIZE | ||
314 | 611 | _AS_PREPARE | ||
315 | 612 | exec AS_MESSAGE_FD>&1 | ||
316 | 613 | _ASEOF | ||
317 | 614 | test $lt_write_fail = 0 && chmod +x $1[]dnl | ||
318 | 615 | m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT | ||
319 | 571 | 616 | ||
320 | 572 | # LT_OUTPUT | 617 | # LT_OUTPUT |
321 | 573 | # --------- | 618 | # --------- |
322 | @@ -577,20 +622,11 @@ | |||
323 | 577 | AC_DEFUN([LT_OUTPUT], | 622 | AC_DEFUN([LT_OUTPUT], |
324 | 578 | [: ${CONFIG_LT=./config.lt} | 623 | [: ${CONFIG_LT=./config.lt} |
325 | 579 | AC_MSG_NOTICE([creating $CONFIG_LT]) | 624 | AC_MSG_NOTICE([creating $CONFIG_LT]) |
330 | 580 | cat >"$CONFIG_LT" <<_LTEOF | 625 | _LT_GENERATED_FILE_INIT(["$CONFIG_LT"], |
331 | 581 | #! $SHELL | 626 | [# Run this file to recreate a libtool stub with the current configuration.]) |
328 | 582 | # Generated by $as_me. | ||
329 | 583 | # Run this file to recreate a libtool stub with the current configuration. | ||
332 | 584 | 627 | ||
333 | 628 | cat >>"$CONFIG_LT" <<\_LTEOF | ||
334 | 585 | lt_cl_silent=false | 629 | lt_cl_silent=false |
335 | 586 | SHELL=\${CONFIG_SHELL-$SHELL} | ||
336 | 587 | _LTEOF | ||
337 | 588 | |||
338 | 589 | cat >>"$CONFIG_LT" <<\_LTEOF | ||
339 | 590 | AS_SHELL_SANITIZE | ||
340 | 591 | _AS_PREPARE | ||
341 | 592 | |||
342 | 593 | exec AS_MESSAGE_FD>&1 | ||
343 | 594 | exec AS_MESSAGE_LOG_FD>>config.log | 630 | exec AS_MESSAGE_LOG_FD>>config.log |
344 | 595 | { | 631 | { |
345 | 596 | echo | 632 | echo |
346 | @@ -616,7 +652,7 @@ | |||
347 | 616 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) | 652 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) |
348 | 617 | configured by $[0], generated by m4_PACKAGE_STRING. | 653 | configured by $[0], generated by m4_PACKAGE_STRING. |
349 | 618 | 654 | ||
351 | 619 | Copyright (C) 2008 Free Software Foundation, Inc. | 655 | Copyright (C) 2010 Free Software Foundation, Inc. |
352 | 620 | This config.lt script is free software; the Free Software Foundation | 656 | This config.lt script is free software; the Free Software Foundation |
353 | 621 | gives unlimited permision to copy, distribute and modify it." | 657 | gives unlimited permision to copy, distribute and modify it." |
354 | 622 | 658 | ||
355 | @@ -661,15 +697,13 @@ | |||
356 | 661 | # appending to config.log, which fails on DOS, as config.log is still kept | 697 | # appending to config.log, which fails on DOS, as config.log is still kept |
357 | 662 | # open by configure. Here we exec the FD to /dev/null, effectively closing | 698 | # open by configure. Here we exec the FD to /dev/null, effectively closing |
358 | 663 | # config.log, so it can be properly (re)opened and appended to by config.lt. | 699 | # config.log, so it can be properly (re)opened and appended to by config.lt. |
368 | 664 | if test "$no_create" != yes; then | 700 | lt_cl_success=: |
369 | 665 | lt_cl_success=: | 701 | test "$silent" = yes && |
370 | 666 | test "$silent" = yes && | 702 | lt_config_lt_args="$lt_config_lt_args --quiet" |
371 | 667 | lt_config_lt_args="$lt_config_lt_args --quiet" | 703 | exec AS_MESSAGE_LOG_FD>/dev/null |
372 | 668 | exec AS_MESSAGE_LOG_FD>/dev/null | 704 | $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false |
373 | 669 | $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false | 705 | exec AS_MESSAGE_LOG_FD>>config.log |
374 | 670 | exec AS_MESSAGE_LOG_FD>>config.log | 706 | $lt_cl_success || AS_EXIT(1) |
366 | 671 | $lt_cl_success || AS_EXIT(1) | ||
367 | 672 | fi | ||
375 | 673 | ])# LT_OUTPUT | 707 | ])# LT_OUTPUT |
376 | 674 | 708 | ||
377 | 675 | 709 | ||
378 | @@ -732,15 +766,12 @@ | |||
379 | 732 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 766 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
380 | 733 | # text mode, it properly converts lines to CR/LF. This bash problem | 767 | # text mode, it properly converts lines to CR/LF. This bash problem |
381 | 734 | # is reportedly fixed, but why not run on old versions too? | 768 | # is reportedly fixed, but why not run on old versions too? |
391 | 735 | sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ | 769 | sed '$q' "$ltmain" >> "$cfgfile" \ |
392 | 736 | || (rm -f "$cfgfile"; exit 1) | 770 | || (rm -f "$cfgfile"; exit 1) |
393 | 737 | 771 | ||
394 | 738 | _LT_PROG_XSI_SHELLFNS | 772 | _LT_PROG_REPLACE_SHELLFNS |
395 | 739 | 773 | ||
396 | 740 | sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | 774 | mv -f "$cfgfile" "$ofile" || |
388 | 741 | || (rm -f "$cfgfile"; exit 1) | ||
389 | 742 | |||
390 | 743 | mv -f "$cfgfile" "$ofile" || | ||
397 | 744 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | 775 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
398 | 745 | chmod +x "$ofile" | 776 | chmod +x "$ofile" |
399 | 746 | ], | 777 | ], |
400 | @@ -846,11 +877,13 @@ | |||
401 | 846 | AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) | 877 | AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) |
402 | 847 | AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) | 878 | AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) |
403 | 848 | AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) | 879 | AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) |
404 | 880 | AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) | ||
405 | 849 | dnl aclocal-1.4 backwards compatibility: | 881 | dnl aclocal-1.4 backwards compatibility: |
406 | 850 | dnl AC_DEFUN([AC_LIBTOOL_CXX], []) | 882 | dnl AC_DEFUN([AC_LIBTOOL_CXX], []) |
407 | 851 | dnl AC_DEFUN([AC_LIBTOOL_F77], []) | 883 | dnl AC_DEFUN([AC_LIBTOOL_F77], []) |
408 | 852 | dnl AC_DEFUN([AC_LIBTOOL_FC], []) | 884 | dnl AC_DEFUN([AC_LIBTOOL_FC], []) |
409 | 853 | dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) | 885 | dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) |
410 | 886 | dnl AC_DEFUN([AC_LIBTOOL_RC], []) | ||
411 | 854 | 887 | ||
412 | 855 | 888 | ||
413 | 856 | # _LT_TAG_COMPILER | 889 | # _LT_TAG_COMPILER |
414 | @@ -955,6 +988,31 @@ | |||
415 | 955 | [lt_cv_ld_exported_symbols_list=no]) | 988 | [lt_cv_ld_exported_symbols_list=no]) |
416 | 956 | LDFLAGS="$save_LDFLAGS" | 989 | LDFLAGS="$save_LDFLAGS" |
417 | 957 | ]) | 990 | ]) |
418 | 991 | AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], | ||
419 | 992 | [lt_cv_ld_force_load=no | ||
420 | 993 | cat > conftest.c << _LT_EOF | ||
421 | 994 | int forced_loaded() { return 2;} | ||
422 | 995 | _LT_EOF | ||
423 | 996 | echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD | ||
424 | 997 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD | ||
425 | 998 | echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD | ||
426 | 999 | $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD | ||
427 | 1000 | echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD | ||
428 | 1001 | $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD | ||
429 | 1002 | cat > conftest.c << _LT_EOF | ||
430 | 1003 | int main() { return 0;} | ||
431 | 1004 | _LT_EOF | ||
432 | 1005 | echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD | ||
433 | 1006 | $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err | ||
434 | 1007 | _lt_result=$? | ||
435 | 1008 | if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then | ||
436 | 1009 | lt_cv_ld_force_load=yes | ||
437 | 1010 | else | ||
438 | 1011 | cat conftest.err >&AS_MESSAGE_LOG_FD | ||
439 | 1012 | fi | ||
440 | 1013 | rm -f conftest.err libconftest.a conftest conftest.c | ||
441 | 1014 | rm -rf conftest.dSYM | ||
442 | 1015 | ]) | ||
443 | 958 | case $host_os in | 1016 | case $host_os in |
444 | 959 | rhapsody* | darwin1.[[012]]) | 1017 | rhapsody* | darwin1.[[012]]) |
445 | 960 | _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; | 1018 | _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; |
446 | @@ -982,7 +1040,7 @@ | |||
447 | 982 | else | 1040 | else |
448 | 983 | _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' | 1041 | _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' |
449 | 984 | fi | 1042 | fi |
451 | 985 | if test "$DSYMUTIL" != ":"; then | 1043 | if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then |
452 | 986 | _lt_dsymutil='~$DSYMUTIL $lib || :' | 1044 | _lt_dsymutil='~$DSYMUTIL $lib || :' |
453 | 987 | else | 1045 | else |
454 | 988 | _lt_dsymutil= | 1046 | _lt_dsymutil= |
455 | @@ -1002,7 +1060,11 @@ | |||
456 | 1002 | _LT_TAGVAR(hardcode_direct, $1)=no | 1060 | _LT_TAGVAR(hardcode_direct, $1)=no |
457 | 1003 | _LT_TAGVAR(hardcode_automatic, $1)=yes | 1061 | _LT_TAGVAR(hardcode_automatic, $1)=yes |
458 | 1004 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported | 1062 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
460 | 1005 | _LT_TAGVAR(whole_archive_flag_spec, $1)='' | 1063 | if test "$lt_cv_ld_force_load" = "yes"; then |
461 | 1064 | _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' | ||
462 | 1065 | else | ||
463 | 1066 | _LT_TAGVAR(whole_archive_flag_spec, $1)='' | ||
464 | 1067 | fi | ||
465 | 1006 | _LT_TAGVAR(link_all_deplibs, $1)=yes | 1068 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
466 | 1007 | _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" | 1069 | _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" |
467 | 1008 | case $cc_basename in | 1070 | case $cc_basename in |
468 | @@ -1010,7 +1072,7 @@ | |||
469 | 1010 | *) _lt_dar_can_shared=$GCC ;; | 1072 | *) _lt_dar_can_shared=$GCC ;; |
470 | 1011 | esac | 1073 | esac |
471 | 1012 | if test "$_lt_dar_can_shared" = "yes"; then | 1074 | if test "$_lt_dar_can_shared" = "yes"; then |
473 | 1013 | output_verbose_link_cmd=echo | 1075 | output_verbose_link_cmd=func_echo_all |
474 | 1014 | _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}" | 1076 | _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" |
475 | 1015 | _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" | 1077 | _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" |
476 | 1016 | _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}" | 1078 | _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" |
477 | @@ -1026,203 +1088,142 @@ | |||
478 | 1026 | fi | 1088 | fi |
479 | 1027 | ]) | 1089 | ]) |
480 | 1028 | 1090 | ||
483 | 1029 | # _LT_SYS_MODULE_PATH_AIX | 1091 | # _LT_SYS_MODULE_PATH_AIX([TAGNAME]) |
484 | 1030 | # ----------------------- | 1092 | # ---------------------------------- |
485 | 1031 | # Links a minimal program and checks the executable | 1093 | # Links a minimal program and checks the executable |
486 | 1032 | # for the system default hardcoded library path. In most cases, | 1094 | # for the system default hardcoded library path. In most cases, |
487 | 1033 | # this is /usr/lib:/lib, but when the MPI compilers are used | 1095 | # this is /usr/lib:/lib, but when the MPI compilers are used |
488 | 1034 | # the location of the communication and MPI libs are included too. | 1096 | # the location of the communication and MPI libs are included too. |
489 | 1035 | # If we don't find anything, use the default library path according | 1097 | # If we don't find anything, use the default library path according |
490 | 1036 | # to the aix ld manual. | 1098 | # to the aix ld manual. |
491 | 1099 | # Store the results from the different compilers for each TAGNAME. | ||
492 | 1100 | # Allow to override them for all tags through lt_cv_aix_libpath. | ||
493 | 1037 | m4_defun([_LT_SYS_MODULE_PATH_AIX], | 1101 | m4_defun([_LT_SYS_MODULE_PATH_AIX], |
494 | 1038 | [m4_require([_LT_DECL_SED])dnl | 1102 | [m4_require([_LT_DECL_SED])dnl |
509 | 1039 | AC_LINK_IFELSE(AC_LANG_PROGRAM,[ | 1103 | if test "${lt_cv_aix_libpath+set}" = set; then |
510 | 1040 | lt_aix_libpath_sed=' | 1104 | aix_libpath=$lt_cv_aix_libpath |
511 | 1041 | /Import File Strings/,/^$/ { | 1105 | else |
512 | 1042 | /^0/ { | 1106 | AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], |
513 | 1043 | s/^0 *\(.*\)$/\1/ | 1107 | [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ |
514 | 1044 | p | 1108 | lt_aix_libpath_sed='[ |
515 | 1045 | } | 1109 | /Import File Strings/,/^$/ { |
516 | 1046 | }' | 1110 | /^0/ { |
517 | 1047 | aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | 1111 | s/^0 *\([^ ]*\) *$/\1/ |
518 | 1048 | # Check for a 64-bit object if we didn't find anything. | 1112 | p |
519 | 1049 | if test -z "$aix_libpath"; then | 1113 | } |
520 | 1050 | aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | 1114 | }]' |
521 | 1051 | fi],[]) | 1115 | _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
522 | 1052 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 1116 | # Check for a 64-bit object if we didn't find anything. |
523 | 1117 | if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then | ||
524 | 1118 | _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
525 | 1119 | fi],[]) | ||
526 | 1120 | if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then | ||
527 | 1121 | _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" | ||
528 | 1122 | fi | ||
529 | 1123 | ]) | ||
530 | 1124 | aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) | ||
531 | 1125 | fi | ||
532 | 1053 | ])# _LT_SYS_MODULE_PATH_AIX | 1126 | ])# _LT_SYS_MODULE_PATH_AIX |
533 | 1054 | 1127 | ||
534 | 1055 | 1128 | ||
535 | 1056 | # _LT_SHELL_INIT(ARG) | 1129 | # _LT_SHELL_INIT(ARG) |
536 | 1057 | # ------------------- | 1130 | # ------------------- |
537 | 1058 | m4_define([_LT_SHELL_INIT], | 1131 | m4_define([_LT_SHELL_INIT], |
544 | 1059 | [ifdef([AC_DIVERSION_NOTICE], | 1132 | [m4_divert_text([M4SH-INIT], [$1 |
545 | 1060 | [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], | 1133 | ])])# _LT_SHELL_INIT |
546 | 1061 | [AC_DIVERT_PUSH(NOTICE)]) | 1134 | |
541 | 1062 | $1 | ||
542 | 1063 | AC_DIVERT_POP | ||
543 | 1064 | ])# _LT_SHELL_INIT | ||
547 | 1065 | 1135 | ||
548 | 1066 | 1136 | ||
549 | 1067 | # _LT_PROG_ECHO_BACKSLASH | 1137 | # _LT_PROG_ECHO_BACKSLASH |
550 | 1068 | # ----------------------- | 1138 | # ----------------------- |
553 | 1069 | # Add some code to the start of the generated configure script which | 1139 | # Find how we can fake an echo command that does not interpret backslash. |
554 | 1070 | # will find an echo command which doesn't interpret backslashes. | 1140 | # In particular, with Autoconf 2.60 or later we add some code to the start |
555 | 1141 | # of the generated configure script which will find a shell with a builtin | ||
556 | 1142 | # printf (which we can use as an echo command). | ||
557 | 1071 | m4_defun([_LT_PROG_ECHO_BACKSLASH], | 1143 | m4_defun([_LT_PROG_ECHO_BACKSLASH], |
567 | 1072 | [_LT_SHELL_INIT([ | 1144 | [ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' |
568 | 1073 | # Check that we are running under the correct shell. | 1145 | ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO |
569 | 1074 | SHELL=${CONFIG_SHELL-/bin/sh} | 1146 | ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
570 | 1075 | 1147 | ||
571 | 1076 | case X$lt_ECHO in | 1148 | AC_MSG_CHECKING([how to print strings]) |
572 | 1077 | X*--fallback-echo) | 1149 | # Test print first, because it will be a builtin if present. |
573 | 1078 | # Remove one level of quotation (which was required for Make). | 1150 | if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
574 | 1079 | ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` | 1151 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
575 | 1080 | ;; | 1152 | ECHO='print -r --' |
576 | 1153 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | ||
577 | 1154 | ECHO='printf %s\n' | ||
578 | 1155 | else | ||
579 | 1156 | # Use this function as a fallback that always works. | ||
580 | 1157 | func_fallback_echo () | ||
581 | 1158 | { | ||
582 | 1159 | eval 'cat <<_LTECHO_EOF | ||
583 | 1160 | $[]1 | ||
584 | 1161 | _LTECHO_EOF' | ||
585 | 1162 | } | ||
586 | 1163 | ECHO='func_fallback_echo' | ||
587 | 1164 | fi | ||
588 | 1165 | |||
589 | 1166 | # func_echo_all arg... | ||
590 | 1167 | # Invoke $ECHO with all args, space-separated. | ||
591 | 1168 | func_echo_all () | ||
592 | 1169 | { | ||
593 | 1170 | $ECHO "$*" | ||
594 | 1171 | } | ||
595 | 1172 | |||
596 | 1173 | case "$ECHO" in | ||
597 | 1174 | printf*) AC_MSG_RESULT([printf]) ;; | ||
598 | 1175 | print*) AC_MSG_RESULT([print -r]) ;; | ||
599 | 1176 | *) AC_MSG_RESULT([cat]) ;; | ||
600 | 1081 | esac | 1177 | esac |
601 | 1082 | 1178 | ||
739 | 1083 | ECHO=${lt_ECHO-echo} | 1179 | m4_ifdef([_AS_DETECT_SUGGESTED], |
740 | 1084 | if test "X[$]1" = X--no-reexec; then | 1180 | [_AS_DETECT_SUGGESTED([ |
741 | 1085 | # Discard the --no-reexec flag, and continue. | 1181 | test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( |
742 | 1086 | shift | 1182 | ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' |
743 | 1087 | elif test "X[$]1" = X--fallback-echo; then | 1183 | ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO |
744 | 1088 | # Avoid inline document here, it may be left over | 1184 | ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
745 | 1089 | : | 1185 | PATH=/empty FPATH=/empty; export PATH FPATH |
746 | 1090 | elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then | 1186 | test "X`printf %s $ECHO`" = "X$ECHO" \ |
747 | 1091 | # Yippee, $ECHO works! | 1187 | || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) |
748 | 1092 | : | 1188 | |
612 | 1093 | else | ||
613 | 1094 | # Restart under the correct shell. | ||
614 | 1095 | exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} | ||
615 | 1096 | fi | ||
616 | 1097 | |||
617 | 1098 | if test "X[$]1" = X--fallback-echo; then | ||
618 | 1099 | # used as fallback echo | ||
619 | 1100 | shift | ||
620 | 1101 | cat <<_LT_EOF | ||
621 | 1102 | [$]* | ||
622 | 1103 | _LT_EOF | ||
623 | 1104 | exit 0 | ||
624 | 1105 | fi | ||
625 | 1106 | |||
626 | 1107 | # The HP-UX ksh and POSIX shell print the target directory to stdout | ||
627 | 1108 | # if CDPATH is set. | ||
628 | 1109 | (unset CDPATH) >/dev/null 2>&1 && unset CDPATH | ||
629 | 1110 | |||
630 | 1111 | if test -z "$lt_ECHO"; then | ||
631 | 1112 | if test "X${echo_test_string+set}" != Xset; then | ||
632 | 1113 | # find a string as large as possible, as long as the shell can cope with it | ||
633 | 1114 | for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do | ||
634 | 1115 | # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... | ||
635 | 1116 | if { echo_test_string=`eval $cmd`; } 2>/dev/null && | ||
636 | 1117 | { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null | ||
637 | 1118 | then | ||
638 | 1119 | break | ||
639 | 1120 | fi | ||
640 | 1121 | done | ||
641 | 1122 | fi | ||
642 | 1123 | |||
643 | 1124 | if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && | ||
644 | 1125 | echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && | ||
645 | 1126 | test "X$echo_testing_string" = "X$echo_test_string"; then | ||
646 | 1127 | : | ||
647 | 1128 | else | ||
648 | 1129 | # The Solaris, AIX, and Digital Unix default echo programs unquote | ||
649 | 1130 | # backslashes. This makes it impossible to quote backslashes using | ||
650 | 1131 | # echo "$something" | sed 's/\\/\\\\/g' | ||
651 | 1132 | # | ||
652 | 1133 | # So, first we look for a working echo in the user's PATH. | ||
653 | 1134 | |||
654 | 1135 | lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR | ||
655 | 1136 | for dir in $PATH /usr/ucb; do | ||
656 | 1137 | IFS="$lt_save_ifs" | ||
657 | 1138 | if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && | ||
658 | 1139 | test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && | ||
659 | 1140 | echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && | ||
660 | 1141 | test "X$echo_testing_string" = "X$echo_test_string"; then | ||
661 | 1142 | ECHO="$dir/echo" | ||
662 | 1143 | break | ||
663 | 1144 | fi | ||
664 | 1145 | done | ||
665 | 1146 | IFS="$lt_save_ifs" | ||
666 | 1147 | |||
667 | 1148 | if test "X$ECHO" = Xecho; then | ||
668 | 1149 | # We didn't find a better echo, so look for alternatives. | ||
669 | 1150 | if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && | ||
670 | 1151 | echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && | ||
671 | 1152 | test "X$echo_testing_string" = "X$echo_test_string"; then | ||
672 | 1153 | # This shell has a builtin print -r that does the trick. | ||
673 | 1154 | ECHO='print -r' | ||
674 | 1155 | elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && | ||
675 | 1156 | test "X$CONFIG_SHELL" != X/bin/ksh; then | ||
676 | 1157 | # If we have ksh, try running configure again with it. | ||
677 | 1158 | ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} | ||
678 | 1159 | export ORIGINAL_CONFIG_SHELL | ||
679 | 1160 | CONFIG_SHELL=/bin/ksh | ||
680 | 1161 | export CONFIG_SHELL | ||
681 | 1162 | exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} | ||
682 | 1163 | else | ||
683 | 1164 | # Try using printf. | ||
684 | 1165 | ECHO='printf %s\n' | ||
685 | 1166 | if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && | ||
686 | 1167 | echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && | ||
687 | 1168 | test "X$echo_testing_string" = "X$echo_test_string"; then | ||
688 | 1169 | # Cool, printf works | ||
689 | 1170 | : | ||
690 | 1171 | elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && | ||
691 | 1172 | test "X$echo_testing_string" = 'X\t' && | ||
692 | 1173 | echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && | ||
693 | 1174 | test "X$echo_testing_string" = "X$echo_test_string"; then | ||
694 | 1175 | CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL | ||
695 | 1176 | export CONFIG_SHELL | ||
696 | 1177 | SHELL="$CONFIG_SHELL" | ||
697 | 1178 | export SHELL | ||
698 | 1179 | ECHO="$CONFIG_SHELL [$]0 --fallback-echo" | ||
699 | 1180 | elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && | ||
700 | 1181 | test "X$echo_testing_string" = 'X\t' && | ||
701 | 1182 | echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && | ||
702 | 1183 | test "X$echo_testing_string" = "X$echo_test_string"; then | ||
703 | 1184 | ECHO="$CONFIG_SHELL [$]0 --fallback-echo" | ||
704 | 1185 | else | ||
705 | 1186 | # maybe with a smaller string... | ||
706 | 1187 | prev=: | ||
707 | 1188 | |||
708 | 1189 | for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do | ||
709 | 1190 | if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null | ||
710 | 1191 | then | ||
711 | 1192 | break | ||
712 | 1193 | fi | ||
713 | 1194 | prev="$cmd" | ||
714 | 1195 | done | ||
715 | 1196 | |||
716 | 1197 | if test "$prev" != 'sed 50q "[$]0"'; then | ||
717 | 1198 | echo_test_string=`eval $prev` | ||
718 | 1199 | export echo_test_string | ||
719 | 1200 | exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} | ||
720 | 1201 | else | ||
721 | 1202 | # Oops. We lost completely, so just stick with echo. | ||
722 | 1203 | ECHO=echo | ||
723 | 1204 | fi | ||
724 | 1205 | fi | ||
725 | 1206 | fi | ||
726 | 1207 | fi | ||
727 | 1208 | fi | ||
728 | 1209 | fi | ||
729 | 1210 | |||
730 | 1211 | # Copy echo and quote the copy suitably for passing to libtool from | ||
731 | 1212 | # the Makefile, instead of quoting the original, which is used later. | ||
732 | 1213 | lt_ECHO=$ECHO | ||
733 | 1214 | if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then | ||
734 | 1215 | lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" | ||
735 | 1216 | fi | ||
736 | 1217 | |||
737 | 1218 | AC_SUBST(lt_ECHO) | ||
738 | 1219 | ]) | ||
749 | 1220 | _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) | 1189 | _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) |
752 | 1221 | _LT_DECL([], [ECHO], [1], | 1190 | _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) |
751 | 1222 | [An echo program that does not interpret backslashes]) | ||
753 | 1223 | ])# _LT_PROG_ECHO_BACKSLASH | 1191 | ])# _LT_PROG_ECHO_BACKSLASH |
754 | 1224 | 1192 | ||
755 | 1225 | 1193 | ||
756 | 1194 | # _LT_WITH_SYSROOT | ||
757 | 1195 | # ---------------- | ||
758 | 1196 | AC_DEFUN([_LT_WITH_SYSROOT], | ||
759 | 1197 | [AC_MSG_CHECKING([for sysroot]) | ||
760 | 1198 | AC_ARG_WITH([sysroot], | ||
761 | 1199 | [ --with-sysroot[=DIR] Search for dependent libraries within DIR | ||
762 | 1200 | (or the compiler's sysroot if not specified).], | ||
763 | 1201 | [], [with_sysroot=no]) | ||
764 | 1202 | |||
765 | 1203 | dnl lt_sysroot will always be passed unquoted. We quote it here | ||
766 | 1204 | dnl in case the user passed a directory name. | ||
767 | 1205 | lt_sysroot= | ||
768 | 1206 | case ${with_sysroot} in #( | ||
769 | 1207 | yes) | ||
770 | 1208 | if test "$GCC" = yes; then | ||
771 | 1209 | lt_sysroot=`$CC --print-sysroot 2>/dev/null` | ||
772 | 1210 | fi | ||
773 | 1211 | ;; #( | ||
774 | 1212 | /*) | ||
775 | 1213 | lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` | ||
776 | 1214 | ;; #( | ||
777 | 1215 | no|'') | ||
778 | 1216 | ;; #( | ||
779 | 1217 | *) | ||
780 | 1218 | AC_MSG_RESULT([${with_sysroot}]) | ||
781 | 1219 | AC_MSG_ERROR([The sysroot must be an absolute path.]) | ||
782 | 1220 | ;; | ||
783 | 1221 | esac | ||
784 | 1222 | |||
785 | 1223 | AC_MSG_RESULT([${lt_sysroot:-no}]) | ||
786 | 1224 | _LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl | ||
787 | 1225 | [dependent libraries, and in which our libraries should be installed.])]) | ||
788 | 1226 | |||
789 | 1226 | # _LT_ENABLE_LOCK | 1227 | # _LT_ENABLE_LOCK |
790 | 1227 | # --------------- | 1228 | # --------------- |
791 | 1228 | m4_defun([_LT_ENABLE_LOCK], | 1229 | m4_defun([_LT_ENABLE_LOCK], |
792 | @@ -1251,7 +1252,7 @@ | |||
793 | 1251 | ;; | 1252 | ;; |
794 | 1252 | *-*-irix6*) | 1253 | *-*-irix6*) |
795 | 1253 | # Find out which ABI we are using. | 1254 | # Find out which ABI we are using. |
797 | 1254 | echo '[#]line __oline__ "configure"' > conftest.$ac_ext | 1255 | echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext |
798 | 1255 | if AC_TRY_EVAL(ac_compile); then | 1256 | if AC_TRY_EVAL(ac_compile); then |
799 | 1256 | if test "$lt_cv_prog_gnu_ld" = yes; then | 1257 | if test "$lt_cv_prog_gnu_ld" = yes; then |
800 | 1257 | case `/usr/bin/file conftest.$ac_objext` in | 1258 | case `/usr/bin/file conftest.$ac_objext` in |
801 | @@ -1369,14 +1370,47 @@ | |||
802 | 1369 | ])# _LT_ENABLE_LOCK | 1370 | ])# _LT_ENABLE_LOCK |
803 | 1370 | 1371 | ||
804 | 1371 | 1372 | ||
805 | 1373 | # _LT_PROG_AR | ||
806 | 1374 | # ----------- | ||
807 | 1375 | m4_defun([_LT_PROG_AR], | ||
808 | 1376 | [AC_CHECK_TOOLS(AR, [ar], false) | ||
809 | 1377 | : ${AR=ar} | ||
810 | 1378 | : ${AR_FLAGS=cru} | ||
811 | 1379 | _LT_DECL([], [AR], [1], [The archiver]) | ||
812 | 1380 | _LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) | ||
813 | 1381 | |||
814 | 1382 | AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], | ||
815 | 1383 | [lt_cv_ar_at_file=no | ||
816 | 1384 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM], | ||
817 | 1385 | [echo conftest.$ac_objext > conftest.lst | ||
818 | 1386 | lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' | ||
819 | 1387 | AC_TRY_EVAL([lt_ar_try]) | ||
820 | 1388 | if test "$ac_status" -eq 0; then | ||
821 | 1389 | # Ensure the archiver fails upon bogus file names. | ||
822 | 1390 | rm -f conftest.$ac_objext libconftest.a | ||
823 | 1391 | AC_TRY_EVAL([lt_ar_try]) | ||
824 | 1392 | if test "$ac_status" -ne 0; then | ||
825 | 1393 | lt_cv_ar_at_file=@ | ||
826 | 1394 | fi | ||
827 | 1395 | fi | ||
828 | 1396 | rm -f conftest.* libconftest.a | ||
829 | 1397 | ]) | ||
830 | 1398 | ]) | ||
831 | 1399 | |||
832 | 1400 | if test "x$lt_cv_ar_at_file" = xno; then | ||
833 | 1401 | archiver_list_spec= | ||
834 | 1402 | else | ||
835 | 1403 | archiver_list_spec=$lt_cv_ar_at_file | ||
836 | 1404 | fi | ||
837 | 1405 | _LT_DECL([], [archiver_list_spec], [1], | ||
838 | 1406 | [How to feed a file listing to the archiver]) | ||
839 | 1407 | ])# _LT_PROG_AR | ||
840 | 1408 | |||
841 | 1409 | |||
842 | 1372 | # _LT_CMD_OLD_ARCHIVE | 1410 | # _LT_CMD_OLD_ARCHIVE |
843 | 1373 | # ------------------- | 1411 | # ------------------- |
844 | 1374 | m4_defun([_LT_CMD_OLD_ARCHIVE], | 1412 | m4_defun([_LT_CMD_OLD_ARCHIVE], |
850 | 1375 | [AC_CHECK_TOOL(AR, ar, false) | 1413 | [_LT_PROG_AR |
846 | 1376 | test -z "$AR" && AR=ar | ||
847 | 1377 | test -z "$AR_FLAGS" && AR_FLAGS=cru | ||
848 | 1378 | _LT_DECL([], [AR], [1], [The archiver]) | ||
849 | 1379 | _LT_DECL([], [AR_FLAGS], [1]) | ||
851 | 1380 | 1414 | ||
852 | 1381 | AC_CHECK_TOOL(STRIP, strip, :) | 1415 | AC_CHECK_TOOL(STRIP, strip, :) |
853 | 1382 | test -z "$STRIP" && STRIP=: | 1416 | test -z "$STRIP" && STRIP=: |
854 | @@ -1403,10 +1437,19 @@ | |||
855 | 1403 | esac | 1437 | esac |
856 | 1404 | old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" | 1438 | old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" |
857 | 1405 | fi | 1439 | fi |
858 | 1440 | |||
859 | 1441 | case $host_os in | ||
860 | 1442 | darwin*) | ||
861 | 1443 | lock_old_archive_extraction=yes ;; | ||
862 | 1444 | *) | ||
863 | 1445 | lock_old_archive_extraction=no ;; | ||
864 | 1446 | esac | ||
865 | 1406 | _LT_DECL([], [old_postinstall_cmds], [2]) | 1447 | _LT_DECL([], [old_postinstall_cmds], [2]) |
866 | 1407 | _LT_DECL([], [old_postuninstall_cmds], [2]) | 1448 | _LT_DECL([], [old_postuninstall_cmds], [2]) |
867 | 1408 | _LT_TAGDECL([], [old_archive_cmds], [2], | 1449 | _LT_TAGDECL([], [old_archive_cmds], [2], |
868 | 1409 | [Commands used to build an old-style archive]) | 1450 | [Commands used to build an old-style archive]) |
869 | 1451 | _LT_DECL([], [lock_old_archive_extraction], [0], | ||
870 | 1452 | [Whether to use a lock for old archive extraction]) | ||
871 | 1410 | ])# _LT_CMD_OLD_ARCHIVE | 1453 | ])# _LT_CMD_OLD_ARCHIVE |
872 | 1411 | 1454 | ||
873 | 1412 | 1455 | ||
874 | @@ -1431,15 +1474,15 @@ | |||
875 | 1431 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 1474 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
876 | 1432 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ | 1475 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ |
877 | 1433 | -e 's:$: $lt_compiler_flag:'` | 1476 | -e 's:$: $lt_compiler_flag:'` |
879 | 1434 | (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) | 1477 | (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
880 | 1435 | (eval "$lt_compile" 2>conftest.err) | 1478 | (eval "$lt_compile" 2>conftest.err) |
881 | 1436 | ac_status=$? | 1479 | ac_status=$? |
882 | 1437 | cat conftest.err >&AS_MESSAGE_LOG_FD | 1480 | cat conftest.err >&AS_MESSAGE_LOG_FD |
884 | 1438 | echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD | 1481 | echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
885 | 1439 | if (exit $ac_status) && test -s "$ac_outfile"; then | 1482 | if (exit $ac_status) && test -s "$ac_outfile"; then |
886 | 1440 | # The compiler can only warn and ignore the option if not recognized | 1483 | # The compiler can only warn and ignore the option if not recognized |
887 | 1441 | # So say no if there are warnings other than the usual output. | 1484 | # So say no if there are warnings other than the usual output. |
889 | 1442 | $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp | 1485 | $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp |
890 | 1443 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 | 1486 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
891 | 1444 | if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then | 1487 | if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then |
892 | 1445 | $2=yes | 1488 | $2=yes |
893 | @@ -1479,7 +1522,7 @@ | |||
894 | 1479 | if test -s conftest.err; then | 1522 | if test -s conftest.err; then |
895 | 1480 | # Append any errors to the config.log. | 1523 | # Append any errors to the config.log. |
896 | 1481 | cat conftest.err 1>&AS_MESSAGE_LOG_FD | 1524 | cat conftest.err 1>&AS_MESSAGE_LOG_FD |
898 | 1482 | $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp | 1525 | $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp |
899 | 1483 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 | 1526 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
900 | 1484 | if diff conftest.exp conftest.er2 >/dev/null; then | 1527 | if diff conftest.exp conftest.er2 >/dev/null; then |
901 | 1485 | $2=yes | 1528 | $2=yes |
902 | @@ -1542,6 +1585,11 @@ | |||
903 | 1542 | lt_cv_sys_max_cmd_len=8192; | 1585 | lt_cv_sys_max_cmd_len=8192; |
904 | 1543 | ;; | 1586 | ;; |
905 | 1544 | 1587 | ||
906 | 1588 | mint*) | ||
907 | 1589 | # On MiNT this can take a long time and run out of memory. | ||
908 | 1590 | lt_cv_sys_max_cmd_len=8192; | ||
909 | 1591 | ;; | ||
910 | 1592 | |||
911 | 1545 | amigaos*) | 1593 | amigaos*) |
912 | 1546 | # On AmigaOS with pdksh, this test takes hours, literally. | 1594 | # On AmigaOS with pdksh, this test takes hours, literally. |
913 | 1547 | # So we just punt and use a minimum line length of 8192. | 1595 | # So we just punt and use a minimum line length of 8192. |
914 | @@ -1606,8 +1654,8 @@ | |||
915 | 1606 | # If test is not a shell built-in, we'll probably end up computing a | 1654 | # If test is not a shell built-in, we'll probably end up computing a |
916 | 1607 | # maximum length that is only half of the actual maximum length, but | 1655 | # maximum length that is only half of the actual maximum length, but |
917 | 1608 | # we can't tell. | 1656 | # we can't tell. |
920 | 1609 | while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ | 1657 | while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ |
921 | 1610 | = "XX$teststring$teststring"; } >/dev/null 2>&1 && | 1658 | = "X$teststring$teststring"; } >/dev/null 2>&1 && |
922 | 1611 | test $i != 17 # 1/2 MB should be enough | 1659 | test $i != 17 # 1/2 MB should be enough |
923 | 1612 | do | 1660 | do |
924 | 1613 | i=`expr $i + 1` | 1661 | i=`expr $i + 1` |
925 | @@ -1658,7 +1706,7 @@ | |||
926 | 1658 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 1706 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
927 | 1659 | lt_status=$lt_dlunknown | 1707 | lt_status=$lt_dlunknown |
928 | 1660 | cat > conftest.$ac_ext <<_LT_EOF | 1708 | cat > conftest.$ac_ext <<_LT_EOF |
930 | 1661 | [#line __oline__ "configure" | 1709 | [#line $LINENO "configure" |
931 | 1662 | #include "confdefs.h" | 1710 | #include "confdefs.h" |
932 | 1663 | 1711 | ||
933 | 1664 | #if HAVE_DLFCN_H | 1712 | #if HAVE_DLFCN_H |
934 | @@ -1699,7 +1747,13 @@ | |||
935 | 1699 | # endif | 1747 | # endif |
936 | 1700 | #endif | 1748 | #endif |
937 | 1701 | 1749 | ||
939 | 1702 | void fnord() { int i=42;} | 1750 | /* When -fvisbility=hidden is used, assume the code has been annotated |
940 | 1751 | correspondingly for the symbols needed. */ | ||
941 | 1752 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
942 | 1753 | int fnord () __attribute__((visibility("default"))); | ||
943 | 1754 | #endif | ||
944 | 1755 | |||
945 | 1756 | int fnord () { return 42; } | ||
946 | 1703 | int main () | 1757 | int main () |
947 | 1704 | { | 1758 | { |
948 | 1705 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 1759 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
949 | @@ -1708,7 +1762,11 @@ | |||
950 | 1708 | if (self) | 1762 | if (self) |
951 | 1709 | { | 1763 | { |
952 | 1710 | if (dlsym (self,"fnord")) status = $lt_dlno_uscore; | 1764 | if (dlsym (self,"fnord")) status = $lt_dlno_uscore; |
954 | 1711 | else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; | 1765 | else |
955 | 1766 | { | ||
956 | 1767 | if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; | ||
957 | 1768 | else puts (dlerror ()); | ||
958 | 1769 | } | ||
959 | 1712 | /* dlclose (self); */ | 1770 | /* dlclose (self); */ |
960 | 1713 | } | 1771 | } |
961 | 1714 | else | 1772 | else |
962 | @@ -1884,16 +1942,16 @@ | |||
963 | 1884 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 1942 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
964 | 1885 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ | 1943 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ |
965 | 1886 | -e 's:$: $lt_compiler_flag:'` | 1944 | -e 's:$: $lt_compiler_flag:'` |
967 | 1887 | (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) | 1945 | (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
968 | 1888 | (eval "$lt_compile" 2>out/conftest.err) | 1946 | (eval "$lt_compile" 2>out/conftest.err) |
969 | 1889 | ac_status=$? | 1947 | ac_status=$? |
970 | 1890 | cat out/conftest.err >&AS_MESSAGE_LOG_FD | 1948 | cat out/conftest.err >&AS_MESSAGE_LOG_FD |
972 | 1891 | echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD | 1949 | echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
973 | 1892 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | 1950 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
974 | 1893 | then | 1951 | then |
975 | 1894 | # The compiler can only warn and ignore the option if not recognized | 1952 | # The compiler can only warn and ignore the option if not recognized |
976 | 1895 | # So say no if there are warnings | 1953 | # So say no if there are warnings |
978 | 1896 | $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp | 1954 | $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp |
979 | 1897 | $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 | 1955 | $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 |
980 | 1898 | if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then | 1956 | if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then |
981 | 1899 | _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes | 1957 | _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes |
982 | @@ -2052,6 +2110,7 @@ | |||
983 | 2052 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl | 2110 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
984 | 2053 | m4_require([_LT_DECL_OBJDUMP])dnl | 2111 | m4_require([_LT_DECL_OBJDUMP])dnl |
985 | 2054 | m4_require([_LT_DECL_SED])dnl | 2112 | m4_require([_LT_DECL_SED])dnl |
986 | 2113 | m4_require([_LT_CHECK_SHELL_FEATURES])dnl | ||
987 | 2055 | AC_MSG_CHECKING([dynamic linker characteristics]) | 2114 | AC_MSG_CHECKING([dynamic linker characteristics]) |
988 | 2056 | m4_if([$1], | 2115 | m4_if([$1], |
989 | 2057 | [], [ | 2116 | [], [ |
990 | @@ -2060,16 +2119,23 @@ | |||
991 | 2060 | darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; | 2119 | darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; |
992 | 2061 | *) lt_awk_arg="/^libraries:/" ;; | 2120 | *) lt_awk_arg="/^libraries:/" ;; |
993 | 2062 | esac | 2121 | esac |
996 | 2063 | lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` | 2122 | case $host_os in |
997 | 2064 | if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then | 2123 | mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; |
998 | 2124 | *) lt_sed_strip_eq="s,=/,/,g" ;; | ||
999 | 2125 | esac | ||
1000 | 2126 | lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` | ||
1001 | 2127 | case $lt_search_path_spec in | ||
1002 | 2128 | *\;*) | ||
1003 | 2065 | # if the path contains ";" then we assume it to be the separator | 2129 | # if the path contains ";" then we assume it to be the separator |
1004 | 2066 | # otherwise default to the standard path separator (i.e. ":") - it is | 2130 | # otherwise default to the standard path separator (i.e. ":") - it is |
1005 | 2067 | # assumed that no part of a normal pathname contains ";" but that should | 2131 | # assumed that no part of a normal pathname contains ";" but that should |
1006 | 2068 | # okay in the real world where ";" in dirpaths is itself problematic. | 2132 | # okay in the real world where ";" in dirpaths is itself problematic. |
1011 | 2069 | lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` | 2133 | lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` |
1012 | 2070 | else | 2134 | ;; |
1013 | 2071 | lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | 2135 | *) |
1014 | 2072 | fi | 2136 | lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` |
1015 | 2137 | ;; | ||
1016 | 2138 | esac | ||
1017 | 2073 | # Ok, now we have the path, separated by spaces, we can step through it | 2139 | # Ok, now we have the path, separated by spaces, we can step through it |
1018 | 2074 | # and add multilib dir if necessary. | 2140 | # and add multilib dir if necessary. |
1019 | 2075 | lt_tmp_lt_search_path_spec= | 2141 | lt_tmp_lt_search_path_spec= |
1020 | @@ -2082,7 +2148,7 @@ | |||
1021 | 2082 | lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" | 2148 | lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" |
1022 | 2083 | fi | 2149 | fi |
1023 | 2084 | done | 2150 | done |
1025 | 2085 | lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' | 2151 | lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' |
1026 | 2086 | BEGIN {RS=" "; FS="/|\n";} { | 2152 | BEGIN {RS=" "; FS="/|\n";} { |
1027 | 2087 | lt_foo=""; | 2153 | lt_foo=""; |
1028 | 2088 | lt_count=0; | 2154 | lt_count=0; |
1029 | @@ -2102,7 +2168,13 @@ | |||
1030 | 2102 | if (lt_foo != "") { lt_freq[[lt_foo]]++; } | 2168 | if (lt_foo != "") { lt_freq[[lt_foo]]++; } |
1031 | 2103 | if (lt_freq[[lt_foo]] == 1) { print lt_foo; } | 2169 | if (lt_freq[[lt_foo]] == 1) { print lt_foo; } |
1032 | 2104 | }'` | 2170 | }'` |
1034 | 2105 | sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` | 2171 | # AWK program above erroneously prepends '/' to C:/dos/paths |
1035 | 2172 | # for these hosts. | ||
1036 | 2173 | case $host_os in | ||
1037 | 2174 | mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ | ||
1038 | 2175 | $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; | ||
1039 | 2176 | esac | ||
1040 | 2177 | sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` | ||
1041 | 2106 | else | 2178 | else |
1042 | 2107 | sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" | 2179 | sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" |
1043 | 2108 | fi]) | 2180 | fi]) |
1044 | @@ -2190,7 +2262,7 @@ | |||
1045 | 2190 | m68k) | 2262 | m68k) |
1046 | 2191 | library_names_spec='$libname.ixlibrary $libname.a' | 2263 | library_names_spec='$libname.ixlibrary $libname.a' |
1047 | 2192 | # Create ${libname}_ixlibrary.a entries in /sys/libs. | 2264 | # Create ${libname}_ixlibrary.a entries in /sys/libs. |
1049 | 2193 | 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' | 2265 | finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' |
1050 | 2194 | ;; | 2266 | ;; |
1051 | 2195 | esac | 2267 | esac |
1052 | 2196 | ;; | 2268 | ;; |
1053 | @@ -2221,8 +2293,9 @@ | |||
1054 | 2221 | need_version=no | 2293 | need_version=no |
1055 | 2222 | need_lib_prefix=no | 2294 | need_lib_prefix=no |
1056 | 2223 | 2295 | ||
1059 | 2224 | case $GCC,$host_os in | 2296 | case $GCC,$cc_basename in |
1060 | 2225 | yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) | 2297 | yes,*) |
1061 | 2298 | # gcc | ||
1062 | 2226 | library_names_spec='$libname.dll.a' | 2299 | library_names_spec='$libname.dll.a' |
1063 | 2227 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 2300 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
1064 | 2228 | postinstall_cmds='base_file=`basename \${file}`~ | 2301 | postinstall_cmds='base_file=`basename \${file}`~ |
1065 | @@ -2243,36 +2316,83 @@ | |||
1066 | 2243 | cygwin*) | 2316 | cygwin*) |
1067 | 2244 | # Cygwin DLLs use 'cyg' prefix rather than 'lib' | 2317 | # Cygwin DLLs use 'cyg' prefix rather than 'lib' |
1068 | 2245 | soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' | 2318 | soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
1070 | 2246 | sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" | 2319 | m4_if([$1], [],[ |
1071 | 2320 | sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) | ||
1072 | 2247 | ;; | 2321 | ;; |
1073 | 2248 | mingw* | cegcc*) | 2322 | mingw* | cegcc*) |
1074 | 2249 | # MinGW DLLs use traditional 'lib' prefix | 2323 | # MinGW DLLs use traditional 'lib' prefix |
1075 | 2250 | soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' | 2324 | soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
1076 | 2251 | sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` | ||
1077 | 2252 | if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then | ||
1078 | 2253 | # It is most probably a Windows format PATH printed by | ||
1079 | 2254 | # mingw gcc, but we are running on Cygwin. Gcc prints its search | ||
1080 | 2255 | # path with ; separators, and with drive letters. We can handle the | ||
1081 | 2256 | # drive letters (cygwin fileutils understands them), so leave them, | ||
1082 | 2257 | # especially as we might pass files found there to a mingw objdump, | ||
1083 | 2258 | # which wouldn't understand a cygwinified path. Ahh. | ||
1084 | 2259 | sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | ||
1085 | 2260 | else | ||
1086 | 2261 | sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
1087 | 2262 | fi | ||
1088 | 2263 | ;; | 2325 | ;; |
1089 | 2264 | pw32*) | 2326 | pw32*) |
1090 | 2265 | # pw32 DLLs use 'pw' prefix rather than 'lib' | 2327 | # pw32 DLLs use 'pw' prefix rather than 'lib' |
1091 | 2266 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' | 2328 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
1092 | 2267 | ;; | 2329 | ;; |
1093 | 2268 | esac | 2330 | esac |
1094 | 2331 | dynamic_linker='Win32 ld.exe' | ||
1095 | 2332 | ;; | ||
1096 | 2333 | |||
1097 | 2334 | *,cl*) | ||
1098 | 2335 | # Native MSVC | ||
1099 | 2336 | libname_spec='$name' | ||
1100 | 2337 | soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' | ||
1101 | 2338 | library_names_spec='${libname}.dll.lib' | ||
1102 | 2339 | |||
1103 | 2340 | case $build_os in | ||
1104 | 2341 | mingw*) | ||
1105 | 2342 | sys_lib_search_path_spec= | ||
1106 | 2343 | lt_save_ifs=$IFS | ||
1107 | 2344 | IFS=';' | ||
1108 | 2345 | for lt_path in $LIB | ||
1109 | 2346 | do | ||
1110 | 2347 | IFS=$lt_save_ifs | ||
1111 | 2348 | # Let DOS variable expansion print the short 8.3 style file name. | ||
1112 | 2349 | lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` | ||
1113 | 2350 | sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" | ||
1114 | 2351 | done | ||
1115 | 2352 | IFS=$lt_save_ifs | ||
1116 | 2353 | # Convert to MSYS style. | ||
1117 | 2354 | sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` | ||
1118 | 2355 | ;; | ||
1119 | 2356 | cygwin*) | ||
1120 | 2357 | # Convert to unix form, then to dos form, then back to unix form | ||
1121 | 2358 | # but this time dos style (no spaces!) so that the unix form looks | ||
1122 | 2359 | # like /cygdrive/c/PROGRA~1:/cygdr... | ||
1123 | 2360 | sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` | ||
1124 | 2361 | sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` | ||
1125 | 2362 | sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
1126 | 2363 | ;; | ||
1127 | 2364 | *) | ||
1128 | 2365 | sys_lib_search_path_spec="$LIB" | ||
1129 | 2366 | if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then | ||
1130 | 2367 | # It is most probably a Windows format PATH. | ||
1131 | 2368 | sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | ||
1132 | 2369 | else | ||
1133 | 2370 | sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
1134 | 2371 | fi | ||
1135 | 2372 | # FIXME: find the short name or the path components, as spaces are | ||
1136 | 2373 | # common. (e.g. "Program Files" -> "PROGRA~1") | ||
1137 | 2374 | ;; | ||
1138 | 2375 | esac | ||
1139 | 2376 | |||
1140 | 2377 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
1141 | 2378 | postinstall_cmds='base_file=`basename \${file}`~ | ||
1142 | 2379 | dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ | ||
1143 | 2380 | dldir=$destdir/`dirname \$dlpath`~ | ||
1144 | 2381 | test -d \$dldir || mkdir -p \$dldir~ | ||
1145 | 2382 | $install_prog $dir/$dlname \$dldir/$dlname' | ||
1146 | 2383 | postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ | ||
1147 | 2384 | dlpath=$dir/\$dldll~ | ||
1148 | 2385 | $RM \$dlpath' | ||
1149 | 2386 | shlibpath_overrides_runpath=yes | ||
1150 | 2387 | dynamic_linker='Win32 link.exe' | ||
1151 | 2269 | ;; | 2388 | ;; |
1152 | 2270 | 2389 | ||
1153 | 2271 | *) | 2390 | *) |
1154 | 2391 | # Assume MSVC wrapper | ||
1155 | 2272 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' | 2392 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' |
1156 | 2393 | dynamic_linker='Win32 ld.exe' | ||
1157 | 2273 | ;; | 2394 | ;; |
1158 | 2274 | esac | 2395 | esac |
1159 | 2275 | dynamic_linker='Win32 ld.exe' | ||
1160 | 2276 | # FIXME: first we should search . and the directory the executable is in | 2396 | # FIXME: first we should search . and the directory the executable is in |
1161 | 2277 | shlibpath_var=PATH | 2397 | shlibpath_var=PATH |
1162 | 2278 | ;; | 2398 | ;; |
1163 | @@ -2356,6 +2476,20 @@ | |||
1164 | 2356 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' | 2476 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
1165 | 2357 | soname_spec='${libname}${release}${shared_ext}$major' | 2477 | soname_spec='${libname}${release}${shared_ext}$major' |
1166 | 2358 | shlibpath_var=LD_LIBRARY_PATH | 2478 | shlibpath_var=LD_LIBRARY_PATH |
1167 | 2479 | shlibpath_overrides_runpath=no | ||
1168 | 2480 | hardcode_into_libs=yes | ||
1169 | 2481 | ;; | ||
1170 | 2482 | |||
1171 | 2483 | haiku*) | ||
1172 | 2484 | version_type=linux | ||
1173 | 2485 | need_lib_prefix=no | ||
1174 | 2486 | need_version=no | ||
1175 | 2487 | dynamic_linker="$host_os runtime_loader" | ||
1176 | 2488 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' | ||
1177 | 2489 | soname_spec='${libname}${release}${shared_ext}$major' | ||
1178 | 2490 | shlibpath_var=LIBRARY_PATH | ||
1179 | 2491 | shlibpath_overrides_runpath=yes | ||
1180 | 2492 | sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' | ||
1181 | 2359 | hardcode_into_libs=yes | 2493 | hardcode_into_libs=yes |
1182 | 2360 | ;; | 2494 | ;; |
1183 | 2361 | 2495 | ||
1184 | @@ -2401,8 +2535,10 @@ | |||
1185 | 2401 | soname_spec='${libname}${release}${shared_ext}$major' | 2535 | soname_spec='${libname}${release}${shared_ext}$major' |
1186 | 2402 | ;; | 2536 | ;; |
1187 | 2403 | esac | 2537 | esac |
1189 | 2404 | # HP-UX runs *really* slowly unless shared libraries are mode 555. | 2538 | # HP-UX runs *really* slowly unless shared libraries are mode 555, ... |
1190 | 2405 | postinstall_cmds='chmod 555 $lib' | 2539 | postinstall_cmds='chmod 555 $lib' |
1191 | 2540 | # or fails outright, so override atomically: | ||
1192 | 2541 | install_override_mode=555 | ||
1193 | 2406 | ;; | 2542 | ;; |
1194 | 2407 | 2543 | ||
1195 | 2408 | interix[[3-9]]*) | 2544 | interix[[3-9]]*) |
1196 | @@ -2469,16 +2605,21 @@ | |||
1197 | 2469 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' | 2605 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' |
1198 | 2470 | shlibpath_var=LD_LIBRARY_PATH | 2606 | shlibpath_var=LD_LIBRARY_PATH |
1199 | 2471 | shlibpath_overrides_runpath=no | 2607 | shlibpath_overrides_runpath=no |
1200 | 2608 | |||
1201 | 2472 | # Some binutils ld are patched to set DT_RUNPATH | 2609 | # Some binutils ld are patched to set DT_RUNPATH |
1211 | 2473 | save_LDFLAGS=$LDFLAGS | 2610 | AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], |
1212 | 2474 | save_libdir=$libdir | 2611 | [lt_cv_shlibpath_overrides_runpath=no |
1213 | 2475 | eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ | 2612 | save_LDFLAGS=$LDFLAGS |
1214 | 2476 | LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" | 2613 | save_libdir=$libdir |
1215 | 2477 | AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], | 2614 | eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ |
1216 | 2478 | [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], | 2615 | LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" |
1217 | 2479 | [shlibpath_overrides_runpath=yes])]) | 2616 | AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], |
1218 | 2480 | LDFLAGS=$save_LDFLAGS | 2617 | [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], |
1219 | 2481 | libdir=$save_libdir | 2618 | [lt_cv_shlibpath_overrides_runpath=yes])]) |
1220 | 2619 | LDFLAGS=$save_LDFLAGS | ||
1221 | 2620 | libdir=$save_libdir | ||
1222 | 2621 | ]) | ||
1223 | 2622 | shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath | ||
1224 | 2482 | 2623 | ||
1225 | 2483 | # This implies no fast_install, which is unacceptable. | 2624 | # This implies no fast_install, which is unacceptable. |
1226 | 2484 | # Some rework will be needed to allow for fast_install | 2625 | # Some rework will be needed to allow for fast_install |
1227 | @@ -2487,7 +2628,7 @@ | |||
1228 | 2487 | 2628 | ||
1229 | 2488 | # Append ld.so.conf contents to the search path | 2629 | # Append ld.so.conf contents to the search path |
1230 | 2489 | if test -f /etc/ld.so.conf; then | 2630 | if test -f /etc/ld.so.conf; then |
1232 | 2490 | 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' ' '` | 2631 | lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` |
1233 | 2491 | sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" | 2632 | sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" |
1234 | 2492 | fi | 2633 | fi |
1235 | 2493 | 2634 | ||
1236 | @@ -2732,6 +2873,8 @@ | |||
1237 | 2732 | The last name is the one that the linker finds with -lNAME]]) | 2873 | The last name is the one that the linker finds with -lNAME]]) |
1238 | 2733 | _LT_DECL([], [soname_spec], [1], | 2874 | _LT_DECL([], [soname_spec], [1], |
1239 | 2734 | [[The coded name of the library, if different from the real name]]) | 2875 | [[The coded name of the library, if different from the real name]]) |
1240 | 2876 | _LT_DECL([], [install_override_mode], [1], | ||
1241 | 2877 | [Permission mode override for installation of shared libraries]) | ||
1242 | 2735 | _LT_DECL([], [postinstall_cmds], [2], | 2878 | _LT_DECL([], [postinstall_cmds], [2], |
1243 | 2736 | [Command to use after installation of a shared archive]) | 2879 | [Command to use after installation of a shared archive]) |
1244 | 2737 | _LT_DECL([], [postuninstall_cmds], [2], | 2880 | _LT_DECL([], [postuninstall_cmds], [2], |
1245 | @@ -2844,6 +2987,7 @@ | |||
1246 | 2844 | AC_REQUIRE([AC_CANONICAL_BUILD])dnl | 2987 | AC_REQUIRE([AC_CANONICAL_BUILD])dnl |
1247 | 2845 | m4_require([_LT_DECL_SED])dnl | 2988 | m4_require([_LT_DECL_SED])dnl |
1248 | 2846 | m4_require([_LT_DECL_EGREP])dnl | 2989 | m4_require([_LT_DECL_EGREP])dnl |
1249 | 2990 | m4_require([_LT_PROG_ECHO_BACKSLASH])dnl | ||
1250 | 2847 | 2991 | ||
1251 | 2848 | AC_ARG_WITH([gnu-ld], | 2992 | AC_ARG_WITH([gnu-ld], |
1252 | 2849 | [AS_HELP_STRING([--with-gnu-ld], | 2993 | [AS_HELP_STRING([--with-gnu-ld], |
1253 | @@ -2965,6 +3109,11 @@ | |||
1254 | 2965 | esac | 3109 | esac |
1255 | 2966 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 3110 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
1256 | 2967 | case $host_os in | 3111 | case $host_os in |
1257 | 3112 | cygwin* | mingw* | pw32* | cegcc*) | ||
1258 | 3113 | if test "$GCC" != yes; then | ||
1259 | 3114 | reload_cmds=false | ||
1260 | 3115 | fi | ||
1261 | 3116 | ;; | ||
1262 | 2968 | darwin*) | 3117 | darwin*) |
1263 | 2969 | if test "$GCC" = yes; then | 3118 | if test "$GCC" = yes; then |
1264 | 2970 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 3119 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
1265 | @@ -2973,8 +3122,8 @@ | |||
1266 | 2973 | fi | 3122 | fi |
1267 | 2974 | ;; | 3123 | ;; |
1268 | 2975 | esac | 3124 | esac |
1271 | 2976 | _LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl | 3125 | _LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl |
1272 | 2977 | _LT_DECL([], [reload_cmds], [2])dnl | 3126 | _LT_TAGDECL([], [reload_cmds], [2])dnl |
1273 | 2978 | ])# _LT_CMD_RELOAD | 3127 | ])# _LT_CMD_RELOAD |
1274 | 2979 | 3128 | ||
1275 | 2980 | 3129 | ||
1276 | @@ -3026,16 +3175,18 @@ | |||
1277 | 3026 | # Base MSYS/MinGW do not provide the 'file' command needed by | 3175 | # Base MSYS/MinGW do not provide the 'file' command needed by |
1278 | 3027 | # func_win32_libid shell function, so use a weaker test based on 'objdump', | 3176 | # func_win32_libid shell function, so use a weaker test based on 'objdump', |
1279 | 3028 | # unless we find 'file', for example because we are cross-compiling. | 3177 | # unless we find 'file', for example because we are cross-compiling. |
1281 | 3029 | if ( file / ) >/dev/null 2>&1; then | 3178 | # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. |
1282 | 3179 | if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then | ||
1283 | 3030 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 3180 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
1284 | 3031 | lt_cv_file_magic_cmd='func_win32_libid' | 3181 | lt_cv_file_magic_cmd='func_win32_libid' |
1285 | 3032 | else | 3182 | else |
1287 | 3033 | lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' | 3183 | # Keep this pattern in sync with the one in func_win32_libid. |
1288 | 3184 | lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' | ||
1289 | 3034 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 3185 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
1290 | 3035 | fi | 3186 | fi |
1291 | 3036 | ;; | 3187 | ;; |
1292 | 3037 | 3188 | ||
1294 | 3038 | cegcc) | 3189 | cegcc*) |
1295 | 3039 | # use the weaker test based on 'objdump'. See mingw*. | 3190 | # use the weaker test based on 'objdump'. See mingw*. |
1296 | 3040 | lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' | 3191 | lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' |
1297 | 3041 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 3192 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
1298 | @@ -3065,6 +3216,10 @@ | |||
1299 | 3065 | lt_cv_deplibs_check_method=pass_all | 3216 | lt_cv_deplibs_check_method=pass_all |
1300 | 3066 | ;; | 3217 | ;; |
1301 | 3067 | 3218 | ||
1302 | 3219 | haiku*) | ||
1303 | 3220 | lt_cv_deplibs_check_method=pass_all | ||
1304 | 3221 | ;; | ||
1305 | 3222 | |||
1306 | 3068 | hpux10.20* | hpux11*) | 3223 | hpux10.20* | hpux11*) |
1307 | 3069 | lt_cv_file_magic_cmd=/usr/bin/file | 3224 | lt_cv_file_magic_cmd=/usr/bin/file |
1308 | 3070 | case $host_cpu in | 3225 | case $host_cpu in |
1309 | @@ -3073,11 +3228,11 @@ | |||
1310 | 3073 | lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so | 3228 | lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so |
1311 | 3074 | ;; | 3229 | ;; |
1312 | 3075 | hppa*64*) | 3230 | hppa*64*) |
1314 | 3076 | [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]'] | 3231 | [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] |
1315 | 3077 | lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl | 3232 | lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl |
1316 | 3078 | ;; | 3233 | ;; |
1317 | 3079 | *) | 3234 | *) |
1319 | 3080 | lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' | 3235 | lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' |
1320 | 3081 | lt_cv_file_magic_test_file=/usr/lib/libc.sl | 3236 | lt_cv_file_magic_test_file=/usr/lib/libc.sl |
1321 | 3082 | ;; | 3237 | ;; |
1322 | 3083 | esac | 3238 | esac |
1323 | @@ -3177,6 +3332,21 @@ | |||
1324 | 3177 | ;; | 3332 | ;; |
1325 | 3178 | esac | 3333 | esac |
1326 | 3179 | ]) | 3334 | ]) |
1327 | 3335 | |||
1328 | 3336 | file_magic_glob= | ||
1329 | 3337 | want_nocaseglob=no | ||
1330 | 3338 | if test "$build" = "$host"; then | ||
1331 | 3339 | case $host_os in | ||
1332 | 3340 | mingw* | pw32*) | ||
1333 | 3341 | if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then | ||
1334 | 3342 | want_nocaseglob=yes | ||
1335 | 3343 | else | ||
1336 | 3344 | file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` | ||
1337 | 3345 | fi | ||
1338 | 3346 | ;; | ||
1339 | 3347 | esac | ||
1340 | 3348 | fi | ||
1341 | 3349 | |||
1342 | 3180 | file_magic_cmd=$lt_cv_file_magic_cmd | 3350 | file_magic_cmd=$lt_cv_file_magic_cmd |
1343 | 3181 | deplibs_check_method=$lt_cv_deplibs_check_method | 3351 | deplibs_check_method=$lt_cv_deplibs_check_method |
1344 | 3182 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 3352 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
1345 | @@ -3184,7 +3354,11 @@ | |||
1346 | 3184 | _LT_DECL([], [deplibs_check_method], [1], | 3354 | _LT_DECL([], [deplibs_check_method], [1], |
1347 | 3185 | [Method to check whether dependent libraries are shared objects]) | 3355 | [Method to check whether dependent libraries are shared objects]) |
1348 | 3186 | _LT_DECL([], [file_magic_cmd], [1], | 3356 | _LT_DECL([], [file_magic_cmd], [1], |
1350 | 3187 | [Command to use when deplibs_check_method == "file_magic"]) | 3357 | [Command to use when deplibs_check_method = "file_magic"]) |
1351 | 3358 | _LT_DECL([], [file_magic_glob], [1], | ||
1352 | 3359 | [How to find potential files when deplibs_check_method = "file_magic"]) | ||
1353 | 3360 | _LT_DECL([], [want_nocaseglob], [1], | ||
1354 | 3361 | [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) | ||
1355 | 3188 | ])# _LT_CHECK_MAGIC_METHOD | 3362 | ])# _LT_CHECK_MAGIC_METHOD |
1356 | 3189 | 3363 | ||
1357 | 3190 | 3364 | ||
1358 | @@ -3241,7 +3415,19 @@ | |||
1359 | 3241 | NM="$lt_cv_path_NM" | 3415 | NM="$lt_cv_path_NM" |
1360 | 3242 | else | 3416 | else |
1361 | 3243 | # Didn't find any BSD compatible name lister, look for dumpbin. | 3417 | # Didn't find any BSD compatible name lister, look for dumpbin. |
1363 | 3244 | AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) | 3418 | if test -n "$DUMPBIN"; then : |
1364 | 3419 | # Let the user override the test. | ||
1365 | 3420 | else | ||
1366 | 3421 | AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) | ||
1367 | 3422 | case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in | ||
1368 | 3423 | *COFF*) | ||
1369 | 3424 | DUMPBIN="$DUMPBIN -symbols" | ||
1370 | 3425 | ;; | ||
1371 | 3426 | *) | ||
1372 | 3427 | DUMPBIN=: | ||
1373 | 3428 | ;; | ||
1374 | 3429 | esac | ||
1375 | 3430 | fi | ||
1376 | 3245 | AC_SUBST([DUMPBIN]) | 3431 | AC_SUBST([DUMPBIN]) |
1377 | 3246 | if test "$DUMPBIN" != ":"; then | 3432 | if test "$DUMPBIN" != ":"; then |
1378 | 3247 | NM="$DUMPBIN" | 3433 | NM="$DUMPBIN" |
1379 | @@ -3254,13 +3440,13 @@ | |||
1380 | 3254 | AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], | 3440 | AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], |
1381 | 3255 | [lt_cv_nm_interface="BSD nm" | 3441 | [lt_cv_nm_interface="BSD nm" |
1382 | 3256 | echo "int some_variable = 0;" > conftest.$ac_ext | 3442 | echo "int some_variable = 0;" > conftest.$ac_ext |
1384 | 3257 | (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) | 3443 | (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) |
1385 | 3258 | (eval "$ac_compile" 2>conftest.err) | 3444 | (eval "$ac_compile" 2>conftest.err) |
1386 | 3259 | cat conftest.err >&AS_MESSAGE_LOG_FD | 3445 | cat conftest.err >&AS_MESSAGE_LOG_FD |
1388 | 3260 | (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) | 3446 | (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) |
1389 | 3261 | (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) | 3447 | (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) |
1390 | 3262 | cat conftest.err >&AS_MESSAGE_LOG_FD | 3448 | cat conftest.err >&AS_MESSAGE_LOG_FD |
1392 | 3263 | (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) | 3449 | (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) |
1393 | 3264 | cat conftest.out >&AS_MESSAGE_LOG_FD | 3450 | cat conftest.out >&AS_MESSAGE_LOG_FD |
1394 | 3265 | if $GREP 'External.*some_variable' conftest.out > /dev/null; then | 3451 | if $GREP 'External.*some_variable' conftest.out > /dev/null; then |
1395 | 3266 | lt_cv_nm_interface="MS dumpbin" | 3452 | lt_cv_nm_interface="MS dumpbin" |
1396 | @@ -3275,6 +3461,67 @@ | |||
1397 | 3275 | dnl AC_DEFUN([AM_PROG_NM], []) | 3461 | dnl AC_DEFUN([AM_PROG_NM], []) |
1398 | 3276 | dnl AC_DEFUN([AC_PROG_NM], []) | 3462 | dnl AC_DEFUN([AC_PROG_NM], []) |
1399 | 3277 | 3463 | ||
1400 | 3464 | # _LT_CHECK_SHAREDLIB_FROM_LINKLIB | ||
1401 | 3465 | # -------------------------------- | ||
1402 | 3466 | # how to determine the name of the shared library | ||
1403 | 3467 | # associated with a specific link library. | ||
1404 | 3468 | # -- PORTME fill in with the dynamic library characteristics | ||
1405 | 3469 | m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], | ||
1406 | 3470 | [m4_require([_LT_DECL_EGREP]) | ||
1407 | 3471 | m4_require([_LT_DECL_OBJDUMP]) | ||
1408 | 3472 | m4_require([_LT_DECL_DLLTOOL]) | ||
1409 | 3473 | AC_CACHE_CHECK([how to associate runtime and link libraries], | ||
1410 | 3474 | lt_cv_sharedlib_from_linklib_cmd, | ||
1411 | 3475 | [lt_cv_sharedlib_from_linklib_cmd='unknown' | ||
1412 | 3476 | |||
1413 | 3477 | case $host_os in | ||
1414 | 3478 | cygwin* | mingw* | pw32* | cegcc*) | ||
1415 | 3479 | # two different shell functions defined in ltmain.sh | ||
1416 | 3480 | # decide which to use based on capabilities of $DLLTOOL | ||
1417 | 3481 | case `$DLLTOOL --help 2>&1` in | ||
1418 | 3482 | *--identify-strict*) | ||
1419 | 3483 | lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib | ||
1420 | 3484 | ;; | ||
1421 | 3485 | *) | ||
1422 | 3486 | lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback | ||
1423 | 3487 | ;; | ||
1424 | 3488 | esac | ||
1425 | 3489 | ;; | ||
1426 | 3490 | *) | ||
1427 | 3491 | # fallback: assume linklib IS sharedlib | ||
1428 | 3492 | lt_cv_sharedlib_from_linklib_cmd="$ECHO" | ||
1429 | 3493 | ;; | ||
1430 | 3494 | esac | ||
1431 | 3495 | ]) | ||
1432 | 3496 | sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd | ||
1433 | 3497 | test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO | ||
1434 | 3498 | |||
1435 | 3499 | _LT_DECL([], [sharedlib_from_linklib_cmd], [1], | ||
1436 | 3500 | [Command to associate shared and link libraries]) | ||
1437 | 3501 | ])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB | ||
1438 | 3502 | |||
1439 | 3503 | |||
1440 | 3504 | # _LT_PATH_MANIFEST_TOOL | ||
1441 | 3505 | # ---------------------- | ||
1442 | 3506 | # locate the manifest tool | ||
1443 | 3507 | m4_defun([_LT_PATH_MANIFEST_TOOL], | ||
1444 | 3508 | [AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) | ||
1445 | 3509 | test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt | ||
1446 | 3510 | AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], | ||
1447 | 3511 | [lt_cv_path_mainfest_tool=no | ||
1448 | 3512 | echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD | ||
1449 | 3513 | $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out | ||
1450 | 3514 | cat conftest.err >&AS_MESSAGE_LOG_FD | ||
1451 | 3515 | if $GREP 'Manifest Tool' conftest.out > /dev/null; then | ||
1452 | 3516 | lt_cv_path_mainfest_tool=yes | ||
1453 | 3517 | fi | ||
1454 | 3518 | rm -f conftest*]) | ||
1455 | 3519 | if test "x$lt_cv_path_mainfest_tool" != xyes; then | ||
1456 | 3520 | MANIFEST_TOOL=: | ||
1457 | 3521 | fi | ||
1458 | 3522 | _LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl | ||
1459 | 3523 | ])# _LT_PATH_MANIFEST_TOOL | ||
1460 | 3524 | |||
1461 | 3278 | 3525 | ||
1462 | 3279 | # LT_LIB_M | 3526 | # LT_LIB_M |
1463 | 3280 | # -------- | 3527 | # -------- |
1464 | @@ -3283,7 +3530,7 @@ | |||
1465 | 3283 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl | 3530 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl |
1466 | 3284 | LIBM= | 3531 | LIBM= |
1467 | 3285 | case $host in | 3532 | case $host in |
1469 | 3286 | *-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) | 3533 | *-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) |
1470 | 3287 | # These system don't have libm, or don't need it | 3534 | # These system don't have libm, or don't need it |
1471 | 3288 | ;; | 3535 | ;; |
1472 | 3289 | *-ncr-sysv4.3*) | 3536 | *-ncr-sysv4.3*) |
1473 | @@ -3311,7 +3558,12 @@ | |||
1474 | 3311 | _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= | 3558 | _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= |
1475 | 3312 | 3559 | ||
1476 | 3313 | if test "$GCC" = yes; then | 3560 | if test "$GCC" = yes; then |
1478 | 3314 | _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' | 3561 | case $cc_basename in |
1479 | 3562 | nvcc*) | ||
1480 | 3563 | _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; | ||
1481 | 3564 | *) | ||
1482 | 3565 | _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; | ||
1483 | 3566 | esac | ||
1484 | 3315 | 3567 | ||
1485 | 3316 | _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], | 3568 | _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], |
1486 | 3317 | lt_cv_prog_compiler_rtti_exceptions, | 3569 | lt_cv_prog_compiler_rtti_exceptions, |
1487 | @@ -3328,6 +3580,7 @@ | |||
1488 | 3328 | m4_defun([_LT_CMD_GLOBAL_SYMBOLS], | 3580 | m4_defun([_LT_CMD_GLOBAL_SYMBOLS], |
1489 | 3329 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl | 3581 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl |
1490 | 3330 | AC_REQUIRE([AC_PROG_CC])dnl | 3582 | AC_REQUIRE([AC_PROG_CC])dnl |
1491 | 3583 | AC_REQUIRE([AC_PROG_AWK])dnl | ||
1492 | 3331 | AC_REQUIRE([LT_PATH_NM])dnl | 3584 | AC_REQUIRE([LT_PATH_NM])dnl |
1493 | 3332 | AC_REQUIRE([LT_PATH_LD])dnl | 3585 | AC_REQUIRE([LT_PATH_LD])dnl |
1494 | 3333 | m4_require([_LT_DECL_SED])dnl | 3586 | m4_require([_LT_DECL_SED])dnl |
1495 | @@ -3395,8 +3648,8 @@ | |||
1496 | 3395 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 3648 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
1497 | 3396 | 3649 | ||
1498 | 3397 | # Transform an extracted symbol line into symbol name and symbol address | 3650 | # Transform an extracted symbol line into symbol name and symbol address |
1501 | 3398 | lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" | 3651 | lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" |
1502 | 3399 | 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'" | 3652 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" |
1503 | 3400 | 3653 | ||
1504 | 3401 | # Handle CRLF in mingw tool chain | 3654 | # Handle CRLF in mingw tool chain |
1505 | 3402 | opt_cr= | 3655 | opt_cr= |
1506 | @@ -3432,6 +3685,7 @@ | |||
1507 | 3432 | else | 3685 | else |
1508 | 3433 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | 3686 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
1509 | 3434 | fi | 3687 | fi |
1510 | 3688 | lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" | ||
1511 | 3435 | 3689 | ||
1512 | 3436 | # Check to see that the pipe works correctly. | 3690 | # Check to see that the pipe works correctly. |
1513 | 3437 | pipe_works=no | 3691 | pipe_works=no |
1514 | @@ -3453,7 +3707,7 @@ | |||
1515 | 3453 | if AC_TRY_EVAL(ac_compile); then | 3707 | if AC_TRY_EVAL(ac_compile); then |
1516 | 3454 | # Now try to grab the symbols. | 3708 | # Now try to grab the symbols. |
1517 | 3455 | nlist=conftest.nm | 3709 | nlist=conftest.nm |
1519 | 3456 | if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then | 3710 | if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then |
1520 | 3457 | # Try sorting and uniquifying the output. | 3711 | # Try sorting and uniquifying the output. |
1521 | 3458 | if sort "$nlist" | uniq > "$nlist"T; then | 3712 | if sort "$nlist" | uniq > "$nlist"T; then |
1522 | 3459 | mv -f "$nlist"T "$nlist" | 3713 | mv -f "$nlist"T "$nlist" |
1523 | @@ -3465,6 +3719,18 @@ | |||
1524 | 3465 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | 3719 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
1525 | 3466 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 3720 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
1526 | 3467 | cat <<_LT_EOF > conftest.$ac_ext | 3721 | cat <<_LT_EOF > conftest.$ac_ext |
1527 | 3722 | /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ | ||
1528 | 3723 | #if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) | ||
1529 | 3724 | /* DATA imports from DLLs on WIN32 con't be const, because runtime | ||
1530 | 3725 | relocations are performed -- see ld's documentation on pseudo-relocs. */ | ||
1531 | 3726 | # define LT@&t@_DLSYM_CONST | ||
1532 | 3727 | #elif defined(__osf__) | ||
1533 | 3728 | /* This system does not cope well with relocations in const data. */ | ||
1534 | 3729 | # define LT@&t@_DLSYM_CONST | ||
1535 | 3730 | #else | ||
1536 | 3731 | # define LT@&t@_DLSYM_CONST const | ||
1537 | 3732 | #endif | ||
1538 | 3733 | |||
1539 | 3468 | #ifdef __cplusplus | 3734 | #ifdef __cplusplus |
1540 | 3469 | extern "C" { | 3735 | extern "C" { |
1541 | 3470 | #endif | 3736 | #endif |
1542 | @@ -3476,7 +3742,7 @@ | |||
1543 | 3476 | cat <<_LT_EOF >> conftest.$ac_ext | 3742 | cat <<_LT_EOF >> conftest.$ac_ext |
1544 | 3477 | 3743 | ||
1545 | 3478 | /* The mapping between symbol names and symbols. */ | 3744 | /* The mapping between symbol names and symbols. */ |
1547 | 3479 | const struct { | 3745 | LT@&t@_DLSYM_CONST struct { |
1548 | 3480 | const char *name; | 3746 | const char *name; |
1549 | 3481 | void *address; | 3747 | void *address; |
1550 | 3482 | } | 3748 | } |
1551 | @@ -3502,15 +3768,15 @@ | |||
1552 | 3502 | _LT_EOF | 3768 | _LT_EOF |
1553 | 3503 | # Now try linking the two files. | 3769 | # Now try linking the two files. |
1554 | 3504 | mv conftest.$ac_objext conftstm.$ac_objext | 3770 | mv conftest.$ac_objext conftstm.$ac_objext |
1557 | 3505 | lt_save_LIBS="$LIBS" | 3771 | lt_globsym_save_LIBS=$LIBS |
1558 | 3506 | lt_save_CFLAGS="$CFLAGS" | 3772 | lt_globsym_save_CFLAGS=$CFLAGS |
1559 | 3507 | LIBS="conftstm.$ac_objext" | 3773 | LIBS="conftstm.$ac_objext" |
1560 | 3508 | CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" | 3774 | CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" |
1561 | 3509 | if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then | 3775 | if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then |
1562 | 3510 | pipe_works=yes | 3776 | pipe_works=yes |
1563 | 3511 | fi | 3777 | fi |
1566 | 3512 | LIBS="$lt_save_LIBS" | 3778 | LIBS=$lt_globsym_save_LIBS |
1567 | 3513 | CFLAGS="$lt_save_CFLAGS" | 3779 | CFLAGS=$lt_globsym_save_CFLAGS |
1568 | 3514 | else | 3780 | else |
1569 | 3515 | echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD | 3781 | echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD |
1570 | 3516 | fi | 3782 | fi |
1571 | @@ -3543,6 +3809,13 @@ | |||
1572 | 3543 | AC_MSG_RESULT(ok) | 3809 | AC_MSG_RESULT(ok) |
1573 | 3544 | fi | 3810 | fi |
1574 | 3545 | 3811 | ||
1575 | 3812 | # Response file support. | ||
1576 | 3813 | if test "$lt_cv_nm_interface" = "MS dumpbin"; then | ||
1577 | 3814 | nm_file_list_spec='@' | ||
1578 | 3815 | elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then | ||
1579 | 3816 | nm_file_list_spec='@' | ||
1580 | 3817 | fi | ||
1581 | 3818 | |||
1582 | 3546 | _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], | 3819 | _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], |
1583 | 3547 | [Take the output of nm and produce a listing of raw symbols and C names]) | 3820 | [Take the output of nm and produce a listing of raw symbols and C names]) |
1584 | 3548 | _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], | 3821 | _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], |
1585 | @@ -3553,6 +3826,8 @@ | |||
1586 | 3553 | _LT_DECL([global_symbol_to_c_name_address_lib_prefix], | 3826 | _LT_DECL([global_symbol_to_c_name_address_lib_prefix], |
1587 | 3554 | [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], | 3827 | [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], |
1588 | 3555 | [Transform the output of nm in a C name address pair when lib prefix is needed]) | 3828 | [Transform the output of nm in a C name address pair when lib prefix is needed]) |
1589 | 3829 | _LT_DECL([], [nm_file_list_spec], [1], | ||
1590 | 3830 | [Specify filename containing input files for $NM]) | ||
1591 | 3556 | ]) # _LT_CMD_GLOBAL_SYMBOLS | 3831 | ]) # _LT_CMD_GLOBAL_SYMBOLS |
1592 | 3557 | 3832 | ||
1593 | 3558 | 3833 | ||
1594 | @@ -3564,7 +3839,6 @@ | |||
1595 | 3564 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= | 3839 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
1596 | 3565 | _LT_TAGVAR(lt_prog_compiler_static, $1)= | 3840 | _LT_TAGVAR(lt_prog_compiler_static, $1)= |
1597 | 3566 | 3841 | ||
1598 | 3567 | AC_MSG_CHECKING([for $compiler option to produce PIC]) | ||
1599 | 3568 | m4_if([$1], [CXX], [ | 3842 | m4_if([$1], [CXX], [ |
1600 | 3569 | # C++ specific cases for pic, static, wl, etc. | 3843 | # C++ specific cases for pic, static, wl, etc. |
1601 | 3570 | if test "$GXX" = yes; then | 3844 | if test "$GXX" = yes; then |
1602 | @@ -3615,6 +3889,11 @@ | |||
1603 | 3615 | # DJGPP does not support shared libraries at all | 3889 | # DJGPP does not support shared libraries at all |
1604 | 3616 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= | 3890 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
1605 | 3617 | ;; | 3891 | ;; |
1606 | 3892 | haiku*) | ||
1607 | 3893 | # PIC is the default for Haiku. | ||
1608 | 3894 | # The "-static" flag exists, but is broken. | ||
1609 | 3895 | _LT_TAGVAR(lt_prog_compiler_static, $1)= | ||
1610 | 3896 | ;; | ||
1611 | 3618 | interix[[3-9]]*) | 3897 | interix[[3-9]]*) |
1612 | 3619 | # Interix 3.x gcc -fpic/-fPIC options generate broken code. | 3898 | # Interix 3.x gcc -fpic/-fPIC options generate broken code. |
1613 | 3620 | # Instead, we relocate shared libraries at runtime. | 3899 | # Instead, we relocate shared libraries at runtime. |
1614 | @@ -3664,6 +3943,12 @@ | |||
1615 | 3664 | ;; | 3943 | ;; |
1616 | 3665 | esac | 3944 | esac |
1617 | 3666 | ;; | 3945 | ;; |
1618 | 3946 | mingw* | cygwin* | os2* | pw32* | cegcc*) | ||
1619 | 3947 | # This hack is so that the source file can tell whether it is being | ||
1620 | 3948 | # built for inclusion in a dll (and should export symbols for example). | ||
1621 | 3949 | m4_if([$1], [GCJ], [], | ||
1622 | 3950 | [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) | ||
1623 | 3951 | ;; | ||
1624 | 3667 | dgux*) | 3952 | dgux*) |
1625 | 3668 | case $cc_basename in | 3953 | case $cc_basename in |
1626 | 3669 | ec++*) | 3954 | ec++*) |
1627 | @@ -3753,8 +4038,8 @@ | |||
1628 | 3753 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= | 4038 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
1629 | 3754 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' | 4039 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
1630 | 3755 | ;; | 4040 | ;; |
1633 | 3756 | xlc* | xlC*) | 4041 | xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) |
1634 | 3757 | # IBM XL 8.0 on PPC | 4042 | # IBM XL 8.0, 9.0 on PPC and BlueGene |
1635 | 3758 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | 4043 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
1636 | 3759 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' | 4044 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' |
1637 | 3760 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' | 4045 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' |
1638 | @@ -3816,7 +4101,7 @@ | |||
1639 | 3816 | ;; | 4101 | ;; |
1640 | 3817 | solaris*) | 4102 | solaris*) |
1641 | 3818 | case $cc_basename in | 4103 | case $cc_basename in |
1643 | 3819 | CC*) | 4104 | CC* | sunCC*) |
1644 | 3820 | # Sun C++ 4.2, 5.x and Centerline C++ | 4105 | # Sun C++ 4.2, 5.x and Centerline C++ |
1645 | 3821 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | 4106 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
1646 | 3822 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | 4107 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
1647 | @@ -3920,6 +4205,12 @@ | |||
1648 | 3920 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' | 4205 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' |
1649 | 3921 | ;; | 4206 | ;; |
1650 | 3922 | 4207 | ||
1651 | 4208 | haiku*) | ||
1652 | 4209 | # PIC is the default for Haiku. | ||
1653 | 4210 | # The "-static" flag exists, but is broken. | ||
1654 | 4211 | _LT_TAGVAR(lt_prog_compiler_static, $1)= | ||
1655 | 4212 | ;; | ||
1656 | 4213 | |||
1657 | 3923 | hpux*) | 4214 | hpux*) |
1658 | 3924 | # PIC is the default for 64-bit PA HP-UX, but not for 32-bit | 4215 | # PIC is the default for 64-bit PA HP-UX, but not for 32-bit |
1659 | 3925 | # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag | 4216 | # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag |
1660 | @@ -3962,6 +4253,13 @@ | |||
1661 | 3962 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' | 4253 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
1662 | 3963 | ;; | 4254 | ;; |
1663 | 3964 | esac | 4255 | esac |
1664 | 4256 | |||
1665 | 4257 | case $cc_basename in | ||
1666 | 4258 | nvcc*) # Cuda Compiler Driver 2.2 | ||
1667 | 4259 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' | ||
1668 | 4260 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' | ||
1669 | 4261 | ;; | ||
1670 | 4262 | esac | ||
1671 | 3965 | else | 4263 | else |
1672 | 3966 | # PORTME Check for flag to pass linker flags through the system compiler. | 4264 | # PORTME Check for flag to pass linker flags through the system compiler. |
1673 | 3967 | case $host_os in | 4265 | case $host_os in |
1674 | @@ -4025,7 +4323,13 @@ | |||
1675 | 4025 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' | 4323 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' |
1676 | 4026 | _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' | 4324 | _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' |
1677 | 4027 | ;; | 4325 | ;; |
1679 | 4028 | pgcc* | pgf77* | pgf90* | pgf95*) | 4326 | nagfor*) |
1680 | 4327 | # NAG Fortran compiler | ||
1681 | 4328 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' | ||
1682 | 4329 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' | ||
1683 | 4330 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | ||
1684 | 4331 | ;; | ||
1685 | 4332 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | ||
1686 | 4029 | # Portland Group compilers (*not* the Pentium gcc compiler, | 4333 | # Portland Group compilers (*not* the Pentium gcc compiler, |
1687 | 4030 | # which looks to be a dead project) | 4334 | # which looks to be a dead project) |
1688 | 4031 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | 4335 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
1689 | @@ -4037,26 +4341,26 @@ | |||
1690 | 4037 | # All Alpha code is PIC. | 4341 | # All Alpha code is PIC. |
1691 | 4038 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' | 4342 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
1692 | 4039 | ;; | 4343 | ;; |
1695 | 4040 | xl*) | 4344 | xl* | bgxl* | bgf* | mpixl*) |
1696 | 4041 | # IBM XL C 8.0/Fortran 10.1 on PPC | 4345 | # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene |
1697 | 4042 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | 4346 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
1698 | 4043 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' | 4347 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' |
1699 | 4044 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' | 4348 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' |
1700 | 4045 | ;; | 4349 | ;; |
1701 | 4046 | *) | 4350 | *) |
1702 | 4047 | case `$CC -V 2>&1 | sed 5q` in | 4351 | case `$CC -V 2>&1 | sed 5q` in |
1703 | 4352 | *Sun\ F* | *Sun*Fortran*) | ||
1704 | 4353 | # Sun Fortran 8.3 passes all unrecognized flags to the linker | ||
1705 | 4354 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | ||
1706 | 4355 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | ||
1707 | 4356 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='' | ||
1708 | 4357 | ;; | ||
1709 | 4048 | *Sun\ C*) | 4358 | *Sun\ C*) |
1710 | 4049 | # Sun C 5.9 | 4359 | # Sun C 5.9 |
1711 | 4050 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | 4360 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
1712 | 4051 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | 4361 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
1713 | 4052 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | 4362 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
1714 | 4053 | ;; | 4363 | ;; |
1715 | 4054 | *Sun\ F*) | ||
1716 | 4055 | # Sun Fortran 8.3 passes all unrecognized flags to the linker | ||
1717 | 4056 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | ||
1718 | 4057 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | ||
1719 | 4058 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='' | ||
1720 | 4059 | ;; | ||
1721 | 4060 | esac | 4364 | esac |
1722 | 4061 | ;; | 4365 | ;; |
1723 | 4062 | esac | 4366 | esac |
1724 | @@ -4087,7 +4391,7 @@ | |||
1725 | 4087 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | 4391 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
1726 | 4088 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | 4392 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
1727 | 4089 | case $cc_basename in | 4393 | case $cc_basename in |
1729 | 4090 | f77* | f90* | f95*) | 4394 | f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
1730 | 4091 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; | 4395 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; |
1731 | 4092 | *) | 4396 | *) |
1732 | 4093 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; | 4397 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; |
1733 | @@ -4144,9 +4448,11 @@ | |||
1734 | 4144 | _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" | 4448 | _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" |
1735 | 4145 | ;; | 4449 | ;; |
1736 | 4146 | esac | 4450 | esac |
1740 | 4147 | AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) | 4451 | |
1741 | 4148 | _LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], | 4452 | AC_CACHE_CHECK([for $compiler option to produce PIC], |
1742 | 4149 | [How to pass a linker flag through the compiler]) | 4453 | [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], |
1743 | 4454 | [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) | ||
1744 | 4455 | _LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) | ||
1745 | 4150 | 4456 | ||
1746 | 4151 | # | 4457 | # |
1747 | 4152 | # Check to make sure the PIC flag actually works. | 4458 | # Check to make sure the PIC flag actually works. |
1748 | @@ -4165,6 +4471,8 @@ | |||
1749 | 4165 | _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], | 4471 | _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], |
1750 | 4166 | [Additional compiler flags for building library objects]) | 4472 | [Additional compiler flags for building library objects]) |
1751 | 4167 | 4473 | ||
1752 | 4474 | _LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], | ||
1753 | 4475 | [How to pass a linker flag through the compiler]) | ||
1754 | 4168 | # | 4476 | # |
1755 | 4169 | # Check to make sure the static flag actually works. | 4477 | # Check to make sure the static flag actually works. |
1756 | 4170 | # | 4478 | # |
1757 | @@ -4185,6 +4493,7 @@ | |||
1758 | 4185 | m4_defun([_LT_LINKER_SHLIBS], | 4493 | m4_defun([_LT_LINKER_SHLIBS], |
1759 | 4186 | [AC_REQUIRE([LT_PATH_LD])dnl | 4494 | [AC_REQUIRE([LT_PATH_LD])dnl |
1760 | 4187 | AC_REQUIRE([LT_PATH_NM])dnl | 4495 | AC_REQUIRE([LT_PATH_NM])dnl |
1761 | 4496 | m4_require([_LT_PATH_MANIFEST_TOOL])dnl | ||
1762 | 4188 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl | 4497 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
1763 | 4189 | m4_require([_LT_DECL_EGREP])dnl | 4498 | m4_require([_LT_DECL_EGREP])dnl |
1764 | 4190 | m4_require([_LT_DECL_SED])dnl | 4499 | m4_require([_LT_DECL_SED])dnl |
1765 | @@ -4193,30 +4502,38 @@ | |||
1766 | 4193 | AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) | 4502 | AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) |
1767 | 4194 | m4_if([$1], [CXX], [ | 4503 | m4_if([$1], [CXX], [ |
1768 | 4195 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | 4504 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
1769 | 4505 | _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] | ||
1770 | 4196 | case $host_os in | 4506 | case $host_os in |
1771 | 4197 | aix[[4-9]]*) | 4507 | aix[[4-9]]*) |
1772 | 4198 | # If we're using GNU nm, then we don't want the "-C" option. | 4508 | # If we're using GNU nm, then we don't want the "-C" option. |
1773 | 4199 | # -C means demangle to AIX nm, but means don't demangle with GNU nm | 4509 | # -C means demangle to AIX nm, but means don't demangle with GNU nm |
1774 | 4510 | # Also, AIX nm treats weak defined symbols like other global defined | ||
1775 | 4511 | # symbols, whereas GNU nm marks them as "W". | ||
1776 | 4200 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then | 4512 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then |
1778 | 4201 | _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' | 4513 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
1779 | 4202 | else | 4514 | else |
1780 | 4203 | _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' | 4515 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
1781 | 4204 | fi | 4516 | fi |
1782 | 4205 | ;; | 4517 | ;; |
1783 | 4206 | pw32*) | 4518 | pw32*) |
1784 | 4207 | _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" | 4519 | _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" |
1786 | 4208 | ;; | 4520 | ;; |
1787 | 4209 | cygwin* | mingw* | cegcc*) | 4521 | cygwin* | mingw* | cegcc*) |
1791 | 4210 | _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' | 4522 | case $cc_basename in |
1792 | 4211 | ;; | 4523 | cl*) ;; |
1793 | 4212 | linux* | k*bsd*-gnu) | 4524 | *) |
1794 | 4525 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' | ||
1795 | 4526 | _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] | ||
1796 | 4527 | ;; | ||
1797 | 4528 | esac | ||
1798 | 4529 | ;; | ||
1799 | 4530 | linux* | k*bsd*-gnu | gnu*) | ||
1800 | 4213 | _LT_TAGVAR(link_all_deplibs, $1)=no | 4531 | _LT_TAGVAR(link_all_deplibs, $1)=no |
1802 | 4214 | ;; | 4532 | ;; |
1803 | 4215 | *) | 4533 | *) |
1804 | 4216 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | 4534 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
1806 | 4217 | ;; | 4535 | ;; |
1807 | 4218 | esac | 4536 | esac |
1808 | 4219 | _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] | ||
1809 | 4220 | ], [ | 4537 | ], [ |
1810 | 4221 | runpath_var= | 4538 | runpath_var= |
1811 | 4222 | _LT_TAGVAR(allow_undefined_flag, $1)= | 4539 | _LT_TAGVAR(allow_undefined_flag, $1)= |
1812 | @@ -4276,13 +4593,39 @@ | |||
1813 | 4276 | openbsd*) | 4593 | openbsd*) |
1814 | 4277 | with_gnu_ld=no | 4594 | with_gnu_ld=no |
1815 | 4278 | ;; | 4595 | ;; |
1817 | 4279 | linux* | k*bsd*-gnu) | 4596 | linux* | k*bsd*-gnu | gnu*) |
1818 | 4280 | _LT_TAGVAR(link_all_deplibs, $1)=no | 4597 | _LT_TAGVAR(link_all_deplibs, $1)=no |
1819 | 4281 | ;; | 4598 | ;; |
1820 | 4282 | esac | 4599 | esac |
1821 | 4283 | 4600 | ||
1822 | 4284 | _LT_TAGVAR(ld_shlibs, $1)=yes | 4601 | _LT_TAGVAR(ld_shlibs, $1)=yes |
1823 | 4602 | |||
1824 | 4603 | # On some targets, GNU ld is compatible enough with the native linker | ||
1825 | 4604 | # that we're better off using the native interface for both. | ||
1826 | 4605 | lt_use_gnu_ld_interface=no | ||
1827 | 4285 | if test "$with_gnu_ld" = yes; then | 4606 | if test "$with_gnu_ld" = yes; then |
1828 | 4607 | case $host_os in | ||
1829 | 4608 | aix*) | ||
1830 | 4609 | # The AIX port of GNU ld has always aspired to compatibility | ||
1831 | 4610 | # with the native linker. However, as the warning in the GNU ld | ||
1832 | 4611 | # block says, versions before 2.19.5* couldn't really create working | ||
1833 | 4612 | # shared libraries, regardless of the interface used. | ||
1834 | 4613 | case `$LD -v 2>&1` in | ||
1835 | 4614 | *\ \(GNU\ Binutils\)\ 2.19.5*) ;; | ||
1836 | 4615 | *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; | ||
1837 | 4616 | *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; | ||
1838 | 4617 | *) | ||
1839 | 4618 | lt_use_gnu_ld_interface=yes | ||
1840 | 4619 | ;; | ||
1841 | 4620 | esac | ||
1842 | 4621 | ;; | ||
1843 | 4622 | *) | ||
1844 | 4623 | lt_use_gnu_ld_interface=yes | ||
1845 | 4624 | ;; | ||
1846 | 4625 | esac | ||
1847 | 4626 | fi | ||
1848 | 4627 | |||
1849 | 4628 | if test "$lt_use_gnu_ld_interface" = yes; then | ||
1850 | 4286 | # If archive_cmds runs LD, not CC, wlarc should be empty | 4629 | # If archive_cmds runs LD, not CC, wlarc should be empty |
1851 | 4287 | wlarc='${wl}' | 4630 | wlarc='${wl}' |
1852 | 4288 | 4631 | ||
1853 | @@ -4316,11 +4659,12 @@ | |||
1854 | 4316 | _LT_TAGVAR(ld_shlibs, $1)=no | 4659 | _LT_TAGVAR(ld_shlibs, $1)=no |
1855 | 4317 | cat <<_LT_EOF 1>&2 | 4660 | cat <<_LT_EOF 1>&2 |
1856 | 4318 | 4661 | ||
1858 | 4319 | *** Warning: the GNU linker, at least up to release 2.9.1, is reported | 4662 | *** Warning: the GNU linker, at least up to release 2.19, is reported |
1859 | 4320 | *** to be unable to reliably create shared libraries on AIX. | 4663 | *** to be unable to reliably create shared libraries on AIX. |
1860 | 4321 | *** Therefore, libtool is disabling shared libraries support. If you | 4664 | *** Therefore, libtool is disabling shared libraries support. If you |
1863 | 4322 | *** really care for shared libraries, you may want to modify your PATH | 4665 | *** really care for shared libraries, you may want to install binutils |
1864 | 4323 | *** so that a non-GNU linker is found, and then restart. | 4666 | *** 2.20 or above, or modify your PATH so that a non-GNU linker is found. |
1865 | 4667 | *** You will then need to restart the configuration process. | ||
1866 | 4324 | 4668 | ||
1867 | 4325 | _LT_EOF | 4669 | _LT_EOF |
1868 | 4326 | fi | 4670 | fi |
1869 | @@ -4356,10 +4700,12 @@ | |||
1870 | 4356 | # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, | 4700 | # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, |
1871 | 4357 | # as there is no search path for DLLs. | 4701 | # as there is no search path for DLLs. |
1872 | 4358 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' | 4702 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
1873 | 4703 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' | ||
1874 | 4359 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | 4704 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
1875 | 4360 | _LT_TAGVAR(always_export_symbols, $1)=no | 4705 | _LT_TAGVAR(always_export_symbols, $1)=no |
1876 | 4361 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | 4706 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
1878 | 4362 | _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' | 4707 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' |
1879 | 4708 | _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] | ||
1880 | 4363 | 4709 | ||
1881 | 4364 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 4710 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
1882 | 4365 | _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' | 4711 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
1883 | @@ -4377,6 +4723,11 @@ | |||
1884 | 4377 | fi | 4723 | fi |
1885 | 4378 | ;; | 4724 | ;; |
1886 | 4379 | 4725 | ||
1887 | 4726 | haiku*) | ||
1888 | 4727 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
1889 | 4728 | _LT_TAGVAR(link_all_deplibs, $1)=yes | ||
1890 | 4729 | ;; | ||
1891 | 4730 | |||
1892 | 4380 | interix[[3-9]]*) | 4731 | interix[[3-9]]*) |
1893 | 4381 | _LT_TAGVAR(hardcode_direct, $1)=no | 4732 | _LT_TAGVAR(hardcode_direct, $1)=no |
1894 | 4382 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no | 4733 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
1895 | @@ -4402,15 +4753,16 @@ | |||
1896 | 4402 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ | 4753 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ |
1897 | 4403 | && test "$tmp_diet" = no | 4754 | && test "$tmp_diet" = no |
1898 | 4404 | then | 4755 | then |
1900 | 4405 | tmp_addflag= | 4756 | tmp_addflag=' $pic_flag' |
1901 | 4406 | tmp_sharedflag='-shared' | 4757 | tmp_sharedflag='-shared' |
1902 | 4407 | case $cc_basename,$host_cpu in | 4758 | case $cc_basename,$host_cpu in |
1903 | 4408 | pgcc*) # Portland Group C compiler | 4759 | pgcc*) # Portland Group C compiler |
1905 | 4409 | _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' | 4760 | _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
1906 | 4410 | tmp_addflag=' $pic_flag' | 4761 | tmp_addflag=' $pic_flag' |
1907 | 4411 | ;; | 4762 | ;; |
1910 | 4412 | pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers | 4763 | pgf77* | pgf90* | pgf95* | pgfortran*) |
1911 | 4413 | _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' | 4764 | # Portland Group f77 and f90 compilers |
1912 | 4765 | _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' | ||
1913 | 4414 | tmp_addflag=' $pic_flag -Mnomain' ;; | 4766 | tmp_addflag=' $pic_flag -Mnomain' ;; |
1914 | 4415 | ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 | 4767 | ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 |
1915 | 4416 | tmp_addflag=' -i_dynamic' ;; | 4768 | tmp_addflag=' -i_dynamic' ;; |
1916 | @@ -4421,13 +4773,17 @@ | |||
1917 | 4421 | lf95*) # Lahey Fortran 8.1 | 4773 | lf95*) # Lahey Fortran 8.1 |
1918 | 4422 | _LT_TAGVAR(whole_archive_flag_spec, $1)= | 4774 | _LT_TAGVAR(whole_archive_flag_spec, $1)= |
1919 | 4423 | tmp_sharedflag='--shared' ;; | 4775 | tmp_sharedflag='--shared' ;; |
1921 | 4424 | xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) | 4776 | xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) |
1922 | 4425 | tmp_sharedflag='-qmkshrobj' | 4777 | tmp_sharedflag='-qmkshrobj' |
1923 | 4426 | tmp_addflag= ;; | 4778 | tmp_addflag= ;; |
1924 | 4779 | nvcc*) # Cuda Compiler Driver 2.2 | ||
1925 | 4780 | _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' | ||
1926 | 4781 | _LT_TAGVAR(compiler_needs_object, $1)=yes | ||
1927 | 4782 | ;; | ||
1928 | 4427 | esac | 4783 | esac |
1929 | 4428 | case `$CC -V 2>&1 | sed 5q` in | 4784 | case `$CC -V 2>&1 | sed 5q` in |
1930 | 4429 | *Sun\ C*) # Sun C 5.9 | 4785 | *Sun\ C*) # Sun C 5.9 |
1932 | 4430 | _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' | 4786 | _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
1933 | 4431 | _LT_TAGVAR(compiler_needs_object, $1)=yes | 4787 | _LT_TAGVAR(compiler_needs_object, $1)=yes |
1934 | 4432 | tmp_sharedflag='-G' ;; | 4788 | tmp_sharedflag='-G' ;; |
1935 | 4433 | *Sun\ F*) # Sun Fortran 8.3 | 4789 | *Sun\ F*) # Sun Fortran 8.3 |
1936 | @@ -4443,17 +4799,17 @@ | |||
1937 | 4443 | fi | 4799 | fi |
1938 | 4444 | 4800 | ||
1939 | 4445 | case $cc_basename in | 4801 | case $cc_basename in |
1941 | 4446 | xlf*) | 4802 | xlf* | bgf* | bgxlf* | mpixlf*) |
1942 | 4447 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself | 4803 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself |
1943 | 4448 | _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' | 4804 | _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' |
1944 | 4449 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | 4805 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
1945 | 4450 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' | 4806 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' |
1947 | 4451 | _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' | 4807 | _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
1948 | 4452 | if test "x$supports_anon_versioning" = xyes; then | 4808 | if test "x$supports_anon_versioning" = xyes; then |
1949 | 4453 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ | 4809 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ |
1950 | 4454 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ | 4810 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
1951 | 4455 | echo "local: *; };" >> $output_objdir/$libname.ver~ | 4811 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
1953 | 4456 | $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | 4812 | $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
1954 | 4457 | fi | 4813 | fi |
1955 | 4458 | ;; | 4814 | ;; |
1956 | 4459 | esac | 4815 | esac |
1957 | @@ -4467,8 +4823,8 @@ | |||
1958 | 4467 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 4823 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
1959 | 4468 | wlarc= | 4824 | wlarc= |
1960 | 4469 | else | 4825 | else |
1963 | 4470 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | 4826 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
1964 | 4471 | _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' | 4827 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
1965 | 4472 | fi | 4828 | fi |
1966 | 4473 | ;; | 4829 | ;; |
1967 | 4474 | 4830 | ||
1968 | @@ -4486,8 +4842,8 @@ | |||
1969 | 4486 | 4842 | ||
1970 | 4487 | _LT_EOF | 4843 | _LT_EOF |
1971 | 4488 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 4844 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
1974 | 4489 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | 4845 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
1975 | 4490 | _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' | 4846 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
1976 | 4491 | else | 4847 | else |
1977 | 4492 | _LT_TAGVAR(ld_shlibs, $1)=no | 4848 | _LT_TAGVAR(ld_shlibs, $1)=no |
1978 | 4493 | fi | 4849 | fi |
1979 | @@ -4533,8 +4889,8 @@ | |||
1980 | 4533 | 4889 | ||
1981 | 4534 | *) | 4890 | *) |
1982 | 4535 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 4891 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
1985 | 4536 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | 4892 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
1986 | 4537 | _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' | 4893 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
1987 | 4538 | else | 4894 | else |
1988 | 4539 | _LT_TAGVAR(ld_shlibs, $1)=no | 4895 | _LT_TAGVAR(ld_shlibs, $1)=no |
1989 | 4540 | fi | 4896 | fi |
1990 | @@ -4574,8 +4930,10 @@ | |||
1991 | 4574 | else | 4930 | else |
1992 | 4575 | # If we're using GNU nm, then we don't want the "-C" option. | 4931 | # If we're using GNU nm, then we don't want the "-C" option. |
1993 | 4576 | # -C means demangle to AIX nm, but means don't demangle with GNU nm | 4932 | # -C means demangle to AIX nm, but means don't demangle with GNU nm |
1994 | 4933 | # Also, AIX nm treats weak defined symbols like other global | ||
1995 | 4934 | # defined symbols, whereas GNU nm marks them as "W". | ||
1996 | 4577 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then | 4935 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then |
1998 | 4578 | _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' | 4936 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
1999 | 4579 | else | 4937 | else |
2000 | 4580 | _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' | 4938 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
2001 | 4581 | fi | 4939 | fi |
2002 | @@ -4663,9 +5021,9 @@ | |||
2003 | 4663 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' | 5021 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' |
2004 | 4664 | # Determine the default libpath from the value encoded in an | 5022 | # Determine the default libpath from the value encoded in an |
2005 | 4665 | # empty executable. | 5023 | # empty executable. |
2007 | 4666 | _LT_SYS_MODULE_PATH_AIX | 5024 | _LT_SYS_MODULE_PATH_AIX([$1]) |
2008 | 4667 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" | 5025 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
2010 | 4668 | _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" | 5026 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
2011 | 4669 | else | 5027 | else |
2012 | 4670 | if test "$host_cpu" = ia64; then | 5028 | if test "$host_cpu" = ia64; then |
2013 | 4671 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' | 5029 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' |
2014 | @@ -4674,14 +5032,19 @@ | |||
2015 | 4674 | else | 5032 | else |
2016 | 4675 | # Determine the default libpath from the value encoded in an | 5033 | # Determine the default libpath from the value encoded in an |
2017 | 4676 | # empty executable. | 5034 | # empty executable. |
2019 | 4677 | _LT_SYS_MODULE_PATH_AIX | 5035 | _LT_SYS_MODULE_PATH_AIX([$1]) |
2020 | 4678 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" | 5036 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
2021 | 4679 | # Warning - without using the other run time loading flags, | 5037 | # Warning - without using the other run time loading flags, |
2022 | 4680 | # -berok will link without error, but may produce a broken library. | 5038 | # -berok will link without error, but may produce a broken library. |
2023 | 4681 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' | 5039 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' |
2024 | 4682 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' | 5040 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' |
2027 | 4683 | # Exported symbols can be pulled into shared objects from archives | 5041 | if test "$with_gnu_ld" = yes; then |
2028 | 4684 | _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' | 5042 | # We only use this code for GNU lds that support --whole-archive. |
2029 | 5043 | _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' | ||
2030 | 5044 | else | ||
2031 | 5045 | # Exported symbols can be pulled into shared objects from archives | ||
2032 | 5046 | _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' | ||
2033 | 5047 | fi | ||
2034 | 4685 | _LT_TAGVAR(archive_cmds_need_lc, $1)=yes | 5048 | _LT_TAGVAR(archive_cmds_need_lc, $1)=yes |
2035 | 4686 | # This is similar to how AIX traditionally builds its shared libraries. | 5049 | # This is similar to how AIX traditionally builds its shared libraries. |
2036 | 4687 | _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' | 5050 | _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' |
2037 | @@ -4713,20 +5076,63 @@ | |||
2038 | 4713 | # Microsoft Visual C++. | 5076 | # Microsoft Visual C++. |
2039 | 4714 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 5077 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
2040 | 4715 | # no search path for DLLs. | 5078 | # no search path for DLLs. |
2055 | 4716 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' | 5079 | case $cc_basename in |
2056 | 4717 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | 5080 | cl*) |
2057 | 4718 | # Tell ltmain to make .lib files, not .a files. | 5081 | # Native MSVC |
2058 | 4719 | libext=lib | 5082 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
2059 | 4720 | # Tell ltmain to make .dll files, not .so files. | 5083 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
2060 | 4721 | shrext_cmds=".dll" | 5084 | _LT_TAGVAR(always_export_symbols, $1)=yes |
2061 | 4722 | # FIXME: Setting linknames here is a bad hack. | 5085 | _LT_TAGVAR(file_list_spec, $1)='@' |
2062 | 4723 | _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' | 5086 | # Tell ltmain to make .lib files, not .a files. |
2063 | 4724 | # The linker will automatically build a .lib file if we build a DLL. | 5087 | libext=lib |
2064 | 4725 | _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' | 5088 | # Tell ltmain to make .dll files, not .so files. |
2065 | 4726 | # FIXME: Should let the user specify the lib program. | 5089 | shrext_cmds=".dll" |
2066 | 4727 | _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' | 5090 | # FIXME: Setting linknames here is a bad hack. |
2067 | 4728 | _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' | 5091 | _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
2068 | 4729 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | 5092 | _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
2069 | 5093 | sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; | ||
2070 | 5094 | else | ||
2071 | 5095 | sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; | ||
2072 | 5096 | fi~ | ||
2073 | 5097 | $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ | ||
2074 | 5098 | linknames=' | ||
2075 | 5099 | # The linker will not automatically build a static lib if we build a DLL. | ||
2076 | 5100 | # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' | ||
2077 | 5101 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | ||
2078 | 5102 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' | ||
2079 | 5103 | # Don't use ranlib | ||
2080 | 5104 | _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' | ||
2081 | 5105 | _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ | ||
2082 | 5106 | lt_tool_outputfile="@TOOL_OUTPUT@"~ | ||
2083 | 5107 | case $lt_outputfile in | ||
2084 | 5108 | *.exe|*.EXE) ;; | ||
2085 | 5109 | *) | ||
2086 | 5110 | lt_outputfile="$lt_outputfile.exe" | ||
2087 | 5111 | lt_tool_outputfile="$lt_tool_outputfile.exe" | ||
2088 | 5112 | ;; | ||
2089 | 5113 | esac~ | ||
2090 | 5114 | if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then | ||
2091 | 5115 | $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; | ||
2092 | 5116 | $RM "$lt_outputfile.manifest"; | ||
2093 | 5117 | fi' | ||
2094 | 5118 | ;; | ||
2095 | 5119 | *) | ||
2096 | 5120 | # Assume MSVC wrapper | ||
2097 | 5121 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' | ||
2098 | 5122 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | ||
2099 | 5123 | # Tell ltmain to make .lib files, not .a files. | ||
2100 | 5124 | libext=lib | ||
2101 | 5125 | # Tell ltmain to make .dll files, not .so files. | ||
2102 | 5126 | shrext_cmds=".dll" | ||
2103 | 5127 | # FIXME: Setting linknames here is a bad hack. | ||
2104 | 5128 | _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
2105 | 5129 | # The linker will automatically build a .lib file if we build a DLL. | ||
2106 | 5130 | _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' | ||
2107 | 5131 | # FIXME: Should let the user specify the lib program. | ||
2108 | 5132 | _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
2109 | 5133 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | ||
2110 | 5134 | ;; | ||
2111 | 5135 | esac | ||
2112 | 4730 | ;; | 5136 | ;; |
2113 | 4731 | 5137 | ||
2114 | 4732 | darwin* | rhapsody*) | 5138 | darwin* | rhapsody*) |
2115 | @@ -4764,7 +5170,7 @@ | |||
2116 | 4764 | 5170 | ||
2117 | 4765 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 5171 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
2118 | 4766 | freebsd* | dragonfly*) | 5172 | freebsd* | dragonfly*) |
2120 | 4767 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | 5173 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
2121 | 4768 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' | 5174 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' |
2122 | 4769 | _LT_TAGVAR(hardcode_direct, $1)=yes | 5175 | _LT_TAGVAR(hardcode_direct, $1)=yes |
2123 | 4770 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no | 5176 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
2124 | @@ -4772,7 +5178,7 @@ | |||
2125 | 4772 | 5178 | ||
2126 | 4773 | hpux9*) | 5179 | hpux9*) |
2127 | 4774 | if test "$GCC" = yes; then | 5180 | if test "$GCC" = yes; then |
2129 | 4775 | _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' | 5181 | _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
2130 | 4776 | else | 5182 | else |
2131 | 4777 | _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' | 5183 | _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
2132 | 4778 | fi | 5184 | fi |
2133 | @@ -4787,8 +5193,8 @@ | |||
2134 | 4787 | ;; | 5193 | ;; |
2135 | 4788 | 5194 | ||
2136 | 4789 | hpux10*) | 5195 | hpux10*) |
2139 | 4790 | if test "$GCC" = yes -a "$with_gnu_ld" = no; then | 5196 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
2140 | 4791 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | 5197 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
2141 | 4792 | else | 5198 | else |
2142 | 4793 | _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 5199 | _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
2143 | 4794 | fi | 5200 | fi |
2144 | @@ -4806,16 +5212,16 @@ | |||
2145 | 4806 | ;; | 5212 | ;; |
2146 | 4807 | 5213 | ||
2147 | 4808 | hpux11*) | 5214 | hpux11*) |
2149 | 4809 | if test "$GCC" = yes -a "$with_gnu_ld" = no; then | 5215 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
2150 | 4810 | case $host_cpu in | 5216 | case $host_cpu in |
2151 | 4811 | hppa*64*) | 5217 | hppa*64*) |
2152 | 4812 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 5218 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
2153 | 4813 | ;; | 5219 | ;; |
2154 | 4814 | ia64*) | 5220 | ia64*) |
2156 | 4815 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | 5221 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
2157 | 4816 | ;; | 5222 | ;; |
2158 | 4817 | *) | 5223 | *) |
2160 | 4818 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | 5224 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
2161 | 4819 | ;; | 5225 | ;; |
2162 | 4820 | esac | 5226 | esac |
2163 | 4821 | else | 5227 | else |
2164 | @@ -4827,7 +5233,14 @@ | |||
2165 | 4827 | _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | 5233 | _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
2166 | 4828 | ;; | 5234 | ;; |
2167 | 4829 | *) | 5235 | *) |
2169 | 4830 | _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | 5236 | m4_if($1, [], [ |
2170 | 5237 | # Older versions of the 11.00 compiler do not understand -b yet | ||
2171 | 5238 | # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) | ||
2172 | 5239 | _LT_LINKER_OPTION([if $CC understands -b], | ||
2173 | 5240 | _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], | ||
2174 | 5241 | [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], | ||
2175 | 5242 | [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], | ||
2176 | 5243 | [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) | ||
2177 | 4831 | ;; | 5244 | ;; |
2178 | 4832 | esac | 5245 | esac |
2179 | 4833 | fi | 5246 | fi |
2180 | @@ -4855,19 +5268,34 @@ | |||
2181 | 4855 | 5268 | ||
2182 | 4856 | irix5* | irix6* | nonstopux*) | 5269 | irix5* | irix6* | nonstopux*) |
2183 | 4857 | if test "$GCC" = yes; then | 5270 | if test "$GCC" = yes; then |
2185 | 4858 | _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' | 5271 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
2186 | 4859 | # Try to use the -exported_symbol ld option, if it does not | 5272 | # Try to use the -exported_symbol ld option, if it does not |
2187 | 4860 | # work, assume that -exports_file does not work either and | 5273 | # work, assume that -exports_file does not work either and |
2188 | 4861 | # implicitly export all symbols. | 5274 | # implicitly export all symbols. |
2195 | 4862 | save_LDFLAGS="$LDFLAGS" | 5275 | # This should be the same for all languages, so no per-tag cache variable. |
2196 | 4863 | LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | 5276 | AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], |
2197 | 4864 | AC_LINK_IFELSE(int foo(void) {}, | 5277 | [lt_cv_irix_exported_symbol], |
2198 | 4865 | _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' | 5278 | [save_LDFLAGS="$LDFLAGS" |
2199 | 4866 | ) | 5279 | LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
2200 | 4867 | LDFLAGS="$save_LDFLAGS" | 5280 | AC_LINK_IFELSE( |
2201 | 5281 | [AC_LANG_SOURCE( | ||
2202 | 5282 | [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], | ||
2203 | 5283 | [C++], [[int foo (void) { return 0; }]], | ||
2204 | 5284 | [Fortran 77], [[ | ||
2205 | 5285 | subroutine foo | ||
2206 | 5286 | end]], | ||
2207 | 5287 | [Fortran], [[ | ||
2208 | 5288 | subroutine foo | ||
2209 | 5289 | end]])])], | ||
2210 | 5290 | [lt_cv_irix_exported_symbol=yes], | ||
2211 | 5291 | [lt_cv_irix_exported_symbol=no]) | ||
2212 | 5292 | LDFLAGS="$save_LDFLAGS"]) | ||
2213 | 5293 | if test "$lt_cv_irix_exported_symbol" = yes; then | ||
2214 | 5294 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' | ||
2215 | 5295 | fi | ||
2216 | 4868 | else | 5296 | else |
2219 | 4869 | _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' | 5297 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
2220 | 4870 | _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' | 5298 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' |
2221 | 4871 | fi | 5299 | fi |
2222 | 4872 | _LT_TAGVAR(archive_cmds_need_lc, $1)='no' | 5300 | _LT_TAGVAR(archive_cmds_need_lc, $1)='no' |
2223 | 4873 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | 5301 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
2224 | @@ -4929,17 +5357,17 @@ | |||
2225 | 4929 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' | 5357 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
2226 | 4930 | _LT_TAGVAR(hardcode_minus_L, $1)=yes | 5358 | _LT_TAGVAR(hardcode_minus_L, $1)=yes |
2227 | 4931 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | 5359 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
2229 | 4932 | _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' | 5360 | _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' |
2230 | 4933 | _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' | 5361 | _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' |
2231 | 4934 | ;; | 5362 | ;; |
2232 | 4935 | 5363 | ||
2233 | 4936 | osf3*) | 5364 | osf3*) |
2234 | 4937 | if test "$GCC" = yes; then | 5365 | if test "$GCC" = yes; then |
2235 | 4938 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' | 5366 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
2237 | 4939 | _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' | 5367 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
2238 | 4940 | else | 5368 | else |
2239 | 4941 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' | 5369 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
2241 | 4942 | _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' | 5370 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
2242 | 4943 | fi | 5371 | fi |
2243 | 4944 | _LT_TAGVAR(archive_cmds_need_lc, $1)='no' | 5372 | _LT_TAGVAR(archive_cmds_need_lc, $1)='no' |
2244 | 4945 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | 5373 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
2245 | @@ -4949,13 +5377,13 @@ | |||
2246 | 4949 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 5377 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
2247 | 4950 | if test "$GCC" = yes; then | 5378 | if test "$GCC" = yes; then |
2248 | 4951 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' | 5379 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
2250 | 4952 | _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' | 5380 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
2251 | 4953 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | 5381 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
2252 | 4954 | else | 5382 | else |
2253 | 4955 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' | 5383 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
2255 | 4956 | _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' | 5384 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
2256 | 4957 | _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~ | 5385 | _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~ |
2258 | 4958 | $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' | 5386 | $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' |
2259 | 4959 | 5387 | ||
2260 | 4960 | # Both c and cxx compiler support -rpath directly | 5388 | # Both c and cxx compiler support -rpath directly |
2261 | 4961 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' | 5389 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' |
2262 | @@ -4968,9 +5396,9 @@ | |||
2263 | 4968 | _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' | 5396 | _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' |
2264 | 4969 | if test "$GCC" = yes; then | 5397 | if test "$GCC" = yes; then |
2265 | 4970 | wlarc='${wl}' | 5398 | wlarc='${wl}' |
2267 | 4971 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 5399 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
2268 | 4972 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ | 5400 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
2270 | 4973 | $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' | 5401 | $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
2271 | 4974 | else | 5402 | else |
2272 | 4975 | case `$CC -V 2>&1` in | 5403 | case `$CC -V 2>&1` in |
2273 | 4976 | *"Compilers 5.0"*) | 5404 | *"Compilers 5.0"*) |
2274 | @@ -5146,36 +5574,38 @@ | |||
2275 | 5146 | # Test whether the compiler implicitly links with -lc since on some | 5574 | # Test whether the compiler implicitly links with -lc since on some |
2276 | 5147 | # systems, -lgcc has to come before -lc. If gcc already passes -lc | 5575 | # systems, -lgcc has to come before -lc. If gcc already passes -lc |
2277 | 5148 | # to ld, don't add -lc before -lgcc. | 5576 | # to ld, don't add -lc before -lgcc. |
2281 | 5149 | AC_MSG_CHECKING([whether -lc should be explicitly linked in]) | 5577 | AC_CACHE_CHECK([whether -lc should be explicitly linked in], |
2282 | 5150 | $RM conftest* | 5578 | [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), |
2283 | 5151 | echo "$lt_simple_compile_test_code" > conftest.$ac_ext | 5579 | [$RM conftest* |
2284 | 5580 | echo "$lt_simple_compile_test_code" > conftest.$ac_ext | ||
2285 | 5152 | 5581 | ||
2312 | 5153 | if AC_TRY_EVAL(ac_compile) 2>conftest.err; then | 5582 | if AC_TRY_EVAL(ac_compile) 2>conftest.err; then |
2313 | 5154 | soname=conftest | 5583 | soname=conftest |
2314 | 5155 | lib=conftest | 5584 | lib=conftest |
2315 | 5156 | libobjs=conftest.$ac_objext | 5585 | libobjs=conftest.$ac_objext |
2316 | 5157 | deplibs= | 5586 | deplibs= |
2317 | 5158 | wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) | 5587 | wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) |
2318 | 5159 | pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) | 5588 | pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) |
2319 | 5160 | compiler_flags=-v | 5589 | compiler_flags=-v |
2320 | 5161 | linker_flags=-v | 5590 | linker_flags=-v |
2321 | 5162 | verstring= | 5591 | verstring= |
2322 | 5163 | output_objdir=. | 5592 | output_objdir=. |
2323 | 5164 | libname=conftest | 5593 | libname=conftest |
2324 | 5165 | lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) | 5594 | lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) |
2325 | 5166 | _LT_TAGVAR(allow_undefined_flag, $1)= | 5595 | _LT_TAGVAR(allow_undefined_flag, $1)= |
2326 | 5167 | if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) | 5596 | if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) |
2327 | 5168 | then | 5597 | then |
2328 | 5169 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no | 5598 | lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no |
2329 | 5170 | else | 5599 | else |
2330 | 5171 | _LT_TAGVAR(archive_cmds_need_lc, $1)=yes | 5600 | lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes |
2331 | 5172 | fi | 5601 | fi |
2332 | 5173 | _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag | 5602 | _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag |
2333 | 5174 | else | 5603 | else |
2334 | 5175 | cat conftest.err 1>&5 | 5604 | cat conftest.err 1>&5 |
2335 | 5176 | fi | 5605 | fi |
2336 | 5177 | $RM conftest* | 5606 | $RM conftest* |
2337 | 5178 | AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) | 5607 | ]) |
2338 | 5608 | _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) | ||
2339 | 5179 | ;; | 5609 | ;; |
2340 | 5180 | esac | 5610 | esac |
2341 | 5181 | fi | 5611 | fi |
2342 | @@ -5240,8 +5670,6 @@ | |||
2343 | 5240 | to runtime path list]) | 5670 | to runtime path list]) |
2344 | 5241 | _LT_TAGDECL([], [link_all_deplibs], [0], | 5671 | _LT_TAGDECL([], [link_all_deplibs], [0], |
2345 | 5242 | [Whether libtool must link a program against all its dependency libraries]) | 5672 | [Whether libtool must link a program against all its dependency libraries]) |
2346 | 5243 | _LT_TAGDECL([], [fix_srcfile_path], [1], | ||
2347 | 5244 | [Fix the shell variable $srcfile for the compiler]) | ||
2348 | 5245 | _LT_TAGDECL([], [always_export_symbols], [0], | 5673 | _LT_TAGDECL([], [always_export_symbols], [0], |
2349 | 5246 | [Set to "yes" if exported symbols are required]) | 5674 | [Set to "yes" if exported symbols are required]) |
2350 | 5247 | _LT_TAGDECL([], [export_symbols_cmds], [2], | 5675 | _LT_TAGDECL([], [export_symbols_cmds], [2], |
2351 | @@ -5252,6 +5680,8 @@ | |||
2352 | 5252 | [Symbols that must always be exported]) | 5680 | [Symbols that must always be exported]) |
2353 | 5253 | _LT_TAGDECL([], [prelink_cmds], [2], | 5681 | _LT_TAGDECL([], [prelink_cmds], [2], |
2354 | 5254 | [Commands necessary for linking programs (against libraries) with templates]) | 5682 | [Commands necessary for linking programs (against libraries) with templates]) |
2355 | 5683 | _LT_TAGDECL([], [postlink_cmds], [2], | ||
2356 | 5684 | [Commands necessary for finishing linking programs]) | ||
2357 | 5255 | _LT_TAGDECL([], [file_list_spec], [1], | 5685 | _LT_TAGDECL([], [file_list_spec], [1], |
2358 | 5256 | [Specify filename containing input files]) | 5686 | [Specify filename containing input files]) |
2359 | 5257 | dnl FIXME: Not yet implemented | 5687 | dnl FIXME: Not yet implemented |
2360 | @@ -5341,14 +5771,15 @@ | |||
2361 | 5341 | ])# _LT_LANG_C_CONFIG | 5771 | ])# _LT_LANG_C_CONFIG |
2362 | 5342 | 5772 | ||
2363 | 5343 | 5773 | ||
2372 | 5344 | # _LT_PROG_CXX | 5774 | # _LT_LANG_CXX_CONFIG([TAG]) |
2373 | 5345 | # ------------ | 5775 | # -------------------------- |
2374 | 5346 | # Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ | 5776 | # Ensure that the configuration variables for a C++ compiler are suitably |
2375 | 5347 | # compiler, we have our own version here. | 5777 | # defined. These variables are subsequently used by _LT_CONFIG to write |
2376 | 5348 | m4_defun([_LT_PROG_CXX], | 5778 | # the compiler configuration to `libtool'. |
2377 | 5349 | [ | 5779 | m4_defun([_LT_LANG_CXX_CONFIG], |
2378 | 5350 | pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) | 5780 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
2379 | 5351 | AC_PROG_CXX | 5781 | m4_require([_LT_DECL_EGREP])dnl |
2380 | 5782 | m4_require([_LT_PATH_MANIFEST_TOOL])dnl | ||
2381 | 5352 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && | 5783 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && |
2382 | 5353 | ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || | 5784 | ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || |
2383 | 5354 | (test "X$CXX" != "Xg++"))) ; then | 5785 | (test "X$CXX" != "Xg++"))) ; then |
2384 | @@ -5356,22 +5787,6 @@ | |||
2385 | 5356 | else | 5787 | else |
2386 | 5357 | _lt_caught_CXX_error=yes | 5788 | _lt_caught_CXX_error=yes |
2387 | 5358 | fi | 5789 | fi |
2388 | 5359 | popdef([AC_MSG_ERROR]) | ||
2389 | 5360 | ])# _LT_PROG_CXX | ||
2390 | 5361 | |||
2391 | 5362 | dnl aclocal-1.4 backwards compatibility: | ||
2392 | 5363 | dnl AC_DEFUN([_LT_PROG_CXX], []) | ||
2393 | 5364 | |||
2394 | 5365 | |||
2395 | 5366 | # _LT_LANG_CXX_CONFIG([TAG]) | ||
2396 | 5367 | # -------------------------- | ||
2397 | 5368 | # Ensure that the configuration variables for a C++ compiler are suitably | ||
2398 | 5369 | # defined. These variables are subsequently used by _LT_CONFIG to write | ||
2399 | 5370 | # the compiler configuration to `libtool'. | ||
2400 | 5371 | m4_defun([_LT_LANG_CXX_CONFIG], | ||
2401 | 5372 | [AC_REQUIRE([_LT_PROG_CXX])dnl | ||
2402 | 5373 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl | ||
2403 | 5374 | m4_require([_LT_DECL_EGREP])dnl | ||
2404 | 5375 | 5790 | ||
2405 | 5376 | AC_LANG_PUSH(C++) | 5791 | AC_LANG_PUSH(C++) |
2406 | 5377 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no | 5792 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
2407 | @@ -5393,6 +5808,8 @@ | |||
2408 | 5393 | _LT_TAGVAR(module_expsym_cmds, $1)= | 5808 | _LT_TAGVAR(module_expsym_cmds, $1)= |
2409 | 5394 | _LT_TAGVAR(link_all_deplibs, $1)=unknown | 5809 | _LT_TAGVAR(link_all_deplibs, $1)=unknown |
2410 | 5395 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds | 5810 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
2411 | 5811 | _LT_TAGVAR(reload_flag, $1)=$reload_flag | ||
2412 | 5812 | _LT_TAGVAR(reload_cmds, $1)=$reload_cmds | ||
2413 | 5396 | _LT_TAGVAR(no_undefined_flag, $1)= | 5813 | _LT_TAGVAR(no_undefined_flag, $1)= |
2414 | 5397 | _LT_TAGVAR(whole_archive_flag_spec, $1)= | 5814 | _LT_TAGVAR(whole_archive_flag_spec, $1)= |
2415 | 5398 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no | 5815 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no |
2416 | @@ -5424,6 +5841,7 @@ | |||
2417 | 5424 | 5841 | ||
2418 | 5425 | # Allow CC to be a program name with arguments. | 5842 | # Allow CC to be a program name with arguments. |
2419 | 5426 | lt_save_CC=$CC | 5843 | lt_save_CC=$CC |
2420 | 5844 | lt_save_CFLAGS=$CFLAGS | ||
2421 | 5427 | lt_save_LD=$LD | 5845 | lt_save_LD=$LD |
2422 | 5428 | lt_save_GCC=$GCC | 5846 | lt_save_GCC=$GCC |
2423 | 5429 | GCC=$GXX | 5847 | GCC=$GXX |
2424 | @@ -5441,6 +5859,7 @@ | |||
2425 | 5441 | fi | 5859 | fi |
2426 | 5442 | test -z "${LDCXX+set}" || LD=$LDCXX | 5860 | test -z "${LDCXX+set}" || LD=$LDCXX |
2427 | 5443 | CC=${CXX-"c++"} | 5861 | CC=${CXX-"c++"} |
2428 | 5862 | CFLAGS=$CXXFLAGS | ||
2429 | 5444 | compiler=$CC | 5863 | compiler=$CC |
2430 | 5445 | _LT_TAGVAR(compiler, $1)=$CC | 5864 | _LT_TAGVAR(compiler, $1)=$CC |
2431 | 5446 | _LT_CC_BASENAME([$compiler]) | 5865 | _LT_CC_BASENAME([$compiler]) |
2432 | @@ -5462,8 +5881,8 @@ | |||
2433 | 5462 | # Check if GNU C++ uses GNU ld as the underlying linker, since the | 5881 | # Check if GNU C++ uses GNU ld as the underlying linker, since the |
2434 | 5463 | # archiving commands below assume that GNU ld is being used. | 5882 | # archiving commands below assume that GNU ld is being used. |
2435 | 5464 | if test "$with_gnu_ld" = yes; then | 5883 | if test "$with_gnu_ld" = yes; then |
2438 | 5465 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' | 5884 | _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' |
2439 | 5466 | _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' | 5885 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
2440 | 5467 | 5886 | ||
2441 | 5468 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | 5887 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
2442 | 5469 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' | 5888 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
2443 | @@ -5495,7 +5914,7 @@ | |||
2444 | 5495 | # Commands to make compiler produce verbose output that lists | 5914 | # Commands to make compiler produce verbose output that lists |
2445 | 5496 | # what "hidden" libraries, object files and flags are used when | 5915 | # what "hidden" libraries, object files and flags are used when |
2446 | 5497 | # linking a shared library. | 5916 | # linking a shared library. |
2448 | 5498 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' | 5917 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
2449 | 5499 | 5918 | ||
2450 | 5500 | else | 5919 | else |
2451 | 5501 | GXX=no | 5920 | GXX=no |
2452 | @@ -5604,10 +6023,10 @@ | |||
2453 | 5604 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' | 6023 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' |
2454 | 5605 | # Determine the default libpath from the value encoded in an empty | 6024 | # Determine the default libpath from the value encoded in an empty |
2455 | 5606 | # executable. | 6025 | # executable. |
2457 | 5607 | _LT_SYS_MODULE_PATH_AIX | 6026 | _LT_SYS_MODULE_PATH_AIX([$1]) |
2458 | 5608 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" | 6027 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
2459 | 5609 | 6028 | ||
2461 | 5610 | _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" | 6029 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
2462 | 5611 | else | 6030 | else |
2463 | 5612 | if test "$host_cpu" = ia64; then | 6031 | if test "$host_cpu" = ia64; then |
2464 | 5613 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' | 6032 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' |
2465 | @@ -5616,14 +6035,19 @@ | |||
2466 | 5616 | else | 6035 | else |
2467 | 5617 | # Determine the default libpath from the value encoded in an | 6036 | # Determine the default libpath from the value encoded in an |
2468 | 5618 | # empty executable. | 6037 | # empty executable. |
2470 | 5619 | _LT_SYS_MODULE_PATH_AIX | 6038 | _LT_SYS_MODULE_PATH_AIX([$1]) |
2471 | 5620 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" | 6039 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
2472 | 5621 | # Warning - without using the other run time loading flags, | 6040 | # Warning - without using the other run time loading flags, |
2473 | 5622 | # -berok will link without error, but may produce a broken library. | 6041 | # -berok will link without error, but may produce a broken library. |
2474 | 5623 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' | 6042 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' |
2475 | 5624 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' | 6043 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' |
2478 | 5625 | # Exported symbols can be pulled into shared objects from archives | 6044 | if test "$with_gnu_ld" = yes; then |
2479 | 5626 | _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' | 6045 | # We only use this code for GNU lds that support --whole-archive. |
2480 | 6046 | _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' | ||
2481 | 6047 | else | ||
2482 | 6048 | # Exported symbols can be pulled into shared objects from archives | ||
2483 | 6049 | _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' | ||
2484 | 6050 | fi | ||
2485 | 5627 | _LT_TAGVAR(archive_cmds_need_lc, $1)=yes | 6051 | _LT_TAGVAR(archive_cmds_need_lc, $1)=yes |
2486 | 5628 | # This is similar to how AIX traditionally builds its shared | 6052 | # This is similar to how AIX traditionally builds its shared |
2487 | 5629 | # libraries. | 6053 | # libraries. |
2488 | @@ -5653,28 +6077,75 @@ | |||
2489 | 5653 | ;; | 6077 | ;; |
2490 | 5654 | 6078 | ||
2491 | 5655 | cygwin* | mingw* | pw32* | cegcc*) | 6079 | cygwin* | mingw* | pw32* | cegcc*) |
2498 | 5656 | # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, | 6080 | case $GXX,$cc_basename in |
2499 | 5657 | # as there is no search path for DLLs. | 6081 | ,cl* | no,cl*) |
2500 | 5658 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' | 6082 | # Native MSVC |
2501 | 5659 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | 6083 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
2502 | 5660 | _LT_TAGVAR(always_export_symbols, $1)=no | 6084 | # no search path for DLLs. |
2503 | 5661 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | 6085 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
2504 | 6086 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | ||
2505 | 6087 | _LT_TAGVAR(always_export_symbols, $1)=yes | ||
2506 | 6088 | _LT_TAGVAR(file_list_spec, $1)='@' | ||
2507 | 6089 | # Tell ltmain to make .lib files, not .a files. | ||
2508 | 6090 | libext=lib | ||
2509 | 6091 | # Tell ltmain to make .dll files, not .so files. | ||
2510 | 6092 | shrext_cmds=".dll" | ||
2511 | 6093 | # FIXME: Setting linknames here is a bad hack. | ||
2512 | 6094 | _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' | ||
2513 | 6095 | _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | ||
2514 | 6096 | $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; | ||
2515 | 6097 | else | ||
2516 | 6098 | $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; | ||
2517 | 6099 | fi~ | ||
2518 | 6100 | $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ | ||
2519 | 6101 | linknames=' | ||
2520 | 6102 | # The linker will not automatically build a static lib if we build a DLL. | ||
2521 | 6103 | # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' | ||
2522 | 6104 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | ||
2523 | 6105 | # Don't use ranlib | ||
2524 | 6106 | _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' | ||
2525 | 6107 | _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ | ||
2526 | 6108 | lt_tool_outputfile="@TOOL_OUTPUT@"~ | ||
2527 | 6109 | case $lt_outputfile in | ||
2528 | 6110 | *.exe|*.EXE) ;; | ||
2529 | 6111 | *) | ||
2530 | 6112 | lt_outputfile="$lt_outputfile.exe" | ||
2531 | 6113 | lt_tool_outputfile="$lt_tool_outputfile.exe" | ||
2532 | 6114 | ;; | ||
2533 | 6115 | esac~ | ||
2534 | 6116 | func_to_tool_file "$lt_outputfile"~ | ||
2535 | 6117 | if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then | ||
2536 | 6118 | $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; | ||
2537 | 6119 | $RM "$lt_outputfile.manifest"; | ||
2538 | 6120 | fi' | ||
2539 | 6121 | ;; | ||
2540 | 6122 | *) | ||
2541 | 6123 | # g++ | ||
2542 | 6124 | # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, | ||
2543 | 6125 | # as there is no search path for DLLs. | ||
2544 | 6126 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' | ||
2545 | 6127 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' | ||
2546 | 6128 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | ||
2547 | 6129 | _LT_TAGVAR(always_export_symbols, $1)=no | ||
2548 | 6130 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | ||
2549 | 5662 | 6131 | ||
2565 | 5663 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 6132 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
2566 | 5664 | _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' | 6133 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
2567 | 5665 | # If the export-symbols file already is a .def file (1st line | 6134 | # If the export-symbols file already is a .def file (1st line |
2568 | 5666 | # is EXPORTS), use it as is; otherwise, prepend... | 6135 | # is EXPORTS), use it as is; otherwise, prepend... |
2569 | 5667 | _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | 6136 | _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
2570 | 5668 | cp $export_symbols $output_objdir/$soname.def; | 6137 | cp $export_symbols $output_objdir/$soname.def; |
2571 | 5669 | else | 6138 | else |
2572 | 5670 | echo EXPORTS > $output_objdir/$soname.def; | 6139 | echo EXPORTS > $output_objdir/$soname.def; |
2573 | 5671 | cat $export_symbols >> $output_objdir/$soname.def; | 6140 | cat $export_symbols >> $output_objdir/$soname.def; |
2574 | 5672 | fi~ | 6141 | fi~ |
2575 | 5673 | $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' | 6142 | $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
2576 | 5674 | else | 6143 | else |
2577 | 5675 | _LT_TAGVAR(ld_shlibs, $1)=no | 6144 | _LT_TAGVAR(ld_shlibs, $1)=no |
2578 | 5676 | fi | 6145 | fi |
2579 | 5677 | ;; | 6146 | ;; |
2580 | 6147 | esac | ||
2581 | 6148 | ;; | ||
2582 | 5678 | darwin* | rhapsody*) | 6149 | darwin* | rhapsody*) |
2583 | 5679 | _LT_DARWIN_LINKER_FEATURES($1) | 6150 | _LT_DARWIN_LINKER_FEATURES($1) |
2584 | 5680 | ;; | 6151 | ;; |
2585 | @@ -5716,6 +6187,11 @@ | |||
2586 | 5716 | gnu*) | 6187 | gnu*) |
2587 | 5717 | ;; | 6188 | ;; |
2588 | 5718 | 6189 | ||
2589 | 6190 | haiku*) | ||
2590 | 6191 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
2591 | 6192 | _LT_TAGVAR(link_all_deplibs, $1)=yes | ||
2592 | 6193 | ;; | ||
2593 | 6194 | |||
2594 | 5719 | hpux9*) | 6195 | hpux9*) |
2595 | 5720 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' | 6196 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' |
2596 | 5721 | _LT_TAGVAR(hardcode_libdir_separator, $1)=: | 6197 | _LT_TAGVAR(hardcode_libdir_separator, $1)=: |
2597 | @@ -5740,11 +6216,11 @@ | |||
2598 | 5740 | # explicitly linking system object files so we need to strip them | 6216 | # explicitly linking system object files so we need to strip them |
2599 | 5741 | # from the output so that they don't get included in the library | 6217 | # from the output so that they don't get included in the library |
2600 | 5742 | # dependencies. | 6218 | # dependencies. |
2602 | 5743 | 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' | 6219 | output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' |
2603 | 5744 | ;; | 6220 | ;; |
2604 | 5745 | *) | 6221 | *) |
2605 | 5746 | if test "$GXX" = yes; then | 6222 | if test "$GXX" = yes; then |
2607 | 5747 | _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' | 6223 | _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
2608 | 5748 | else | 6224 | else |
2609 | 5749 | # FIXME: insert proper C++ library support | 6225 | # FIXME: insert proper C++ library support |
2610 | 5750 | _LT_TAGVAR(ld_shlibs, $1)=no | 6226 | _LT_TAGVAR(ld_shlibs, $1)=no |
2611 | @@ -5805,7 +6281,7 @@ | |||
2612 | 5805 | # explicitly linking system object files so we need to strip them | 6281 | # explicitly linking system object files so we need to strip them |
2613 | 5806 | # from the output so that they don't get included in the library | 6282 | # from the output so that they don't get included in the library |
2614 | 5807 | # dependencies. | 6283 | # dependencies. |
2616 | 5808 | 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' | 6284 | output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' |
2617 | 5809 | ;; | 6285 | ;; |
2618 | 5810 | *) | 6286 | *) |
2619 | 5811 | if test "$GXX" = yes; then | 6287 | if test "$GXX" = yes; then |
2620 | @@ -5815,10 +6291,10 @@ | |||
2621 | 5815 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | 6291 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
2622 | 5816 | ;; | 6292 | ;; |
2623 | 5817 | ia64*) | 6293 | ia64*) |
2625 | 5818 | _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' | 6294 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
2626 | 5819 | ;; | 6295 | ;; |
2627 | 5820 | *) | 6296 | *) |
2629 | 5821 | _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' | 6297 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
2630 | 5822 | ;; | 6298 | ;; |
2631 | 5823 | esac | 6299 | esac |
2632 | 5824 | fi | 6300 | fi |
2633 | @@ -5848,7 +6324,7 @@ | |||
2634 | 5848 | case $cc_basename in | 6324 | case $cc_basename in |
2635 | 5849 | CC*) | 6325 | CC*) |
2636 | 5850 | # SGI C++ | 6326 | # SGI C++ |
2638 | 5851 | _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' | 6327 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
2639 | 5852 | 6328 | ||
2640 | 5853 | # Archives containing C++ object files must be created using | 6329 | # Archives containing C++ object files must be created using |
2641 | 5854 | # "CC -ar", where "CC" is the IRIX C++ compiler. This is | 6330 | # "CC -ar", where "CC" is the IRIX C++ compiler. This is |
2642 | @@ -5859,9 +6335,9 @@ | |||
2643 | 5859 | *) | 6335 | *) |
2644 | 5860 | if test "$GXX" = yes; then | 6336 | if test "$GXX" = yes; then |
2645 | 5861 | if test "$with_gnu_ld" = no; then | 6337 | if test "$with_gnu_ld" = no; then |
2647 | 5862 | _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' | 6338 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
2648 | 5863 | else | 6339 | else |
2650 | 5864 | _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' | 6340 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' |
2651 | 5865 | fi | 6341 | fi |
2652 | 5866 | fi | 6342 | fi |
2653 | 5867 | _LT_TAGVAR(link_all_deplibs, $1)=yes | 6343 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
2654 | @@ -5890,7 +6366,7 @@ | |||
2655 | 5890 | # explicitly linking system object files so we need to strip them | 6366 | # explicitly linking system object files so we need to strip them |
2656 | 5891 | # from the output so that they don't get included in the library | 6367 | # from the output so that they don't get included in the library |
2657 | 5892 | # dependencies. | 6368 | # dependencies. |
2659 | 5893 | 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' | 6369 | output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' |
2660 | 5894 | 6370 | ||
2661 | 5895 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' | 6371 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' |
2662 | 5896 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' | 6372 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
2663 | @@ -5927,26 +6403,26 @@ | |||
2664 | 5927 | pgCC* | pgcpp*) | 6403 | pgCC* | pgcpp*) |
2665 | 5928 | # Portland Group C++ compiler | 6404 | # Portland Group C++ compiler |
2666 | 5929 | case `$CC -V` in | 6405 | case `$CC -V` in |
2668 | 5930 | *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) | 6406 | *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) |
2669 | 5931 | _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ | 6407 | _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ |
2670 | 5932 | rm -rf $tpldir~ | 6408 | rm -rf $tpldir~ |
2671 | 5933 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ | 6409 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ |
2673 | 5934 | compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' | 6410 | compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' |
2674 | 5935 | _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ | 6411 | _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ |
2675 | 5936 | rm -rf $tpldir~ | 6412 | rm -rf $tpldir~ |
2676 | 5937 | $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ | 6413 | $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ |
2678 | 5938 | $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ | 6414 | $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ |
2679 | 5939 | $RANLIB $oldlib' | 6415 | $RANLIB $oldlib' |
2680 | 5940 | _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ | 6416 | _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ |
2681 | 5941 | rm -rf $tpldir~ | 6417 | rm -rf $tpldir~ |
2682 | 5942 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ | 6418 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
2684 | 5943 | $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' | 6419 | $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
2685 | 5944 | _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ | 6420 | _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ |
2686 | 5945 | rm -rf $tpldir~ | 6421 | rm -rf $tpldir~ |
2687 | 5946 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ | 6422 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
2689 | 5947 | $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' | 6423 | $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' |
2690 | 5948 | ;; | 6424 | ;; |
2692 | 5949 | *) # Version 6 will use weak symbols | 6425 | *) # Version 6 and above use weak symbols |
2693 | 5950 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' | 6426 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
2694 | 5951 | _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' | 6427 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' |
2695 | 5952 | ;; | 6428 | ;; |
2696 | @@ -5954,7 +6430,7 @@ | |||
2697 | 5954 | 6430 | ||
2698 | 5955 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' | 6431 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' |
2699 | 5956 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' | 6432 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
2701 | 5957 | _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' | 6433 | _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
2702 | 5958 | ;; | 6434 | ;; |
2703 | 5959 | cxx*) | 6435 | cxx*) |
2704 | 5960 | # Compaq C++ | 6436 | # Compaq C++ |
2705 | @@ -5973,9 +6449,9 @@ | |||
2706 | 5973 | # explicitly linking system object files so we need to strip them | 6449 | # explicitly linking system object files so we need to strip them |
2707 | 5974 | # from the output so that they don't get included in the library | 6450 | # from the output so that they don't get included in the library |
2708 | 5975 | # dependencies. | 6451 | # dependencies. |
2710 | 5976 | 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' | 6452 | output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' |
2711 | 5977 | ;; | 6453 | ;; |
2713 | 5978 | xl*) | 6454 | xl* | mpixl* | bgxl*) |
2714 | 5979 | # IBM XL 8.0 on PPC, with GNU ld | 6455 | # IBM XL 8.0 on PPC, with GNU ld |
2715 | 5980 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | 6456 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
2716 | 5981 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' | 6457 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
2717 | @@ -5995,13 +6471,13 @@ | |||
2718 | 5995 | _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | 6471 | _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
2719 | 5996 | _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' | 6472 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' |
2720 | 5997 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' | 6473 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' |
2722 | 5998 | _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' | 6474 | _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
2723 | 5999 | _LT_TAGVAR(compiler_needs_object, $1)=yes | 6475 | _LT_TAGVAR(compiler_needs_object, $1)=yes |
2724 | 6000 | 6476 | ||
2725 | 6001 | # Not sure whether something based on | 6477 | # Not sure whether something based on |
2726 | 6002 | # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | 6478 | # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 |
2727 | 6003 | # would be better. | 6479 | # would be better. |
2729 | 6004 | output_verbose_link_cmd='echo' | 6480 | output_verbose_link_cmd='func_echo_all' |
2730 | 6005 | 6481 | ||
2731 | 6006 | # Archives containing C++ object files must be created using | 6482 | # Archives containing C++ object files must be created using |
2732 | 6007 | # "CC -xar", where "CC" is the Sun C++ compiler. This is | 6483 | # "CC -xar", where "CC" is the Sun C++ compiler. This is |
2733 | @@ -6070,7 +6546,7 @@ | |||
2734 | 6070 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' | 6546 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' |
2735 | 6071 | _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' | 6547 | _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' |
2736 | 6072 | fi | 6548 | fi |
2738 | 6073 | output_verbose_link_cmd=echo | 6549 | output_verbose_link_cmd=func_echo_all |
2739 | 6074 | else | 6550 | else |
2740 | 6075 | _LT_TAGVAR(ld_shlibs, $1)=no | 6551 | _LT_TAGVAR(ld_shlibs, $1)=no |
2741 | 6076 | fi | 6552 | fi |
2742 | @@ -6105,15 +6581,15 @@ | |||
2743 | 6105 | case $host in | 6581 | case $host in |
2744 | 6106 | osf3*) | 6582 | osf3*) |
2745 | 6107 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' | 6583 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
2747 | 6108 | _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' | 6584 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
2748 | 6109 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | 6585 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
2749 | 6110 | ;; | 6586 | ;; |
2750 | 6111 | *) | 6587 | *) |
2751 | 6112 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' | 6588 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
2753 | 6113 | _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' | 6589 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
2754 | 6114 | _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ | 6590 | _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ |
2755 | 6115 | echo "-hidden">> $lib.exp~ | 6591 | echo "-hidden">> $lib.exp~ |
2757 | 6116 | $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~ | 6592 | $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ |
2758 | 6117 | $RM $lib.exp' | 6593 | $RM $lib.exp' |
2759 | 6118 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' | 6594 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' |
2760 | 6119 | ;; | 6595 | ;; |
2761 | @@ -6129,17 +6605,17 @@ | |||
2762 | 6129 | # explicitly linking system object files so we need to strip them | 6605 | # explicitly linking system object files so we need to strip them |
2763 | 6130 | # from the output so that they don't get included in the library | 6606 | # from the output so that they don't get included in the library |
2764 | 6131 | # dependencies. | 6607 | # dependencies. |
2766 | 6132 | 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' | 6608 | output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' |
2767 | 6133 | ;; | 6609 | ;; |
2768 | 6134 | *) | 6610 | *) |
2769 | 6135 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then | 6611 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
2770 | 6136 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' | 6612 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
2771 | 6137 | case $host in | 6613 | case $host in |
2772 | 6138 | osf3*) | 6614 | osf3*) |
2774 | 6139 | _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' | 6615 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
2775 | 6140 | ;; | 6616 | ;; |
2776 | 6141 | *) | 6617 | *) |
2778 | 6142 | _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' | 6618 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
2779 | 6143 | ;; | 6619 | ;; |
2780 | 6144 | esac | 6620 | esac |
2781 | 6145 | 6621 | ||
2782 | @@ -6149,7 +6625,7 @@ | |||
2783 | 6149 | # Commands to make compiler produce verbose output that lists | 6625 | # Commands to make compiler produce verbose output that lists |
2784 | 6150 | # what "hidden" libraries, object files and flags are used when | 6626 | # what "hidden" libraries, object files and flags are used when |
2785 | 6151 | # linking a shared library. | 6627 | # linking a shared library. |
2787 | 6152 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' | 6628 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
2788 | 6153 | 6629 | ||
2789 | 6154 | else | 6630 | else |
2790 | 6155 | # FIXME: insert proper C++ library support | 6631 | # FIXME: insert proper C++ library support |
2791 | @@ -6185,7 +6661,7 @@ | |||
2792 | 6185 | 6661 | ||
2793 | 6186 | solaris*) | 6662 | solaris*) |
2794 | 6187 | case $cc_basename in | 6663 | case $cc_basename in |
2796 | 6188 | CC*) | 6664 | CC* | sunCC*) |
2797 | 6189 | # Sun C++ 4.2, 5.x and Centerline C++ | 6665 | # Sun C++ 4.2, 5.x and Centerline C++ |
2798 | 6190 | _LT_TAGVAR(archive_cmds_need_lc,$1)=yes | 6666 | _LT_TAGVAR(archive_cmds_need_lc,$1)=yes |
2799 | 6191 | _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' | 6667 | _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' |
2800 | @@ -6206,7 +6682,7 @@ | |||
2801 | 6206 | esac | 6682 | esac |
2802 | 6207 | _LT_TAGVAR(link_all_deplibs, $1)=yes | 6683 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
2803 | 6208 | 6684 | ||
2805 | 6209 | output_verbose_link_cmd='echo' | 6685 | output_verbose_link_cmd='func_echo_all' |
2806 | 6210 | 6686 | ||
2807 | 6211 | # Archives containing C++ object files must be created using | 6687 | # Archives containing C++ object files must be created using |
2808 | 6212 | # "CC -xar", where "CC" is the Sun C++ compiler. This is | 6688 | # "CC -xar", where "CC" is the Sun C++ compiler. This is |
2809 | @@ -6226,14 +6702,14 @@ | |||
2810 | 6226 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then | 6702 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
2811 | 6227 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' | 6703 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' |
2812 | 6228 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then | 6704 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then |
2814 | 6229 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' | 6705 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' |
2815 | 6230 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ | 6706 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
2817 | 6231 | $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' | 6707 | $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' |
2818 | 6232 | 6708 | ||
2819 | 6233 | # Commands to make compiler produce verbose output that lists | 6709 | # Commands to make compiler produce verbose output that lists |
2820 | 6234 | # what "hidden" libraries, object files and flags are used when | 6710 | # what "hidden" libraries, object files and flags are used when |
2821 | 6235 | # linking a shared library. | 6711 | # linking a shared library. |
2823 | 6236 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' | 6712 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
2824 | 6237 | else | 6713 | else |
2825 | 6238 | # g++ 2.7 appears to require `-G' NOT `-shared' on this | 6714 | # g++ 2.7 appears to require `-G' NOT `-shared' on this |
2826 | 6239 | # platform. | 6715 | # platform. |
2827 | @@ -6244,7 +6720,7 @@ | |||
2828 | 6244 | # Commands to make compiler produce verbose output that lists | 6720 | # Commands to make compiler produce verbose output that lists |
2829 | 6245 | # what "hidden" libraries, object files and flags are used when | 6721 | # what "hidden" libraries, object files and flags are used when |
2830 | 6246 | # linking a shared library. | 6722 | # linking a shared library. |
2832 | 6247 | output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' | 6723 | output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
2833 | 6248 | fi | 6724 | fi |
2834 | 6249 | 6725 | ||
2835 | 6250 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' | 6726 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' |
2836 | @@ -6298,6 +6774,10 @@ | |||
2837 | 6298 | CC*) | 6774 | CC*) |
2838 | 6299 | _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | 6775 | _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
2839 | 6300 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | 6776 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
2840 | 6777 | _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ | ||
2841 | 6778 | '"$_LT_TAGVAR(old_archive_cmds, $1)" | ||
2842 | 6779 | _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ | ||
2843 | 6780 | '"$_LT_TAGVAR(reload_cmds, $1)" | ||
2844 | 6301 | ;; | 6781 | ;; |
2845 | 6302 | *) | 6782 | *) |
2846 | 6303 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | 6783 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
2847 | @@ -6353,6 +6833,7 @@ | |||
2848 | 6353 | fi # test -n "$compiler" | 6833 | fi # test -n "$compiler" |
2849 | 6354 | 6834 | ||
2850 | 6355 | CC=$lt_save_CC | 6835 | CC=$lt_save_CC |
2851 | 6836 | CFLAGS=$lt_save_CFLAGS | ||
2852 | 6356 | LDCXX=$LD | 6837 | LDCXX=$LD |
2853 | 6357 | LD=$lt_save_LD | 6838 | LD=$lt_save_LD |
2854 | 6358 | GCC=$lt_save_GCC | 6839 | GCC=$lt_save_GCC |
2855 | @@ -6367,6 +6848,29 @@ | |||
2856 | 6367 | ])# _LT_LANG_CXX_CONFIG | 6848 | ])# _LT_LANG_CXX_CONFIG |
2857 | 6368 | 6849 | ||
2858 | 6369 | 6850 | ||
2859 | 6851 | # _LT_FUNC_STRIPNAME_CNF | ||
2860 | 6852 | # ---------------------- | ||
2861 | 6853 | # func_stripname_cnf prefix suffix name | ||
2862 | 6854 | # strip PREFIX and SUFFIX off of NAME. | ||
2863 | 6855 | # PREFIX and SUFFIX must not contain globbing or regex special | ||
2864 | 6856 | # characters, hashes, percent signs, but SUFFIX may contain a leading | ||
2865 | 6857 | # dot (in which case that matches only a dot). | ||
2866 | 6858 | # | ||
2867 | 6859 | # This function is identical to the (non-XSI) version of func_stripname, | ||
2868 | 6860 | # except this one can be used by m4 code that may be executed by configure, | ||
2869 | 6861 | # rather than the libtool script. | ||
2870 | 6862 | m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl | ||
2871 | 6863 | AC_REQUIRE([_LT_DECL_SED]) | ||
2872 | 6864 | AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) | ||
2873 | 6865 | func_stripname_cnf () | ||
2874 | 6866 | { | ||
2875 | 6867 | case ${2} in | ||
2876 | 6868 | .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; | ||
2877 | 6869 | *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; | ||
2878 | 6870 | esac | ||
2879 | 6871 | } # func_stripname_cnf | ||
2880 | 6872 | ])# _LT_FUNC_STRIPNAME_CNF | ||
2881 | 6873 | |||
2882 | 6370 | # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) | 6874 | # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) |
2883 | 6371 | # --------------------------------- | 6875 | # --------------------------------- |
2884 | 6372 | # Figure out "hidden" library dependencies from verbose | 6876 | # Figure out "hidden" library dependencies from verbose |
2885 | @@ -6375,6 +6879,7 @@ | |||
2886 | 6375 | # objects, libraries and library flags. | 6879 | # objects, libraries and library flags. |
2887 | 6376 | m4_defun([_LT_SYS_HIDDEN_LIBDEPS], | 6880 | m4_defun([_LT_SYS_HIDDEN_LIBDEPS], |
2888 | 6377 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl | 6881 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
2889 | 6882 | AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl | ||
2890 | 6378 | # Dependencies to place before and after the object being linked: | 6883 | # Dependencies to place before and after the object being linked: |
2891 | 6379 | _LT_TAGVAR(predep_objects, $1)= | 6884 | _LT_TAGVAR(predep_objects, $1)= |
2892 | 6380 | _LT_TAGVAR(postdep_objects, $1)= | 6885 | _LT_TAGVAR(postdep_objects, $1)= |
2893 | @@ -6425,6 +6930,13 @@ | |||
2894 | 6425 | }; | 6930 | }; |
2895 | 6426 | _LT_EOF | 6931 | _LT_EOF |
2896 | 6427 | ]) | 6932 | ]) |
2897 | 6933 | |||
2898 | 6934 | _lt_libdeps_save_CFLAGS=$CFLAGS | ||
2899 | 6935 | case "$CC $CFLAGS " in #( | ||
2900 | 6936 | *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; | ||
2901 | 6937 | *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; | ||
2902 | 6938 | esac | ||
2903 | 6939 | |||
2904 | 6428 | dnl Parse the compiler output and extract the necessary | 6940 | dnl Parse the compiler output and extract the necessary |
2905 | 6429 | dnl objects, libraries and library flags. | 6941 | dnl objects, libraries and library flags. |
2906 | 6430 | if AC_TRY_EVAL(ac_compile); then | 6942 | if AC_TRY_EVAL(ac_compile); then |
2907 | @@ -6436,7 +6948,7 @@ | |||
2908 | 6436 | pre_test_object_deps_done=no | 6948 | pre_test_object_deps_done=no |
2909 | 6437 | 6949 | ||
2910 | 6438 | for p in `eval "$output_verbose_link_cmd"`; do | 6950 | for p in `eval "$output_verbose_link_cmd"`; do |
2912 | 6439 | case $p in | 6951 | case ${prev}${p} in |
2913 | 6440 | 6952 | ||
2914 | 6441 | -L* | -R* | -l*) | 6953 | -L* | -R* | -l*) |
2915 | 6442 | # Some compilers place space between "-{L,R}" and the path. | 6954 | # Some compilers place space between "-{L,R}" and the path. |
2916 | @@ -6445,13 +6957,22 @@ | |||
2917 | 6445 | test $p = "-R"; then | 6957 | test $p = "-R"; then |
2918 | 6446 | prev=$p | 6958 | prev=$p |
2919 | 6447 | continue | 6959 | continue |
2920 | 6448 | else | ||
2921 | 6449 | prev= | ||
2922 | 6450 | fi | 6960 | fi |
2923 | 6451 | 6961 | ||
2924 | 6962 | # Expand the sysroot to ease extracting the directories later. | ||
2925 | 6963 | if test -z "$prev"; then | ||
2926 | 6964 | case $p in | ||
2927 | 6965 | -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; | ||
2928 | 6966 | -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; | ||
2929 | 6967 | -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; | ||
2930 | 6968 | esac | ||
2931 | 6969 | fi | ||
2932 | 6970 | case $p in | ||
2933 | 6971 | =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; | ||
2934 | 6972 | esac | ||
2935 | 6452 | if test "$pre_test_object_deps_done" = no; then | 6973 | if test "$pre_test_object_deps_done" = no; then |
2938 | 6453 | case $p in | 6974 | case ${prev} in |
2939 | 6454 | -L* | -R*) | 6975 | -L | -R) |
2940 | 6455 | # Internal compiler library paths should come after those | 6976 | # Internal compiler library paths should come after those |
2941 | 6456 | # provided the user. The postdeps already come after the | 6977 | # provided the user. The postdeps already come after the |
2942 | 6457 | # user supplied libs so there is no need to process them. | 6978 | # user supplied libs so there is no need to process them. |
2943 | @@ -6471,8 +6992,10 @@ | |||
2944 | 6471 | _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" | 6992 | _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" |
2945 | 6472 | fi | 6993 | fi |
2946 | 6473 | fi | 6994 | fi |
2947 | 6995 | prev= | ||
2948 | 6474 | ;; | 6996 | ;; |
2949 | 6475 | 6997 | ||
2950 | 6998 | *.lto.$objext) ;; # Ignore GCC LTO objects | ||
2951 | 6476 | *.$objext) | 6999 | *.$objext) |
2952 | 6477 | # This assumes that the test object file only shows up | 7000 | # This assumes that the test object file only shows up |
2953 | 6478 | # once in the compiler output. | 7001 | # once in the compiler output. |
2954 | @@ -6508,6 +7031,7 @@ | |||
2955 | 6508 | fi | 7031 | fi |
2956 | 6509 | 7032 | ||
2957 | 6510 | $RM -f confest.$objext | 7033 | $RM -f confest.$objext |
2958 | 7034 | CFLAGS=$_lt_libdeps_save_CFLAGS | ||
2959 | 6511 | 7035 | ||
2960 | 6512 | # PORTME: override above test on systems where it is broken | 7036 | # PORTME: override above test on systems where it is broken |
2961 | 6513 | m4_if([$1], [CXX], | 7037 | m4_if([$1], [CXX], |
2962 | @@ -6544,7 +7068,7 @@ | |||
2963 | 6544 | 7068 | ||
2964 | 6545 | solaris*) | 7069 | solaris*) |
2965 | 6546 | case $cc_basename in | 7070 | case $cc_basename in |
2967 | 6547 | CC*) | 7071 | CC* | sunCC*) |
2968 | 6548 | # The more standards-conforming stlport4 library is | 7072 | # The more standards-conforming stlport4 library is |
2969 | 6549 | # incompatible with the Cstd library. Avoid specifying | 7073 | # incompatible with the Cstd library. Avoid specifying |
2970 | 6550 | # it if it's in CXXFLAGS. Ignore libCrun as | 7074 | # it if it's in CXXFLAGS. Ignore libCrun as |
2971 | @@ -6588,32 +7112,16 @@ | |||
2972 | 6588 | ])# _LT_SYS_HIDDEN_LIBDEPS | 7112 | ])# _LT_SYS_HIDDEN_LIBDEPS |
2973 | 6589 | 7113 | ||
2974 | 6590 | 7114 | ||
2975 | 6591 | # _LT_PROG_F77 | ||
2976 | 6592 | # ------------ | ||
2977 | 6593 | # Since AC_PROG_F77 is broken, in that it returns the empty string | ||
2978 | 6594 | # if there is no fortran compiler, we have our own version here. | ||
2979 | 6595 | m4_defun([_LT_PROG_F77], | ||
2980 | 6596 | [ | ||
2981 | 6597 | pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) | ||
2982 | 6598 | AC_PROG_F77 | ||
2983 | 6599 | if test -z "$F77" || test "X$F77" = "Xno"; then | ||
2984 | 6600 | _lt_disable_F77=yes | ||
2985 | 6601 | fi | ||
2986 | 6602 | popdef([AC_MSG_ERROR]) | ||
2987 | 6603 | ])# _LT_PROG_F77 | ||
2988 | 6604 | |||
2989 | 6605 | dnl aclocal-1.4 backwards compatibility: | ||
2990 | 6606 | dnl AC_DEFUN([_LT_PROG_F77], []) | ||
2991 | 6607 | |||
2992 | 6608 | |||
2993 | 6609 | # _LT_LANG_F77_CONFIG([TAG]) | 7115 | # _LT_LANG_F77_CONFIG([TAG]) |
2994 | 6610 | # -------------------------- | 7116 | # -------------------------- |
2995 | 6611 | # Ensure that the configuration variables for a Fortran 77 compiler are | 7117 | # Ensure that the configuration variables for a Fortran 77 compiler are |
2996 | 6612 | # suitably defined. These variables are subsequently used by _LT_CONFIG | 7118 | # suitably defined. These variables are subsequently used by _LT_CONFIG |
2997 | 6613 | # to write the compiler configuration to `libtool'. | 7119 | # to write the compiler configuration to `libtool'. |
2998 | 6614 | m4_defun([_LT_LANG_F77_CONFIG], | 7120 | m4_defun([_LT_LANG_F77_CONFIG], |
3001 | 6615 | [AC_REQUIRE([_LT_PROG_F77])dnl | 7121 | [AC_LANG_PUSH(Fortran 77) |
3002 | 6616 | AC_LANG_PUSH(Fortran 77) | 7122 | if test -z "$F77" || test "X$F77" = "Xno"; then |
3003 | 7123 | _lt_disable_F77=yes | ||
3004 | 7124 | fi | ||
3005 | 6617 | 7125 | ||
3006 | 6618 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no | 7126 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
3007 | 6619 | _LT_TAGVAR(allow_undefined_flag, $1)= | 7127 | _LT_TAGVAR(allow_undefined_flag, $1)= |
3008 | @@ -6632,6 +7140,8 @@ | |||
3009 | 6632 | _LT_TAGVAR(module_expsym_cmds, $1)= | 7140 | _LT_TAGVAR(module_expsym_cmds, $1)= |
3010 | 6633 | _LT_TAGVAR(link_all_deplibs, $1)=unknown | 7141 | _LT_TAGVAR(link_all_deplibs, $1)=unknown |
3011 | 6634 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds | 7142 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
3012 | 7143 | _LT_TAGVAR(reload_flag, $1)=$reload_flag | ||
3013 | 7144 | _LT_TAGVAR(reload_cmds, $1)=$reload_cmds | ||
3014 | 6635 | _LT_TAGVAR(no_undefined_flag, $1)= | 7145 | _LT_TAGVAR(no_undefined_flag, $1)= |
3015 | 6636 | _LT_TAGVAR(whole_archive_flag_spec, $1)= | 7146 | _LT_TAGVAR(whole_archive_flag_spec, $1)= |
3016 | 6637 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no | 7147 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no |
3017 | @@ -6671,7 +7181,9 @@ | |||
3018 | 6671 | # Allow CC to be a program name with arguments. | 7181 | # Allow CC to be a program name with arguments. |
3019 | 6672 | lt_save_CC="$CC" | 7182 | lt_save_CC="$CC" |
3020 | 6673 | lt_save_GCC=$GCC | 7183 | lt_save_GCC=$GCC |
3021 | 7184 | lt_save_CFLAGS=$CFLAGS | ||
3022 | 6674 | CC=${F77-"f77"} | 7185 | CC=${F77-"f77"} |
3023 | 7186 | CFLAGS=$FFLAGS | ||
3024 | 6675 | compiler=$CC | 7187 | compiler=$CC |
3025 | 6676 | _LT_TAGVAR(compiler, $1)=$CC | 7188 | _LT_TAGVAR(compiler, $1)=$CC |
3026 | 6677 | _LT_CC_BASENAME([$compiler]) | 7189 | _LT_CC_BASENAME([$compiler]) |
3027 | @@ -6725,38 +7237,24 @@ | |||
3028 | 6725 | 7237 | ||
3029 | 6726 | GCC=$lt_save_GCC | 7238 | GCC=$lt_save_GCC |
3030 | 6727 | CC="$lt_save_CC" | 7239 | CC="$lt_save_CC" |
3031 | 7240 | CFLAGS="$lt_save_CFLAGS" | ||
3032 | 6728 | fi # test "$_lt_disable_F77" != yes | 7241 | fi # test "$_lt_disable_F77" != yes |
3033 | 6729 | 7242 | ||
3034 | 6730 | AC_LANG_POP | 7243 | AC_LANG_POP |
3035 | 6731 | ])# _LT_LANG_F77_CONFIG | 7244 | ])# _LT_LANG_F77_CONFIG |
3036 | 6732 | 7245 | ||
3037 | 6733 | 7246 | ||
3038 | 6734 | # _LT_PROG_FC | ||
3039 | 6735 | # ----------- | ||
3040 | 6736 | # Since AC_PROG_FC is broken, in that it returns the empty string | ||
3041 | 6737 | # if there is no fortran compiler, we have our own version here. | ||
3042 | 6738 | m4_defun([_LT_PROG_FC], | ||
3043 | 6739 | [ | ||
3044 | 6740 | pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) | ||
3045 | 6741 | AC_PROG_FC | ||
3046 | 6742 | if test -z "$FC" || test "X$FC" = "Xno"; then | ||
3047 | 6743 | _lt_disable_FC=yes | ||
3048 | 6744 | fi | ||
3049 | 6745 | popdef([AC_MSG_ERROR]) | ||
3050 | 6746 | ])# _LT_PROG_FC | ||
3051 | 6747 | |||
3052 | 6748 | dnl aclocal-1.4 backwards compatibility: | ||
3053 | 6749 | dnl AC_DEFUN([_LT_PROG_FC], []) | ||
3054 | 6750 | |||
3055 | 6751 | |||
3056 | 6752 | # _LT_LANG_FC_CONFIG([TAG]) | 7247 | # _LT_LANG_FC_CONFIG([TAG]) |
3057 | 6753 | # ------------------------- | 7248 | # ------------------------- |
3058 | 6754 | # Ensure that the configuration variables for a Fortran compiler are | 7249 | # Ensure that the configuration variables for a Fortran compiler are |
3059 | 6755 | # suitably defined. These variables are subsequently used by _LT_CONFIG | 7250 | # suitably defined. These variables are subsequently used by _LT_CONFIG |
3060 | 6756 | # to write the compiler configuration to `libtool'. | 7251 | # to write the compiler configuration to `libtool'. |
3061 | 6757 | m4_defun([_LT_LANG_FC_CONFIG], | 7252 | m4_defun([_LT_LANG_FC_CONFIG], |
3064 | 6758 | [AC_REQUIRE([_LT_PROG_FC])dnl | 7253 | [AC_LANG_PUSH(Fortran) |
3065 | 6759 | AC_LANG_PUSH(Fortran) | 7254 | |
3066 | 7255 | if test -z "$FC" || test "X$FC" = "Xno"; then | ||
3067 | 7256 | _lt_disable_FC=yes | ||
3068 | 7257 | fi | ||
3069 | 6760 | 7258 | ||
3070 | 6761 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no | 7259 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
3071 | 6762 | _LT_TAGVAR(allow_undefined_flag, $1)= | 7260 | _LT_TAGVAR(allow_undefined_flag, $1)= |
3072 | @@ -6775,6 +7273,8 @@ | |||
3073 | 6775 | _LT_TAGVAR(module_expsym_cmds, $1)= | 7273 | _LT_TAGVAR(module_expsym_cmds, $1)= |
3074 | 6776 | _LT_TAGVAR(link_all_deplibs, $1)=unknown | 7274 | _LT_TAGVAR(link_all_deplibs, $1)=unknown |
3075 | 6777 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds | 7275 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
3076 | 7276 | _LT_TAGVAR(reload_flag, $1)=$reload_flag | ||
3077 | 7277 | _LT_TAGVAR(reload_cmds, $1)=$reload_cmds | ||
3078 | 6778 | _LT_TAGVAR(no_undefined_flag, $1)= | 7278 | _LT_TAGVAR(no_undefined_flag, $1)= |
3079 | 6779 | _LT_TAGVAR(whole_archive_flag_spec, $1)= | 7279 | _LT_TAGVAR(whole_archive_flag_spec, $1)= |
3080 | 6780 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no | 7280 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no |
3081 | @@ -6814,7 +7314,9 @@ | |||
3082 | 6814 | # Allow CC to be a program name with arguments. | 7314 | # Allow CC to be a program name with arguments. |
3083 | 6815 | lt_save_CC="$CC" | 7315 | lt_save_CC="$CC" |
3084 | 6816 | lt_save_GCC=$GCC | 7316 | lt_save_GCC=$GCC |
3085 | 7317 | lt_save_CFLAGS=$CFLAGS | ||
3086 | 6817 | CC=${FC-"f95"} | 7318 | CC=${FC-"f95"} |
3087 | 7319 | CFLAGS=$FCFLAGS | ||
3088 | 6818 | compiler=$CC | 7320 | compiler=$CC |
3089 | 6819 | GCC=$ac_cv_fc_compiler_gnu | 7321 | GCC=$ac_cv_fc_compiler_gnu |
3090 | 6820 | 7322 | ||
3091 | @@ -6870,7 +7372,8 @@ | |||
3092 | 6870 | fi # test -n "$compiler" | 7372 | fi # test -n "$compiler" |
3093 | 6871 | 7373 | ||
3094 | 6872 | GCC=$lt_save_GCC | 7374 | GCC=$lt_save_GCC |
3096 | 6873 | CC="$lt_save_CC" | 7375 | CC=$lt_save_CC |
3097 | 7376 | CFLAGS=$lt_save_CFLAGS | ||
3098 | 6874 | fi # test "$_lt_disable_FC" != yes | 7377 | fi # test "$_lt_disable_FC" != yes |
3099 | 6875 | 7378 | ||
3100 | 6876 | AC_LANG_POP | 7379 | AC_LANG_POP |
3101 | @@ -6907,10 +7410,12 @@ | |||
3102 | 6907 | _LT_LINKER_BOILERPLATE | 7410 | _LT_LINKER_BOILERPLATE |
3103 | 6908 | 7411 | ||
3104 | 6909 | # Allow CC to be a program name with arguments. | 7412 | # Allow CC to be a program name with arguments. |
3106 | 6910 | lt_save_CC="$CC" | 7413 | lt_save_CC=$CC |
3107 | 7414 | lt_save_CFLAGS=$CFLAGS | ||
3108 | 6911 | lt_save_GCC=$GCC | 7415 | lt_save_GCC=$GCC |
3109 | 6912 | GCC=yes | 7416 | GCC=yes |
3110 | 6913 | CC=${GCJ-"gcj"} | 7417 | CC=${GCJ-"gcj"} |
3111 | 7418 | CFLAGS=$GCJFLAGS | ||
3112 | 6914 | compiler=$CC | 7419 | compiler=$CC |
3113 | 6915 | _LT_TAGVAR(compiler, $1)=$CC | 7420 | _LT_TAGVAR(compiler, $1)=$CC |
3114 | 6916 | _LT_TAGVAR(LD, $1)="$LD" | 7421 | _LT_TAGVAR(LD, $1)="$LD" |
3115 | @@ -6920,6 +7425,8 @@ | |||
3116 | 6920 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no | 7425 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
3117 | 6921 | 7426 | ||
3118 | 6922 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds | 7427 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
3119 | 7428 | _LT_TAGVAR(reload_flag, $1)=$reload_flag | ||
3120 | 7429 | _LT_TAGVAR(reload_cmds, $1)=$reload_cmds | ||
3121 | 6923 | 7430 | ||
3122 | 6924 | if test -n "$compiler"; then | 7431 | if test -n "$compiler"; then |
3123 | 6925 | _LT_COMPILER_NO_RTTI($1) | 7432 | _LT_COMPILER_NO_RTTI($1) |
3124 | @@ -6935,7 +7442,8 @@ | |||
3125 | 6935 | AC_LANG_RESTORE | 7442 | AC_LANG_RESTORE |
3126 | 6936 | 7443 | ||
3127 | 6937 | GCC=$lt_save_GCC | 7444 | GCC=$lt_save_GCC |
3129 | 6938 | CC="$lt_save_CC" | 7445 | CC=$lt_save_CC |
3130 | 7446 | CFLAGS=$lt_save_CFLAGS | ||
3131 | 6939 | ])# _LT_LANG_GCJ_CONFIG | 7447 | ])# _LT_LANG_GCJ_CONFIG |
3132 | 6940 | 7448 | ||
3133 | 6941 | 7449 | ||
3134 | @@ -6970,9 +7478,11 @@ | |||
3135 | 6970 | 7478 | ||
3136 | 6971 | # Allow CC to be a program name with arguments. | 7479 | # Allow CC to be a program name with arguments. |
3137 | 6972 | lt_save_CC="$CC" | 7480 | lt_save_CC="$CC" |
3138 | 7481 | lt_save_CFLAGS=$CFLAGS | ||
3139 | 6973 | lt_save_GCC=$GCC | 7482 | lt_save_GCC=$GCC |
3140 | 6974 | GCC= | 7483 | GCC= |
3141 | 6975 | CC=${RC-"windres"} | 7484 | CC=${RC-"windres"} |
3142 | 7485 | CFLAGS= | ||
3143 | 6976 | compiler=$CC | 7486 | compiler=$CC |
3144 | 6977 | _LT_TAGVAR(compiler, $1)=$CC | 7487 | _LT_TAGVAR(compiler, $1)=$CC |
3145 | 6978 | _LT_CC_BASENAME([$compiler]) | 7488 | _LT_CC_BASENAME([$compiler]) |
3146 | @@ -6985,7 +7495,8 @@ | |||
3147 | 6985 | 7495 | ||
3148 | 6986 | GCC=$lt_save_GCC | 7496 | GCC=$lt_save_GCC |
3149 | 6987 | AC_LANG_RESTORE | 7497 | AC_LANG_RESTORE |
3151 | 6988 | CC="$lt_save_CC" | 7498 | CC=$lt_save_CC |
3152 | 7499 | CFLAGS=$lt_save_CFLAGS | ||
3153 | 6989 | ])# _LT_LANG_RC_CONFIG | 7500 | ])# _LT_LANG_RC_CONFIG |
3154 | 6990 | 7501 | ||
3155 | 6991 | 7502 | ||
3156 | @@ -7044,6 +7555,15 @@ | |||
3157 | 7044 | AC_SUBST([OBJDUMP]) | 7555 | AC_SUBST([OBJDUMP]) |
3158 | 7045 | ]) | 7556 | ]) |
3159 | 7046 | 7557 | ||
3160 | 7558 | # _LT_DECL_DLLTOOL | ||
3161 | 7559 | # ---------------- | ||
3162 | 7560 | # Ensure DLLTOOL variable is set. | ||
3163 | 7561 | m4_defun([_LT_DECL_DLLTOOL], | ||
3164 | 7562 | [AC_CHECK_TOOL(DLLTOOL, dlltool, false) | ||
3165 | 7563 | test -z "$DLLTOOL" && DLLTOOL=dlltool | ||
3166 | 7564 | _LT_DECL([], [DLLTOOL], [1], [DLL creation program]) | ||
3167 | 7565 | AC_SUBST([DLLTOOL]) | ||
3168 | 7566 | ]) | ||
3169 | 7047 | 7567 | ||
3170 | 7048 | # _LT_DECL_SED | 7568 | # _LT_DECL_SED |
3171 | 7049 | # ------------ | 7569 | # ------------ |
3172 | @@ -7135,8 +7655,8 @@ | |||
3173 | 7135 | # Try some XSI features | 7655 | # Try some XSI features |
3174 | 7136 | xsi_shell=no | 7656 | xsi_shell=no |
3175 | 7137 | ( _lt_dummy="a/b/c" | 7657 | ( _lt_dummy="a/b/c" |
3178 | 7138 | test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ | 7658 | test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
3179 | 7139 | = c,a/b,, \ | 7659 | = c,a/b,b/c, \ |
3180 | 7140 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 7660 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
3181 | 7141 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 7661 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
3182 | 7142 | && xsi_shell=yes | 7662 | && xsi_shell=yes |
3183 | @@ -7175,222 +7695,177 @@ | |||
3184 | 7175 | ])# _LT_CHECK_SHELL_FEATURES | 7695 | ])# _LT_CHECK_SHELL_FEATURES |
3185 | 7176 | 7696 | ||
3186 | 7177 | 7697 | ||
3392 | 7178 | # _LT_PROG_XSI_SHELLFNS | 7698 | # _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) |
3393 | 7179 | # --------------------- | 7699 | # ------------------------------------------------------ |
3394 | 7180 | # Bourne and XSI compatible variants of some useful shell functions. | 7700 | # In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and |
3395 | 7181 | m4_defun([_LT_PROG_XSI_SHELLFNS], | 7701 | # '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. |
3396 | 7182 | [case $xsi_shell in | 7702 | m4_defun([_LT_PROG_FUNCTION_REPLACE], |
3397 | 7183 | yes) | 7703 | [dnl { |
3398 | 7184 | cat << \_LT_EOF >> "$cfgfile" | 7704 | sed -e '/^$1 ()$/,/^} # $1 /c\ |
3399 | 7185 | 7705 | $1 ()\ | |
3400 | 7186 | # func_dirname file append nondir_replacement | 7706 | {\ |
3401 | 7187 | # Compute the dirname of FILE. If nonempty, add APPEND to the result, | 7707 | m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) |
3402 | 7188 | # otherwise set result to NONDIR_REPLACEMENT. | 7708 | } # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ |
3403 | 7189 | func_dirname () | 7709 | && mv -f "$cfgfile.tmp" "$cfgfile" \ |
3404 | 7190 | { | 7710 | || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
3405 | 7191 | case ${1} in | 7711 | test 0 -eq $? || _lt_function_replace_fail=: |
3406 | 7192 | */*) func_dirname_result="${1%/*}${2}" ;; | 7712 | ]) |
3407 | 7193 | * ) func_dirname_result="${3}" ;; | 7713 | |
3408 | 7194 | esac | 7714 | |
3409 | 7195 | } | 7715 | # _LT_PROG_REPLACE_SHELLFNS |
3410 | 7196 | 7716 | # ------------------------- | |
3411 | 7197 | # func_basename file | 7717 | # Replace existing portable implementations of several shell functions with |
3412 | 7198 | func_basename () | 7718 | # equivalent extended shell implementations where those features are available.. |
3413 | 7199 | { | 7719 | m4_defun([_LT_PROG_REPLACE_SHELLFNS], |
3414 | 7200 | func_basename_result="${1##*/}" | 7720 | [if test x"$xsi_shell" = xyes; then |
3415 | 7201 | } | 7721 | _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl |
3416 | 7202 | 7722 | case ${1} in | |
3417 | 7203 | # func_dirname_and_basename file append nondir_replacement | 7723 | */*) func_dirname_result="${1%/*}${2}" ;; |
3418 | 7204 | # perform func_basename and func_dirname in a single function | 7724 | * ) func_dirname_result="${3}" ;; |
3419 | 7205 | # call: | 7725 | esac]) |
3420 | 7206 | # dirname: Compute the dirname of FILE. If nonempty, | 7726 | |
3421 | 7207 | # add APPEND to the result, otherwise set result | 7727 | _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl |
3422 | 7208 | # to NONDIR_REPLACEMENT. | 7728 | func_basename_result="${1##*/}"]) |
3423 | 7209 | # value returned in "$func_dirname_result" | 7729 | |
3424 | 7210 | # basename: Compute filename of FILE. | 7730 | _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl |
3425 | 7211 | # value retuned in "$func_basename_result" | 7731 | case ${1} in |
3426 | 7212 | # Implementation must be kept synchronized with func_dirname | 7732 | */*) func_dirname_result="${1%/*}${2}" ;; |
3427 | 7213 | # and func_basename. For efficiency, we do not delegate to | 7733 | * ) func_dirname_result="${3}" ;; |
3428 | 7214 | # those functions but instead duplicate the functionality here. | 7734 | esac |
3429 | 7215 | func_dirname_and_basename () | 7735 | func_basename_result="${1##*/}"]) |
3430 | 7216 | { | 7736 | |
3431 | 7217 | case ${1} in | 7737 | _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl |
3432 | 7218 | */*) func_dirname_result="${1%/*}${2}" ;; | 7738 | # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
3433 | 7219 | * ) func_dirname_result="${3}" ;; | 7739 | # positional parameters, so assign one to ordinary parameter first. |
3434 | 7220 | esac | 7740 | func_stripname_result=${3} |
3435 | 7221 | func_basename_result="${1##*/}" | 7741 | func_stripname_result=${func_stripname_result#"${1}"} |
3436 | 7222 | } | 7742 | func_stripname_result=${func_stripname_result%"${2}"}]) |
3437 | 7223 | 7743 | ||
3438 | 7224 | # func_stripname prefix suffix name | 7744 | _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl |
3439 | 7225 | # strip PREFIX and SUFFIX off of NAME. | 7745 | func_split_long_opt_name=${1%%=*} |
3440 | 7226 | # PREFIX and SUFFIX must not contain globbing or regex special | 7746 | func_split_long_opt_arg=${1#*=}]) |
3441 | 7227 | # characters, hashes, percent signs, but SUFFIX may contain a leading | 7747 | |
3442 | 7228 | # dot (in which case that matches only a dot). | 7748 | _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl |
3443 | 7229 | func_stripname () | 7749 | func_split_short_opt_arg=${1#??} |
3444 | 7230 | { | 7750 | func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) |
3445 | 7231 | # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are | 7751 | |
3446 | 7232 | # positional parameters, so assign one to ordinary parameter first. | 7752 | _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl |
3447 | 7233 | func_stripname_result=${3} | 7753 | case ${1} in |
3448 | 7234 | func_stripname_result=${func_stripname_result#"${1}"} | 7754 | *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
3449 | 7235 | func_stripname_result=${func_stripname_result%"${2}"} | 7755 | *) func_lo2o_result=${1} ;; |
3450 | 7236 | } | 7756 | esac]) |
3451 | 7237 | 7757 | ||
3452 | 7238 | # func_opt_split | 7758 | _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) |
3453 | 7239 | func_opt_split () | 7759 | |
3454 | 7240 | { | 7760 | _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) |
3455 | 7241 | func_opt_split_opt=${1%%=*} | 7761 | |
3456 | 7242 | func_opt_split_arg=${1#*=} | 7762 | _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) |
3457 | 7243 | } | 7763 | fi |
3458 | 7244 | 7764 | ||
3459 | 7245 | # func_lo2o object | 7765 | if test x"$lt_shell_append" = xyes; then |
3460 | 7246 | func_lo2o () | 7766 | _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) |
3461 | 7247 | { | 7767 | |
3462 | 7248 | case ${1} in | 7768 | _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl |
3463 | 7249 | *.lo) func_lo2o_result=${1%.lo}.${objext} ;; | 7769 | func_quote_for_eval "${2}" |
3464 | 7250 | *) func_lo2o_result=${1} ;; | 7770 | dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ |
3465 | 7251 | esac | 7771 | eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) |
3466 | 7252 | } | 7772 | |
3467 | 7253 | 7773 | # Save a `func_append' function call where possible by direct use of '+=' | |
3468 | 7254 | # func_xform libobj-or-source | 7774 | sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ |
3469 | 7255 | func_xform () | 7775 | && mv -f "$cfgfile.tmp" "$cfgfile" \ |
3470 | 7256 | { | 7776 | || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
3471 | 7257 | func_xform_result=${1%.*}.lo | 7777 | test 0 -eq $? || _lt_function_replace_fail=: |
3472 | 7258 | } | 7778 | else |
3473 | 7259 | 7779 | # Save a `func_append' function call even when '+=' is not available | |
3474 | 7260 | # func_arith arithmetic-term... | 7780 | sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ |
3475 | 7261 | func_arith () | 7781 | && mv -f "$cfgfile.tmp" "$cfgfile" \ |
3476 | 7262 | { | 7782 | || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
3477 | 7263 | func_arith_result=$(( $[*] )) | 7783 | test 0 -eq $? || _lt_function_replace_fail=: |
3478 | 7264 | } | 7784 | fi |
3479 | 7265 | 7785 | ||
3480 | 7266 | # func_len string | 7786 | if test x"$_lt_function_replace_fail" = x":"; then |
3481 | 7267 | # STRING may not start with a hyphen. | 7787 | AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) |
3482 | 7268 | func_len () | 7788 | fi |
3483 | 7269 | { | 7789 | ]) |
3484 | 7270 | func_len_result=${#1} | 7790 | |
3485 | 7271 | } | 7791 | # _LT_PATH_CONVERSION_FUNCTIONS |
3486 | 7272 | 7792 | # ----------------------------- | |
3487 | 7273 | _LT_EOF | 7793 | # Determine which file name conversion functions should be used by |
3488 | 7274 | ;; | 7794 | # func_to_host_file (and, implicitly, by func_to_host_path). These are needed |
3489 | 7275 | *) # Bourne compatible functions. | 7795 | # for certain cross-compile configurations and native mingw. |
3490 | 7276 | cat << \_LT_EOF >> "$cfgfile" | 7796 | m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], |
3491 | 7277 | 7797 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl | |
3492 | 7278 | # func_dirname file append nondir_replacement | 7798 | AC_REQUIRE([AC_CANONICAL_BUILD])dnl |
3493 | 7279 | # Compute the dirname of FILE. If nonempty, add APPEND to the result, | 7799 | AC_MSG_CHECKING([how to convert $build file names to $host format]) |
3494 | 7280 | # otherwise set result to NONDIR_REPLACEMENT. | 7800 | AC_CACHE_VAL(lt_cv_to_host_file_cmd, |
3495 | 7281 | func_dirname () | 7801 | [case $host in |
3496 | 7282 | { | 7802 | *-*-mingw* ) |
3497 | 7283 | # Extract subdirectory from the argument. | 7803 | case $build in |
3498 | 7284 | func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` | 7804 | *-*-mingw* ) # actually msys |
3499 | 7285 | if test "X$func_dirname_result" = "X${1}"; then | 7805 | lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
3500 | 7286 | func_dirname_result="${3}" | 7806 | ;; |
3501 | 7287 | else | 7807 | *-*-cygwin* ) |
3502 | 7288 | func_dirname_result="$func_dirname_result${2}" | 7808 | lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
3503 | 7289 | fi | 7809 | ;; |
3504 | 7290 | } | 7810 | * ) # otherwise, assume *nix |
3505 | 7291 | 7811 | lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 | |
3506 | 7292 | # func_basename file | 7812 | ;; |
3507 | 7293 | func_basename () | 7813 | esac |
3508 | 7294 | { | 7814 | ;; |
3509 | 7295 | func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` | 7815 | *-*-cygwin* ) |
3510 | 7296 | } | 7816 | case $build in |
3511 | 7297 | 7817 | *-*-mingw* ) # actually msys | |
3512 | 7298 | dnl func_dirname_and_basename | 7818 | lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
3513 | 7299 | dnl A portable version of this function is already defined in general.m4sh | 7819 | ;; |
3514 | 7300 | dnl so there is no need for it here. | 7820 | *-*-cygwin* ) |
3515 | 7301 | 7821 | lt_cv_to_host_file_cmd=func_convert_file_noop | |
3516 | 7302 | # func_stripname prefix suffix name | 7822 | ;; |
3517 | 7303 | # strip PREFIX and SUFFIX off of NAME. | 7823 | * ) # otherwise, assume *nix |
3518 | 7304 | # PREFIX and SUFFIX must not contain globbing or regex special | 7824 | lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
3519 | 7305 | # characters, hashes, percent signs, but SUFFIX may contain a leading | 7825 | ;; |
3520 | 7306 | # dot (in which case that matches only a dot). | 7826 | esac |
3521 | 7307 | # func_strip_suffix prefix name | 7827 | ;; |
3522 | 7308 | func_stripname () | 7828 | * ) # unhandled hosts (and "normal" native builds) |
3523 | 7309 | { | 7829 | lt_cv_to_host_file_cmd=func_convert_file_noop |
3524 | 7310 | case ${2} in | 7830 | ;; |
3525 | 7311 | .*) func_stripname_result=`$ECHO "X${3}" \ | 7831 | esac |
3526 | 7312 | | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; | 7832 | ]) |
3527 | 7313 | *) func_stripname_result=`$ECHO "X${3}" \ | 7833 | to_host_file_cmd=$lt_cv_to_host_file_cmd |
3528 | 7314 | | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; | 7834 | AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) |
3529 | 7315 | esac | 7835 | _LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], |
3530 | 7316 | } | 7836 | [0], [convert $build file names to $host format])dnl |
3531 | 7317 | 7837 | ||
3532 | 7318 | # sed scripts: | 7838 | AC_MSG_CHECKING([how to convert $build file names to toolchain format]) |
3533 | 7319 | my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' | 7839 | AC_CACHE_VAL(lt_cv_to_tool_file_cmd, |
3534 | 7320 | my_sed_long_arg='1s/^-[[^=]]*=//' | 7840 | [#assume ordinary cross tools, or native build. |
3535 | 7321 | 7841 | lt_cv_to_tool_file_cmd=func_convert_file_noop | |
3536 | 7322 | # func_opt_split | 7842 | case $host in |
3537 | 7323 | func_opt_split () | 7843 | *-*-mingw* ) |
3538 | 7324 | { | 7844 | case $build in |
3539 | 7325 | func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` | 7845 | *-*-mingw* ) # actually msys |
3540 | 7326 | func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` | 7846 | lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
3541 | 7327 | } | 7847 | ;; |
3542 | 7328 | 7848 | esac | |
3543 | 7329 | # func_lo2o object | 7849 | ;; |
3544 | 7330 | func_lo2o () | 7850 | esac |
3545 | 7331 | { | 7851 | ]) |
3546 | 7332 | func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` | 7852 | to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
3547 | 7333 | } | 7853 | AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) |
3548 | 7334 | 7854 | _LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], | |
3549 | 7335 | # func_xform libobj-or-source | 7855 | [0], [convert $build files to toolchain format])dnl |
3550 | 7336 | func_xform () | 7856 | ])# _LT_PATH_CONVERSION_FUNCTIONS |
3346 | 7337 | { | ||
3347 | 7338 | func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` | ||
3348 | 7339 | } | ||
3349 | 7340 | |||
3350 | 7341 | # func_arith arithmetic-term... | ||
3351 | 7342 | func_arith () | ||
3352 | 7343 | { | ||
3353 | 7344 | func_arith_result=`expr "$[@]"` | ||
3354 | 7345 | } | ||
3355 | 7346 | |||
3356 | 7347 | # func_len string | ||
3357 | 7348 | # STRING may not start with a hyphen. | ||
3358 | 7349 | func_len () | ||
3359 | 7350 | { | ||
3360 | 7351 | func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` | ||
3361 | 7352 | } | ||
3362 | 7353 | |||
3363 | 7354 | _LT_EOF | ||
3364 | 7355 | esac | ||
3365 | 7356 | |||
3366 | 7357 | case $lt_shell_append in | ||
3367 | 7358 | yes) | ||
3368 | 7359 | cat << \_LT_EOF >> "$cfgfile" | ||
3369 | 7360 | |||
3370 | 7361 | # func_append var value | ||
3371 | 7362 | # Append VALUE to the end of shell variable VAR. | ||
3372 | 7363 | func_append () | ||
3373 | 7364 | { | ||
3374 | 7365 | eval "$[1]+=\$[2]" | ||
3375 | 7366 | } | ||
3376 | 7367 | _LT_EOF | ||
3377 | 7368 | ;; | ||
3378 | 7369 | *) | ||
3379 | 7370 | cat << \_LT_EOF >> "$cfgfile" | ||
3380 | 7371 | |||
3381 | 7372 | # func_append var value | ||
3382 | 7373 | # Append VALUE to the end of shell variable VAR. | ||
3383 | 7374 | func_append () | ||
3384 | 7375 | { | ||
3385 | 7376 | eval "$[1]=\$$[1]\$[2]" | ||
3386 | 7377 | } | ||
3387 | 7378 | |||
3388 | 7379 | _LT_EOF | ||
3389 | 7380 | ;; | ||
3390 | 7381 | esac | ||
3391 | 7382 | ]) | ||
3551 | 7383 | 7857 | ||
3552 | 7384 | # Helper functions for option handling. -*- Autoconf -*- | 7858 | # Helper functions for option handling. -*- Autoconf -*- |
3553 | 7385 | # | 7859 | # |
3555 | 7386 | # Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. | 7860 | # Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, |
3556 | 7861 | # Inc. | ||
3557 | 7387 | # Written by Gary V. Vaughan, 2004 | 7862 | # Written by Gary V. Vaughan, 2004 |
3558 | 7388 | # | 7863 | # |
3559 | 7389 | # This file is free software; the Free Software Foundation gives | 7864 | # This file is free software; the Free Software Foundation gives |
3560 | 7390 | # unlimited permission to copy and/or distribute it, with or without | 7865 | # unlimited permission to copy and/or distribute it, with or without |
3561 | 7391 | # modifications, as long as this notice is preserved. | 7866 | # modifications, as long as this notice is preserved. |
3562 | 7392 | 7867 | ||
3564 | 7393 | # serial 6 ltoptions.m4 | 7868 | # serial 7 ltoptions.m4 |
3565 | 7394 | 7869 | ||
3566 | 7395 | # This is to help aclocal find these macros, as it can't see m4_define. | 7870 | # This is to help aclocal find these macros, as it can't see m4_define. |
3567 | 7396 | AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) | 7871 | AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) |
3568 | @@ -7505,7 +7980,7 @@ | |||
3569 | 7505 | [enable_win32_dll=yes | 7980 | [enable_win32_dll=yes |
3570 | 7506 | 7981 | ||
3571 | 7507 | case $host in | 7982 | case $host in |
3573 | 7508 | *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) | 7983 | *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) |
3574 | 7509 | AC_CHECK_TOOL(AS, as, false) | 7984 | AC_CHECK_TOOL(AS, as, false) |
3575 | 7510 | AC_CHECK_TOOL(DLLTOOL, dlltool, false) | 7985 | AC_CHECK_TOOL(DLLTOOL, dlltool, false) |
3576 | 7511 | AC_CHECK_TOOL(OBJDUMP, objdump, false) | 7986 | AC_CHECK_TOOL(OBJDUMP, objdump, false) |
3577 | @@ -7513,13 +7988,13 @@ | |||
3578 | 7513 | esac | 7988 | esac |
3579 | 7514 | 7989 | ||
3580 | 7515 | test -z "$AS" && AS=as | 7990 | test -z "$AS" && AS=as |
3582 | 7516 | _LT_DECL([], [AS], [0], [Assembler program])dnl | 7991 | _LT_DECL([], [AS], [1], [Assembler program])dnl |
3583 | 7517 | 7992 | ||
3584 | 7518 | test -z "$DLLTOOL" && DLLTOOL=dlltool | 7993 | test -z "$DLLTOOL" && DLLTOOL=dlltool |
3586 | 7519 | _LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl | 7994 | _LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl |
3587 | 7520 | 7995 | ||
3588 | 7521 | test -z "$OBJDUMP" && OBJDUMP=objdump | 7996 | test -z "$OBJDUMP" && OBJDUMP=objdump |
3590 | 7522 | _LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl | 7997 | _LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl |
3591 | 7523 | ])# win32-dll | 7998 | ])# win32-dll |
3592 | 7524 | 7999 | ||
3593 | 7525 | AU_DEFUN([AC_LIBTOOL_WIN32_DLL], | 8000 | AU_DEFUN([AC_LIBTOOL_WIN32_DLL], |
3594 | @@ -7877,31 +8352,31 @@ | |||
3595 | 7877 | # unlimited permission to copy and/or distribute it, with or without | 8352 | # unlimited permission to copy and/or distribute it, with or without |
3596 | 7878 | # modifications, as long as this notice is preserved. | 8353 | # modifications, as long as this notice is preserved. |
3597 | 7879 | 8354 | ||
3599 | 7880 | # Generated from ltversion.in. | 8355 | # @configure_input@ |
3600 | 7881 | 8356 | ||
3602 | 7882 | # serial 3017 ltversion.m4 | 8357 | # serial 3293 ltversion.m4 |
3603 | 7883 | # This file is part of GNU Libtool | 8358 | # This file is part of GNU Libtool |
3604 | 7884 | 8359 | ||
3607 | 7885 | m4_define([LT_PACKAGE_VERSION], [2.2.6b]) | 8360 | m4_define([LT_PACKAGE_VERSION], [2.4]) |
3608 | 7886 | m4_define([LT_PACKAGE_REVISION], [1.3017]) | 8361 | m4_define([LT_PACKAGE_REVISION], [1.3293]) |
3609 | 7887 | 8362 | ||
3610 | 7888 | AC_DEFUN([LTVERSION_VERSION], | 8363 | AC_DEFUN([LTVERSION_VERSION], |
3613 | 7889 | [macro_version='2.2.6b' | 8364 | [macro_version='2.4' |
3614 | 7890 | macro_revision='1.3017' | 8365 | macro_revision='1.3293' |
3615 | 7891 | _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) | 8366 | _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) |
3616 | 7892 | _LT_DECL(, macro_revision, 0) | 8367 | _LT_DECL(, macro_revision, 0) |
3617 | 7893 | ]) | 8368 | ]) |
3618 | 7894 | 8369 | ||
3619 | 7895 | # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- | 8370 | # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- |
3620 | 7896 | # | 8371 | # |
3622 | 7897 | # Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. | 8372 | # Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. |
3623 | 7898 | # Written by Scott James Remnant, 2004. | 8373 | # Written by Scott James Remnant, 2004. |
3624 | 7899 | # | 8374 | # |
3625 | 7900 | # This file is free software; the Free Software Foundation gives | 8375 | # This file is free software; the Free Software Foundation gives |
3626 | 7901 | # unlimited permission to copy and/or distribute it, with or without | 8376 | # unlimited permission to copy and/or distribute it, with or without |
3627 | 7902 | # modifications, as long as this notice is preserved. | 8377 | # modifications, as long as this notice is preserved. |
3628 | 7903 | 8378 | ||
3630 | 7904 | # serial 4 lt~obsolete.m4 | 8379 | # serial 5 lt~obsolete.m4 |
3631 | 7905 | 8380 | ||
3632 | 7906 | # These exist entirely to fool aclocal when bootstrapping libtool. | 8381 | # These exist entirely to fool aclocal when bootstrapping libtool. |
3633 | 7907 | # | 8382 | # |
3634 | @@ -7971,7 +8446,6 @@ | |||
3635 | 7971 | m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) | 8446 | m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) |
3636 | 7972 | m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) | 8447 | m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) |
3637 | 7973 | m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) | 8448 | m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) |
3638 | 7974 | m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) | ||
3639 | 7975 | m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) | 8449 | m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) |
3640 | 7976 | m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) | 8450 | m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) |
3641 | 7977 | m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) | 8451 | m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) |
3642 | @@ -7984,6 +8458,13 @@ | |||
3643 | 7984 | m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) | 8458 | m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) |
3644 | 7985 | m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) | 8459 | m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) |
3645 | 7986 | m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) | 8460 | m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) |
3646 | 8461 | m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) | ||
3647 | 8462 | m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) | ||
3648 | 8463 | m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) | ||
3649 | 8464 | m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) | ||
3650 | 8465 | m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) | ||
3651 | 8466 | m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) | ||
3652 | 8467 | m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) | ||
3653 | 7987 | 8468 | ||
3654 | 7988 | # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- | 8469 | # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- |
3655 | 7989 | # serial 1 (pkg-config-0.24) | 8470 | # serial 1 (pkg-config-0.24) |
3656 | @@ -8013,7 +8494,8 @@ | |||
3657 | 8013 | # ---------------------------------- | 8494 | # ---------------------------------- |
3658 | 8014 | AC_DEFUN([PKG_PROG_PKG_CONFIG], | 8495 | AC_DEFUN([PKG_PROG_PKG_CONFIG], |
3659 | 8015 | [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) | 8496 | [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) |
3661 | 8016 | m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) | 8497 | m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) |
3662 | 8498 | m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) | ||
3663 | 8017 | AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) | 8499 | AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) |
3664 | 8018 | AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) | 8500 | AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) |
3665 | 8019 | AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) | 8501 | AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) |
3666 | @@ -8059,7 +8541,8 @@ | |||
3667 | 8059 | pkg_cv_[]$1="$$1" | 8541 | pkg_cv_[]$1="$$1" |
3668 | 8060 | elif test -n "$PKG_CONFIG"; then | 8542 | elif test -n "$PKG_CONFIG"; then |
3669 | 8061 | PKG_CHECK_EXISTS([$3], | 8543 | PKG_CHECK_EXISTS([$3], |
3671 | 8062 | [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], | 8544 | [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` |
3672 | 8545 | test "x$?" != "x0" && pkg_failed=yes ], | ||
3673 | 8063 | [pkg_failed=yes]) | 8546 | [pkg_failed=yes]) |
3674 | 8064 | else | 8547 | else |
3675 | 8065 | pkg_failed=untried | 8548 | pkg_failed=untried |
3676 | @@ -8107,9 +8590,9 @@ | |||
3677 | 8107 | AC_MSG_RESULT([no]) | 8590 | AC_MSG_RESULT([no]) |
3678 | 8108 | _PKG_SHORT_ERRORS_SUPPORTED | 8591 | _PKG_SHORT_ERRORS_SUPPORTED |
3679 | 8109 | if test $_pkg_short_errors_supported = yes; then | 8592 | if test $_pkg_short_errors_supported = yes; then |
3681 | 8110 | $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` | 8593 | $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` |
3682 | 8111 | else | 8594 | else |
3684 | 8112 | $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` | 8595 | $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` |
3685 | 8113 | fi | 8596 | fi |
3686 | 8114 | # Put the nasty error message in config.log where it belongs | 8597 | # Put the nasty error message in config.log where it belongs |
3687 | 8115 | echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD | 8598 | echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD |
3688 | 8116 | 8599 | ||
3689 | === modified file 'config-aux/config.guess' | |||
3690 | --- config-aux/config.guess 2010-12-10 16:59:27 +0000 | |||
3691 | +++ config-aux/config.guess 2012-08-23 20:59:19 +0000 | |||
3692 | @@ -1,10 +1,10 @@ | |||
3693 | 1 | #! /bin/sh | 1 | #! /bin/sh |
3694 | 2 | # Attempt to guess a canonical system name. | 2 | # Attempt to guess a canonical system name. |
3695 | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
3698 | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
3699 | 5 | # Free Software Foundation, Inc. | 5 | # 2011 Free Software Foundation, Inc. |
3700 | 6 | 6 | ||
3702 | 7 | timestamp='2009-12-30' | 7 | timestamp='2011-05-11' |
3703 | 8 | 8 | ||
3704 | 9 | # This file is free software; you can redistribute it and/or modify it | 9 | # This file is free software; you can redistribute it and/or modify it |
3705 | 10 | # under the terms of the GNU General Public License as published by | 10 | # under the terms of the GNU General Public License as published by |
3706 | @@ -57,7 +57,7 @@ | |||
3707 | 57 | 57 | ||
3708 | 58 | Originally written by Per Bothner. | 58 | Originally written by Per Bothner. |
3709 | 59 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, | 59 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
3711 | 60 | 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free | 60 | 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free |
3712 | 61 | Software Foundation, Inc. | 61 | Software Foundation, Inc. |
3713 | 62 | 62 | ||
3714 | 63 | This is free software; see the source for copying conditions. There is NO | 63 | This is free software; see the source for copying conditions. There is NO |
3715 | @@ -181,7 +181,7 @@ | |||
3716 | 181 | fi | 181 | fi |
3717 | 182 | ;; | 182 | ;; |
3718 | 183 | *) | 183 | *) |
3720 | 184 | os=netbsd | 184 | os=netbsd |
3721 | 185 | ;; | 185 | ;; |
3722 | 186 | esac | 186 | esac |
3723 | 187 | # The OS release | 187 | # The OS release |
3724 | @@ -224,7 +224,7 @@ | |||
3725 | 224 | UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` | 224 | UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` |
3726 | 225 | ;; | 225 | ;; |
3727 | 226 | *5.*) | 226 | *5.*) |
3729 | 227 | UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` | 227 | UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` |
3730 | 228 | ;; | 228 | ;; |
3731 | 229 | esac | 229 | esac |
3732 | 230 | # According to Compaq, /usr/sbin/psrinfo has been available on | 230 | # According to Compaq, /usr/sbin/psrinfo has been available on |
3733 | @@ -270,7 +270,10 @@ | |||
3734 | 270 | # A Xn.n version is an unreleased experimental baselevel. | 270 | # A Xn.n version is an unreleased experimental baselevel. |
3735 | 271 | # 1.2 uses "1.2" for uname -r. | 271 | # 1.2 uses "1.2" for uname -r. |
3736 | 272 | echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` | 272 | echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
3738 | 273 | exit ;; | 273 | # Reset EXIT trap before exiting to avoid spurious non-zero exit code. |
3739 | 274 | exitcode=$? | ||
3740 | 275 | trap '' 0 | ||
3741 | 276 | exit $exitcode ;; | ||
3742 | 274 | Alpha\ *:Windows_NT*:*) | 277 | Alpha\ *:Windows_NT*:*) |
3743 | 275 | # How do we know it's Interix rather than the generic POSIX subsystem? | 278 | # How do we know it's Interix rather than the generic POSIX subsystem? |
3744 | 276 | # Should we change UNAME_MACHINE based on the output of uname instead | 279 | # Should we change UNAME_MACHINE based on the output of uname instead |
3745 | @@ -296,7 +299,7 @@ | |||
3746 | 296 | echo s390-ibm-zvmoe | 299 | echo s390-ibm-zvmoe |
3747 | 297 | exit ;; | 300 | exit ;; |
3748 | 298 | *:OS400:*:*) | 301 | *:OS400:*:*) |
3750 | 299 | echo powerpc-ibm-os400 | 302 | echo powerpc-ibm-os400 |
3751 | 300 | exit ;; | 303 | exit ;; |
3752 | 301 | arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) | 304 | arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) |
3753 | 302 | echo arm-acorn-riscix${UNAME_RELEASE} | 305 | echo arm-acorn-riscix${UNAME_RELEASE} |
3754 | @@ -395,23 +398,23 @@ | |||
3755 | 395 | # MiNT. But MiNT is downward compatible to TOS, so this should | 398 | # MiNT. But MiNT is downward compatible to TOS, so this should |
3756 | 396 | # be no problem. | 399 | # be no problem. |
3757 | 397 | atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) | 400 | atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) |
3759 | 398 | echo m68k-atari-mint${UNAME_RELEASE} | 401 | echo m68k-atari-mint${UNAME_RELEASE} |
3760 | 399 | exit ;; | 402 | exit ;; |
3761 | 400 | atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) | 403 | atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) |
3762 | 401 | echo m68k-atari-mint${UNAME_RELEASE} | 404 | echo m68k-atari-mint${UNAME_RELEASE} |
3764 | 402 | exit ;; | 405 | exit ;; |
3765 | 403 | *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) | 406 | *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) |
3767 | 404 | echo m68k-atari-mint${UNAME_RELEASE} | 407 | echo m68k-atari-mint${UNAME_RELEASE} |
3768 | 405 | exit ;; | 408 | exit ;; |
3769 | 406 | milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) | 409 | milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) |
3772 | 407 | echo m68k-milan-mint${UNAME_RELEASE} | 410 | echo m68k-milan-mint${UNAME_RELEASE} |
3773 | 408 | exit ;; | 411 | exit ;; |
3774 | 409 | hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) | 412 | hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) |
3777 | 410 | echo m68k-hades-mint${UNAME_RELEASE} | 413 | echo m68k-hades-mint${UNAME_RELEASE} |
3778 | 411 | exit ;; | 414 | exit ;; |
3779 | 412 | *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) | 415 | *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) |
3782 | 413 | echo m68k-unknown-mint${UNAME_RELEASE} | 416 | echo m68k-unknown-mint${UNAME_RELEASE} |
3783 | 414 | exit ;; | 417 | exit ;; |
3784 | 415 | m68k:machten:*:*) | 418 | m68k:machten:*:*) |
3785 | 416 | echo m68k-apple-machten${UNAME_RELEASE} | 419 | echo m68k-apple-machten${UNAME_RELEASE} |
3786 | 417 | exit ;; | 420 | exit ;; |
3787 | @@ -481,8 +484,8 @@ | |||
3788 | 481 | echo m88k-motorola-sysv3 | 484 | echo m88k-motorola-sysv3 |
3789 | 482 | exit ;; | 485 | exit ;; |
3790 | 483 | AViiON:dgux:*:*) | 486 | AViiON:dgux:*:*) |
3793 | 484 | # DG/UX returns AViiON for all architectures | 487 | # DG/UX returns AViiON for all architectures |
3794 | 485 | UNAME_PROCESSOR=`/usr/bin/uname -p` | 488 | UNAME_PROCESSOR=`/usr/bin/uname -p` |
3795 | 486 | if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] | 489 | if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] |
3796 | 487 | then | 490 | then |
3797 | 488 | if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ | 491 | if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ |
3798 | @@ -495,7 +498,7 @@ | |||
3799 | 495 | else | 498 | else |
3800 | 496 | echo i586-dg-dgux${UNAME_RELEASE} | 499 | echo i586-dg-dgux${UNAME_RELEASE} |
3801 | 497 | fi | 500 | fi |
3803 | 498 | exit ;; | 501 | exit ;; |
3804 | 499 | M88*:DolphinOS:*:*) # DolphinOS (SVR3) | 502 | M88*:DolphinOS:*:*) # DolphinOS (SVR3) |
3805 | 500 | echo m88k-dolphin-sysv3 | 503 | echo m88k-dolphin-sysv3 |
3806 | 501 | exit ;; | 504 | exit ;; |
3807 | @@ -552,7 +555,7 @@ | |||
3808 | 552 | echo rs6000-ibm-aix3.2 | 555 | echo rs6000-ibm-aix3.2 |
3809 | 553 | fi | 556 | fi |
3810 | 554 | exit ;; | 557 | exit ;; |
3812 | 555 | *:AIX:*:[456]) | 558 | *:AIX:*:[4567]) |
3813 | 556 | IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` | 559 | IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` |
3814 | 557 | if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then | 560 | if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then |
3815 | 558 | IBM_ARCH=rs6000 | 561 | IBM_ARCH=rs6000 |
3816 | @@ -595,52 +598,52 @@ | |||
3817 | 595 | 9000/[678][0-9][0-9]) | 598 | 9000/[678][0-9][0-9]) |
3818 | 596 | if [ -x /usr/bin/getconf ]; then | 599 | if [ -x /usr/bin/getconf ]; then |
3819 | 597 | sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` | 600 | sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` |
3828 | 598 | sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` | 601 | sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` |
3829 | 599 | case "${sc_cpu_version}" in | 602 | case "${sc_cpu_version}" in |
3830 | 600 | 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 | 603 | 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 |
3831 | 601 | 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 | 604 | 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 |
3832 | 602 | 532) # CPU_PA_RISC2_0 | 605 | 532) # CPU_PA_RISC2_0 |
3833 | 603 | case "${sc_kernel_bits}" in | 606 | case "${sc_kernel_bits}" in |
3834 | 604 | 32) HP_ARCH="hppa2.0n" ;; | 607 | 32) HP_ARCH="hppa2.0n" ;; |
3835 | 605 | 64) HP_ARCH="hppa2.0w" ;; | 608 | 64) HP_ARCH="hppa2.0w" ;; |
3836 | 606 | '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 | 609 | '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 |
3839 | 607 | esac ;; | 610 | esac ;; |
3840 | 608 | esac | 611 | esac |
3841 | 609 | fi | 612 | fi |
3842 | 610 | if [ "${HP_ARCH}" = "" ]; then | 613 | if [ "${HP_ARCH}" = "" ]; then |
3843 | 611 | eval $set_cc_for_build | 614 | eval $set_cc_for_build |
3876 | 612 | sed 's/^ //' << EOF >$dummy.c | 615 | sed 's/^ //' << EOF >$dummy.c |
3877 | 613 | 616 | ||
3878 | 614 | #define _HPUX_SOURCE | 617 | #define _HPUX_SOURCE |
3879 | 615 | #include <stdlib.h> | 618 | #include <stdlib.h> |
3880 | 616 | #include <unistd.h> | 619 | #include <unistd.h> |
3881 | 617 | 620 | ||
3882 | 618 | int main () | 621 | int main () |
3883 | 619 | { | 622 | { |
3884 | 620 | #if defined(_SC_KERNEL_BITS) | 623 | #if defined(_SC_KERNEL_BITS) |
3885 | 621 | long bits = sysconf(_SC_KERNEL_BITS); | 624 | long bits = sysconf(_SC_KERNEL_BITS); |
3886 | 622 | #endif | 625 | #endif |
3887 | 623 | long cpu = sysconf (_SC_CPU_VERSION); | 626 | long cpu = sysconf (_SC_CPU_VERSION); |
3888 | 624 | 627 | ||
3889 | 625 | switch (cpu) | 628 | switch (cpu) |
3890 | 626 | { | 629 | { |
3891 | 627 | case CPU_PA_RISC1_0: puts ("hppa1.0"); break; | 630 | case CPU_PA_RISC1_0: puts ("hppa1.0"); break; |
3892 | 628 | case CPU_PA_RISC1_1: puts ("hppa1.1"); break; | 631 | case CPU_PA_RISC1_1: puts ("hppa1.1"); break; |
3893 | 629 | case CPU_PA_RISC2_0: | 632 | case CPU_PA_RISC2_0: |
3894 | 630 | #if defined(_SC_KERNEL_BITS) | 633 | #if defined(_SC_KERNEL_BITS) |
3895 | 631 | switch (bits) | 634 | switch (bits) |
3896 | 632 | { | 635 | { |
3897 | 633 | case 64: puts ("hppa2.0w"); break; | 636 | case 64: puts ("hppa2.0w"); break; |
3898 | 634 | case 32: puts ("hppa2.0n"); break; | 637 | case 32: puts ("hppa2.0n"); break; |
3899 | 635 | default: puts ("hppa2.0"); break; | 638 | default: puts ("hppa2.0"); break; |
3900 | 636 | } break; | 639 | } break; |
3901 | 637 | #else /* !defined(_SC_KERNEL_BITS) */ | 640 | #else /* !defined(_SC_KERNEL_BITS) */ |
3902 | 638 | puts ("hppa2.0"); break; | 641 | puts ("hppa2.0"); break; |
3903 | 639 | #endif | 642 | #endif |
3904 | 640 | default: puts ("hppa1.0"); break; | 643 | default: puts ("hppa1.0"); break; |
3905 | 641 | } | 644 | } |
3906 | 642 | exit (0); | 645 | exit (0); |
3907 | 643 | } | 646 | } |
3908 | 644 | EOF | 647 | EOF |
3909 | 645 | (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` | 648 | (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` |
3910 | 646 | test -z "$HP_ARCH" && HP_ARCH=hppa | 649 | test -z "$HP_ARCH" && HP_ARCH=hppa |
3911 | @@ -731,22 +734,22 @@ | |||
3912 | 731 | exit ;; | 734 | exit ;; |
3913 | 732 | C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) | 735 | C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) |
3914 | 733 | echo c1-convex-bsd | 736 | echo c1-convex-bsd |
3916 | 734 | exit ;; | 737 | exit ;; |
3917 | 735 | C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) | 738 | C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) |
3918 | 736 | if getsysinfo -f scalar_acc | 739 | if getsysinfo -f scalar_acc |
3919 | 737 | then echo c32-convex-bsd | 740 | then echo c32-convex-bsd |
3920 | 738 | else echo c2-convex-bsd | 741 | else echo c2-convex-bsd |
3921 | 739 | fi | 742 | fi |
3923 | 740 | exit ;; | 743 | exit ;; |
3924 | 741 | C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) | 744 | C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) |
3925 | 742 | echo c34-convex-bsd | 745 | echo c34-convex-bsd |
3927 | 743 | exit ;; | 746 | exit ;; |
3928 | 744 | C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) | 747 | C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) |
3929 | 745 | echo c38-convex-bsd | 748 | echo c38-convex-bsd |
3931 | 746 | exit ;; | 749 | exit ;; |
3932 | 747 | C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) | 750 | C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) |
3933 | 748 | echo c4-convex-bsd | 751 | echo c4-convex-bsd |
3935 | 749 | exit ;; | 752 | exit ;; |
3936 | 750 | CRAY*Y-MP:*:*:*) | 753 | CRAY*Y-MP:*:*:*) |
3937 | 751 | echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' | 754 | echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
3938 | 752 | exit ;; | 755 | exit ;; |
3939 | @@ -770,14 +773,14 @@ | |||
3940 | 770 | exit ;; | 773 | exit ;; |
3941 | 771 | F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) | 774 | F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) |
3942 | 772 | FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` | 775 | FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
3947 | 773 | FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` | 776 | FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
3948 | 774 | FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` | 777 | FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` |
3949 | 775 | echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" | 778 | echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
3950 | 776 | exit ;; | 779 | exit ;; |
3951 | 777 | 5000:UNIX_System_V:4.*:*) | 780 | 5000:UNIX_System_V:4.*:*) |
3955 | 778 | FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` | 781 | FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
3956 | 779 | FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` | 782 | FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` |
3957 | 780 | echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" | 783 | echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
3958 | 781 | exit ;; | 784 | exit ;; |
3959 | 782 | i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) | 785 | i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) |
3960 | 783 | echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} | 786 | echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} |
3961 | @@ -805,14 +808,14 @@ | |||
3962 | 805 | echo ${UNAME_MACHINE}-pc-mingw32 | 808 | echo ${UNAME_MACHINE}-pc-mingw32 |
3963 | 806 | exit ;; | 809 | exit ;; |
3964 | 807 | i*:windows32*:*) | 810 | i*:windows32*:*) |
3967 | 808 | # uname -m includes "-pc" on this system. | 811 | # uname -m includes "-pc" on this system. |
3968 | 809 | echo ${UNAME_MACHINE}-mingw32 | 812 | echo ${UNAME_MACHINE}-mingw32 |
3969 | 810 | exit ;; | 813 | exit ;; |
3970 | 811 | i*:PW*:*) | 814 | i*:PW*:*) |
3971 | 812 | echo ${UNAME_MACHINE}-pc-pw32 | 815 | echo ${UNAME_MACHINE}-pc-pw32 |
3972 | 813 | exit ;; | 816 | exit ;; |
3973 | 814 | *:Interix*:*) | 817 | *:Interix*:*) |
3975 | 815 | case ${UNAME_MACHINE} in | 818 | case ${UNAME_MACHINE} in |
3976 | 816 | x86) | 819 | x86) |
3977 | 817 | echo i586-pc-interix${UNAME_RELEASE} | 820 | echo i586-pc-interix${UNAME_RELEASE} |
3978 | 818 | exit ;; | 821 | exit ;; |
3979 | @@ -867,7 +870,7 @@ | |||
3980 | 867 | EV6) UNAME_MACHINE=alphaev6 ;; | 870 | EV6) UNAME_MACHINE=alphaev6 ;; |
3981 | 868 | EV67) UNAME_MACHINE=alphaev67 ;; | 871 | EV67) UNAME_MACHINE=alphaev67 ;; |
3982 | 869 | EV68*) UNAME_MACHINE=alphaev68 ;; | 872 | EV68*) UNAME_MACHINE=alphaev68 ;; |
3984 | 870 | esac | 873 | esac |
3985 | 871 | objdump --private-headers /bin/sh | grep -q ld.so.1 | 874 | objdump --private-headers /bin/sh | grep -q ld.so.1 |
3986 | 872 | if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi | 875 | if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi |
3987 | 873 | echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} | 876 | echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} |
3988 | @@ -879,7 +882,13 @@ | |||
3989 | 879 | then | 882 | then |
3990 | 880 | echo ${UNAME_MACHINE}-unknown-linux-gnu | 883 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
3991 | 881 | else | 884 | else |
3993 | 882 | echo ${UNAME_MACHINE}-unknown-linux-gnueabi | 885 | if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ |
3994 | 886 | | grep -q __ARM_PCS_VFP | ||
3995 | 887 | then | ||
3996 | 888 | echo ${UNAME_MACHINE}-unknown-linux-gnueabi | ||
3997 | 889 | else | ||
3998 | 890 | echo ${UNAME_MACHINE}-unknown-linux-gnueabihf | ||
3999 | 891 | fi | ||
4000 | 883 | fi | 892 | fi |
4001 | 884 | exit ;; | 893 | exit ;; |
4002 | 885 | avr32*:Linux:*:*) | 894 | avr32*:Linux:*:*) |
4003 | @@ -892,7 +901,7 @@ | |||
4004 | 892 | echo crisv32-axis-linux-gnu | 901 | echo crisv32-axis-linux-gnu |
4005 | 893 | exit ;; | 902 | exit ;; |
4006 | 894 | frv:Linux:*:*) | 903 | frv:Linux:*:*) |
4008 | 895 | echo frv-unknown-linux-gnu | 904 | echo frv-unknown-linux-gnu |
4009 | 896 | exit ;; | 905 | exit ;; |
4010 | 897 | i*86:Linux:*:*) | 906 | i*86:Linux:*:*) |
4011 | 898 | LIBC=gnu | 907 | LIBC=gnu |
4012 | @@ -960,7 +969,7 @@ | |||
4013 | 960 | echo ${UNAME_MACHINE}-ibm-linux | 969 | echo ${UNAME_MACHINE}-ibm-linux |
4014 | 961 | exit ;; | 970 | exit ;; |
4015 | 962 | sh64*:Linux:*:*) | 971 | sh64*:Linux:*:*) |
4017 | 963 | echo ${UNAME_MACHINE}-unknown-linux-gnu | 972 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
4018 | 964 | exit ;; | 973 | exit ;; |
4019 | 965 | sh*:Linux:*:*) | 974 | sh*:Linux:*:*) |
4020 | 966 | echo ${UNAME_MACHINE}-unknown-linux-gnu | 975 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
4021 | @@ -968,6 +977,9 @@ | |||
4022 | 968 | sparc:Linux:*:* | sparc64:Linux:*:*) | 977 | sparc:Linux:*:* | sparc64:Linux:*:*) |
4023 | 969 | echo ${UNAME_MACHINE}-unknown-linux-gnu | 978 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
4024 | 970 | exit ;; | 979 | exit ;; |
4025 | 980 | tile*:Linux:*:*) | ||
4026 | 981 | echo ${UNAME_MACHINE}-tilera-linux-gnu | ||
4027 | 982 | exit ;; | ||
4028 | 971 | vax:Linux:*:*) | 983 | vax:Linux:*:*) |
4029 | 972 | echo ${UNAME_MACHINE}-dec-linux-gnu | 984 | echo ${UNAME_MACHINE}-dec-linux-gnu |
4030 | 973 | exit ;; | 985 | exit ;; |
4031 | @@ -975,7 +987,7 @@ | |||
4032 | 975 | echo x86_64-unknown-linux-gnu | 987 | echo x86_64-unknown-linux-gnu |
4033 | 976 | exit ;; | 988 | exit ;; |
4034 | 977 | xtensa*:Linux:*:*) | 989 | xtensa*:Linux:*:*) |
4036 | 978 | echo ${UNAME_MACHINE}-unknown-linux-gnu | 990 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
4037 | 979 | exit ;; | 991 | exit ;; |
4038 | 980 | i*86:DYNIX/ptx:4*:*) | 992 | i*86:DYNIX/ptx:4*:*) |
4039 | 981 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. | 993 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. |
4040 | @@ -984,11 +996,11 @@ | |||
4041 | 984 | echo i386-sequent-sysv4 | 996 | echo i386-sequent-sysv4 |
4042 | 985 | exit ;; | 997 | exit ;; |
4043 | 986 | i*86:UNIX_SV:4.2MP:2.*) | 998 | i*86:UNIX_SV:4.2MP:2.*) |
4047 | 987 | # Unixware is an offshoot of SVR4, but it has its own version | 999 | # Unixware is an offshoot of SVR4, but it has its own version |
4048 | 988 | # number series starting with 2... | 1000 | # number series starting with 2... |
4049 | 989 | # I am not positive that other SVR4 systems won't match this, | 1001 | # I am not positive that other SVR4 systems won't match this, |
4050 | 990 | # I just have to hope. -- rms. | 1002 | # I just have to hope. -- rms. |
4052 | 991 | # Use sysv4.2uw... so that sysv4* matches it. | 1003 | # Use sysv4.2uw... so that sysv4* matches it. |
4053 | 992 | echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} | 1004 | echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} |
4054 | 993 | exit ;; | 1005 | exit ;; |
4055 | 994 | i*86:OS/2:*:*) | 1006 | i*86:OS/2:*:*) |
4056 | @@ -1020,7 +1032,7 @@ | |||
4057 | 1020 | fi | 1032 | fi |
4058 | 1021 | exit ;; | 1033 | exit ;; |
4059 | 1022 | i*86:*:5:[678]*) | 1034 | i*86:*:5:[678]*) |
4061 | 1023 | # UnixWare 7.x, OpenUNIX and OpenServer 6. | 1035 | # UnixWare 7.x, OpenUNIX and OpenServer 6. |
4062 | 1024 | case `/bin/uname -X | grep "^Machine"` in | 1036 | case `/bin/uname -X | grep "^Machine"` in |
4063 | 1025 | *486*) UNAME_MACHINE=i486 ;; | 1037 | *486*) UNAME_MACHINE=i486 ;; |
4064 | 1026 | *Pentium) UNAME_MACHINE=i586 ;; | 1038 | *Pentium) UNAME_MACHINE=i586 ;; |
4065 | @@ -1048,13 +1060,13 @@ | |||
4066 | 1048 | exit ;; | 1060 | exit ;; |
4067 | 1049 | pc:*:*:*) | 1061 | pc:*:*:*) |
4068 | 1050 | # Left here for compatibility: | 1062 | # Left here for compatibility: |
4071 | 1051 | # uname -m prints for DJGPP always 'pc', but it prints nothing about | 1063 | # uname -m prints for DJGPP always 'pc', but it prints nothing about |
4072 | 1052 | # the processor, so we play safe by assuming i586. | 1064 | # the processor, so we play safe by assuming i586. |
4073 | 1053 | # Note: whatever this is, it MUST be the same as what config.sub | 1065 | # Note: whatever this is, it MUST be the same as what config.sub |
4074 | 1054 | # prints for the "djgpp" host, or else GDB configury will decide that | 1066 | # prints for the "djgpp" host, or else GDB configury will decide that |
4075 | 1055 | # this is a cross-build. | 1067 | # this is a cross-build. |
4076 | 1056 | echo i586-pc-msdosdjgpp | 1068 | echo i586-pc-msdosdjgpp |
4078 | 1057 | exit ;; | 1069 | exit ;; |
4079 | 1058 | Intel:Mach:3*:*) | 1070 | Intel:Mach:3*:*) |
4080 | 1059 | echo i386-pc-mach3 | 1071 | echo i386-pc-mach3 |
4081 | 1060 | exit ;; | 1072 | exit ;; |
4082 | @@ -1089,8 +1101,8 @@ | |||
4083 | 1089 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ | 1101 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ |
4084 | 1090 | && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; | 1102 | && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; |
4085 | 1091 | 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) | 1103 | 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) |
4088 | 1092 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ | 1104 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
4089 | 1093 | && { echo i486-ncr-sysv4; exit; } ;; | 1105 | && { echo i486-ncr-sysv4; exit; } ;; |
4090 | 1094 | NCR*:*:4.2:* | MPRAS*:*:4.2:*) | 1106 | NCR*:*:4.2:* | MPRAS*:*:4.2:*) |
4091 | 1095 | OS_REL='.3' | 1107 | OS_REL='.3' |
4092 | 1096 | test -r /etc/.relid \ | 1108 | test -r /etc/.relid \ |
4093 | @@ -1133,10 +1145,10 @@ | |||
4094 | 1133 | echo ns32k-sni-sysv | 1145 | echo ns32k-sni-sysv |
4095 | 1134 | fi | 1146 | fi |
4096 | 1135 | exit ;; | 1147 | exit ;; |
4101 | 1136 | PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort | 1148 | PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort |
4102 | 1137 | # says <Richard.M.Bartel@ccMail.Census.GOV> | 1149 | # says <Richard.M.Bartel@ccMail.Census.GOV> |
4103 | 1138 | echo i586-unisys-sysv4 | 1150 | echo i586-unisys-sysv4 |
4104 | 1139 | exit ;; | 1151 | exit ;; |
4105 | 1140 | *:UNIX_System_V:4*:FTX*) | 1152 | *:UNIX_System_V:4*:FTX*) |
4106 | 1141 | # From Gerald Hewes <hewes@openmarket.com>. | 1153 | # From Gerald Hewes <hewes@openmarket.com>. |
4107 | 1142 | # How about differentiating between stratus architectures? -djm | 1154 | # How about differentiating between stratus architectures? -djm |
4108 | @@ -1162,11 +1174,11 @@ | |||
4109 | 1162 | exit ;; | 1174 | exit ;; |
4110 | 1163 | R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) | 1175 | R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) |
4111 | 1164 | if [ -d /usr/nec ]; then | 1176 | if [ -d /usr/nec ]; then |
4113 | 1165 | echo mips-nec-sysv${UNAME_RELEASE} | 1177 | echo mips-nec-sysv${UNAME_RELEASE} |
4114 | 1166 | else | 1178 | else |
4116 | 1167 | echo mips-unknown-sysv${UNAME_RELEASE} | 1179 | echo mips-unknown-sysv${UNAME_RELEASE} |
4117 | 1168 | fi | 1180 | fi |
4119 | 1169 | exit ;; | 1181 | exit ;; |
4120 | 1170 | BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. | 1182 | BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. |
4121 | 1171 | echo powerpc-be-beos | 1183 | echo powerpc-be-beos |
4122 | 1172 | exit ;; | 1184 | exit ;; |
4123 | @@ -1231,6 +1243,9 @@ | |||
4124 | 1231 | *:QNX:*:4*) | 1243 | *:QNX:*:4*) |
4125 | 1232 | echo i386-pc-qnx | 1244 | echo i386-pc-qnx |
4126 | 1233 | exit ;; | 1245 | exit ;; |
4127 | 1246 | NEO-?:NONSTOP_KERNEL:*:*) | ||
4128 | 1247 | echo neo-tandem-nsk${UNAME_RELEASE} | ||
4129 | 1248 | exit ;; | ||
4130 | 1234 | NSE-?:NONSTOP_KERNEL:*:*) | 1249 | NSE-?:NONSTOP_KERNEL:*:*) |
4131 | 1235 | echo nse-tandem-nsk${UNAME_RELEASE} | 1250 | echo nse-tandem-nsk${UNAME_RELEASE} |
4132 | 1236 | exit ;; | 1251 | exit ;; |
4133 | @@ -1276,13 +1291,13 @@ | |||
4134 | 1276 | echo pdp10-unknown-its | 1291 | echo pdp10-unknown-its |
4135 | 1277 | exit ;; | 1292 | exit ;; |
4136 | 1278 | SEI:*:*:SEIUX) | 1293 | SEI:*:*:SEIUX) |
4138 | 1279 | echo mips-sei-seiux${UNAME_RELEASE} | 1294 | echo mips-sei-seiux${UNAME_RELEASE} |
4139 | 1280 | exit ;; | 1295 | exit ;; |
4140 | 1281 | *:DragonFly:*:*) | 1296 | *:DragonFly:*:*) |
4141 | 1282 | echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` | 1297 | echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` |
4142 | 1283 | exit ;; | 1298 | exit ;; |
4143 | 1284 | *:*VMS:*:*) | 1299 | *:*VMS:*:*) |
4145 | 1285 | UNAME_MACHINE=`(uname -p) 2>/dev/null` | 1300 | UNAME_MACHINE=`(uname -p) 2>/dev/null` |
4146 | 1286 | case "${UNAME_MACHINE}" in | 1301 | case "${UNAME_MACHINE}" in |
4147 | 1287 | A*) echo alpha-dec-vms ; exit ;; | 1302 | A*) echo alpha-dec-vms ; exit ;; |
4148 | 1288 | I*) echo ia64-dec-vms ; exit ;; | 1303 | I*) echo ia64-dec-vms ; exit ;; |
4149 | @@ -1322,11 +1337,11 @@ | |||
4150 | 1322 | #include <sys/param.h> | 1337 | #include <sys/param.h> |
4151 | 1323 | printf ("m68k-sony-newsos%s\n", | 1338 | printf ("m68k-sony-newsos%s\n", |
4152 | 1324 | #ifdef NEWSOS4 | 1339 | #ifdef NEWSOS4 |
4154 | 1325 | "4" | 1340 | "4" |
4155 | 1326 | #else | 1341 | #else |
4157 | 1327 | "" | 1342 | "" |
4158 | 1328 | #endif | 1343 | #endif |
4160 | 1329 | ); exit (0); | 1344 | ); exit (0); |
4161 | 1330 | #endif | 1345 | #endif |
4162 | 1331 | #endif | 1346 | #endif |
4163 | 1332 | 1347 | ||
4164 | 1333 | 1348 | ||
4165 | === modified file 'config-aux/config.sub' | |||
4166 | --- config-aux/config.sub 2010-12-10 16:59:27 +0000 | |||
4167 | +++ config-aux/config.sub 2012-08-23 20:59:19 +0000 | |||
4168 | @@ -1,10 +1,10 @@ | |||
4169 | 1 | #! /bin/sh | 1 | #! /bin/sh |
4170 | 2 | # Configuration validation subroutine script. | 2 | # Configuration validation subroutine script. |
4171 | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
4174 | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
4175 | 5 | # Free Software Foundation, Inc. | 5 | # 2011 Free Software Foundation, Inc. |
4176 | 6 | 6 | ||
4178 | 7 | timestamp='2010-01-22' | 7 | timestamp='2011-03-23' |
4179 | 8 | 8 | ||
4180 | 9 | # This file is (in principle) common to ALL GNU software. | 9 | # This file is (in principle) common to ALL GNU software. |
4181 | 10 | # The presence of a machine in this file suggests that SOME GNU software | 10 | # The presence of a machine in this file suggests that SOME GNU software |
4182 | @@ -76,7 +76,7 @@ | |||
4183 | 76 | GNU config.sub ($timestamp) | 76 | GNU config.sub ($timestamp) |
4184 | 77 | 77 | ||
4185 | 78 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, | 78 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
4187 | 79 | 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free | 79 | 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free |
4188 | 80 | Software Foundation, Inc. | 80 | Software Foundation, Inc. |
4189 | 81 | 81 | ||
4190 | 82 | This is free software; see the source for copying conditions. There is NO | 82 | This is free software; see the source for copying conditions. There is NO |
4191 | @@ -124,8 +124,9 @@ | |||
4192 | 124 | # Here we must recognize all the valid KERNEL-OS combinations. | 124 | # Here we must recognize all the valid KERNEL-OS combinations. |
4193 | 125 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` | 125 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` |
4194 | 126 | case $maybe_os in | 126 | case $maybe_os in |
4197 | 127 | nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ | 127 | nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ |
4198 | 128 | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ | 128 | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ |
4199 | 129 | knetbsd*-gnu* | netbsd*-gnu* | \ | ||
4200 | 129 | kopensolaris*-gnu* | \ | 130 | kopensolaris*-gnu* | \ |
4201 | 130 | storm-chaos* | os2-emx* | rtmk-nova*) | 131 | storm-chaos* | os2-emx* | rtmk-nova*) |
4202 | 131 | os=-$maybe_os | 132 | os=-$maybe_os |
4203 | @@ -157,8 +158,8 @@ | |||
4204 | 157 | os= | 158 | os= |
4205 | 158 | basic_machine=$1 | 159 | basic_machine=$1 |
4206 | 159 | ;; | 160 | ;; |
4209 | 160 | -bluegene*) | 161 | -bluegene*) |
4210 | 161 | os=-cnk | 162 | os=-cnk |
4211 | 162 | ;; | 163 | ;; |
4212 | 163 | -sim | -cisco | -oki | -wec | -winbond) | 164 | -sim | -cisco | -oki | -wec | -winbond) |
4213 | 164 | os= | 165 | os= |
4214 | @@ -174,10 +175,10 @@ | |||
4215 | 174 | os=-chorusos | 175 | os=-chorusos |
4216 | 175 | basic_machine=$1 | 176 | basic_machine=$1 |
4217 | 176 | ;; | 177 | ;; |
4220 | 177 | -chorusrdb) | 178 | -chorusrdb) |
4221 | 178 | os=-chorusrdb | 179 | os=-chorusrdb |
4222 | 179 | basic_machine=$1 | 180 | basic_machine=$1 |
4224 | 180 | ;; | 181 | ;; |
4225 | 181 | -hiux*) | 182 | -hiux*) |
4226 | 182 | os=-hiuxwe2 | 183 | os=-hiuxwe2 |
4227 | 183 | ;; | 184 | ;; |
4228 | @@ -282,11 +283,13 @@ | |||
4229 | 282 | | moxie \ | 283 | | moxie \ |
4230 | 283 | | mt \ | 284 | | mt \ |
4231 | 284 | | msp430 \ | 285 | | msp430 \ |
4232 | 286 | | nds32 | nds32le | nds32be \ | ||
4233 | 285 | | nios | nios2 \ | 287 | | nios | nios2 \ |
4234 | 286 | | ns16k | ns32k \ | 288 | | ns16k | ns32k \ |
4235 | 289 | | open8 \ | ||
4236 | 287 | | or32 \ | 290 | | or32 \ |
4237 | 288 | | pdp10 | pdp11 | pj | pjl \ | 291 | | pdp10 | pdp11 | pj | pjl \ |
4239 | 289 | | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | 292 | | powerpc | powerpc64 | powerpc64le | powerpcle \ |
4240 | 290 | | pyramid \ | 293 | | pyramid \ |
4241 | 291 | | rx \ | 294 | | rx \ |
4242 | 292 | | score \ | 295 | | score \ |
4243 | @@ -294,15 +297,24 @@ | |||
4244 | 294 | | sh64 | sh64le \ | 297 | | sh64 | sh64le \ |
4245 | 295 | | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | 298 | | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ |
4246 | 296 | | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ | 299 | | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ |
4249 | 297 | | spu | strongarm \ | 300 | | spu \ |
4250 | 298 | | tahoe | thumb | tic4x | tic80 | tron \ | 301 | | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ |
4251 | 299 | | ubicom32 \ | 302 | | ubicom32 \ |
4252 | 300 | | v850 | v850e \ | 303 | | v850 | v850e \ |
4253 | 301 | | we32k \ | 304 | | we32k \ |
4255 | 302 | | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | 305 | | x86 | xc16x | xstormy16 | xtensa \ |
4256 | 303 | | z8k | z80) | 306 | | z8k | z80) |
4257 | 304 | basic_machine=$basic_machine-unknown | 307 | basic_machine=$basic_machine-unknown |
4258 | 305 | ;; | 308 | ;; |
4259 | 309 | c54x) | ||
4260 | 310 | basic_machine=tic54x-unknown | ||
4261 | 311 | ;; | ||
4262 | 312 | c55x) | ||
4263 | 313 | basic_machine=tic55x-unknown | ||
4264 | 314 | ;; | ||
4265 | 315 | c6x) | ||
4266 | 316 | basic_machine=tic6x-unknown | ||
4267 | 317 | ;; | ||
4268 | 306 | m6811 | m68hc11 | m6812 | m68hc12 | picochip) | 318 | m6811 | m68hc11 | m6812 | m68hc12 | picochip) |
4269 | 307 | # Motorola 68HC11/12. | 319 | # Motorola 68HC11/12. |
4270 | 308 | basic_machine=$basic_machine-unknown | 320 | basic_machine=$basic_machine-unknown |
4271 | @@ -314,6 +326,18 @@ | |||
4272 | 314 | basic_machine=mt-unknown | 326 | basic_machine=mt-unknown |
4273 | 315 | ;; | 327 | ;; |
4274 | 316 | 328 | ||
4275 | 329 | strongarm | thumb | xscale) | ||
4276 | 330 | basic_machine=arm-unknown | ||
4277 | 331 | ;; | ||
4278 | 332 | |||
4279 | 333 | xscaleeb) | ||
4280 | 334 | basic_machine=armeb-unknown | ||
4281 | 335 | ;; | ||
4282 | 336 | |||
4283 | 337 | xscaleel) | ||
4284 | 338 | basic_machine=armel-unknown | ||
4285 | 339 | ;; | ||
4286 | 340 | |||
4287 | 317 | # We use `pc' rather than `unknown' | 341 | # We use `pc' rather than `unknown' |
4288 | 318 | # because (1) that's what they normally are, and | 342 | # because (1) that's what they normally are, and |
4289 | 319 | # (2) the word "unknown" tends to confuse beginning users. | 343 | # (2) the word "unknown" tends to confuse beginning users. |
4290 | @@ -334,7 +358,7 @@ | |||
4291 | 334 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | 358 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ |
4292 | 335 | | avr-* | avr32-* \ | 359 | | avr-* | avr32-* \ |
4293 | 336 | | bfin-* | bs2000-* \ | 360 | | bfin-* | bs2000-* \ |
4295 | 337 | | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | 361 | | c[123]* | c30-* | [cjt]90-* | c4x-* \ |
4296 | 338 | | clipper-* | craynv-* | cydra-* \ | 362 | | clipper-* | craynv-* | cydra-* \ |
4297 | 339 | | d10v-* | d30v-* | dlx-* \ | 363 | | d10v-* | d30v-* | dlx-* \ |
4298 | 340 | | elxsi-* \ | 364 | | elxsi-* \ |
4299 | @@ -368,26 +392,28 @@ | |||
4300 | 368 | | mmix-* \ | 392 | | mmix-* \ |
4301 | 369 | | mt-* \ | 393 | | mt-* \ |
4302 | 370 | | msp430-* \ | 394 | | msp430-* \ |
4303 | 395 | | nds32-* | nds32le-* | nds32be-* \ | ||
4304 | 371 | | nios-* | nios2-* \ | 396 | | nios-* | nios2-* \ |
4305 | 372 | | none-* | np1-* | ns16k-* | ns32k-* \ | 397 | | none-* | np1-* | ns16k-* | ns32k-* \ |
4306 | 398 | | open8-* \ | ||
4307 | 373 | | orion-* \ | 399 | | orion-* \ |
4308 | 374 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | 400 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ |
4310 | 375 | | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | 401 | | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ |
4311 | 376 | | pyramid-* \ | 402 | | pyramid-* \ |
4312 | 377 | | romp-* | rs6000-* | rx-* \ | 403 | | romp-* | rs6000-* | rx-* \ |
4313 | 378 | | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | 404 | | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ |
4314 | 379 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | 405 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ |
4315 | 380 | | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | 406 | | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ |
4316 | 381 | | sparclite-* \ | 407 | | sparclite-* \ |
4319 | 382 | | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | 408 | | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ |
4320 | 383 | | tahoe-* | thumb-* \ | 409 | | tahoe-* \ |
4321 | 384 | | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | 410 | | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ |
4322 | 385 | | tile-* | tilegx-* \ | 411 | | tile-* | tilegx-* \ |
4323 | 386 | | tron-* \ | 412 | | tron-* \ |
4324 | 387 | | ubicom32-* \ | 413 | | ubicom32-* \ |
4325 | 388 | | v850-* | v850e-* | vax-* \ | 414 | | v850-* | v850e-* | vax-* \ |
4326 | 389 | | we32k-* \ | 415 | | we32k-* \ |
4328 | 390 | | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | 416 | | x86-* | x86_64-* | xc16x-* | xps100-* \ |
4329 | 391 | | xstormy16-* | xtensa*-* \ | 417 | | xstormy16-* | xtensa*-* \ |
4330 | 392 | | ymp-* \ | 418 | | ymp-* \ |
4331 | 393 | | z8k-* | z80-*) | 419 | | z8k-* | z80-*) |
4332 | @@ -412,7 +438,7 @@ | |||
4333 | 412 | basic_machine=a29k-amd | 438 | basic_machine=a29k-amd |
4334 | 413 | os=-udi | 439 | os=-udi |
4335 | 414 | ;; | 440 | ;; |
4337 | 415 | abacus) | 441 | abacus) |
4338 | 416 | basic_machine=abacus-unknown | 442 | basic_machine=abacus-unknown |
4339 | 417 | ;; | 443 | ;; |
4340 | 418 | adobe68k) | 444 | adobe68k) |
4341 | @@ -482,11 +508,20 @@ | |||
4342 | 482 | basic_machine=powerpc-ibm | 508 | basic_machine=powerpc-ibm |
4343 | 483 | os=-cnk | 509 | os=-cnk |
4344 | 484 | ;; | 510 | ;; |
4345 | 511 | c54x-*) | ||
4346 | 512 | basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` | ||
4347 | 513 | ;; | ||
4348 | 514 | c55x-*) | ||
4349 | 515 | basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` | ||
4350 | 516 | ;; | ||
4351 | 517 | c6x-*) | ||
4352 | 518 | basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` | ||
4353 | 519 | ;; | ||
4354 | 485 | c90) | 520 | c90) |
4355 | 486 | basic_machine=c90-cray | 521 | basic_machine=c90-cray |
4356 | 487 | os=-unicos | 522 | os=-unicos |
4357 | 488 | ;; | 523 | ;; |
4359 | 489 | cegcc) | 524 | cegcc) |
4360 | 490 | basic_machine=arm-unknown | 525 | basic_machine=arm-unknown |
4361 | 491 | os=-cegcc | 526 | os=-cegcc |
4362 | 492 | ;; | 527 | ;; |
4363 | @@ -518,7 +553,7 @@ | |||
4364 | 518 | basic_machine=craynv-cray | 553 | basic_machine=craynv-cray |
4365 | 519 | os=-unicosmp | 554 | os=-unicosmp |
4366 | 520 | ;; | 555 | ;; |
4368 | 521 | cr16) | 556 | cr16 | cr16-*) |
4369 | 522 | basic_machine=cr16-unknown | 557 | basic_machine=cr16-unknown |
4370 | 523 | os=-elf | 558 | os=-elf |
4371 | 524 | ;; | 559 | ;; |
4372 | @@ -734,7 +769,7 @@ | |||
4373 | 734 | basic_machine=ns32k-utek | 769 | basic_machine=ns32k-utek |
4374 | 735 | os=-sysv | 770 | os=-sysv |
4375 | 736 | ;; | 771 | ;; |
4377 | 737 | microblaze) | 772 | microblaze) |
4378 | 738 | basic_machine=microblaze-xilinx | 773 | basic_machine=microblaze-xilinx |
4379 | 739 | ;; | 774 | ;; |
4380 | 740 | mingw32) | 775 | mingw32) |
4381 | @@ -841,6 +876,12 @@ | |||
4382 | 841 | np1) | 876 | np1) |
4383 | 842 | basic_machine=np1-gould | 877 | basic_machine=np1-gould |
4384 | 843 | ;; | 878 | ;; |
4385 | 879 | neo-tandem) | ||
4386 | 880 | basic_machine=neo-tandem | ||
4387 | 881 | ;; | ||
4388 | 882 | nse-tandem) | ||
4389 | 883 | basic_machine=nse-tandem | ||
4390 | 884 | ;; | ||
4391 | 844 | nsr-tandem) | 885 | nsr-tandem) |
4392 | 845 | basic_machine=nsr-tandem | 886 | basic_machine=nsr-tandem |
4393 | 846 | ;; | 887 | ;; |
4394 | @@ -923,9 +964,10 @@ | |||
4395 | 923 | ;; | 964 | ;; |
4396 | 924 | power) basic_machine=power-ibm | 965 | power) basic_machine=power-ibm |
4397 | 925 | ;; | 966 | ;; |
4399 | 926 | ppc) basic_machine=powerpc-unknown | 967 | ppc | ppcbe) basic_machine=powerpc-unknown |
4400 | 927 | ;; | 968 | ;; |
4402 | 928 | ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` | 969 | ppc-* | ppcbe-*) |
4403 | 970 | basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` | ||
4404 | 929 | ;; | 971 | ;; |
4405 | 930 | ppcle | powerpclittle | ppc-le | powerpc-little) | 972 | ppcle | powerpclittle | ppc-le | powerpc-little) |
4406 | 931 | basic_machine=powerpcle-unknown | 973 | basic_machine=powerpcle-unknown |
4407 | @@ -1019,6 +1061,9 @@ | |||
4408 | 1019 | basic_machine=i860-stratus | 1061 | basic_machine=i860-stratus |
4409 | 1020 | os=-sysv4 | 1062 | os=-sysv4 |
4410 | 1021 | ;; | 1063 | ;; |
4411 | 1064 | strongarm-* | thumb-*) | ||
4412 | 1065 | basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` | ||
4413 | 1066 | ;; | ||
4414 | 1022 | sun2) | 1067 | sun2) |
4415 | 1023 | basic_machine=m68000-sun | 1068 | basic_machine=m68000-sun |
4416 | 1024 | ;; | 1069 | ;; |
4417 | @@ -1075,20 +1120,8 @@ | |||
4418 | 1075 | basic_machine=t90-cray | 1120 | basic_machine=t90-cray |
4419 | 1076 | os=-unicos | 1121 | os=-unicos |
4420 | 1077 | ;; | 1122 | ;; |
4435 | 1078 | tic54x | c54x*) | 1123 | # This must be matched before tile*. |
4436 | 1079 | basic_machine=tic54x-unknown | 1124 | tilegx*) |
4423 | 1080 | os=-coff | ||
4424 | 1081 | ;; | ||
4425 | 1082 | tic55x | c55x*) | ||
4426 | 1083 | basic_machine=tic55x-unknown | ||
4427 | 1084 | os=-coff | ||
4428 | 1085 | ;; | ||
4429 | 1086 | tic6x | c6x*) | ||
4430 | 1087 | basic_machine=tic6x-unknown | ||
4431 | 1088 | os=-coff | ||
4432 | 1089 | ;; | ||
4433 | 1090 | # This must be matched before tile*. | ||
4434 | 1091 | tilegx*) | ||
4437 | 1092 | basic_machine=tilegx-unknown | 1125 | basic_machine=tilegx-unknown |
4438 | 1093 | os=-linux-gnu | 1126 | os=-linux-gnu |
4439 | 1094 | ;; | 1127 | ;; |
4440 | @@ -1163,6 +1196,9 @@ | |||
4441 | 1163 | xps | xps100) | 1196 | xps | xps100) |
4442 | 1164 | basic_machine=xps100-honeywell | 1197 | basic_machine=xps100-honeywell |
4443 | 1165 | ;; | 1198 | ;; |
4444 | 1199 | xscale-* | xscalee[bl]-*) | ||
4445 | 1200 | basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` | ||
4446 | 1201 | ;; | ||
4447 | 1166 | ymp) | 1202 | ymp) |
4448 | 1167 | basic_machine=ymp-cray | 1203 | basic_machine=ymp-cray |
4449 | 1168 | os=-unicos | 1204 | os=-unicos |
4450 | @@ -1260,11 +1296,11 @@ | |||
4451 | 1260 | if [ x"$os" != x"" ] | 1296 | if [ x"$os" != x"" ] |
4452 | 1261 | then | 1297 | then |
4453 | 1262 | case $os in | 1298 | case $os in |
4456 | 1263 | # First match some system type aliases | 1299 | # First match some system type aliases |
4457 | 1264 | # that might get confused with valid system types. | 1300 | # that might get confused with valid system types. |
4458 | 1265 | # -solaris* is a basic system type, with this one exception. | 1301 | # -solaris* is a basic system type, with this one exception. |
4461 | 1266 | -auroraux) | 1302 | -auroraux) |
4462 | 1267 | os=-auroraux | 1303 | os=-auroraux |
4463 | 1268 | ;; | 1304 | ;; |
4464 | 1269 | -solaris1 | -solaris1.*) | 1305 | -solaris1 | -solaris1.*) |
4465 | 1270 | os=`echo $os | sed -e 's|solaris1|sunos4|'` | 1306 | os=`echo $os | sed -e 's|solaris1|sunos4|'` |
4466 | @@ -1301,7 +1337,8 @@ | |||
4467 | 1301 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | 1337 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ |
4468 | 1302 | | -chorusos* | -chorusrdb* | -cegcc* \ | 1338 | | -chorusos* | -chorusrdb* | -cegcc* \ |
4469 | 1303 | | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | 1339 | | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
4471 | 1304 | | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ | 1340 | | -mingw32* | -linux-gnu* | -linux-android* \ |
4472 | 1341 | | -linux-newlib* | -linux-uclibc* \ | ||
4473 | 1305 | | -uxpv* | -beos* | -mpeix* | -udk* \ | 1342 | | -uxpv* | -beos* | -mpeix* | -udk* \ |
4474 | 1306 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | 1343 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
4475 | 1307 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | 1344 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
4476 | @@ -1348,7 +1385,7 @@ | |||
4477 | 1348 | -opened*) | 1385 | -opened*) |
4478 | 1349 | os=-openedition | 1386 | os=-openedition |
4479 | 1350 | ;; | 1387 | ;; |
4481 | 1351 | -os400*) | 1388 | -os400*) |
4482 | 1352 | os=-os400 | 1389 | os=-os400 |
4483 | 1353 | ;; | 1390 | ;; |
4484 | 1354 | -wince*) | 1391 | -wince*) |
4485 | @@ -1397,7 +1434,7 @@ | |||
4486 | 1397 | -sinix*) | 1434 | -sinix*) |
4487 | 1398 | os=-sysv4 | 1435 | os=-sysv4 |
4488 | 1399 | ;; | 1436 | ;; |
4490 | 1400 | -tpf*) | 1437 | -tpf*) |
4491 | 1401 | os=-tpf | 1438 | os=-tpf |
4492 | 1402 | ;; | 1439 | ;; |
4493 | 1403 | -triton*) | 1440 | -triton*) |
4494 | @@ -1442,8 +1479,8 @@ | |||
4495 | 1442 | -dicos*) | 1479 | -dicos*) |
4496 | 1443 | os=-dicos | 1480 | os=-dicos |
4497 | 1444 | ;; | 1481 | ;; |
4500 | 1445 | -nacl*) | 1482 | -nacl*) |
4501 | 1446 | ;; | 1483 | ;; |
4502 | 1447 | -none) | 1484 | -none) |
4503 | 1448 | ;; | 1485 | ;; |
4504 | 1449 | *) | 1486 | *) |
4505 | @@ -1466,10 +1503,10 @@ | |||
4506 | 1466 | # system, and we'll never get to this point. | 1503 | # system, and we'll never get to this point. |
4507 | 1467 | 1504 | ||
4508 | 1468 | case $basic_machine in | 1505 | case $basic_machine in |
4510 | 1469 | score-*) | 1506 | score-*) |
4511 | 1470 | os=-elf | 1507 | os=-elf |
4512 | 1471 | ;; | 1508 | ;; |
4514 | 1472 | spu-*) | 1509 | spu-*) |
4515 | 1473 | os=-elf | 1510 | os=-elf |
4516 | 1474 | ;; | 1511 | ;; |
4517 | 1475 | *-acorn) | 1512 | *-acorn) |
4518 | @@ -1481,8 +1518,17 @@ | |||
4519 | 1481 | arm*-semi) | 1518 | arm*-semi) |
4520 | 1482 | os=-aout | 1519 | os=-aout |
4521 | 1483 | ;; | 1520 | ;; |
4524 | 1484 | c4x-* | tic4x-*) | 1521 | c4x-* | tic4x-*) |
4525 | 1485 | os=-coff | 1522 | os=-coff |
4526 | 1523 | ;; | ||
4527 | 1524 | tic54x-*) | ||
4528 | 1525 | os=-coff | ||
4529 | 1526 | ;; | ||
4530 | 1527 | tic55x-*) | ||
4531 | 1528 | os=-coff | ||
4532 | 1529 | ;; | ||
4533 | 1530 | tic6x-*) | ||
4534 | 1531 | os=-coff | ||
4535 | 1486 | ;; | 1532 | ;; |
4536 | 1487 | # This must come before the *-dec entry. | 1533 | # This must come before the *-dec entry. |
4537 | 1488 | pdp10-*) | 1534 | pdp10-*) |
4538 | @@ -1509,7 +1555,7 @@ | |||
4539 | 1509 | m68*-cisco) | 1555 | m68*-cisco) |
4540 | 1510 | os=-aout | 1556 | os=-aout |
4541 | 1511 | ;; | 1557 | ;; |
4543 | 1512 | mep-*) | 1558 | mep-*) |
4544 | 1513 | os=-elf | 1559 | os=-elf |
4545 | 1514 | ;; | 1560 | ;; |
4546 | 1515 | mips*-cisco) | 1561 | mips*-cisco) |
4547 | @@ -1536,7 +1582,7 @@ | |||
4548 | 1536 | *-ibm) | 1582 | *-ibm) |
4549 | 1537 | os=-aix | 1583 | os=-aix |
4550 | 1538 | ;; | 1584 | ;; |
4552 | 1539 | *-knuth) | 1585 | *-knuth) |
4553 | 1540 | os=-mmixware | 1586 | os=-mmixware |
4554 | 1541 | ;; | 1587 | ;; |
4555 | 1542 | *-wec) | 1588 | *-wec) |
4556 | 1543 | 1589 | ||
4557 | === modified file 'config-aux/ltmain.sh' | |||
4558 | --- config-aux/ltmain.sh 2010-12-10 16:59:27 +0000 | |||
4559 | +++ config-aux/ltmain.sh 2012-08-23 20:59:19 +0000 | |||
4560 | @@ -1,9 +1,9 @@ | |||
4561 | 1 | # Generated from ltmain.m4sh. | ||
4562 | 2 | 1 | ||
4564 | 3 | # ltmain.sh (GNU libtool) 2.2.6b | 2 | # libtool (GNU libtool) 2.4 |
4565 | 4 | # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 | 3 | # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 |
4566 | 5 | 4 | ||
4568 | 6 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. | 5 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, |
4569 | 6 | # 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | ||
4570 | 7 | # This is free software; see the source for copying conditions. There is NO | 7 | # This is free software; see the source for copying conditions. There is NO |
4571 | 8 | # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 8 | # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
4572 | 9 | 9 | ||
4573 | @@ -32,50 +32,56 @@ | |||
4574 | 32 | # | 32 | # |
4575 | 33 | # Provide generalized library-building support services. | 33 | # Provide generalized library-building support services. |
4576 | 34 | # | 34 | # |
4588 | 35 | # --config show all configuration variables | 35 | # --config show all configuration variables |
4589 | 36 | # --debug enable verbose shell tracing | 36 | # --debug enable verbose shell tracing |
4590 | 37 | # -n, --dry-run display commands without modifying any files | 37 | # -n, --dry-run display commands without modifying any files |
4591 | 38 | # --features display basic configuration information and exit | 38 | # --features display basic configuration information and exit |
4592 | 39 | # --mode=MODE use operation mode MODE | 39 | # --mode=MODE use operation mode MODE |
4593 | 40 | # --preserve-dup-deps don't remove duplicate dependency libraries | 40 | # --preserve-dup-deps don't remove duplicate dependency libraries |
4594 | 41 | # --quiet, --silent don't print informational messages | 41 | # --quiet, --silent don't print informational messages |
4595 | 42 | # --tag=TAG use configuration variables from tag TAG | 42 | # --no-quiet, --no-silent |
4596 | 43 | # -v, --verbose print informational messages (default) | 43 | # print informational messages (default) |
4597 | 44 | # --version print version information | 44 | # --tag=TAG use configuration variables from tag TAG |
4598 | 45 | # -h, --help print short or long help message | 45 | # -v, --verbose print more informational messages than default |
4599 | 46 | # --no-verbose don't print the extra informational messages | ||
4600 | 47 | # --version print version information | ||
4601 | 48 | # -h, --help, --help-all print short, long, or detailed help message | ||
4602 | 46 | # | 49 | # |
4603 | 47 | # MODE must be one of the following: | 50 | # MODE must be one of the following: |
4604 | 48 | # | 51 | # |
4612 | 49 | # clean remove files from the build directory | 52 | # clean remove files from the build directory |
4613 | 50 | # compile compile a source file into a libtool object | 53 | # compile compile a source file into a libtool object |
4614 | 51 | # execute automatically set library path, then run a program | 54 | # execute automatically set library path, then run a program |
4615 | 52 | # finish complete the installation of libtool libraries | 55 | # finish complete the installation of libtool libraries |
4616 | 53 | # install install libraries or executables | 56 | # install install libraries or executables |
4617 | 54 | # link create a library or an executable | 57 | # link create a library or an executable |
4618 | 55 | # uninstall remove libraries from an installed directory | 58 | # uninstall remove libraries from an installed directory |
4619 | 56 | # | 59 | # |
4621 | 57 | # MODE-ARGS vary depending on the MODE. | 60 | # MODE-ARGS vary depending on the MODE. When passed as first option, |
4622 | 61 | # `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. | ||
4623 | 58 | # Try `$progname --help --mode=MODE' for a more detailed description of MODE. | 62 | # Try `$progname --help --mode=MODE' for a more detailed description of MODE. |
4624 | 59 | # | 63 | # |
4625 | 60 | # When reporting a bug, please describe a test case to reproduce it and | 64 | # When reporting a bug, please describe a test case to reproduce it and |
4626 | 61 | # include the following information: | 65 | # include the following information: |
4627 | 62 | # | 66 | # |
4636 | 63 | # host-triplet: $host | 67 | # host-triplet: $host |
4637 | 64 | # shell: $SHELL | 68 | # shell: $SHELL |
4638 | 65 | # compiler: $LTCC | 69 | # compiler: $LTCC |
4639 | 66 | # compiler flags: $LTCFLAGS | 70 | # compiler flags: $LTCFLAGS |
4640 | 67 | # linker: $LD (gnu? $with_gnu_ld) | 71 | # linker: $LD (gnu? $with_gnu_ld) |
4641 | 68 | # $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1 | 72 | # $progname: (GNU libtool) 2.4 Debian-2.4-2ubuntu1 |
4642 | 69 | # automake: $automake_version | 73 | # automake: $automake_version |
4643 | 70 | # autoconf: $autoconf_version | 74 | # autoconf: $autoconf_version |
4644 | 71 | # | 75 | # |
4645 | 72 | # Report bugs to <bug-libtool@gnu.org>. | 76 | # Report bugs to <bug-libtool@gnu.org>. |
4646 | 77 | # GNU libtool home page: <http://www.gnu.org/software/libtool/>. | ||
4647 | 78 | # General help using GNU software: <http://www.gnu.org/gethelp/>. | ||
4648 | 73 | 79 | ||
4650 | 74 | PROGRAM=ltmain.sh | 80 | PROGRAM=libtool |
4651 | 75 | PACKAGE=libtool | 81 | PACKAGE=libtool |
4653 | 76 | VERSION="2.2.6b Debian-2.2.6b-2ubuntu1" | 82 | VERSION="2.4 Debian-2.4-2ubuntu1" |
4654 | 77 | TIMESTAMP="" | 83 | TIMESTAMP="" |
4656 | 78 | package_revision=1.3017 | 84 | package_revision=1.3293 |
4657 | 79 | 85 | ||
4658 | 80 | # Be Bourne compatible | 86 | # Be Bourne compatible |
4659 | 81 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | 87 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then |
4660 | @@ -91,10 +97,15 @@ | |||
4661 | 91 | BIN_SH=xpg4; export BIN_SH # for Tru64 | 97 | BIN_SH=xpg4; export BIN_SH # for Tru64 |
4662 | 92 | DUALCASE=1; export DUALCASE # for MKS sh | 98 | DUALCASE=1; export DUALCASE # for MKS sh |
4663 | 93 | 99 | ||
4664 | 100 | # A function that is used when there is no print builtin or printf. | ||
4665 | 101 | func_fallback_echo () | ||
4666 | 102 | { | ||
4667 | 103 | eval 'cat <<_LTECHO_EOF | ||
4668 | 104 | $1 | ||
4669 | 105 | _LTECHO_EOF' | ||
4670 | 106 | } | ||
4671 | 107 | |||
4672 | 94 | # NLS nuisances: We save the old values to restore during execute mode. | 108 | # NLS nuisances: We save the old values to restore during execute mode. |
4673 | 95 | # Only set LANG and LC_ALL to C if already set. | ||
4674 | 96 | # These must not be set unconditionally because not all systems understand | ||
4675 | 97 | # e.g. LANG=C (notably SCO). | ||
4676 | 98 | lt_user_locale= | 109 | lt_user_locale= |
4677 | 99 | lt_safe_locale= | 110 | lt_safe_locale= |
4678 | 100 | for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES | 111 | for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES |
4679 | @@ -107,15 +118,24 @@ | |||
4680 | 107 | lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" | 118 | lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" |
4681 | 108 | fi" | 119 | fi" |
4682 | 109 | done | 120 | done |
4683 | 121 | LC_ALL=C | ||
4684 | 122 | LANGUAGE=C | ||
4685 | 123 | export LANGUAGE LC_ALL | ||
4686 | 110 | 124 | ||
4687 | 111 | $lt_unset CDPATH | 125 | $lt_unset CDPATH |
4688 | 112 | 126 | ||
4689 | 113 | 127 | ||
4690 | 128 | # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh | ||
4691 | 129 | # is ksh but when the shell is invoked as "sh" and the current value of | ||
4692 | 130 | # the _XPG environment variable is not equal to 1 (one), the special | ||
4693 | 131 | # positional parameter $0, within a function call, is the name of the | ||
4694 | 132 | # function. | ||
4695 | 133 | progpath="$0" | ||
4696 | 114 | 134 | ||
4697 | 115 | 135 | ||
4698 | 116 | 136 | ||
4699 | 117 | : ${CP="cp -f"} | 137 | : ${CP="cp -f"} |
4701 | 118 | : ${ECHO="echo"} | 138 | test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} |
4702 | 119 | : ${EGREP="/bin/grep -E"} | 139 | : ${EGREP="/bin/grep -E"} |
4703 | 120 | : ${FGREP="/bin/grep -F"} | 140 | : ${FGREP="/bin/grep -F"} |
4704 | 121 | : ${GREP="/bin/grep"} | 141 | : ${GREP="/bin/grep"} |
4705 | @@ -144,6 +164,27 @@ | |||
4706 | 144 | dirname="s,/[^/]*$,," | 164 | dirname="s,/[^/]*$,," |
4707 | 145 | basename="s,^.*/,," | 165 | basename="s,^.*/,," |
4708 | 146 | 166 | ||
4709 | 167 | # func_dirname file append nondir_replacement | ||
4710 | 168 | # Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
4711 | 169 | # otherwise set result to NONDIR_REPLACEMENT. | ||
4712 | 170 | func_dirname () | ||
4713 | 171 | { | ||
4714 | 172 | func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` | ||
4715 | 173 | if test "X$func_dirname_result" = "X${1}"; then | ||
4716 | 174 | func_dirname_result="${3}" | ||
4717 | 175 | else | ||
4718 | 176 | func_dirname_result="$func_dirname_result${2}" | ||
4719 | 177 | fi | ||
4720 | 178 | } # func_dirname may be replaced by extended shell implementation | ||
4721 | 179 | |||
4722 | 180 | |||
4723 | 181 | # func_basename file | ||
4724 | 182 | func_basename () | ||
4725 | 183 | { | ||
4726 | 184 | func_basename_result=`$ECHO "${1}" | $SED "$basename"` | ||
4727 | 185 | } # func_basename may be replaced by extended shell implementation | ||
4728 | 186 | |||
4729 | 187 | |||
4730 | 147 | # func_dirname_and_basename file append nondir_replacement | 188 | # func_dirname_and_basename file append nondir_replacement |
4731 | 148 | # perform func_basename and func_dirname in a single function | 189 | # perform func_basename and func_dirname in a single function |
4732 | 149 | # call: | 190 | # call: |
4733 | @@ -158,33 +199,183 @@ | |||
4734 | 158 | # those functions but instead duplicate the functionality here. | 199 | # those functions but instead duplicate the functionality here. |
4735 | 159 | func_dirname_and_basename () | 200 | func_dirname_and_basename () |
4736 | 160 | { | 201 | { |
4755 | 161 | # Extract subdirectory from the argument. | 202 | # Extract subdirectory from the argument. |
4756 | 162 | func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` | 203 | func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` |
4757 | 163 | if test "X$func_dirname_result" = "X${1}"; then | 204 | if test "X$func_dirname_result" = "X${1}"; then |
4758 | 164 | func_dirname_result="${3}" | 205 | func_dirname_result="${3}" |
4759 | 165 | else | 206 | else |
4760 | 166 | func_dirname_result="$func_dirname_result${2}" | 207 | func_dirname_result="$func_dirname_result${2}" |
4761 | 167 | fi | 208 | fi |
4762 | 168 | func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` | 209 | func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` |
4763 | 169 | } | 210 | } # func_dirname_and_basename may be replaced by extended shell implementation |
4764 | 170 | 211 | ||
4765 | 171 | # Generated shell functions inserted here. | 212 | |
4766 | 172 | 213 | # func_stripname prefix suffix name | |
4767 | 173 | # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh | 214 | # strip PREFIX and SUFFIX off of NAME. |
4768 | 174 | # is ksh but when the shell is invoked as "sh" and the current value of | 215 | # PREFIX and SUFFIX must not contain globbing or regex special |
4769 | 175 | # the _XPG environment variable is not equal to 1 (one), the special | 216 | # characters, hashes, percent signs, but SUFFIX may contain a leading |
4770 | 176 | # positional parameter $0, within a function call, is the name of the | 217 | # dot (in which case that matches only a dot). |
4771 | 177 | # function. | 218 | # func_strip_suffix prefix name |
4772 | 178 | progpath="$0" | 219 | func_stripname () |
4773 | 220 | { | ||
4774 | 221 | case ${2} in | ||
4775 | 222 | .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; | ||
4776 | 223 | *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; | ||
4777 | 224 | esac | ||
4778 | 225 | } # func_stripname may be replaced by extended shell implementation | ||
4779 | 226 | |||
4780 | 227 | |||
4781 | 228 | # These SED scripts presuppose an absolute path with a trailing slash. | ||
4782 | 229 | pathcar='s,^/\([^/]*\).*$,\1,' | ||
4783 | 230 | pathcdr='s,^/[^/]*,,' | ||
4784 | 231 | removedotparts=':dotsl | ||
4785 | 232 | s@/\./@/@g | ||
4786 | 233 | t dotsl | ||
4787 | 234 | s,/\.$,/,' | ||
4788 | 235 | collapseslashes='s@/\{1,\}@/@g' | ||
4789 | 236 | finalslash='s,/*$,/,' | ||
4790 | 237 | |||
4791 | 238 | # func_normal_abspath PATH | ||
4792 | 239 | # Remove doubled-up and trailing slashes, "." path components, | ||
4793 | 240 | # and cancel out any ".." path components in PATH after making | ||
4794 | 241 | # it an absolute path. | ||
4795 | 242 | # value returned in "$func_normal_abspath_result" | ||
4796 | 243 | func_normal_abspath () | ||
4797 | 244 | { | ||
4798 | 245 | # Start from root dir and reassemble the path. | ||
4799 | 246 | func_normal_abspath_result= | ||
4800 | 247 | func_normal_abspath_tpath=$1 | ||
4801 | 248 | func_normal_abspath_altnamespace= | ||
4802 | 249 | case $func_normal_abspath_tpath in | ||
4803 | 250 | "") | ||
4804 | 251 | # Empty path, that just means $cwd. | ||
4805 | 252 | func_stripname '' '/' "`pwd`" | ||
4806 | 253 | func_normal_abspath_result=$func_stripname_result | ||
4807 | 254 | return | ||
4808 | 255 | ;; | ||
4809 | 256 | # The next three entries are used to spot a run of precisely | ||
4810 | 257 | # two leading slashes without using negated character classes; | ||
4811 | 258 | # we take advantage of case's first-match behaviour. | ||
4812 | 259 | ///*) | ||
4813 | 260 | # Unusual form of absolute path, do nothing. | ||
4814 | 261 | ;; | ||
4815 | 262 | //*) | ||
4816 | 263 | # Not necessarily an ordinary path; POSIX reserves leading '//' | ||
4817 | 264 | # and for example Cygwin uses it to access remote file shares | ||
4818 | 265 | # over CIFS/SMB, so we conserve a leading double slash if found. | ||
4819 | 266 | func_normal_abspath_altnamespace=/ | ||
4820 | 267 | ;; | ||
4821 | 268 | /*) | ||
4822 | 269 | # Absolute path, do nothing. | ||
4823 | 270 | ;; | ||
4824 | 271 | *) | ||
4825 | 272 | # Relative path, prepend $cwd. | ||
4826 | 273 | func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath | ||
4827 | 274 | ;; | ||
4828 | 275 | esac | ||
4829 | 276 | # Cancel out all the simple stuff to save iterations. We also want | ||
4830 | 277 | # the path to end with a slash for ease of parsing, so make sure | ||
4831 | 278 | # there is one (and only one) here. | ||
4832 | 279 | func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ | ||
4833 | 280 | -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` | ||
4834 | 281 | while :; do | ||
4835 | 282 | # Processed it all yet? | ||
4836 | 283 | if test "$func_normal_abspath_tpath" = / ; then | ||
4837 | 284 | # If we ascended to the root using ".." the result may be empty now. | ||
4838 | 285 | if test -z "$func_normal_abspath_result" ; then | ||
4839 | 286 | func_normal_abspath_result=/ | ||
4840 | 287 | fi | ||
4841 | 288 | break | ||
4842 | 289 | fi | ||
4843 | 290 | func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ | ||
4844 | 291 | -e "$pathcar"` | ||
4845 | 292 | func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ | ||
4846 | 293 | -e "$pathcdr"` | ||
4847 | 294 | # Figure out what to do with it | ||
4848 | 295 | case $func_normal_abspath_tcomponent in | ||
4849 | 296 | "") | ||
4850 | 297 | # Trailing empty path component, ignore it. | ||
4851 | 298 | ;; | ||
4852 | 299 | ..) | ||
4853 | 300 | # Parent dir; strip last assembled component from result. | ||
4854 | 301 | func_dirname "$func_normal_abspath_result" | ||
4855 | 302 | func_normal_abspath_result=$func_dirname_result | ||
4856 | 303 | ;; | ||
4857 | 304 | *) | ||
4858 | 305 | # Actual path component, append it. | ||
4859 | 306 | func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent | ||
4860 | 307 | ;; | ||
4861 | 308 | esac | ||
4862 | 309 | done | ||
4863 | 310 | # Restore leading double-slash if one was found on entry. | ||
4864 | 311 | func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result | ||
4865 | 312 | } | ||
4866 | 313 | |||
4867 | 314 | # func_relative_path SRCDIR DSTDIR | ||
4868 | 315 | # generates a relative path from SRCDIR to DSTDIR, with a trailing | ||
4869 | 316 | # slash if non-empty, suitable for immediately appending a filename | ||
4870 | 317 | # without needing to append a separator. | ||
4871 | 318 | # value returned in "$func_relative_path_result" | ||
4872 | 319 | func_relative_path () | ||
4873 | 320 | { | ||
4874 | 321 | func_relative_path_result= | ||
4875 | 322 | func_normal_abspath "$1" | ||
4876 | 323 | func_relative_path_tlibdir=$func_normal_abspath_result | ||
4877 | 324 | func_normal_abspath "$2" | ||
4878 | 325 | func_relative_path_tbindir=$func_normal_abspath_result | ||
4879 | 326 | |||
4880 | 327 | # Ascend the tree starting from libdir | ||
4881 | 328 | while :; do | ||
4882 | 329 | # check if we have found a prefix of bindir | ||
4883 | 330 | case $func_relative_path_tbindir in | ||
4884 | 331 | $func_relative_path_tlibdir) | ||
4885 | 332 | # found an exact match | ||
4886 | 333 | func_relative_path_tcancelled= | ||
4887 | 334 | break | ||
4888 | 335 | ;; | ||
4889 | 336 | $func_relative_path_tlibdir*) | ||
4890 | 337 | # found a matching prefix | ||
4891 | 338 | func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" | ||
4892 | 339 | func_relative_path_tcancelled=$func_stripname_result | ||
4893 | 340 | if test -z "$func_relative_path_result"; then | ||
4894 | 341 | func_relative_path_result=. | ||
4895 | 342 | fi | ||
4896 | 343 | break | ||
4897 | 344 | ;; | ||
4898 | 345 | *) | ||
4899 | 346 | func_dirname $func_relative_path_tlibdir | ||
4900 | 347 | func_relative_path_tlibdir=${func_dirname_result} | ||
4901 | 348 | if test "x$func_relative_path_tlibdir" = x ; then | ||
4902 | 349 | # Have to descend all the way to the root! | ||
4903 | 350 | func_relative_path_result=../$func_relative_path_result | ||
4904 | 351 | func_relative_path_tcancelled=$func_relative_path_tbindir | ||
4905 | 352 | break | ||
4906 | 353 | fi | ||
4907 | 354 | func_relative_path_result=../$func_relative_path_result | ||
4908 | 355 | ;; | ||
4909 | 356 | esac | ||
4910 | 357 | done | ||
4911 | 358 | |||
4912 | 359 | # Now calculate path; take care to avoid doubling-up slashes. | ||
4913 | 360 | func_stripname '' '/' "$func_relative_path_result" | ||
4914 | 361 | func_relative_path_result=$func_stripname_result | ||
4915 | 362 | func_stripname '/' '/' "$func_relative_path_tcancelled" | ||
4916 | 363 | if test "x$func_stripname_result" != x ; then | ||
4917 | 364 | func_relative_path_result=${func_relative_path_result}/${func_stripname_result} | ||
4918 | 365 | fi | ||
4919 | 366 | |||
4920 | 367 | # Normalisation. If bindir is libdir, return empty string, | ||
4921 | 368 | # else relative path ending with a slash; either way, target | ||
4922 | 369 | # file name can be directly appended. | ||
4923 | 370 | if test ! -z "$func_relative_path_result"; then | ||
4924 | 371 | func_stripname './' '' "$func_relative_path_result/" | ||
4925 | 372 | func_relative_path_result=$func_stripname_result | ||
4926 | 373 | fi | ||
4927 | 374 | } | ||
4928 | 179 | 375 | ||
4929 | 180 | # The name of this program: | 376 | # The name of this program: |
4930 | 181 | # In the unlikely event $progname began with a '-', it would play havoc with | ||
4931 | 182 | # func_echo (imagine progname=-n), so we prepend ./ in that case: | ||
4932 | 183 | func_dirname_and_basename "$progpath" | 377 | func_dirname_and_basename "$progpath" |
4933 | 184 | progname=$func_basename_result | 378 | progname=$func_basename_result |
4934 | 185 | case $progname in | ||
4935 | 186 | -*) progname=./$progname ;; | ||
4936 | 187 | esac | ||
4937 | 188 | 379 | ||
4938 | 189 | # Make sure we have an absolute path for reexecution: | 380 | # Make sure we have an absolute path for reexecution: |
4939 | 190 | case $progpath in | 381 | case $progpath in |
4940 | @@ -215,6 +406,15 @@ | |||
4941 | 215 | # Same as above, but do not quote variable references. | 406 | # Same as above, but do not quote variable references. |
4942 | 216 | double_quote_subst='s/\(["`\\]\)/\\\1/g' | 407 | double_quote_subst='s/\(["`\\]\)/\\\1/g' |
4943 | 217 | 408 | ||
4944 | 409 | # Sed substitution that turns a string into a regex matching for the | ||
4945 | 410 | # string literally. | ||
4946 | 411 | sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' | ||
4947 | 412 | |||
4948 | 413 | # Sed substitution that converts a w32 file name or path | ||
4949 | 414 | # which contains forward slashes, into one that contains | ||
4950 | 415 | # (escaped) backslashes. A very naive implementation. | ||
4951 | 416 | lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' | ||
4952 | 417 | |||
4953 | 218 | # Re-`\' parameter expansions in output of double_quote_subst that were | 418 | # Re-`\' parameter expansions in output of double_quote_subst that were |
4954 | 219 | # `\'-ed in input to the same. If an odd number of `\' preceded a '$' | 419 | # `\'-ed in input to the same. If an odd number of `\' preceded a '$' |
4955 | 220 | # in input to double_quote_subst, that '$' was protected from expansion. | 420 | # in input to double_quote_subst, that '$' was protected from expansion. |
4956 | @@ -243,7 +443,7 @@ | |||
4957 | 243 | # name if it has been set yet. | 443 | # name if it has been set yet. |
4958 | 244 | func_echo () | 444 | func_echo () |
4959 | 245 | { | 445 | { |
4961 | 246 | $ECHO "$progname${mode+: }$mode: $*" | 446 | $ECHO "$progname: ${opt_mode+$opt_mode: }$*" |
4962 | 247 | } | 447 | } |
4963 | 248 | 448 | ||
4964 | 249 | # func_verbose arg... | 449 | # func_verbose arg... |
4965 | @@ -258,18 +458,25 @@ | |||
4966 | 258 | : | 458 | : |
4967 | 259 | } | 459 | } |
4968 | 260 | 460 | ||
4969 | 461 | # func_echo_all arg... | ||
4970 | 462 | # Invoke $ECHO with all args, space-separated. | ||
4971 | 463 | func_echo_all () | ||
4972 | 464 | { | ||
4973 | 465 | $ECHO "$*" | ||
4974 | 466 | } | ||
4975 | 467 | |||
4976 | 261 | # func_error arg... | 468 | # func_error arg... |
4977 | 262 | # Echo program name prefixed message to standard error. | 469 | # Echo program name prefixed message to standard error. |
4978 | 263 | func_error () | 470 | func_error () |
4979 | 264 | { | 471 | { |
4981 | 265 | $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 | 472 | $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 |
4982 | 266 | } | 473 | } |
4983 | 267 | 474 | ||
4984 | 268 | # func_warning arg... | 475 | # func_warning arg... |
4985 | 269 | # Echo program name prefixed warning message to standard error. | 476 | # Echo program name prefixed warning message to standard error. |
4986 | 270 | func_warning () | 477 | func_warning () |
4987 | 271 | { | 478 | { |
4989 | 272 | $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 | 479 | $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 |
4990 | 273 | 480 | ||
4991 | 274 | # bash bug again: | 481 | # bash bug again: |
4992 | 275 | : | 482 | : |
4993 | @@ -326,9 +533,9 @@ | |||
4994 | 326 | case $my_directory_path in */*) ;; *) break ;; esac | 533 | case $my_directory_path in */*) ;; *) break ;; esac |
4995 | 327 | 534 | ||
4996 | 328 | # ...otherwise throw away the child directory and loop | 535 | # ...otherwise throw away the child directory and loop |
4998 | 329 | my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"` | 536 | my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` |
4999 | 330 | done | 537 | done |
5000 | 331 | my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'` |
The diff has been truncated for viewing.
* The version will need to be ginn_0. 2.4.1-0ubuntu1~ oneiric1 since we will upload the same sources to precise as well.
Everything else looks good. Please fix the version and then push.