]>
Commit | Line | Data |
---|---|---|
f7669933 JB |
1 | --- libtool-1.4.3/libltdl/acinclude.m4.multilib 2002-10-23 04:26:05.000000000 +0200 |
2 | +++ libtool-1.4.3/libltdl/acinclude.m4 2003-01-04 22:26:09.000000000 +0100 | |
3 | @@ -2190,6 +2190,26 @@ | |
4 | # people can always --disable-shared, the test was removed, and we | |
5 | # assume the GNU/Linux dynamic linker is in use. | |
6 | dynamic_linker='GNU/Linux ld.so' | |
7 | + | |
8 | + # Find out which ABI we are using (multilib Linux x86_64 hack). | |
9 | + libsuff= | |
10 | + case "$host_cpu" in | |
11 | + x86_64*|s390x*|powerpc64*) | |
12 | + echo '[#]line __oline__ "configure"' > conftest.$ac_ext | |
13 | + if AC_TRY_EVAL(ac_compile); then | |
14 | + case `/usr/bin/file conftest.$ac_objext` in | |
15 | + *64-bit*) | |
16 | + libsuff=64 | |
17 | + ;; | |
18 | + esac | |
19 | + fi | |
20 | + rm -rf conftest* | |
21 | + ;; | |
22 | + *) | |
23 | + ;; | |
24 | + esac | |
25 | + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" | |
26 | + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" | |
27 | ;; | |
28 | ||
29 | netbsd*) | |
30 | --- libtool-1.4.3/libtool.m4.multilib 2003-01-04 22:22:16.000000000 +0100 | |
31 | +++ libtool-1.4.3/libtool.m4 2003-01-04 22:25:15.000000000 +0100 | |
32 | @@ -2190,6 +2190,26 @@ | |
33 | # people can always --disable-shared, the test was removed, and we | |
34 | # assume the GNU/Linux dynamic linker is in use. | |
35 | dynamic_linker='GNU/Linux ld.so' | |
36 | + | |
37 | + # Find out which ABI we are using (multilib Linux x86_64 hack). | |
38 | + libsuff= | |
39 | + case "$host_cpu" in | |
40 | + x86_64*|s390x*|powerpc64*) | |
41 | + echo '[#]line __oline__ "configure"' > conftest.$ac_ext | |
42 | + if AC_TRY_EVAL(ac_compile); then | |
43 | + case `/usr/bin/file conftest.$ac_objext` in | |
44 | + *64-bit*) | |
45 | + libsuff=64 | |
46 | + ;; | |
47 | + esac | |
48 | + fi | |
49 | + rm -rf conftest* | |
50 | + ;; | |
51 | + *) | |
52 | + ;; | |
53 | + esac | |
54 | + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" | |
55 | + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" | |
56 | ;; | |
57 | ||
58 | netbsd*) |