--- SDL-1.2.10/acinclude.m4.libtool 2006-05-14 22:27:03.000000000 +0200 +++ SDL-1.2.10/acinclude.m4 2006-05-20 16:57:55.000000000 +0200 @@ -843,8 +843,9 @@ ia64-*-hpux*) x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext + lt_cv_cc_lib64_suffix=no if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in + case `/usr/bin/file conftest.$ac_objext` in *32-bit*) case $host in x86_64-*linux*) @@ -865,15 +866,19 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li case $host in x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" + lt_cv_cc_lib64_suffix=yes ;; ppc*-*linux*|powerpc*-*linux*) LD="${LD-ld} -m elf64ppc" + lt_cv_cc_lib64_suffix=yes ;; s390*-*linux*) LD="${LD-ld} -m elf64_s390" + lt_cv_cc_lib64_suffix=yes ;; sparc*-*linux*) LD="${LD-ld} -m elf64_sparc" + lt_cv_cc_lib64_suffix=yes ;; esac ;; @@ -1897,10 +1902,15 @@ linux*) # before this can be enabled. hardcode_into_libs=yes + libsuff= + if test "$lt_cv_cc_lib64_suffix" = "yes"; then + libsuff=64 + fi + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on