Merge lp:~dobey/ubuntu/precise/ubuntuone-client-gnome/release-2-99-2 into lp:ubuntu/precise/ubuntuone-client-gnome
- Precise (12.04)
- release-2-99-2
- Merge into precise
Proposed by
dobey
Status: | Merged |
---|---|
Merged at revision: | 13 |
Proposed branch: | lp:~dobey/ubuntu/precise/ubuntuone-client-gnome/release-2-99-2 |
Merge into: | lp:ubuntu/precise/ubuntuone-client-gnome |
Diff against target: |
1662 lines (+414/-172) 7 files modified
configure (+121/-69) configure.ac (+1/-1) debian/changelog (+6/-0) ltmain.sh (+57/-38) m4/libtool.m4 (+207/-57) m4/ltoptions.m4 (+17/-2) m4/ltversion.m4 (+5/-5) |
To merge this branch: | bzr merge lp:~dobey/ubuntu/precise/ubuntuone-client-gnome/release-2-99-2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu branches | Pending | ||
Review via email: mp+88960@code.launchpad.net |
Commit message
Description of the change
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 'configure' | |||
2 | --- configure 2012-01-04 13:23:49 +0000 | |||
3 | +++ configure 2012-01-17 23:06:35 +0000 | |||
4 | @@ -1,6 +1,6 @@ | |||
5 | 1 | #! /bin/sh | 1 | #! /bin/sh |
6 | 2 | # Guess values for system-dependent variables and create Makefiles. | 2 | # Guess values for system-dependent variables and create Makefiles. |
8 | 3 | # Generated by GNU Autoconf 2.68 for ubuntuone-client-gnome 2.99.1. | 3 | # Generated by GNU Autoconf 2.68 for ubuntuone-client-gnome 2.99.2. |
9 | 4 | # | 4 | # |
10 | 5 | # | 5 | # |
11 | 6 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, | 6 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
12 | @@ -567,8 +567,8 @@ | |||
13 | 567 | # Identity of this package. | 567 | # Identity of this package. |
14 | 568 | PACKAGE_NAME='ubuntuone-client-gnome' | 568 | PACKAGE_NAME='ubuntuone-client-gnome' |
15 | 569 | PACKAGE_TARNAME='ubuntuone-client-gnome' | 569 | PACKAGE_TARNAME='ubuntuone-client-gnome' |
18 | 570 | PACKAGE_VERSION='2.99.1' | 570 | PACKAGE_VERSION='2.99.2' |
19 | 571 | PACKAGE_STRING='ubuntuone-client-gnome 2.99.1' | 571 | PACKAGE_STRING='ubuntuone-client-gnome 2.99.2' |
20 | 572 | PACKAGE_BUGREPORT='' | 572 | PACKAGE_BUGREPORT='' |
21 | 573 | PACKAGE_URL='' | 573 | PACKAGE_URL='' |
22 | 574 | 574 | ||
23 | @@ -1353,7 +1353,7 @@ | |||
24 | 1353 | # Omit some internal or obsolete options to make the list less imposing. | 1353 | # Omit some internal or obsolete options to make the list less imposing. |
25 | 1354 | # This message is too long to be a string in the A/UX 3.1 sh. | 1354 | # This message is too long to be a string in the A/UX 3.1 sh. |
26 | 1355 | cat <<_ACEOF | 1355 | cat <<_ACEOF |
28 | 1356 | \`configure' configures ubuntuone-client-gnome 2.99.1 to adapt to many kinds of systems. | 1356 | \`configure' configures ubuntuone-client-gnome 2.99.2 to adapt to many kinds of systems. |
29 | 1357 | 1357 | ||
30 | 1358 | Usage: $0 [OPTION]... [VAR=VALUE]... | 1358 | Usage: $0 [OPTION]... [VAR=VALUE]... |
31 | 1359 | 1359 | ||
32 | @@ -1424,7 +1424,7 @@ | |||
33 | 1424 | 1424 | ||
34 | 1425 | if test -n "$ac_init_help"; then | 1425 | if test -n "$ac_init_help"; then |
35 | 1426 | case $ac_init_help in | 1426 | case $ac_init_help in |
37 | 1427 | short | recursive ) echo "Configuration of ubuntuone-client-gnome 2.99.1:";; | 1427 | short | recursive ) echo "Configuration of ubuntuone-client-gnome 2.99.2:";; |
38 | 1428 | esac | 1428 | esac |
39 | 1429 | cat <<\_ACEOF | 1429 | cat <<\_ACEOF |
40 | 1430 | 1430 | ||
41 | @@ -1450,7 +1450,7 @@ | |||
42 | 1450 | Optional Packages: | 1450 | Optional Packages: |
43 | 1451 | --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] | 1451 | --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] |
44 | 1452 | --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) | 1452 | --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) |
46 | 1453 | --with-pic try to use only PIC/non-PIC objects [default=use | 1453 | --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use |
47 | 1454 | both] | 1454 | both] |
48 | 1455 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | 1455 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
49 | 1456 | --with-sysroot=DIR Search for dependent libraries within DIR | 1456 | --with-sysroot=DIR Search for dependent libraries within DIR |
50 | @@ -1547,7 +1547,7 @@ | |||
51 | 1547 | test -n "$ac_init_help" && exit $ac_status | 1547 | test -n "$ac_init_help" && exit $ac_status |
52 | 1548 | if $ac_init_version; then | 1548 | if $ac_init_version; then |
53 | 1549 | cat <<\_ACEOF | 1549 | cat <<\_ACEOF |
55 | 1550 | ubuntuone-client-gnome configure 2.99.1 | 1550 | ubuntuone-client-gnome configure 2.99.2 |
56 | 1551 | generated by GNU Autoconf 2.68 | 1551 | generated by GNU Autoconf 2.68 |
57 | 1552 | 1552 | ||
58 | 1553 | Copyright (C) 2010 Free Software Foundation, Inc. | 1553 | Copyright (C) 2010 Free Software Foundation, Inc. |
59 | @@ -1825,7 +1825,7 @@ | |||
60 | 1825 | This file contains any messages produced by compilers while | 1825 | This file contains any messages produced by compilers while |
61 | 1826 | running configure, to aid debugging if configure makes a mistake. | 1826 | running configure, to aid debugging if configure makes a mistake. |
62 | 1827 | 1827 | ||
64 | 1828 | It was created by ubuntuone-client-gnome $as_me 2.99.1, which was | 1828 | It was created by ubuntuone-client-gnome $as_me 2.99.2, which was |
65 | 1829 | generated by GNU Autoconf 2.68. Invocation command line was | 1829 | generated by GNU Autoconf 2.68. Invocation command line was |
66 | 1830 | 1830 | ||
67 | 1831 | $ $0 $@ | 1831 | $ $0 $@ |
68 | @@ -2642,7 +2642,7 @@ | |||
69 | 2642 | 2642 | ||
70 | 2643 | # Define the identity of the package. | 2643 | # Define the identity of the package. |
71 | 2644 | PACKAGE='ubuntuone-client-gnome' | 2644 | PACKAGE='ubuntuone-client-gnome' |
73 | 2645 | VERSION='2.99.1' | 2645 | VERSION='2.99.2' |
74 | 2646 | 2646 | ||
75 | 2647 | 2647 | ||
76 | 2648 | cat >>confdefs.h <<_ACEOF | 2648 | cat >>confdefs.h <<_ACEOF |
77 | @@ -4409,8 +4409,8 @@ | |||
78 | 4409 | 4409 | ||
79 | 4410 | 4410 | ||
80 | 4411 | 4411 | ||
83 | 4412 | macro_version='2.4' | 4412 | macro_version='2.4.2' |
84 | 4413 | macro_revision='1.3293' | 4413 | macro_revision='1.3337' |
85 | 4414 | 4414 | ||
86 | 4415 | 4415 | ||
87 | 4416 | 4416 | ||
88 | @@ -5255,6 +5255,11 @@ | |||
89 | 5255 | lt_cv_sys_max_cmd_len=196608 | 5255 | lt_cv_sys_max_cmd_len=196608 |
90 | 5256 | ;; | 5256 | ;; |
91 | 5257 | 5257 | ||
92 | 5258 | os2*) | ||
93 | 5259 | # The test takes a long time on OS/2. | ||
94 | 5260 | lt_cv_sys_max_cmd_len=8192 | ||
95 | 5261 | ;; | ||
96 | 5262 | |||
97 | 5258 | osf*) | 5263 | osf*) |
98 | 5259 | # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure | 5264 | # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure |
99 | 5260 | # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not | 5265 | # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not |
100 | @@ -5294,7 +5299,7 @@ | |||
101 | 5294 | # If test is not a shell built-in, we'll probably end up computing a | 5299 | # If test is not a shell built-in, we'll probably end up computing a |
102 | 5295 | # maximum length that is only half of the actual maximum length, but | 5300 | # maximum length that is only half of the actual maximum length, but |
103 | 5296 | # we can't tell. | 5301 | # we can't tell. |
105 | 5297 | while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ | 5302 | while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ |
106 | 5298 | = "X$teststring$teststring"; } >/dev/null 2>&1 && | 5303 | = "X$teststring$teststring"; } >/dev/null 2>&1 && |
107 | 5299 | test $i != 17 # 1/2 MB should be enough | 5304 | test $i != 17 # 1/2 MB should be enough |
108 | 5300 | do | 5305 | do |
109 | @@ -5723,7 +5728,7 @@ | |||
110 | 5723 | lt_cv_deplibs_check_method=pass_all | 5728 | lt_cv_deplibs_check_method=pass_all |
111 | 5724 | ;; | 5729 | ;; |
112 | 5725 | 5730 | ||
114 | 5726 | # This must be Linux ELF. | 5731 | # This must be glibc/ELF. |
115 | 5727 | linux* | k*bsd*-gnu | kopensolaris*-gnu) | 5732 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
116 | 5728 | lt_cv_deplibs_check_method=pass_all | 5733 | lt_cv_deplibs_check_method=pass_all |
117 | 5729 | ;; | 5734 | ;; |
118 | @@ -6363,13 +6368,13 @@ | |||
119 | 6363 | if test -n "$RANLIB"; then | 6368 | if test -n "$RANLIB"; then |
120 | 6364 | case $host_os in | 6369 | case $host_os in |
121 | 6365 | openbsd*) | 6370 | openbsd*) |
123 | 6366 | old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" | 6371 | old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" |
124 | 6367 | ;; | 6372 | ;; |
125 | 6368 | *) | 6373 | *) |
127 | 6369 | old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" | 6374 | old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" |
128 | 6370 | ;; | 6375 | ;; |
129 | 6371 | esac | 6376 | esac |
131 | 6372 | old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" | 6377 | old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" |
132 | 6373 | fi | 6378 | fi |
133 | 6374 | 6379 | ||
134 | 6375 | case $host_os in | 6380 | case $host_os in |
135 | @@ -6516,6 +6521,7 @@ | |||
136 | 6516 | # which start with @ or ?. | 6521 | # which start with @ or ?. |
137 | 6517 | lt_cv_sys_global_symbol_pipe="$AWK '"\ | 6522 | lt_cv_sys_global_symbol_pipe="$AWK '"\ |
138 | 6518 | " {last_section=section; section=\$ 3};"\ | 6523 | " {last_section=section; section=\$ 3};"\ |
139 | 6524 | " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ | ||
140 | 6519 | " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ | 6525 | " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ |
141 | 6520 | " \$ 0!~/External *\|/{next};"\ | 6526 | " \$ 0!~/External *\|/{next};"\ |
142 | 6521 | " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ | 6527 | " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ |
143 | @@ -6904,7 +6910,7 @@ | |||
144 | 6904 | CFLAGS="$SAVE_CFLAGS" | 6910 | CFLAGS="$SAVE_CFLAGS" |
145 | 6905 | fi | 6911 | fi |
146 | 6906 | ;; | 6912 | ;; |
148 | 6907 | sparc*-*solaris*) | 6913 | *-*solaris*) |
149 | 6908 | # Find out which ABI we are using. | 6914 | # Find out which ABI we are using. |
150 | 6909 | echo 'int i;' > conftest.$ac_ext | 6915 | echo 'int i;' > conftest.$ac_ext |
151 | 6910 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | 6916 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
152 | @@ -6915,7 +6921,20 @@ | |||
153 | 6915 | case `/usr/bin/file conftest.o` in | 6921 | case `/usr/bin/file conftest.o` in |
154 | 6916 | *64-bit*) | 6922 | *64-bit*) |
155 | 6917 | case $lt_cv_prog_gnu_ld in | 6923 | case $lt_cv_prog_gnu_ld in |
157 | 6918 | yes*) LD="${LD-ld} -m elf64_sparc" ;; | 6924 | yes*) |
158 | 6925 | case $host in | ||
159 | 6926 | i?86-*-solaris*) | ||
160 | 6927 | LD="${LD-ld} -m elf_x86_64" | ||
161 | 6928 | ;; | ||
162 | 6929 | sparc*-*-solaris*) | ||
163 | 6930 | LD="${LD-ld} -m elf64_sparc" | ||
164 | 6931 | ;; | ||
165 | 6932 | esac | ||
166 | 6933 | # GNU ld 2.21 introduced _sol2 emulations. Use them if available. | ||
167 | 6934 | if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then | ||
168 | 6935 | LD="${LD-ld}_sol2" | ||
169 | 6936 | fi | ||
170 | 6937 | ;; | ||
171 | 6919 | *) | 6938 | *) |
172 | 6920 | if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then | 6939 | if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then |
173 | 6921 | LD="${LD-ld} -64" | 6940 | LD="${LD-ld} -64" |
174 | @@ -7555,7 +7574,13 @@ | |||
175 | 7555 | $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ | 7574 | $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ |
176 | 7556 | -dynamiclib -Wl,-single_module conftest.c 2>conftest.err | 7575 | -dynamiclib -Wl,-single_module conftest.c 2>conftest.err |
177 | 7557 | _lt_result=$? | 7576 | _lt_result=$? |
179 | 7558 | if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then | 7577 | # If there is a non-empty error log, and "single_module" |
180 | 7578 | # appears in it, assume the flag caused a linker warning | ||
181 | 7579 | if test -s conftest.err && $GREP single_module conftest.err; then | ||
182 | 7580 | cat conftest.err >&5 | ||
183 | 7581 | # Otherwise, if the output was created with a 0 exit code from | ||
184 | 7582 | # the compiler, it worked. | ||
185 | 7583 | elif test -f libconftest.dylib && test $_lt_result -eq 0; then | ||
186 | 7559 | lt_cv_apple_cc_single_mod=yes | 7584 | lt_cv_apple_cc_single_mod=yes |
187 | 7560 | else | 7585 | else |
188 | 7561 | cat conftest.err >&5 | 7586 | cat conftest.err >&5 |
189 | @@ -7566,6 +7591,7 @@ | |||
190 | 7566 | fi | 7591 | fi |
191 | 7567 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 | 7592 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 |
192 | 7568 | $as_echo "$lt_cv_apple_cc_single_mod" >&6; } | 7593 | $as_echo "$lt_cv_apple_cc_single_mod" >&6; } |
193 | 7594 | |||
194 | 7569 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 | 7595 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 |
195 | 7570 | $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } | 7596 | $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } |
196 | 7571 | if ${lt_cv_ld_exported_symbols_list+:} false; then : | 7597 | if ${lt_cv_ld_exported_symbols_list+:} false; then : |
197 | @@ -7598,6 +7624,7 @@ | |||
198 | 7598 | fi | 7624 | fi |
199 | 7599 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 | 7625 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 |
200 | 7600 | $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } | 7626 | $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } |
201 | 7627 | |||
202 | 7601 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 | 7628 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 |
203 | 7602 | $as_echo_n "checking for -force_load linker flag... " >&6; } | 7629 | $as_echo_n "checking for -force_load linker flag... " >&6; } |
204 | 7603 | if ${lt_cv_ld_force_load+:} false; then : | 7630 | if ${lt_cv_ld_force_load+:} false; then : |
205 | @@ -7619,7 +7646,9 @@ | |||
206 | 7619 | echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 | 7646 | echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 |
207 | 7620 | $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err | 7647 | $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err |
208 | 7621 | _lt_result=$? | 7648 | _lt_result=$? |
210 | 7622 | if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then | 7649 | if test -s conftest.err && $GREP force_load conftest.err; then |
211 | 7650 | cat conftest.err >&5 | ||
212 | 7651 | elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then | ||
213 | 7623 | lt_cv_ld_force_load=yes | 7652 | lt_cv_ld_force_load=yes |
214 | 7624 | else | 7653 | else |
215 | 7625 | cat conftest.err >&5 | 7654 | cat conftest.err >&5 |
216 | @@ -8024,7 +8053,22 @@ | |||
217 | 8024 | 8053 | ||
218 | 8025 | # Check whether --with-pic was given. | 8054 | # Check whether --with-pic was given. |
219 | 8026 | if test "${with_pic+set}" = set; then : | 8055 | if test "${with_pic+set}" = set; then : |
221 | 8027 | withval=$with_pic; pic_mode="$withval" | 8056 | withval=$with_pic; lt_p=${PACKAGE-default} |
222 | 8057 | case $withval in | ||
223 | 8058 | yes|no) pic_mode=$withval ;; | ||
224 | 8059 | *) | ||
225 | 8060 | pic_mode=default | ||
226 | 8061 | # Look at the argument we got. We use all the common list separators. | ||
227 | 8062 | lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," | ||
228 | 8063 | for lt_pkg in $withval; do | ||
229 | 8064 | IFS="$lt_save_ifs" | ||
230 | 8065 | if test "X$lt_pkg" = "X$lt_p"; then | ||
231 | 8066 | pic_mode=yes | ||
232 | 8067 | fi | ||
233 | 8068 | done | ||
234 | 8069 | IFS="$lt_save_ifs" | ||
235 | 8070 | ;; | ||
236 | 8071 | esac | ||
237 | 8028 | else | 8072 | else |
238 | 8029 | pic_mode=default | 8073 | pic_mode=default |
239 | 8030 | fi | 8074 | fi |
240 | @@ -8102,6 +8146,10 @@ | |||
241 | 8102 | 8146 | ||
242 | 8103 | 8147 | ||
243 | 8104 | 8148 | ||
244 | 8149 | |||
245 | 8150 | |||
246 | 8151 | |||
247 | 8152 | |||
248 | 8105 | test -z "$LN_S" && LN_S="ln -s" | 8153 | test -z "$LN_S" && LN_S="ln -s" |
249 | 8106 | 8154 | ||
250 | 8107 | 8155 | ||
251 | @@ -8561,7 +8609,9 @@ | |||
252 | 8561 | case $cc_basename in | 8609 | case $cc_basename in |
253 | 8562 | nvcc*) # Cuda Compiler Driver 2.2 | 8610 | nvcc*) # Cuda Compiler Driver 2.2 |
254 | 8563 | lt_prog_compiler_wl='-Xlinker ' | 8611 | lt_prog_compiler_wl='-Xlinker ' |
256 | 8564 | lt_prog_compiler_pic='-Xcompiler -fPIC' | 8612 | if test -n "$lt_prog_compiler_pic"; then |
257 | 8613 | lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" | ||
258 | 8614 | fi | ||
259 | 8565 | ;; | 8615 | ;; |
260 | 8566 | esac | 8616 | esac |
261 | 8567 | else | 8617 | else |
262 | @@ -8652,18 +8702,33 @@ | |||
263 | 8652 | ;; | 8702 | ;; |
264 | 8653 | *) | 8703 | *) |
265 | 8654 | case `$CC -V 2>&1 | sed 5q` in | 8704 | case `$CC -V 2>&1 | sed 5q` in |
267 | 8655 | *Sun\ F* | *Sun*Fortran*) | 8705 | *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) |
268 | 8656 | # Sun Fortran 8.3 passes all unrecognized flags to the linker | 8706 | # Sun Fortran 8.3 passes all unrecognized flags to the linker |
269 | 8657 | lt_prog_compiler_pic='-KPIC' | 8707 | lt_prog_compiler_pic='-KPIC' |
270 | 8658 | lt_prog_compiler_static='-Bstatic' | 8708 | lt_prog_compiler_static='-Bstatic' |
271 | 8659 | lt_prog_compiler_wl='' | 8709 | lt_prog_compiler_wl='' |
272 | 8660 | ;; | 8710 | ;; |
273 | 8711 | *Sun\ F* | *Sun*Fortran*) | ||
274 | 8712 | lt_prog_compiler_pic='-KPIC' | ||
275 | 8713 | lt_prog_compiler_static='-Bstatic' | ||
276 | 8714 | lt_prog_compiler_wl='-Qoption ld ' | ||
277 | 8715 | ;; | ||
278 | 8661 | *Sun\ C*) | 8716 | *Sun\ C*) |
279 | 8662 | # Sun C 5.9 | 8717 | # Sun C 5.9 |
280 | 8663 | lt_prog_compiler_pic='-KPIC' | 8718 | lt_prog_compiler_pic='-KPIC' |
281 | 8664 | lt_prog_compiler_static='-Bstatic' | 8719 | lt_prog_compiler_static='-Bstatic' |
282 | 8665 | lt_prog_compiler_wl='-Wl,' | 8720 | lt_prog_compiler_wl='-Wl,' |
283 | 8666 | ;; | 8721 | ;; |
284 | 8722 | *Intel*\ [CF]*Compiler*) | ||
285 | 8723 | lt_prog_compiler_wl='-Wl,' | ||
286 | 8724 | lt_prog_compiler_pic='-fPIC' | ||
287 | 8725 | lt_prog_compiler_static='-static' | ||
288 | 8726 | ;; | ||
289 | 8727 | *Portland\ Group*) | ||
290 | 8728 | lt_prog_compiler_wl='-Wl,' | ||
291 | 8729 | lt_prog_compiler_pic='-fpic' | ||
292 | 8730 | lt_prog_compiler_static='-Bstatic' | ||
293 | 8731 | ;; | ||
294 | 8667 | esac | 8732 | esac |
295 | 8668 | ;; | 8733 | ;; |
296 | 8669 | esac | 8734 | esac |
297 | @@ -9025,7 +9090,6 @@ | |||
298 | 9025 | hardcode_direct=no | 9090 | hardcode_direct=no |
299 | 9026 | hardcode_direct_absolute=no | 9091 | hardcode_direct_absolute=no |
300 | 9027 | hardcode_libdir_flag_spec= | 9092 | hardcode_libdir_flag_spec= |
301 | 9028 | hardcode_libdir_flag_spec_ld= | ||
302 | 9029 | hardcode_libdir_separator= | 9093 | hardcode_libdir_separator= |
303 | 9030 | hardcode_minus_L=no | 9094 | hardcode_minus_L=no |
304 | 9031 | hardcode_shlibpath_var=unsupported | 9095 | hardcode_shlibpath_var=unsupported |
305 | @@ -9278,8 +9342,7 @@ | |||
306 | 9278 | xlf* | bgf* | bgxlf* | mpixlf*) | 9342 | xlf* | bgf* | bgxlf* | mpixlf*) |
307 | 9279 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself | 9343 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself |
308 | 9280 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | 9344 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
311 | 9281 | hardcode_libdir_flag_spec= | 9345 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
310 | 9282 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | ||
312 | 9283 | archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' | 9346 | archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
313 | 9284 | if test "x$supports_anon_versioning" = xyes; then | 9347 | if test "x$supports_anon_versioning" = xyes; then |
314 | 9285 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ | 9348 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
315 | @@ -9659,6 +9722,7 @@ | |||
316 | 9659 | # The linker will not automatically build a static lib if we build a DLL. | 9722 | # The linker will not automatically build a static lib if we build a DLL. |
317 | 9660 | # _LT_TAGVAR(old_archive_from_new_cmds, )='true' | 9723 | # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
318 | 9661 | enable_shared_with_static_runtimes=yes | 9724 | enable_shared_with_static_runtimes=yes |
319 | 9725 | exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' | ||
320 | 9662 | export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | 9726 | export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
321 | 9663 | # Don't use ranlib | 9727 | # Don't use ranlib |
322 | 9664 | old_postinstall_cmds='chmod 644 $oldlib' | 9728 | old_postinstall_cmds='chmod 644 $oldlib' |
323 | @@ -9704,6 +9768,7 @@ | |||
324 | 9704 | hardcode_shlibpath_var=unsupported | 9768 | hardcode_shlibpath_var=unsupported |
325 | 9705 | if test "$lt_cv_ld_force_load" = "yes"; then | 9769 | if test "$lt_cv_ld_force_load" = "yes"; then |
326 | 9706 | whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' | 9770 | whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' |
327 | 9771 | |||
328 | 9707 | else | 9772 | else |
329 | 9708 | whole_archive_flag_spec='' | 9773 | whole_archive_flag_spec='' |
330 | 9709 | fi | 9774 | fi |
331 | @@ -9732,10 +9797,6 @@ | |||
332 | 9732 | hardcode_shlibpath_var=no | 9797 | hardcode_shlibpath_var=no |
333 | 9733 | ;; | 9798 | ;; |
334 | 9734 | 9799 | ||
335 | 9735 | freebsd1*) | ||
336 | 9736 | ld_shlibs=no | ||
337 | 9737 | ;; | ||
338 | 9738 | |||
339 | 9739 | # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor | 9800 | # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor |
340 | 9740 | # support. Future versions do this automatically, but an explicit c++rt0.o | 9801 | # support. Future versions do this automatically, but an explicit c++rt0.o |
341 | 9741 | # does not break anything, and helps significantly (at the cost of a little | 9802 | # does not break anything, and helps significantly (at the cost of a little |
342 | @@ -9748,7 +9809,7 @@ | |||
343 | 9748 | ;; | 9809 | ;; |
344 | 9749 | 9810 | ||
345 | 9750 | # Unfortunately, older versions of FreeBSD 2 do not have this feature. | 9811 | # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
347 | 9751 | freebsd2*) | 9812 | freebsd2.*) |
348 | 9752 | archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' | 9813 | archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
349 | 9753 | hardcode_direct=yes | 9814 | hardcode_direct=yes |
350 | 9754 | hardcode_minus_L=yes | 9815 | hardcode_minus_L=yes |
351 | @@ -9787,7 +9848,6 @@ | |||
352 | 9787 | fi | 9848 | fi |
353 | 9788 | if test "$with_gnu_ld" = no; then | 9849 | if test "$with_gnu_ld" = no; then |
354 | 9789 | hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' | 9850 | hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' |
355 | 9790 | hardcode_libdir_flag_spec_ld='+b $libdir' | ||
356 | 9791 | hardcode_libdir_separator=: | 9851 | hardcode_libdir_separator=: |
357 | 9792 | hardcode_direct=yes | 9852 | hardcode_direct=yes |
358 | 9793 | hardcode_direct_absolute=yes | 9853 | hardcode_direct_absolute=yes |
359 | @@ -10411,11 +10471,6 @@ | |||
360 | 10411 | 10471 | ||
361 | 10412 | 10472 | ||
362 | 10413 | 10473 | ||
363 | 10414 | |||
364 | 10415 | |||
365 | 10416 | |||
366 | 10417 | |||
367 | 10418 | |||
368 | 10419 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 | 10474 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 |
369 | 10420 | $as_echo_n "checking dynamic linker characteristics... " >&6; } | 10475 | $as_echo_n "checking dynamic linker characteristics... " >&6; } |
370 | 10421 | 10476 | ||
371 | @@ -10505,7 +10560,7 @@ | |||
372 | 10505 | 10560 | ||
373 | 10506 | case $host_os in | 10561 | case $host_os in |
374 | 10507 | aix3*) | 10562 | aix3*) |
376 | 10508 | version_type=linux | 10563 | version_type=linux # correct to gnu/linux during the next big refactor |
377 | 10509 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' | 10564 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' |
378 | 10510 | shlibpath_var=LIBPATH | 10565 | shlibpath_var=LIBPATH |
379 | 10511 | 10566 | ||
380 | @@ -10514,7 +10569,7 @@ | |||
381 | 10514 | ;; | 10569 | ;; |
382 | 10515 | 10570 | ||
383 | 10516 | aix[4-9]*) | 10571 | aix[4-9]*) |
385 | 10517 | version_type=linux | 10572 | version_type=linux # correct to gnu/linux during the next big refactor |
386 | 10518 | need_lib_prefix=no | 10573 | need_lib_prefix=no |
387 | 10519 | need_version=no | 10574 | need_version=no |
388 | 10520 | hardcode_into_libs=yes | 10575 | hardcode_into_libs=yes |
389 | @@ -10579,7 +10634,7 @@ | |||
390 | 10579 | ;; | 10634 | ;; |
391 | 10580 | 10635 | ||
392 | 10581 | bsdi[45]*) | 10636 | bsdi[45]*) |
394 | 10582 | version_type=linux | 10637 | version_type=linux # correct to gnu/linux during the next big refactor |
395 | 10583 | need_version=no | 10638 | need_version=no |
396 | 10584 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 10639 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
397 | 10585 | soname_spec='${libname}${release}${shared_ext}$major' | 10640 | soname_spec='${libname}${release}${shared_ext}$major' |
398 | @@ -10718,7 +10773,7 @@ | |||
399 | 10718 | ;; | 10773 | ;; |
400 | 10719 | 10774 | ||
401 | 10720 | dgux*) | 10775 | dgux*) |
403 | 10721 | version_type=linux | 10776 | version_type=linux # correct to gnu/linux during the next big refactor |
404 | 10722 | need_lib_prefix=no | 10777 | need_lib_prefix=no |
405 | 10723 | need_version=no | 10778 | need_version=no |
406 | 10724 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' | 10779 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' |
407 | @@ -10726,10 +10781,6 @@ | |||
408 | 10726 | shlibpath_var=LD_LIBRARY_PATH | 10781 | shlibpath_var=LD_LIBRARY_PATH |
409 | 10727 | ;; | 10782 | ;; |
410 | 10728 | 10783 | ||
411 | 10729 | freebsd1*) | ||
412 | 10730 | dynamic_linker=no | ||
413 | 10731 | ;; | ||
414 | 10732 | |||
415 | 10733 | freebsd* | dragonfly*) | 10784 | freebsd* | dragonfly*) |
416 | 10734 | # DragonFly does not have aout. When/if they implement a new | 10785 | # DragonFly does not have aout. When/if they implement a new |
417 | 10735 | # versioning mechanism, adjust this. | 10786 | # versioning mechanism, adjust this. |
418 | @@ -10737,7 +10788,7 @@ | |||
419 | 10737 | objformat=`/usr/bin/objformat` | 10788 | objformat=`/usr/bin/objformat` |
420 | 10738 | else | 10789 | else |
421 | 10739 | case $host_os in | 10790 | case $host_os in |
423 | 10740 | freebsd[123]*) objformat=aout ;; | 10791 | freebsd[23].*) objformat=aout ;; |
424 | 10741 | *) objformat=elf ;; | 10792 | *) objformat=elf ;; |
425 | 10742 | esac | 10793 | esac |
426 | 10743 | fi | 10794 | fi |
427 | @@ -10755,7 +10806,7 @@ | |||
428 | 10755 | esac | 10806 | esac |
429 | 10756 | shlibpath_var=LD_LIBRARY_PATH | 10807 | shlibpath_var=LD_LIBRARY_PATH |
430 | 10757 | case $host_os in | 10808 | case $host_os in |
432 | 10758 | freebsd2*) | 10809 | freebsd2.*) |
433 | 10759 | shlibpath_overrides_runpath=yes | 10810 | shlibpath_overrides_runpath=yes |
434 | 10760 | ;; | 10811 | ;; |
435 | 10761 | freebsd3.[01]* | freebsdelf3.[01]*) | 10812 | freebsd3.[01]* | freebsdelf3.[01]*) |
436 | @@ -10775,7 +10826,7 @@ | |||
437 | 10775 | ;; | 10826 | ;; |
438 | 10776 | 10827 | ||
439 | 10777 | gnu*) | 10828 | gnu*) |
441 | 10778 | version_type=linux | 10829 | version_type=linux # correct to gnu/linux during the next big refactor |
442 | 10779 | need_lib_prefix=no | 10830 | need_lib_prefix=no |
443 | 10780 | need_version=no | 10831 | need_version=no |
444 | 10781 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' | 10832 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
445 | @@ -10786,7 +10837,7 @@ | |||
446 | 10786 | ;; | 10837 | ;; |
447 | 10787 | 10838 | ||
448 | 10788 | haiku*) | 10839 | haiku*) |
450 | 10789 | version_type=linux | 10840 | version_type=linux # correct to gnu/linux during the next big refactor |
451 | 10790 | need_lib_prefix=no | 10841 | need_lib_prefix=no |
452 | 10791 | need_version=no | 10842 | need_version=no |
453 | 10792 | dynamic_linker="$host_os runtime_loader" | 10843 | dynamic_linker="$host_os runtime_loader" |
454 | @@ -10847,7 +10898,7 @@ | |||
455 | 10847 | ;; | 10898 | ;; |
456 | 10848 | 10899 | ||
457 | 10849 | interix[3-9]*) | 10900 | interix[3-9]*) |
459 | 10850 | version_type=linux | 10901 | version_type=linux # correct to gnu/linux during the next big refactor |
460 | 10851 | need_lib_prefix=no | 10902 | need_lib_prefix=no |
461 | 10852 | need_version=no | 10903 | need_version=no |
462 | 10853 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | 10904 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
463 | @@ -10863,7 +10914,7 @@ | |||
464 | 10863 | nonstopux*) version_type=nonstopux ;; | 10914 | nonstopux*) version_type=nonstopux ;; |
465 | 10864 | *) | 10915 | *) |
466 | 10865 | if test "$lt_cv_prog_gnu_ld" = yes; then | 10916 | if test "$lt_cv_prog_gnu_ld" = yes; then |
468 | 10866 | version_type=linux | 10917 | version_type=linux # correct to gnu/linux during the next big refactor |
469 | 10867 | else | 10918 | else |
470 | 10868 | version_type=irix | 10919 | version_type=irix |
471 | 10869 | fi ;; | 10920 | fi ;; |
472 | @@ -10900,9 +10951,9 @@ | |||
473 | 10900 | dynamic_linker=no | 10951 | dynamic_linker=no |
474 | 10901 | ;; | 10952 | ;; |
475 | 10902 | 10953 | ||
477 | 10903 | # This must be Linux ELF. | 10954 | # This must be glibc/ELF. |
478 | 10904 | linux* | k*bsd*-gnu | kopensolaris*-gnu) | 10955 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
480 | 10905 | version_type=linux | 10956 | version_type=linux # correct to gnu/linux during the next big refactor |
481 | 10906 | need_lib_prefix=no | 10957 | need_lib_prefix=no |
482 | 10907 | need_version=no | 10958 | need_version=no |
483 | 10908 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 10959 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
484 | @@ -10996,7 +11047,7 @@ | |||
485 | 10996 | ;; | 11047 | ;; |
486 | 10997 | 11048 | ||
487 | 10998 | newsos6) | 11049 | newsos6) |
489 | 10999 | version_type=linux | 11050 | version_type=linux # correct to gnu/linux during the next big refactor |
490 | 11000 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 11051 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
491 | 11001 | shlibpath_var=LD_LIBRARY_PATH | 11052 | shlibpath_var=LD_LIBRARY_PATH |
492 | 11002 | shlibpath_overrides_runpath=yes | 11053 | shlibpath_overrides_runpath=yes |
493 | @@ -11065,7 +11116,7 @@ | |||
494 | 11065 | ;; | 11116 | ;; |
495 | 11066 | 11117 | ||
496 | 11067 | solaris*) | 11118 | solaris*) |
498 | 11068 | version_type=linux | 11119 | version_type=linux # correct to gnu/linux during the next big refactor |
499 | 11069 | need_lib_prefix=no | 11120 | need_lib_prefix=no |
500 | 11070 | need_version=no | 11121 | need_version=no |
501 | 11071 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 11122 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
502 | @@ -11090,7 +11141,7 @@ | |||
503 | 11090 | ;; | 11141 | ;; |
504 | 11091 | 11142 | ||
505 | 11092 | sysv4 | sysv4.3*) | 11143 | sysv4 | sysv4.3*) |
507 | 11093 | version_type=linux | 11144 | version_type=linux # correct to gnu/linux during the next big refactor |
508 | 11094 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 11145 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
509 | 11095 | soname_spec='${libname}${release}${shared_ext}$major' | 11146 | soname_spec='${libname}${release}${shared_ext}$major' |
510 | 11096 | shlibpath_var=LD_LIBRARY_PATH | 11147 | shlibpath_var=LD_LIBRARY_PATH |
511 | @@ -11114,7 +11165,7 @@ | |||
512 | 11114 | 11165 | ||
513 | 11115 | sysv4*MP*) | 11166 | sysv4*MP*) |
514 | 11116 | if test -d /usr/nec ;then | 11167 | if test -d /usr/nec ;then |
516 | 11117 | version_type=linux | 11168 | version_type=linux # correct to gnu/linux during the next big refactor |
517 | 11118 | library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' | 11169 | library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' |
518 | 11119 | soname_spec='$libname${shared_ext}.$major' | 11170 | soname_spec='$libname${shared_ext}.$major' |
519 | 11120 | shlibpath_var=LD_LIBRARY_PATH | 11171 | shlibpath_var=LD_LIBRARY_PATH |
520 | @@ -11145,7 +11196,7 @@ | |||
521 | 11145 | 11196 | ||
522 | 11146 | tpf*) | 11197 | tpf*) |
523 | 11147 | # TPF is a cross-target only. Preferred cross-host = GNU/Linux. | 11198 | # TPF is a cross-target only. Preferred cross-host = GNU/Linux. |
525 | 11148 | version_type=linux | 11199 | version_type=linux # correct to gnu/linux during the next big refactor |
526 | 11149 | need_lib_prefix=no | 11200 | need_lib_prefix=no |
527 | 11150 | need_version=no | 11201 | need_version=no |
528 | 11151 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 11202 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
529 | @@ -11155,7 +11206,7 @@ | |||
530 | 11155 | ;; | 11206 | ;; |
531 | 11156 | 11207 | ||
532 | 11157 | uts4*) | 11208 | uts4*) |
534 | 11158 | version_type=linux | 11209 | version_type=linux # correct to gnu/linux during the next big refactor |
535 | 11159 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 11210 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
536 | 11160 | soname_spec='${libname}${release}${shared_ext}$major' | 11211 | soname_spec='${libname}${release}${shared_ext}$major' |
537 | 11161 | shlibpath_var=LD_LIBRARY_PATH | 11212 | shlibpath_var=LD_LIBRARY_PATH |
538 | @@ -11937,6 +11988,8 @@ | |||
539 | 11937 | 11988 | ||
540 | 11938 | 11989 | ||
541 | 11939 | 11990 | ||
542 | 11991 | |||
543 | 11992 | |||
544 | 11940 | ac_config_commands="$ac_config_commands libtool" | 11993 | ac_config_commands="$ac_config_commands libtool" |
545 | 11941 | 11994 | ||
546 | 11942 | 11995 | ||
547 | @@ -14143,7 +14196,7 @@ | |||
548 | 14143 | # report actual input values of CONFIG_FILES etc. instead of their | 14196 | # report actual input values of CONFIG_FILES etc. instead of their |
549 | 14144 | # values after options handling. | 14197 | # values after options handling. |
550 | 14145 | ac_log=" | 14198 | ac_log=" |
552 | 14146 | This file was extended by ubuntuone-client-gnome $as_me 2.99.1, which was | 14199 | This file was extended by ubuntuone-client-gnome $as_me 2.99.2, which was |
553 | 14147 | generated by GNU Autoconf 2.68. Invocation command line was | 14200 | generated by GNU Autoconf 2.68. Invocation command line was |
554 | 14148 | 14201 | ||
555 | 14149 | CONFIG_FILES = $CONFIG_FILES | 14202 | CONFIG_FILES = $CONFIG_FILES |
556 | @@ -14209,7 +14262,7 @@ | |||
557 | 14209 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | 14262 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
558 | 14210 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" | 14263 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
559 | 14211 | ac_cs_version="\\ | 14264 | ac_cs_version="\\ |
561 | 14212 | ubuntuone-client-gnome config.status 2.99.1 | 14265 | ubuntuone-client-gnome config.status 2.99.2 |
562 | 14213 | configured by $0, generated by GNU Autoconf 2.68, | 14266 | configured by $0, generated by GNU Autoconf 2.68, |
563 | 14214 | with options \\"\$ac_cs_config\\" | 14267 | with options \\"\$ac_cs_config\\" |
564 | 14215 | 14268 | ||
565 | @@ -14346,6 +14399,7 @@ | |||
566 | 14346 | enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' | 14399 | enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' |
567 | 14347 | SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' | 14400 | SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' |
568 | 14348 | ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' | 14401 | ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' |
569 | 14402 | PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' | ||
570 | 14349 | host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' | 14403 | host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' |
571 | 14350 | host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' | 14404 | host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' |
572 | 14351 | host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' | 14405 | host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' |
573 | @@ -14428,7 +14482,6 @@ | |||
574 | 14428 | allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' | 14482 | allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' |
575 | 14429 | no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' | 14483 | no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' |
576 | 14430 | hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' | 14484 | hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' |
577 | 14431 | hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' | ||
578 | 14432 | hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' | 14485 | hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' |
579 | 14433 | hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' | 14486 | hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' |
580 | 14434 | hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' | 14487 | hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' |
581 | @@ -14484,6 +14537,7 @@ | |||
582 | 14484 | # Quote evaled strings. | 14537 | # Quote evaled strings. |
583 | 14485 | for var in SHELL \ | 14538 | for var in SHELL \ |
584 | 14486 | ECHO \ | 14539 | ECHO \ |
585 | 14540 | PATH_SEPARATOR \ | ||
586 | 14487 | SED \ | 14541 | SED \ |
587 | 14488 | GREP \ | 14542 | GREP \ |
588 | 14489 | EGREP \ | 14543 | EGREP \ |
589 | @@ -14534,7 +14588,6 @@ | |||
590 | 14534 | allow_undefined_flag \ | 14588 | allow_undefined_flag \ |
591 | 14535 | no_undefined_flag \ | 14589 | no_undefined_flag \ |
592 | 14536 | hardcode_libdir_flag_spec \ | 14590 | hardcode_libdir_flag_spec \ |
593 | 14537 | hardcode_libdir_flag_spec_ld \ | ||
594 | 14538 | hardcode_libdir_separator \ | 14591 | hardcode_libdir_separator \ |
595 | 14539 | exclude_expsyms \ | 14592 | exclude_expsyms \ |
596 | 14540 | include_expsyms \ | 14593 | include_expsyms \ |
597 | @@ -15334,8 +15387,8 @@ | |||
598 | 15334 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 15387 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
599 | 15335 | # | 15388 | # |
600 | 15336 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 15389 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
603 | 15337 | # 2006, 2007, 2008, 2009, 2010 Free Software Foundation, | 15390 | # 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
604 | 15338 | # Inc. | 15391 | # Foundation, Inc. |
605 | 15339 | # Written by Gordon Matzigkeit, 1996 | 15392 | # Written by Gordon Matzigkeit, 1996 |
606 | 15340 | # | 15393 | # |
607 | 15341 | # This file is part of GNU Libtool. | 15394 | # This file is part of GNU Libtool. |
608 | @@ -15389,6 +15442,9 @@ | |||
609 | 15389 | # An echo program that protects backslashes. | 15442 | # An echo program that protects backslashes. |
610 | 15390 | ECHO=$lt_ECHO | 15443 | ECHO=$lt_ECHO |
611 | 15391 | 15444 | ||
612 | 15445 | # The PATH separator for the build system. | ||
613 | 15446 | PATH_SEPARATOR=$lt_PATH_SEPARATOR | ||
614 | 15447 | |||
615 | 15392 | # The host system. | 15448 | # The host system. |
616 | 15393 | host_alias=$host_alias | 15449 | host_alias=$host_alias |
617 | 15394 | host=$host | 15450 | host=$host |
618 | @@ -15690,10 +15746,6 @@ | |||
619 | 15690 | # This must work even if \$libdir does not exist | 15746 | # This must work even if \$libdir does not exist |
620 | 15691 | hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec | 15747 | hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec |
621 | 15692 | 15748 | ||
622 | 15693 | # If ld is used when linking, flag to hardcode \$libdir into a binary | ||
623 | 15694 | # during linking. This must work even if \$libdir does not exist. | ||
624 | 15695 | hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld | ||
625 | 15696 | |||
626 | 15697 | # Whether we need a single "-rpath" flag with a separated argument. | 15749 | # Whether we need a single "-rpath" flag with a separated argument. |
627 | 15698 | hardcode_libdir_separator=$lt_hardcode_libdir_separator | 15750 | hardcode_libdir_separator=$lt_hardcode_libdir_separator |
628 | 15699 | 15751 | ||
629 | 15700 | 15752 | ||
630 | === modified file 'configure.ac' | |||
631 | --- configure.ac 2012-01-04 13:23:49 +0000 | |||
632 | +++ configure.ac 2012-01-17 23:06:35 +0000 | |||
633 | @@ -1,7 +1,7 @@ | |||
634 | 1 | dnl Process this file with autoconf to produce a configure script. | 1 | dnl Process this file with autoconf to produce a configure script. |
635 | 2 | AC_PREREQ(2.53) | 2 | AC_PREREQ(2.53) |
636 | 3 | 3 | ||
638 | 4 | AC_INIT([ubuntuone-client-gnome], [2.99.1]) | 4 | AC_INIT([ubuntuone-client-gnome], [2.99.2]) |
639 | 5 | AC_CONFIG_SRCDIR([config.h.in]) | 5 | AC_CONFIG_SRCDIR([config.h.in]) |
640 | 6 | 6 | ||
641 | 7 | AM_INIT_AUTOMAKE([1.10 foreign]) | 7 | AM_INIT_AUTOMAKE([1.10 foreign]) |
642 | 8 | 8 | ||
643 | === modified file 'debian/changelog' | |||
644 | --- debian/changelog 2012-01-12 12:31:05 +0000 | |||
645 | +++ debian/changelog 2012-01-17 23:06:35 +0000 | |||
646 | @@ -1,3 +1,9 @@ | |||
647 | 1 | ubuntuone-client-gnome (2.99.2-0ubuntu1) precise; urgency=low | ||
648 | 2 | |||
649 | 3 | * New upstream release. | ||
650 | 4 | |||
651 | 5 | -- Rodney Dawes <rodney.dawes@ubuntu.com> Tue, 17 Jan 2012 14:21:06 -0500 | ||
652 | 6 | |||
653 | 1 | ubuntuone-client-gnome (2.99.1-0ubuntu2) precise; urgency=low | 7 | ubuntuone-client-gnome (2.99.1-0ubuntu2) precise; urgency=low |
654 | 2 | 8 | ||
655 | 3 | * Rebuild for latest evolution-data-server | 9 | * Rebuild for latest evolution-data-server |
656 | 4 | 10 | ||
657 | === modified file 'ltmain.sh' (properties changed: +x to -x) | |||
658 | --- ltmain.sh 2011-12-21 00:31:37 +0000 | |||
659 | +++ ltmain.sh 2012-01-17 23:06:35 +0000 | |||
660 | @@ -1,9 +1,9 @@ | |||
661 | 1 | 1 | ||
663 | 2 | # libtool (GNU libtool) 2.4 | 2 | # libtool (GNU libtool) 2.4.2 |
664 | 3 | # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 | 3 | # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 |
665 | 4 | 4 | ||
666 | 5 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, | 5 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, |
668 | 6 | # 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 6 | # 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
669 | 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 |
670 | 8 | # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 8 | # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
671 | 9 | 9 | ||
672 | @@ -41,6 +41,7 @@ | |||
673 | 41 | # --quiet, --silent don't print informational messages | 41 | # --quiet, --silent don't print informational messages |
674 | 42 | # --no-quiet, --no-silent | 42 | # --no-quiet, --no-silent |
675 | 43 | # print informational messages (default) | 43 | # print informational messages (default) |
676 | 44 | # --no-warn don't display warning messages | ||
677 | 44 | # --tag=TAG use configuration variables from tag TAG | 45 | # --tag=TAG use configuration variables from tag TAG |
678 | 45 | # -v, --verbose print more informational messages than default | 46 | # -v, --verbose print more informational messages than default |
679 | 46 | # --no-verbose don't print the extra informational messages | 47 | # --no-verbose don't print the extra informational messages |
680 | @@ -69,7 +70,7 @@ | |||
681 | 69 | # compiler: $LTCC | 70 | # compiler: $LTCC |
682 | 70 | # compiler flags: $LTCFLAGS | 71 | # compiler flags: $LTCFLAGS |
683 | 71 | # linker: $LD (gnu? $with_gnu_ld) | 72 | # linker: $LD (gnu? $with_gnu_ld) |
685 | 72 | # $progname: (GNU libtool) 2.4 Debian-2.4-2ubuntu1 | 73 | # $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1 |
686 | 73 | # automake: $automake_version | 74 | # automake: $automake_version |
687 | 74 | # autoconf: $autoconf_version | 75 | # autoconf: $autoconf_version |
688 | 75 | # | 76 | # |
689 | @@ -79,9 +80,9 @@ | |||
690 | 79 | 80 | ||
691 | 80 | PROGRAM=libtool | 81 | PROGRAM=libtool |
692 | 81 | PACKAGE=libtool | 82 | PACKAGE=libtool |
694 | 82 | VERSION="2.4 Debian-2.4-2ubuntu1" | 83 | VERSION="2.4.2 Debian-2.4.2-1ubuntu1" |
695 | 83 | TIMESTAMP="" | 84 | TIMESTAMP="" |
697 | 84 | package_revision=1.3293 | 85 | package_revision=1.3337 |
698 | 85 | 86 | ||
699 | 86 | # Be Bourne compatible | 87 | # Be Bourne compatible |
700 | 87 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | 88 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then |
701 | @@ -136,15 +137,10 @@ | |||
702 | 136 | 137 | ||
703 | 137 | : ${CP="cp -f"} | 138 | : ${CP="cp -f"} |
704 | 138 | test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} | 139 | test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} |
705 | 139 | : ${EGREP="/bin/grep -E"} | ||
706 | 140 | : ${FGREP="/bin/grep -F"} | ||
707 | 141 | : ${GREP="/bin/grep"} | ||
708 | 142 | : ${LN_S="ln -s"} | ||
709 | 143 | : ${MAKE="make"} | 140 | : ${MAKE="make"} |
710 | 144 | : ${MKDIR="mkdir"} | 141 | : ${MKDIR="mkdir"} |
711 | 145 | : ${MV="mv -f"} | 142 | : ${MV="mv -f"} |
712 | 146 | : ${RM="rm -f"} | 143 | : ${RM="rm -f"} |
713 | 147 | : ${SED="/bin/sed"} | ||
714 | 148 | : ${SHELL="${CONFIG_SHELL-/bin/sh}"} | 144 | : ${SHELL="${CONFIG_SHELL-/bin/sh}"} |
715 | 149 | : ${Xsed="$SED -e 1s/^X//"} | 145 | : ${Xsed="$SED -e 1s/^X//"} |
716 | 150 | 146 | ||
717 | @@ -387,7 +383,7 @@ | |||
718 | 387 | ;; | 383 | ;; |
719 | 388 | *) | 384 | *) |
720 | 389 | save_IFS="$IFS" | 385 | save_IFS="$IFS" |
722 | 390 | IFS=: | 386 | IFS=${PATH_SEPARATOR-:} |
723 | 391 | for progdir in $PATH; do | 387 | for progdir in $PATH; do |
724 | 392 | IFS="$save_IFS" | 388 | IFS="$save_IFS" |
725 | 393 | test -x "$progdir/$progname" && break | 389 | test -x "$progdir/$progname" && break |
726 | @@ -771,8 +767,8 @@ | |||
727 | 771 | s*\$LTCFLAGS*'"$LTCFLAGS"'* | 767 | s*\$LTCFLAGS*'"$LTCFLAGS"'* |
728 | 772 | s*\$LD*'"$LD"'* | 768 | s*\$LD*'"$LD"'* |
729 | 773 | s/\$with_gnu_ld/'"$with_gnu_ld"'/ | 769 | s/\$with_gnu_ld/'"$with_gnu_ld"'/ |
732 | 774 | s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ | 770 | s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ |
733 | 775 | s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ | 771 | s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ |
734 | 776 | p | 772 | p |
735 | 777 | d | 773 | d |
736 | 778 | } | 774 | } |
737 | @@ -1052,6 +1048,7 @@ | |||
738 | 1052 | opt_help=false | 1048 | opt_help=false |
739 | 1053 | opt_help_all=false | 1049 | opt_help_all=false |
740 | 1054 | opt_silent=: | 1050 | opt_silent=: |
741 | 1051 | opt_warning=: | ||
742 | 1055 | opt_verbose=: | 1052 | opt_verbose=: |
743 | 1056 | opt_silent=false | 1053 | opt_silent=false |
744 | 1057 | opt_verbose=false | 1054 | opt_verbose=false |
745 | @@ -1120,6 +1117,10 @@ | |||
746 | 1120 | opt_silent=false | 1117 | opt_silent=false |
747 | 1121 | func_append preserve_args " $opt" | 1118 | func_append preserve_args " $opt" |
748 | 1122 | ;; | 1119 | ;; |
749 | 1120 | --no-warning|--no-warn) | ||
750 | 1121 | opt_warning=false | ||
751 | 1122 | func_append preserve_args " $opt" | ||
752 | 1123 | ;; | ||
753 | 1123 | --no-verbose) | 1124 | --no-verbose) |
754 | 1124 | opt_verbose=false | 1125 | opt_verbose=false |
755 | 1125 | func_append preserve_args " $opt" | 1126 | func_append preserve_args " $opt" |
756 | @@ -2059,7 +2060,7 @@ | |||
757 | 2059 | *.[cCFSifmso] | \ | 2060 | *.[cCFSifmso] | \ |
758 | 2060 | *.ada | *.adb | *.ads | *.asm | \ | 2061 | *.ada | *.adb | *.ads | *.asm | \ |
759 | 2061 | *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ | 2062 | *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ |
761 | 2062 | *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) | 2063 | *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) |
762 | 2063 | func_xform "$libobj" | 2064 | func_xform "$libobj" |
763 | 2064 | libobj=$func_xform_result | 2065 | libobj=$func_xform_result |
764 | 2065 | ;; | 2066 | ;; |
765 | @@ -3201,11 +3202,13 @@ | |||
766 | 3201 | 3202 | ||
767 | 3202 | # Set up the ranlib parameters. | 3203 | # Set up the ranlib parameters. |
768 | 3203 | oldlib="$destdir/$name" | 3204 | oldlib="$destdir/$name" |
769 | 3205 | func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 | ||
770 | 3206 | tool_oldlib=$func_to_tool_file_result | ||
771 | 3204 | 3207 | ||
772 | 3205 | func_show_eval "$install_prog \$file \$oldlib" 'exit $?' | 3208 | func_show_eval "$install_prog \$file \$oldlib" 'exit $?' |
773 | 3206 | 3209 | ||
774 | 3207 | if test -n "$stripme" && test -n "$old_striplib"; then | 3210 | if test -n "$stripme" && test -n "$old_striplib"; then |
776 | 3208 | func_show_eval "$old_striplib $oldlib" 'exit $?' | 3211 | func_show_eval "$old_striplib $tool_oldlib" 'exit $?' |
777 | 3209 | fi | 3212 | fi |
778 | 3210 | 3213 | ||
779 | 3211 | # Do each command in the postinstall commands. | 3214 | # Do each command in the postinstall commands. |
780 | @@ -3470,7 +3473,7 @@ | |||
781 | 3470 | # linked before any other PIC object. But we must not use | 3473 | # linked before any other PIC object. But we must not use |
782 | 3471 | # pic_flag when linking with -static. The problem exists in | 3474 | # pic_flag when linking with -static. The problem exists in |
783 | 3472 | # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. | 3475 | # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. |
785 | 3473 | *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) | 3476 | *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) |
786 | 3474 | pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; | 3477 | pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; |
787 | 3475 | *-*-hpux*) | 3478 | *-*-hpux*) |
788 | 3476 | pic_flag_for_symtable=" $pic_flag" ;; | 3479 | pic_flag_for_symtable=" $pic_flag" ;; |
789 | @@ -3982,14 +3985,17 @@ | |||
790 | 3982 | # launches target application with the remaining arguments. | 3985 | # launches target application with the remaining arguments. |
791 | 3983 | func_exec_program () | 3986 | func_exec_program () |
792 | 3984 | { | 3987 | { |
801 | 3985 | for lt_wr_arg | 3988 | case \" \$* \" in |
802 | 3986 | do | 3989 | *\\ --lt-*) |
803 | 3987 | case \$lt_wr_arg in | 3990 | for lt_wr_arg |
804 | 3988 | --lt-*) ;; | 3991 | do |
805 | 3989 | *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; | 3992 | case \$lt_wr_arg in |
806 | 3990 | esac | 3993 | --lt-*) ;; |
807 | 3991 | shift | 3994 | *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; |
808 | 3992 | done | 3995 | esac |
809 | 3996 | shift | ||
810 | 3997 | done ;; | ||
811 | 3998 | esac | ||
812 | 3993 | func_exec_program_core \${1+\"\$@\"} | 3999 | func_exec_program_core \${1+\"\$@\"} |
813 | 3994 | } | 4000 | } |
814 | 3995 | 4001 | ||
815 | @@ -5057,9 +5063,15 @@ | |||
816 | 5057 | { | 5063 | { |
817 | 5058 | EOF | 5064 | EOF |
818 | 5059 | func_emit_wrapper yes | | 5065 | func_emit_wrapper yes | |
822 | 5060 | $SED -e 's/\([\\"]\)/\\\1/g' \ | 5066 | $SED -n -e ' |
823 | 5061 | -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' | 5067 | s/^\(.\{79\}\)\(..*\)/\1\ |
824 | 5062 | 5068 | \2/ | |
825 | 5069 | h | ||
826 | 5070 | s/\([\\"]\)/\\\1/g | ||
827 | 5071 | s/$/\\n/ | ||
828 | 5072 | s/\([^\n]*\).*/ fputs ("\1", f);/p | ||
829 | 5073 | g | ||
830 | 5074 | D' | ||
831 | 5063 | cat <<"EOF" | 5075 | cat <<"EOF" |
832 | 5064 | } | 5076 | } |
833 | 5065 | EOF | 5077 | EOF |
834 | @@ -5643,7 +5655,8 @@ | |||
835 | 5643 | continue | 5655 | continue |
836 | 5644 | ;; | 5656 | ;; |
837 | 5645 | 5657 | ||
839 | 5646 | -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) | 5658 | -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |
840 | 5659 | |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) | ||
841 | 5647 | func_append compiler_flags " $arg" | 5660 | func_append compiler_flags " $arg" |
842 | 5648 | func_append compile_command " $arg" | 5661 | func_append compile_command " $arg" |
843 | 5649 | func_append finalize_command " $arg" | 5662 | func_append finalize_command " $arg" |
844 | @@ -6150,7 +6163,8 @@ | |||
845 | 6150 | lib= | 6163 | lib= |
846 | 6151 | found=no | 6164 | found=no |
847 | 6152 | case $deplib in | 6165 | case $deplib in |
849 | 6153 | -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) | 6166 | -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |
850 | 6167 | |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) | ||
851 | 6154 | if test "$linkmode,$pass" = "prog,link"; then | 6168 | if test "$linkmode,$pass" = "prog,link"; then |
852 | 6155 | compile_deplibs="$deplib $compile_deplibs" | 6169 | compile_deplibs="$deplib $compile_deplibs" |
853 | 6156 | finalize_deplibs="$deplib $finalize_deplibs" | 6170 | finalize_deplibs="$deplib $finalize_deplibs" |
854 | @@ -6834,7 +6848,7 @@ | |||
855 | 6834 | test "$hardcode_direct_absolute" = no; then | 6848 | test "$hardcode_direct_absolute" = no; then |
856 | 6835 | add="$dir/$linklib" | 6849 | add="$dir/$linklib" |
857 | 6836 | elif test "$hardcode_minus_L" = yes; then | 6850 | elif test "$hardcode_minus_L" = yes; then |
859 | 6837 | add_dir="-L$dir" | 6851 | add_dir="-L$absdir" |
860 | 6838 | # Try looking first in the location we're being installed to. | 6852 | # Try looking first in the location we're being installed to. |
861 | 6839 | if test -n "$inst_prefix_dir"; then | 6853 | if test -n "$inst_prefix_dir"; then |
862 | 6840 | case $libdir in | 6854 | case $libdir in |
863 | @@ -7319,6 +7333,7 @@ | |||
864 | 7319 | # which has an extra 1 added just for fun | 7333 | # which has an extra 1 added just for fun |
865 | 7320 | # | 7334 | # |
866 | 7321 | case $version_type in | 7335 | case $version_type in |
867 | 7336 | # correct linux to gnu/linux during the next big refactor | ||
868 | 7322 | darwin|linux|osf|windows|none) | 7337 | darwin|linux|osf|windows|none) |
869 | 7323 | func_arith $number_major + $number_minor | 7338 | func_arith $number_major + $number_minor |
870 | 7324 | current=$func_arith_result | 7339 | current=$func_arith_result |
871 | @@ -7438,7 +7453,7 @@ | |||
872 | 7438 | versuffix="$major.$revision" | 7453 | versuffix="$major.$revision" |
873 | 7439 | ;; | 7454 | ;; |
874 | 7440 | 7455 | ||
876 | 7441 | linux) | 7456 | linux) # correct to gnu/linux during the next big refactor |
877 | 7442 | func_arith $current - $age | 7457 | func_arith $current - $age |
878 | 7443 | major=.$func_arith_result | 7458 | major=.$func_arith_result |
879 | 7444 | versuffix="$major.$age.$revision" | 7459 | versuffix="$major.$age.$revision" |
880 | @@ -8026,6 +8041,11 @@ | |||
881 | 8026 | 8041 | ||
882 | 8027 | # Test again, we may have decided not to build it any more | 8042 | # Test again, we may have decided not to build it any more |
883 | 8028 | if test "$build_libtool_libs" = yes; then | 8043 | if test "$build_libtool_libs" = yes; then |
884 | 8044 | # Remove ${wl} instances when linking with ld. | ||
885 | 8045 | # FIXME: should test the right _cmds variable. | ||
886 | 8046 | case $archive_cmds in | ||
887 | 8047 | *\$LD\ *) wl= ;; | ||
888 | 8048 | esac | ||
889 | 8029 | if test "$hardcode_into_libs" = yes; then | 8049 | if test "$hardcode_into_libs" = yes; then |
890 | 8030 | # Hardcode the library paths | 8050 | # Hardcode the library paths |
891 | 8031 | hardcode_libdirs= | 8051 | hardcode_libdirs= |
892 | @@ -8056,7 +8076,7 @@ | |||
893 | 8056 | elif test -n "$runpath_var"; then | 8076 | elif test -n "$runpath_var"; then |
894 | 8057 | case "$perm_rpath " in | 8077 | case "$perm_rpath " in |
895 | 8058 | *" $libdir "*) ;; | 8078 | *" $libdir "*) ;; |
897 | 8059 | *) func_apped perm_rpath " $libdir" ;; | 8079 | *) func_append perm_rpath " $libdir" ;; |
898 | 8060 | esac | 8080 | esac |
899 | 8061 | fi | 8081 | fi |
900 | 8062 | done | 8082 | done |
901 | @@ -8064,11 +8084,7 @@ | |||
902 | 8064 | if test -n "$hardcode_libdir_separator" && | 8084 | if test -n "$hardcode_libdir_separator" && |
903 | 8065 | test -n "$hardcode_libdirs"; then | 8085 | test -n "$hardcode_libdirs"; then |
904 | 8066 | libdir="$hardcode_libdirs" | 8086 | libdir="$hardcode_libdirs" |
910 | 8067 | if test -n "$hardcode_libdir_flag_spec_ld"; then | 8087 | eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" |
906 | 8068 | eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" | ||
907 | 8069 | else | ||
908 | 8070 | eval dep_rpath=\"$hardcode_libdir_flag_spec\" | ||
909 | 8071 | fi | ||
911 | 8072 | fi | 8088 | fi |
912 | 8073 | if test -n "$runpath_var" && test -n "$perm_rpath"; then | 8089 | if test -n "$runpath_var" && test -n "$perm_rpath"; then |
913 | 8074 | # We should set the runpath_var. | 8090 | # We should set the runpath_var. |
914 | @@ -9158,6 +9174,8 @@ | |||
915 | 9158 | esac | 9174 | esac |
916 | 9159 | done | 9175 | done |
917 | 9160 | fi | 9176 | fi |
918 | 9177 | func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 | ||
919 | 9178 | tool_oldlib=$func_to_tool_file_result | ||
920 | 9161 | eval cmds=\"$old_archive_cmds\" | 9179 | eval cmds=\"$old_archive_cmds\" |
921 | 9162 | 9180 | ||
922 | 9163 | func_len " $cmds" | 9181 | func_len " $cmds" |
923 | @@ -9267,7 +9285,8 @@ | |||
924 | 9267 | *.la) | 9285 | *.la) |
925 | 9268 | func_basename "$deplib" | 9286 | func_basename "$deplib" |
926 | 9269 | name="$func_basename_result" | 9287 | name="$func_basename_result" |
928 | 9270 | eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` | 9288 | func_resolve_sysroot "$deplib" |
929 | 9289 | eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` | ||
930 | 9271 | test -z "$libdir" && \ | 9290 | test -z "$libdir" && \ |
931 | 9272 | func_fatal_error "\`$deplib' is not a valid libtool archive" | 9291 | func_fatal_error "\`$deplib' is not a valid libtool archive" |
932 | 9273 | func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" | 9292 | func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" |
933 | 9274 | 9293 | ||
934 | === modified file 'm4/libtool.m4' | |||
935 | --- m4/libtool.m4 2011-12-21 00:31:37 +0000 | |||
936 | +++ m4/libtool.m4 2012-01-17 23:06:35 +0000 | |||
937 | @@ -1,8 +1,8 @@ | |||
938 | 1 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- | 1 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
939 | 2 | # | 2 | # |
940 | 3 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 3 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
943 | 4 | # 2006, 2007, 2008, 2009, 2010 Free Software Foundation, | 4 | # 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
944 | 5 | # Inc. | 5 | # Foundation, Inc. |
945 | 6 | # Written by Gordon Matzigkeit, 1996 | 6 | # Written by Gordon Matzigkeit, 1996 |
946 | 7 | # | 7 | # |
947 | 8 | # This file is free software; the Free Software Foundation gives | 8 | # This file is free software; the Free Software Foundation gives |
948 | @@ -11,8 +11,8 @@ | |||
949 | 11 | 11 | ||
950 | 12 | m4_define([_LT_COPYING], [dnl | 12 | m4_define([_LT_COPYING], [dnl |
951 | 13 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 13 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
954 | 14 | # 2006, 2007, 2008, 2009, 2010 Free Software Foundation, | 14 | # 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
955 | 15 | # Inc. | 15 | # Foundation, Inc. |
956 | 16 | # Written by Gordon Matzigkeit, 1996 | 16 | # Written by Gordon Matzigkeit, 1996 |
957 | 17 | # | 17 | # |
958 | 18 | # This file is part of GNU Libtool. | 18 | # This file is part of GNU Libtool. |
959 | @@ -146,6 +146,8 @@ | |||
960 | 146 | AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl | 146 | AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl |
961 | 147 | AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl | 147 | AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl |
962 | 148 | 148 | ||
963 | 149 | _LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl | ||
964 | 150 | dnl | ||
965 | 149 | _LT_DECL([], [host_alias], [0], [The host system])dnl | 151 | _LT_DECL([], [host_alias], [0], [The host system])dnl |
966 | 150 | _LT_DECL([], [host], [0])dnl | 152 | _LT_DECL([], [host], [0])dnl |
967 | 151 | _LT_DECL([], [host_os], [0])dnl | 153 | _LT_DECL([], [host_os], [0])dnl |
968 | @@ -637,7 +639,7 @@ | |||
969 | 637 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) | 639 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) |
970 | 638 | configured by $[0], generated by m4_PACKAGE_STRING. | 640 | configured by $[0], generated by m4_PACKAGE_STRING. |
971 | 639 | 641 | ||
973 | 640 | Copyright (C) 2010 Free Software Foundation, Inc. | 642 | Copyright (C) 2011 Free Software Foundation, Inc. |
974 | 641 | This config.lt script is free software; the Free Software Foundation | 643 | This config.lt script is free software; the Free Software Foundation |
975 | 642 | gives unlimited permision to copy, distribute and modify it." | 644 | gives unlimited permision to copy, distribute and modify it." |
976 | 643 | 645 | ||
977 | @@ -801,6 +803,7 @@ | |||
978 | 801 | m4_case([$1], | 803 | m4_case([$1], |
979 | 802 | [C], [_LT_LANG(C)], | 804 | [C], [_LT_LANG(C)], |
980 | 803 | [C++], [_LT_LANG(CXX)], | 805 | [C++], [_LT_LANG(CXX)], |
981 | 806 | [Go], [_LT_LANG(GO)], | ||
982 | 804 | [Java], [_LT_LANG(GCJ)], | 807 | [Java], [_LT_LANG(GCJ)], |
983 | 805 | [Fortran 77], [_LT_LANG(F77)], | 808 | [Fortran 77], [_LT_LANG(F77)], |
984 | 806 | [Fortran], [_LT_LANG(FC)], | 809 | [Fortran], [_LT_LANG(FC)], |
985 | @@ -822,6 +825,31 @@ | |||
986 | 822 | ])# _LT_LANG | 825 | ])# _LT_LANG |
987 | 823 | 826 | ||
988 | 824 | 827 | ||
989 | 828 | m4_ifndef([AC_PROG_GO], [ | ||
990 | 829 | ############################################################ | ||
991 | 830 | # NOTE: This macro has been submitted for inclusion into # | ||
992 | 831 | # GNU Autoconf as AC_PROG_GO. When it is available in # | ||
993 | 832 | # a released version of Autoconf we should remove this # | ||
994 | 833 | # macro and use it instead. # | ||
995 | 834 | ############################################################ | ||
996 | 835 | m4_defun([AC_PROG_GO], | ||
997 | 836 | [AC_LANG_PUSH(Go)dnl | ||
998 | 837 | AC_ARG_VAR([GOC], [Go compiler command])dnl | ||
999 | 838 | AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl | ||
1000 | 839 | _AC_ARG_VAR_LDFLAGS()dnl | ||
1001 | 840 | AC_CHECK_TOOL(GOC, gccgo) | ||
1002 | 841 | if test -z "$GOC"; then | ||
1003 | 842 | if test -n "$ac_tool_prefix"; then | ||
1004 | 843 | AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) | ||
1005 | 844 | fi | ||
1006 | 845 | fi | ||
1007 | 846 | if test -z "$GOC"; then | ||
1008 | 847 | AC_CHECK_PROG(GOC, gccgo, gccgo, false) | ||
1009 | 848 | fi | ||
1010 | 849 | ])#m4_defun | ||
1011 | 850 | ])#m4_ifndef | ||
1012 | 851 | |||
1013 | 852 | |||
1014 | 825 | # _LT_LANG_DEFAULT_CONFIG | 853 | # _LT_LANG_DEFAULT_CONFIG |
1015 | 826 | # ----------------------- | 854 | # ----------------------- |
1016 | 827 | m4_defun([_LT_LANG_DEFAULT_CONFIG], | 855 | m4_defun([_LT_LANG_DEFAULT_CONFIG], |
1017 | @@ -852,6 +880,10 @@ | |||
1018 | 852 | m4_ifdef([LT_PROG_GCJ], | 880 | m4_ifdef([LT_PROG_GCJ], |
1019 | 853 | [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) | 881 | [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) |
1020 | 854 | 882 | ||
1021 | 883 | AC_PROVIDE_IFELSE([AC_PROG_GO], | ||
1022 | 884 | [LT_LANG(GO)], | ||
1023 | 885 | [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) | ||
1024 | 886 | |||
1025 | 855 | AC_PROVIDE_IFELSE([LT_PROG_RC], | 887 | AC_PROVIDE_IFELSE([LT_PROG_RC], |
1026 | 856 | [LT_LANG(RC)], | 888 | [LT_LANG(RC)], |
1027 | 857 | [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) | 889 | [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) |
1028 | @@ -954,7 +986,13 @@ | |||
1029 | 954 | $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ | 986 | $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ |
1030 | 955 | -dynamiclib -Wl,-single_module conftest.c 2>conftest.err | 987 | -dynamiclib -Wl,-single_module conftest.c 2>conftest.err |
1031 | 956 | _lt_result=$? | 988 | _lt_result=$? |
1033 | 957 | if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then | 989 | # If there is a non-empty error log, and "single_module" |
1034 | 990 | # appears in it, assume the flag caused a linker warning | ||
1035 | 991 | if test -s conftest.err && $GREP single_module conftest.err; then | ||
1036 | 992 | cat conftest.err >&AS_MESSAGE_LOG_FD | ||
1037 | 993 | # Otherwise, if the output was created with a 0 exit code from | ||
1038 | 994 | # the compiler, it worked. | ||
1039 | 995 | elif test -f libconftest.dylib && test $_lt_result -eq 0; then | ||
1040 | 958 | lt_cv_apple_cc_single_mod=yes | 996 | lt_cv_apple_cc_single_mod=yes |
1041 | 959 | else | 997 | else |
1042 | 960 | cat conftest.err >&AS_MESSAGE_LOG_FD | 998 | cat conftest.err >&AS_MESSAGE_LOG_FD |
1043 | @@ -962,6 +1000,7 @@ | |||
1044 | 962 | rm -rf libconftest.dylib* | 1000 | rm -rf libconftest.dylib* |
1045 | 963 | rm -f conftest.* | 1001 | rm -f conftest.* |
1046 | 964 | fi]) | 1002 | fi]) |
1047 | 1003 | |||
1048 | 965 | AC_CACHE_CHECK([for -exported_symbols_list linker flag], | 1004 | AC_CACHE_CHECK([for -exported_symbols_list linker flag], |
1049 | 966 | [lt_cv_ld_exported_symbols_list], | 1005 | [lt_cv_ld_exported_symbols_list], |
1050 | 967 | [lt_cv_ld_exported_symbols_list=no | 1006 | [lt_cv_ld_exported_symbols_list=no |
1051 | @@ -973,6 +1012,7 @@ | |||
1052 | 973 | [lt_cv_ld_exported_symbols_list=no]) | 1012 | [lt_cv_ld_exported_symbols_list=no]) |
1053 | 974 | LDFLAGS="$save_LDFLAGS" | 1013 | LDFLAGS="$save_LDFLAGS" |
1054 | 975 | ]) | 1014 | ]) |
1055 | 1015 | |||
1056 | 976 | AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], | 1016 | AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], |
1057 | 977 | [lt_cv_ld_force_load=no | 1017 | [lt_cv_ld_force_load=no |
1058 | 978 | cat > conftest.c << _LT_EOF | 1018 | cat > conftest.c << _LT_EOF |
1059 | @@ -990,7 +1030,9 @@ | |||
1060 | 990 | echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD | 1030 | echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD |
1061 | 991 | $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err | 1031 | $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err |
1062 | 992 | _lt_result=$? | 1032 | _lt_result=$? |
1064 | 993 | if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then | 1033 | if test -s conftest.err && $GREP force_load conftest.err; then |
1065 | 1034 | cat conftest.err >&AS_MESSAGE_LOG_FD | ||
1066 | 1035 | elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then | ||
1067 | 994 | lt_cv_ld_force_load=yes | 1036 | lt_cv_ld_force_load=yes |
1068 | 995 | else | 1037 | else |
1069 | 996 | cat conftest.err >&AS_MESSAGE_LOG_FD | 1038 | cat conftest.err >&AS_MESSAGE_LOG_FD |
1070 | @@ -1035,8 +1077,8 @@ | |||
1071 | 1035 | ]) | 1077 | ]) |
1072 | 1036 | 1078 | ||
1073 | 1037 | 1079 | ||
1076 | 1038 | # _LT_DARWIN_LINKER_FEATURES | 1080 | # _LT_DARWIN_LINKER_FEATURES([TAG]) |
1077 | 1039 | # -------------------------- | 1081 | # --------------------------------- |
1078 | 1040 | # Checks for linker and compiler features on darwin | 1082 | # Checks for linker and compiler features on darwin |
1079 | 1041 | m4_defun([_LT_DARWIN_LINKER_FEATURES], | 1083 | m4_defun([_LT_DARWIN_LINKER_FEATURES], |
1080 | 1042 | [ | 1084 | [ |
1081 | @@ -1047,6 +1089,8 @@ | |||
1082 | 1047 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported | 1089 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
1083 | 1048 | if test "$lt_cv_ld_force_load" = "yes"; then | 1090 | if test "$lt_cv_ld_force_load" = "yes"; then |
1084 | 1049 | _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\"`' | 1091 | _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\"`' |
1085 | 1092 | m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], | ||
1086 | 1093 | [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) | ||
1087 | 1050 | else | 1094 | else |
1088 | 1051 | _LT_TAGVAR(whole_archive_flag_spec, $1)='' | 1095 | _LT_TAGVAR(whole_archive_flag_spec, $1)='' |
1089 | 1052 | fi | 1096 | fi |
1090 | @@ -1330,14 +1374,27 @@ | |||
1091 | 1330 | CFLAGS="$SAVE_CFLAGS" | 1374 | CFLAGS="$SAVE_CFLAGS" |
1092 | 1331 | fi | 1375 | fi |
1093 | 1332 | ;; | 1376 | ;; |
1095 | 1333 | sparc*-*solaris*) | 1377 | *-*solaris*) |
1096 | 1334 | # Find out which ABI we are using. | 1378 | # Find out which ABI we are using. |
1097 | 1335 | echo 'int i;' > conftest.$ac_ext | 1379 | echo 'int i;' > conftest.$ac_ext |
1098 | 1336 | if AC_TRY_EVAL(ac_compile); then | 1380 | if AC_TRY_EVAL(ac_compile); then |
1099 | 1337 | case `/usr/bin/file conftest.o` in | 1381 | case `/usr/bin/file conftest.o` in |
1100 | 1338 | *64-bit*) | 1382 | *64-bit*) |
1101 | 1339 | case $lt_cv_prog_gnu_ld in | 1383 | case $lt_cv_prog_gnu_ld in |
1103 | 1340 | yes*) LD="${LD-ld} -m elf64_sparc" ;; | 1384 | yes*) |
1104 | 1385 | case $host in | ||
1105 | 1386 | i?86-*-solaris*) | ||
1106 | 1387 | LD="${LD-ld} -m elf_x86_64" | ||
1107 | 1388 | ;; | ||
1108 | 1389 | sparc*-*-solaris*) | ||
1109 | 1390 | LD="${LD-ld} -m elf64_sparc" | ||
1110 | 1391 | ;; | ||
1111 | 1392 | esac | ||
1112 | 1393 | # GNU ld 2.21 introduced _sol2 emulations. Use them if available. | ||
1113 | 1394 | if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then | ||
1114 | 1395 | LD="${LD-ld}_sol2" | ||
1115 | 1396 | fi | ||
1116 | 1397 | ;; | ||
1117 | 1341 | *) | 1398 | *) |
1118 | 1342 | if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then | 1399 | if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then |
1119 | 1343 | LD="${LD-ld} -64" | 1400 | LD="${LD-ld} -64" |
1120 | @@ -1414,13 +1471,13 @@ | |||
1121 | 1414 | if test -n "$RANLIB"; then | 1471 | if test -n "$RANLIB"; then |
1122 | 1415 | case $host_os in | 1472 | case $host_os in |
1123 | 1416 | openbsd*) | 1473 | openbsd*) |
1125 | 1417 | old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" | 1474 | old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" |
1126 | 1418 | ;; | 1475 | ;; |
1127 | 1419 | *) | 1476 | *) |
1129 | 1420 | old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" | 1477 | old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" |
1130 | 1421 | ;; | 1478 | ;; |
1131 | 1422 | esac | 1479 | esac |
1133 | 1423 | old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" | 1480 | old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" |
1134 | 1424 | fi | 1481 | fi |
1135 | 1425 | 1482 | ||
1136 | 1426 | case $host_os in | 1483 | case $host_os in |
1137 | @@ -1600,6 +1657,11 @@ | |||
1138 | 1600 | lt_cv_sys_max_cmd_len=196608 | 1657 | lt_cv_sys_max_cmd_len=196608 |
1139 | 1601 | ;; | 1658 | ;; |
1140 | 1602 | 1659 | ||
1141 | 1660 | os2*) | ||
1142 | 1661 | # The test takes a long time on OS/2. | ||
1143 | 1662 | lt_cv_sys_max_cmd_len=8192 | ||
1144 | 1663 | ;; | ||
1145 | 1664 | |||
1146 | 1603 | osf*) | 1665 | osf*) |
1147 | 1604 | # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure | 1666 | # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure |
1148 | 1605 | # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not | 1667 | # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not |
1149 | @@ -1639,7 +1701,7 @@ | |||
1150 | 1639 | # If test is not a shell built-in, we'll probably end up computing a | 1701 | # If test is not a shell built-in, we'll probably end up computing a |
1151 | 1640 | # maximum length that is only half of the actual maximum length, but | 1702 | # maximum length that is only half of the actual maximum length, but |
1152 | 1641 | # we can't tell. | 1703 | # we can't tell. |
1154 | 1642 | while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ | 1704 | while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ |
1155 | 1643 | = "X$teststring$teststring"; } >/dev/null 2>&1 && | 1705 | = "X$teststring$teststring"; } >/dev/null 2>&1 && |
1156 | 1644 | test $i != 17 # 1/2 MB should be enough | 1706 | test $i != 17 # 1/2 MB should be enough |
1157 | 1645 | do | 1707 | do |
1158 | @@ -2185,7 +2247,7 @@ | |||
1159 | 2185 | 2247 | ||
1160 | 2186 | case $host_os in | 2248 | case $host_os in |
1161 | 2187 | aix3*) | 2249 | aix3*) |
1163 | 2188 | version_type=linux | 2250 | version_type=linux # correct to gnu/linux during the next big refactor |
1164 | 2189 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' | 2251 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' |
1165 | 2190 | shlibpath_var=LIBPATH | 2252 | shlibpath_var=LIBPATH |
1166 | 2191 | 2253 | ||
1167 | @@ -2194,7 +2256,7 @@ | |||
1168 | 2194 | ;; | 2256 | ;; |
1169 | 2195 | 2257 | ||
1170 | 2196 | aix[[4-9]]*) | 2258 | aix[[4-9]]*) |
1172 | 2197 | version_type=linux | 2259 | version_type=linux # correct to gnu/linux during the next big refactor |
1173 | 2198 | need_lib_prefix=no | 2260 | need_lib_prefix=no |
1174 | 2199 | need_version=no | 2261 | need_version=no |
1175 | 2200 | hardcode_into_libs=yes | 2262 | hardcode_into_libs=yes |
1176 | @@ -2259,7 +2321,7 @@ | |||
1177 | 2259 | ;; | 2321 | ;; |
1178 | 2260 | 2322 | ||
1179 | 2261 | bsdi[[45]]*) | 2323 | bsdi[[45]]*) |
1181 | 2262 | version_type=linux | 2324 | version_type=linux # correct to gnu/linux during the next big refactor |
1182 | 2263 | need_version=no | 2325 | need_version=no |
1183 | 2264 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2326 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
1184 | 2265 | soname_spec='${libname}${release}${shared_ext}$major' | 2327 | soname_spec='${libname}${release}${shared_ext}$major' |
1185 | @@ -2398,7 +2460,7 @@ | |||
1186 | 2398 | ;; | 2460 | ;; |
1187 | 2399 | 2461 | ||
1188 | 2400 | dgux*) | 2462 | dgux*) |
1190 | 2401 | version_type=linux | 2463 | version_type=linux # correct to gnu/linux during the next big refactor |
1191 | 2402 | need_lib_prefix=no | 2464 | need_lib_prefix=no |
1192 | 2403 | need_version=no | 2465 | need_version=no |
1193 | 2404 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' | 2466 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' |
1194 | @@ -2406,10 +2468,6 @@ | |||
1195 | 2406 | shlibpath_var=LD_LIBRARY_PATH | 2468 | shlibpath_var=LD_LIBRARY_PATH |
1196 | 2407 | ;; | 2469 | ;; |
1197 | 2408 | 2470 | ||
1198 | 2409 | freebsd1*) | ||
1199 | 2410 | dynamic_linker=no | ||
1200 | 2411 | ;; | ||
1201 | 2412 | |||
1202 | 2413 | freebsd* | dragonfly*) | 2471 | freebsd* | dragonfly*) |
1203 | 2414 | # DragonFly does not have aout. When/if they implement a new | 2472 | # DragonFly does not have aout. When/if they implement a new |
1204 | 2415 | # versioning mechanism, adjust this. | 2473 | # versioning mechanism, adjust this. |
1205 | @@ -2417,7 +2475,7 @@ | |||
1206 | 2417 | objformat=`/usr/bin/objformat` | 2475 | objformat=`/usr/bin/objformat` |
1207 | 2418 | else | 2476 | else |
1208 | 2419 | case $host_os in | 2477 | case $host_os in |
1210 | 2420 | freebsd[[123]]*) objformat=aout ;; | 2478 | freebsd[[23]].*) objformat=aout ;; |
1211 | 2421 | *) objformat=elf ;; | 2479 | *) objformat=elf ;; |
1212 | 2422 | esac | 2480 | esac |
1213 | 2423 | fi | 2481 | fi |
1214 | @@ -2435,7 +2493,7 @@ | |||
1215 | 2435 | esac | 2493 | esac |
1216 | 2436 | shlibpath_var=LD_LIBRARY_PATH | 2494 | shlibpath_var=LD_LIBRARY_PATH |
1217 | 2437 | case $host_os in | 2495 | case $host_os in |
1219 | 2438 | freebsd2*) | 2496 | freebsd2.*) |
1220 | 2439 | shlibpath_overrides_runpath=yes | 2497 | shlibpath_overrides_runpath=yes |
1221 | 2440 | ;; | 2498 | ;; |
1222 | 2441 | freebsd3.[[01]]* | freebsdelf3.[[01]]*) | 2499 | freebsd3.[[01]]* | freebsdelf3.[[01]]*) |
1223 | @@ -2455,7 +2513,7 @@ | |||
1224 | 2455 | ;; | 2513 | ;; |
1225 | 2456 | 2514 | ||
1226 | 2457 | gnu*) | 2515 | gnu*) |
1228 | 2458 | version_type=linux | 2516 | version_type=linux # correct to gnu/linux during the next big refactor |
1229 | 2459 | need_lib_prefix=no | 2517 | need_lib_prefix=no |
1230 | 2460 | need_version=no | 2518 | need_version=no |
1231 | 2461 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' | 2519 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
1232 | @@ -2466,7 +2524,7 @@ | |||
1233 | 2466 | ;; | 2524 | ;; |
1234 | 2467 | 2525 | ||
1235 | 2468 | haiku*) | 2526 | haiku*) |
1237 | 2469 | version_type=linux | 2527 | version_type=linux # correct to gnu/linux during the next big refactor |
1238 | 2470 | need_lib_prefix=no | 2528 | need_lib_prefix=no |
1239 | 2471 | need_version=no | 2529 | need_version=no |
1240 | 2472 | dynamic_linker="$host_os runtime_loader" | 2530 | dynamic_linker="$host_os runtime_loader" |
1241 | @@ -2527,7 +2585,7 @@ | |||
1242 | 2527 | ;; | 2585 | ;; |
1243 | 2528 | 2586 | ||
1244 | 2529 | interix[[3-9]]*) | 2587 | interix[[3-9]]*) |
1246 | 2530 | version_type=linux | 2588 | version_type=linux # correct to gnu/linux during the next big refactor |
1247 | 2531 | need_lib_prefix=no | 2589 | need_lib_prefix=no |
1248 | 2532 | need_version=no | 2590 | need_version=no |
1249 | 2533 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | 2591 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
1250 | @@ -2543,7 +2601,7 @@ | |||
1251 | 2543 | nonstopux*) version_type=nonstopux ;; | 2601 | nonstopux*) version_type=nonstopux ;; |
1252 | 2544 | *) | 2602 | *) |
1253 | 2545 | if test "$lt_cv_prog_gnu_ld" = yes; then | 2603 | if test "$lt_cv_prog_gnu_ld" = yes; then |
1255 | 2546 | version_type=linux | 2604 | version_type=linux # correct to gnu/linux during the next big refactor |
1256 | 2547 | else | 2605 | else |
1257 | 2548 | version_type=irix | 2606 | version_type=irix |
1258 | 2549 | fi ;; | 2607 | fi ;; |
1259 | @@ -2580,9 +2638,9 @@ | |||
1260 | 2580 | dynamic_linker=no | 2638 | dynamic_linker=no |
1261 | 2581 | ;; | 2639 | ;; |
1262 | 2582 | 2640 | ||
1264 | 2583 | # This must be Linux ELF. | 2641 | # This must be glibc/ELF. |
1265 | 2584 | linux* | k*bsd*-gnu | kopensolaris*-gnu) | 2642 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
1267 | 2585 | version_type=linux | 2643 | version_type=linux # correct to gnu/linux during the next big refactor |
1268 | 2586 | need_lib_prefix=no | 2644 | need_lib_prefix=no |
1269 | 2587 | need_version=no | 2645 | need_version=no |
1270 | 2588 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2646 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
1271 | @@ -2657,7 +2715,7 @@ | |||
1272 | 2657 | ;; | 2715 | ;; |
1273 | 2658 | 2716 | ||
1274 | 2659 | newsos6) | 2717 | newsos6) |
1276 | 2660 | version_type=linux | 2718 | version_type=linux # correct to gnu/linux during the next big refactor |
1277 | 2661 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2719 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
1278 | 2662 | shlibpath_var=LD_LIBRARY_PATH | 2720 | shlibpath_var=LD_LIBRARY_PATH |
1279 | 2663 | shlibpath_overrides_runpath=yes | 2721 | shlibpath_overrides_runpath=yes |
1280 | @@ -2726,7 +2784,7 @@ | |||
1281 | 2726 | ;; | 2784 | ;; |
1282 | 2727 | 2785 | ||
1283 | 2728 | solaris*) | 2786 | solaris*) |
1285 | 2729 | version_type=linux | 2787 | version_type=linux # correct to gnu/linux during the next big refactor |
1286 | 2730 | need_lib_prefix=no | 2788 | need_lib_prefix=no |
1287 | 2731 | need_version=no | 2789 | need_version=no |
1288 | 2732 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2790 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
1289 | @@ -2751,7 +2809,7 @@ | |||
1290 | 2751 | ;; | 2809 | ;; |
1291 | 2752 | 2810 | ||
1292 | 2753 | sysv4 | sysv4.3*) | 2811 | sysv4 | sysv4.3*) |
1294 | 2754 | version_type=linux | 2812 | version_type=linux # correct to gnu/linux during the next big refactor |
1295 | 2755 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2813 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
1296 | 2756 | soname_spec='${libname}${release}${shared_ext}$major' | 2814 | soname_spec='${libname}${release}${shared_ext}$major' |
1297 | 2757 | shlibpath_var=LD_LIBRARY_PATH | 2815 | shlibpath_var=LD_LIBRARY_PATH |
1298 | @@ -2775,7 +2833,7 @@ | |||
1299 | 2775 | 2833 | ||
1300 | 2776 | sysv4*MP*) | 2834 | sysv4*MP*) |
1301 | 2777 | if test -d /usr/nec ;then | 2835 | if test -d /usr/nec ;then |
1303 | 2778 | version_type=linux | 2836 | version_type=linux # correct to gnu/linux during the next big refactor |
1304 | 2779 | library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' | 2837 | library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' |
1305 | 2780 | soname_spec='$libname${shared_ext}.$major' | 2838 | soname_spec='$libname${shared_ext}.$major' |
1306 | 2781 | shlibpath_var=LD_LIBRARY_PATH | 2839 | shlibpath_var=LD_LIBRARY_PATH |
1307 | @@ -2806,7 +2864,7 @@ | |||
1308 | 2806 | 2864 | ||
1309 | 2807 | tpf*) | 2865 | tpf*) |
1310 | 2808 | # TPF is a cross-target only. Preferred cross-host = GNU/Linux. | 2866 | # TPF is a cross-target only. Preferred cross-host = GNU/Linux. |
1312 | 2809 | version_type=linux | 2867 | version_type=linux # correct to gnu/linux during the next big refactor |
1313 | 2810 | need_lib_prefix=no | 2868 | need_lib_prefix=no |
1314 | 2811 | need_version=no | 2869 | need_version=no |
1315 | 2812 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2870 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
1316 | @@ -2816,7 +2874,7 @@ | |||
1317 | 2816 | ;; | 2874 | ;; |
1318 | 2817 | 2875 | ||
1319 | 2818 | uts4*) | 2876 | uts4*) |
1321 | 2819 | version_type=linux | 2877 | version_type=linux # correct to gnu/linux during the next big refactor |
1322 | 2820 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2878 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
1323 | 2821 | soname_spec='${libname}${release}${shared_ext}$major' | 2879 | soname_spec='${libname}${release}${shared_ext}$major' |
1324 | 2822 | shlibpath_var=LD_LIBRARY_PATH | 2880 | shlibpath_var=LD_LIBRARY_PATH |
1325 | @@ -3238,7 +3296,7 @@ | |||
1326 | 3238 | lt_cv_deplibs_check_method=pass_all | 3296 | lt_cv_deplibs_check_method=pass_all |
1327 | 3239 | ;; | 3297 | ;; |
1328 | 3240 | 3298 | ||
1330 | 3241 | # This must be Linux ELF. | 3299 | # This must be glibc/ELF. |
1331 | 3242 | linux* | k*bsd*-gnu | kopensolaris*-gnu) | 3300 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
1332 | 3243 | lt_cv_deplibs_check_method=pass_all | 3301 | lt_cv_deplibs_check_method=pass_all |
1333 | 3244 | ;; | 3302 | ;; |
1334 | @@ -3658,6 +3716,7 @@ | |||
1335 | 3658 | # which start with @ or ?. | 3716 | # which start with @ or ?. |
1336 | 3659 | lt_cv_sys_global_symbol_pipe="$AWK ['"\ | 3717 | lt_cv_sys_global_symbol_pipe="$AWK ['"\ |
1337 | 3660 | " {last_section=section; section=\$ 3};"\ | 3718 | " {last_section=section; section=\$ 3};"\ |
1338 | 3719 | " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ | ||
1339 | 3661 | " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ | 3720 | " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ |
1340 | 3662 | " \$ 0!~/External *\|/{next};"\ | 3721 | " \$ 0!~/External *\|/{next};"\ |
1341 | 3663 | " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ | 3722 | " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ |
1342 | @@ -4242,7 +4301,9 @@ | |||
1343 | 4242 | case $cc_basename in | 4301 | case $cc_basename in |
1344 | 4243 | nvcc*) # Cuda Compiler Driver 2.2 | 4302 | nvcc*) # Cuda Compiler Driver 2.2 |
1345 | 4244 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' | 4303 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' |
1347 | 4245 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' | 4304 | if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then |
1348 | 4305 | _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" | ||
1349 | 4306 | fi | ||
1350 | 4246 | ;; | 4307 | ;; |
1351 | 4247 | esac | 4308 | esac |
1352 | 4248 | else | 4309 | else |
1353 | @@ -4334,18 +4395,33 @@ | |||
1354 | 4334 | ;; | 4395 | ;; |
1355 | 4335 | *) | 4396 | *) |
1356 | 4336 | case `$CC -V 2>&1 | sed 5q` in | 4397 | case `$CC -V 2>&1 | sed 5q` in |
1358 | 4337 | *Sun\ F* | *Sun*Fortran*) | 4398 | *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) |
1359 | 4338 | # Sun Fortran 8.3 passes all unrecognized flags to the linker | 4399 | # Sun Fortran 8.3 passes all unrecognized flags to the linker |
1360 | 4339 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | 4400 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
1361 | 4340 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | 4401 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
1362 | 4341 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='' | 4402 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='' |
1363 | 4342 | ;; | 4403 | ;; |
1364 | 4404 | *Sun\ F* | *Sun*Fortran*) | ||
1365 | 4405 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | ||
1366 | 4406 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | ||
1367 | 4407 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' | ||
1368 | 4408 | ;; | ||
1369 | 4343 | *Sun\ C*) | 4409 | *Sun\ C*) |
1370 | 4344 | # Sun C 5.9 | 4410 | # Sun C 5.9 |
1371 | 4345 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | 4411 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
1372 | 4346 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | 4412 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
1373 | 4347 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | 4413 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
1374 | 4348 | ;; | 4414 | ;; |
1375 | 4415 | *Intel*\ [[CF]]*Compiler*) | ||
1376 | 4416 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | ||
1377 | 4417 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' | ||
1378 | 4418 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' | ||
1379 | 4419 | ;; | ||
1380 | 4420 | *Portland\ Group*) | ||
1381 | 4421 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | ||
1382 | 4422 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' | ||
1383 | 4423 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | ||
1384 | 4424 | ;; | ||
1385 | 4349 | esac | 4425 | esac |
1386 | 4350 | ;; | 4426 | ;; |
1387 | 4351 | esac | 4427 | esac |
1388 | @@ -4505,7 +4581,9 @@ | |||
1389 | 4505 | ;; | 4581 | ;; |
1390 | 4506 | cygwin* | mingw* | cegcc*) | 4582 | cygwin* | mingw* | cegcc*) |
1391 | 4507 | case $cc_basename in | 4583 | case $cc_basename in |
1393 | 4508 | cl*) ;; | 4584 | cl*) |
1394 | 4585 | _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' | ||
1395 | 4586 | ;; | ||
1396 | 4509 | *) | 4587 | *) |
1397 | 4510 | _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' | 4588 | _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' |
1398 | 4511 | _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] | 4589 | _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] |
1399 | @@ -4533,7 +4611,6 @@ | |||
1400 | 4533 | _LT_TAGVAR(hardcode_direct, $1)=no | 4611 | _LT_TAGVAR(hardcode_direct, $1)=no |
1401 | 4534 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no | 4612 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
1402 | 4535 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | 4613 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
1403 | 4536 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= | ||
1404 | 4537 | _LT_TAGVAR(hardcode_libdir_separator, $1)= | 4614 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
1405 | 4538 | _LT_TAGVAR(hardcode_minus_L, $1)=no | 4615 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
1406 | 4539 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported | 4616 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
1407 | @@ -4787,8 +4864,7 @@ | |||
1408 | 4787 | xlf* | bgf* | bgxlf* | mpixlf*) | 4864 | xlf* | bgf* | bgxlf* | mpixlf*) |
1409 | 4788 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself | 4865 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself |
1410 | 4789 | _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' | 4866 | _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' |
1413 | 4790 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | 4867 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
1412 | 4791 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' | ||
1414 | 4792 | _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' | 4868 | _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
1415 | 4793 | if test "x$supports_anon_versioning" = xyes; then | 4869 | if test "x$supports_anon_versioning" = xyes; then |
1416 | 4794 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ | 4870 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ |
1417 | @@ -5084,6 +5160,7 @@ | |||
1418 | 5084 | # The linker will not automatically build a static lib if we build a DLL. | 5160 | # The linker will not automatically build a static lib if we build a DLL. |
1419 | 5085 | # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' | 5161 | # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
1420 | 5086 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | 5162 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
1421 | 5163 | _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' | ||
1422 | 5087 | _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' | 5164 | _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' |
1423 | 5088 | # Don't use ranlib | 5165 | # Don't use ranlib |
1424 | 5089 | _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' | 5166 | _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' |
1425 | @@ -5130,10 +5207,6 @@ | |||
1426 | 5130 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no | 5207 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
1427 | 5131 | ;; | 5208 | ;; |
1428 | 5132 | 5209 | ||
1429 | 5133 | freebsd1*) | ||
1430 | 5134 | _LT_TAGVAR(ld_shlibs, $1)=no | ||
1431 | 5135 | ;; | ||
1432 | 5136 | |||
1433 | 5137 | # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor | 5210 | # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor |
1434 | 5138 | # support. Future versions do this automatically, but an explicit c++rt0.o | 5211 | # support. Future versions do this automatically, but an explicit c++rt0.o |
1435 | 5139 | # does not break anything, and helps significantly (at the cost of a little | 5212 | # does not break anything, and helps significantly (at the cost of a little |
1436 | @@ -5146,7 +5219,7 @@ | |||
1437 | 5146 | ;; | 5219 | ;; |
1438 | 5147 | 5220 | ||
1439 | 5148 | # Unfortunately, older versions of FreeBSD 2 do not have this feature. | 5221 | # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
1441 | 5149 | freebsd2*) | 5222 | freebsd2.*) |
1442 | 5150 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' | 5223 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
1443 | 5151 | _LT_TAGVAR(hardcode_direct, $1)=yes | 5224 | _LT_TAGVAR(hardcode_direct, $1)=yes |
1444 | 5152 | _LT_TAGVAR(hardcode_minus_L, $1)=yes | 5225 | _LT_TAGVAR(hardcode_minus_L, $1)=yes |
1445 | @@ -5185,7 +5258,6 @@ | |||
1446 | 5185 | fi | 5258 | fi |
1447 | 5186 | if test "$with_gnu_ld" = no; then | 5259 | if test "$with_gnu_ld" = no; then |
1448 | 5187 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' | 5260 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' |
1449 | 5188 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' | ||
1450 | 5189 | _LT_TAGVAR(hardcode_libdir_separator, $1)=: | 5261 | _LT_TAGVAR(hardcode_libdir_separator, $1)=: |
1451 | 5190 | _LT_TAGVAR(hardcode_direct, $1)=yes | 5262 | _LT_TAGVAR(hardcode_direct, $1)=yes |
1452 | 5191 | _LT_TAGVAR(hardcode_direct_absolute, $1)=yes | 5263 | _LT_TAGVAR(hardcode_direct_absolute, $1)=yes |
1453 | @@ -5627,9 +5699,6 @@ | |||
1454 | 5627 | _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], | 5699 | _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], |
1455 | 5628 | [Flag to hardcode $libdir into a binary during linking. | 5700 | [Flag to hardcode $libdir into a binary during linking. |
1456 | 5629 | This must work even if $libdir does not exist]) | 5701 | This must work even if $libdir does not exist]) |
1457 | 5630 | _LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], | ||
1458 | 5631 | [[If ld is used when linking, flag to hardcode $libdir into a binary | ||
1459 | 5632 | during linking. This must work even if $libdir does not exist]]) | ||
1460 | 5633 | _LT_TAGDECL([], [hardcode_libdir_separator], [1], | 5702 | _LT_TAGDECL([], [hardcode_libdir_separator], [1], |
1461 | 5634 | [Whether we need a single "-rpath" flag with a separated argument]) | 5703 | [Whether we need a single "-rpath" flag with a separated argument]) |
1462 | 5635 | _LT_TAGDECL([], [hardcode_direct], [0], | 5704 | _LT_TAGDECL([], [hardcode_direct], [0], |
1463 | @@ -5787,7 +5856,6 @@ | |||
1464 | 5787 | _LT_TAGVAR(hardcode_direct, $1)=no | 5856 | _LT_TAGVAR(hardcode_direct, $1)=no |
1465 | 5788 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no | 5857 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
1466 | 5789 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | 5858 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
1467 | 5790 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= | ||
1468 | 5791 | _LT_TAGVAR(hardcode_libdir_separator, $1)= | 5859 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
1469 | 5792 | _LT_TAGVAR(hardcode_minus_L, $1)=no | 5860 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
1470 | 5793 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported | 5861 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
1471 | @@ -6157,7 +6225,7 @@ | |||
1472 | 6157 | esac | 6225 | esac |
1473 | 6158 | ;; | 6226 | ;; |
1474 | 6159 | 6227 | ||
1476 | 6160 | freebsd[[12]]*) | 6228 | freebsd2.*) |
1477 | 6161 | # C++ shared libraries reported to be fairly broken before | 6229 | # C++ shared libraries reported to be fairly broken before |
1478 | 6162 | # switch to ELF | 6230 | # switch to ELF |
1479 | 6163 | _LT_TAGVAR(ld_shlibs, $1)=no | 6231 | _LT_TAGVAR(ld_shlibs, $1)=no |
1480 | @@ -6918,12 +6986,18 @@ | |||
1481 | 6918 | } | 6986 | } |
1482 | 6919 | }; | 6987 | }; |
1483 | 6920 | _LT_EOF | 6988 | _LT_EOF |
1484 | 6989 | ], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF | ||
1485 | 6990 | package foo | ||
1486 | 6991 | func foo() { | ||
1487 | 6992 | } | ||
1488 | 6993 | _LT_EOF | ||
1489 | 6921 | ]) | 6994 | ]) |
1490 | 6922 | 6995 | ||
1491 | 6923 | _lt_libdeps_save_CFLAGS=$CFLAGS | 6996 | _lt_libdeps_save_CFLAGS=$CFLAGS |
1492 | 6924 | case "$CC $CFLAGS " in #( | 6997 | case "$CC $CFLAGS " in #( |
1493 | 6925 | *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; | 6998 | *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; |
1494 | 6926 | *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; | 6999 | *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; |
1495 | 7000 | *\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; | ||
1496 | 6927 | esac | 7001 | esac |
1497 | 6928 | 7002 | ||
1498 | 6929 | dnl Parse the compiler output and extract the necessary | 7003 | dnl Parse the compiler output and extract the necessary |
1499 | @@ -7120,7 +7194,6 @@ | |||
1500 | 7120 | _LT_TAGVAR(hardcode_direct, $1)=no | 7194 | _LT_TAGVAR(hardcode_direct, $1)=no |
1501 | 7121 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no | 7195 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
1502 | 7122 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | 7196 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
1503 | 7123 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= | ||
1504 | 7124 | _LT_TAGVAR(hardcode_libdir_separator, $1)= | 7197 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
1505 | 7125 | _LT_TAGVAR(hardcode_minus_L, $1)=no | 7198 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
1506 | 7126 | _LT_TAGVAR(hardcode_automatic, $1)=no | 7199 | _LT_TAGVAR(hardcode_automatic, $1)=no |
1507 | @@ -7253,7 +7326,6 @@ | |||
1508 | 7253 | _LT_TAGVAR(hardcode_direct, $1)=no | 7326 | _LT_TAGVAR(hardcode_direct, $1)=no |
1509 | 7254 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no | 7327 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
1510 | 7255 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | 7328 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
1511 | 7256 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= | ||
1512 | 7257 | _LT_TAGVAR(hardcode_libdir_separator, $1)= | 7329 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
1513 | 7258 | _LT_TAGVAR(hardcode_minus_L, $1)=no | 7330 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
1514 | 7259 | _LT_TAGVAR(hardcode_automatic, $1)=no | 7331 | _LT_TAGVAR(hardcode_automatic, $1)=no |
1515 | @@ -7440,6 +7512,77 @@ | |||
1516 | 7440 | ])# _LT_LANG_GCJ_CONFIG | 7512 | ])# _LT_LANG_GCJ_CONFIG |
1517 | 7441 | 7513 | ||
1518 | 7442 | 7514 | ||
1519 | 7515 | # _LT_LANG_GO_CONFIG([TAG]) | ||
1520 | 7516 | # -------------------------- | ||
1521 | 7517 | # Ensure that the configuration variables for the GNU Go compiler | ||
1522 | 7518 | # are suitably defined. These variables are subsequently used by _LT_CONFIG | ||
1523 | 7519 | # to write the compiler configuration to `libtool'. | ||
1524 | 7520 | m4_defun([_LT_LANG_GO_CONFIG], | ||
1525 | 7521 | [AC_REQUIRE([LT_PROG_GO])dnl | ||
1526 | 7522 | AC_LANG_SAVE | ||
1527 | 7523 | |||
1528 | 7524 | # Source file extension for Go test sources. | ||
1529 | 7525 | ac_ext=go | ||
1530 | 7526 | |||
1531 | 7527 | # Object file extension for compiled Go test sources. | ||
1532 | 7528 | objext=o | ||
1533 | 7529 | _LT_TAGVAR(objext, $1)=$objext | ||
1534 | 7530 | |||
1535 | 7531 | # Code to be used in simple compile tests | ||
1536 | 7532 | lt_simple_compile_test_code="package main; func main() { }" | ||
1537 | 7533 | |||
1538 | 7534 | # Code to be used in simple link tests | ||
1539 | 7535 | lt_simple_link_test_code='package main; func main() { }' | ||
1540 | 7536 | |||
1541 | 7537 | # ltmain only uses $CC for tagged configurations so make sure $CC is set. | ||
1542 | 7538 | _LT_TAG_COMPILER | ||
1543 | 7539 | |||
1544 | 7540 | # save warnings/boilerplate of simple test code | ||
1545 | 7541 | _LT_COMPILER_BOILERPLATE | ||
1546 | 7542 | _LT_LINKER_BOILERPLATE | ||
1547 | 7543 | |||
1548 | 7544 | # Allow CC to be a program name with arguments. | ||
1549 | 7545 | lt_save_CC=$CC | ||
1550 | 7546 | lt_save_CFLAGS=$CFLAGS | ||
1551 | 7547 | lt_save_GCC=$GCC | ||
1552 | 7548 | GCC=yes | ||
1553 | 7549 | CC=${GOC-"gccgo"} | ||
1554 | 7550 | CFLAGS=$GOFLAGS | ||
1555 | 7551 | compiler=$CC | ||
1556 | 7552 | _LT_TAGVAR(compiler, $1)=$CC | ||
1557 | 7553 | _LT_TAGVAR(LD, $1)="$LD" | ||
1558 | 7554 | _LT_CC_BASENAME([$compiler]) | ||
1559 | 7555 | |||
1560 | 7556 | # Go did not exist at the time GCC didn't implicitly link libc in. | ||
1561 | 7557 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no | ||
1562 | 7558 | |||
1563 | 7559 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds | ||
1564 | 7560 | _LT_TAGVAR(reload_flag, $1)=$reload_flag | ||
1565 | 7561 | _LT_TAGVAR(reload_cmds, $1)=$reload_cmds | ||
1566 | 7562 | |||
1567 | 7563 | ## CAVEAT EMPTOR: | ||
1568 | 7564 | ## There is no encapsulation within the following macros, do not change | ||
1569 | 7565 | ## the running order or otherwise move them around unless you know exactly | ||
1570 | 7566 | ## what you are doing... | ||
1571 | 7567 | if test -n "$compiler"; then | ||
1572 | 7568 | _LT_COMPILER_NO_RTTI($1) | ||
1573 | 7569 | _LT_COMPILER_PIC($1) | ||
1574 | 7570 | _LT_COMPILER_C_O($1) | ||
1575 | 7571 | _LT_COMPILER_FILE_LOCKS($1) | ||
1576 | 7572 | _LT_LINKER_SHLIBS($1) | ||
1577 | 7573 | _LT_LINKER_HARDCODE_LIBPATH($1) | ||
1578 | 7574 | |||
1579 | 7575 | _LT_CONFIG($1) | ||
1580 | 7576 | fi | ||
1581 | 7577 | |||
1582 | 7578 | AC_LANG_RESTORE | ||
1583 | 7579 | |||
1584 | 7580 | GCC=$lt_save_GCC | ||
1585 | 7581 | CC=$lt_save_CC | ||
1586 | 7582 | CFLAGS=$lt_save_CFLAGS | ||
1587 | 7583 | ])# _LT_LANG_GO_CONFIG | ||
1588 | 7584 | |||
1589 | 7585 | |||
1590 | 7443 | # _LT_LANG_RC_CONFIG([TAG]) | 7586 | # _LT_LANG_RC_CONFIG([TAG]) |
1591 | 7444 | # ------------------------- | 7587 | # ------------------------- |
1592 | 7445 | # Ensure that the configuration variables for the Windows resource compiler | 7588 | # Ensure that the configuration variables for the Windows resource compiler |
1593 | @@ -7509,6 +7652,13 @@ | |||
1594 | 7509 | dnl AC_DEFUN([LT_AC_PROG_GCJ], []) | 7652 | dnl AC_DEFUN([LT_AC_PROG_GCJ], []) |
1595 | 7510 | 7653 | ||
1596 | 7511 | 7654 | ||
1597 | 7655 | # LT_PROG_GO | ||
1598 | 7656 | # ---------- | ||
1599 | 7657 | AC_DEFUN([LT_PROG_GO], | ||
1600 | 7658 | [AC_CHECK_TOOL(GOC, gccgo,) | ||
1601 | 7659 | ]) | ||
1602 | 7660 | |||
1603 | 7661 | |||
1604 | 7512 | # LT_PROG_RC | 7662 | # LT_PROG_RC |
1605 | 7513 | # ---------- | 7663 | # ---------- |
1606 | 7514 | AC_DEFUN([LT_PROG_RC], | 7664 | AC_DEFUN([LT_PROG_RC], |
1607 | 7515 | 7665 | ||
1608 | === modified file 'm4/ltoptions.m4' | |||
1609 | --- m4/ltoptions.m4 2011-12-21 00:31:37 +0000 | |||
1610 | +++ m4/ltoptions.m4 2012-01-17 23:06:35 +0000 | |||
1611 | @@ -326,9 +326,24 @@ | |||
1612 | 326 | # MODE is either `yes' or `no'. If omitted, it defaults to `both'. | 326 | # MODE is either `yes' or `no'. If omitted, it defaults to `both'. |
1613 | 327 | m4_define([_LT_WITH_PIC], | 327 | m4_define([_LT_WITH_PIC], |
1614 | 328 | [AC_ARG_WITH([pic], | 328 | [AC_ARG_WITH([pic], |
1616 | 329 | [AS_HELP_STRING([--with-pic], | 329 | [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], |
1617 | 330 | [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], | 330 | [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], |
1619 | 331 | [pic_mode="$withval"], | 331 | [lt_p=${PACKAGE-default} |
1620 | 332 | case $withval in | ||
1621 | 333 | yes|no) pic_mode=$withval ;; | ||
1622 | 334 | *) | ||
1623 | 335 | pic_mode=default | ||
1624 | 336 | # Look at the argument we got. We use all the common list separators. | ||
1625 | 337 | lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," | ||
1626 | 338 | for lt_pkg in $withval; do | ||
1627 | 339 | IFS="$lt_save_ifs" | ||
1628 | 340 | if test "X$lt_pkg" = "X$lt_p"; then | ||
1629 | 341 | pic_mode=yes | ||
1630 | 342 | fi | ||
1631 | 343 | done | ||
1632 | 344 | IFS="$lt_save_ifs" | ||
1633 | 345 | ;; | ||
1634 | 346 | esac], | ||
1635 | 332 | [pic_mode=default]) | 347 | [pic_mode=default]) |
1636 | 333 | 348 | ||
1637 | 334 | test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) | 349 | test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) |
1638 | 335 | 350 | ||
1639 | === modified file 'm4/ltversion.m4' | |||
1640 | --- m4/ltversion.m4 2011-12-21 00:31:37 +0000 | |||
1641 | +++ m4/ltversion.m4 2012-01-17 23:06:35 +0000 | |||
1642 | @@ -9,15 +9,15 @@ | |||
1643 | 9 | 9 | ||
1644 | 10 | # @configure_input@ | 10 | # @configure_input@ |
1645 | 11 | 11 | ||
1647 | 12 | # serial 3293 ltversion.m4 | 12 | # serial 3337 ltversion.m4 |
1648 | 13 | # This file is part of GNU Libtool | 13 | # This file is part of GNU Libtool |
1649 | 14 | 14 | ||
1652 | 15 | m4_define([LT_PACKAGE_VERSION], [2.4]) | 15 | m4_define([LT_PACKAGE_VERSION], [2.4.2]) |
1653 | 16 | m4_define([LT_PACKAGE_REVISION], [1.3293]) | 16 | m4_define([LT_PACKAGE_REVISION], [1.3337]) |
1654 | 17 | 17 | ||
1655 | 18 | AC_DEFUN([LTVERSION_VERSION], | 18 | AC_DEFUN([LTVERSION_VERSION], |
1658 | 19 | [macro_version='2.4' | 19 | [macro_version='2.4.2' |
1659 | 20 | macro_revision='1.3293' | 20 | macro_revision='1.3337' |
1660 | 21 | _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) | 21 | _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) |
1661 | 22 | _LT_DECL(, macro_revision, 0) | 22 | _LT_DECL(, macro_revision, 0) |
1662 | 23 | ]) | 23 | ]) |