diff -Naurp lesstif-0.95.0/aclocal.m4 lesstif-0.95.0.oden/aclocal.m4 --- lesstif-0.95.0/aclocal.m4 2006-06-10 11:35:23.000000000 +0200 +++ lesstif-0.95.0.oden/aclocal.m4 2008-12-21 16:36:22.000000000 +0100 @@ -567,6 +567,20 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li rm -rf conftest* ;; +*-*-linux*) + # Test if the compiler is 64bit + echo 'int i;' > conftest.$ac_ext + lt_cv_cc_64bit_output=no + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in + *"ELF 64"*) + lt_cv_cc_64bit_output=yes + ;; + esac + fi + rm -rf conftest* + ;; + *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" @@ -1165,7 +1179,7 @@ shlibpath_var= shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" +sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib" if test "$GCC" = yes; then sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then @@ -1178,7 +1192,7 @@ if test "$GCC" = yes; then sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib /usr/X11R6/lib" fi need_lib_prefix=unknown hardcode_into_libs=no @@ -1537,6 +1551,13 @@ linux*) sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi + case $host_cpu:$lt_cv_cc_64bit_output in + powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes) + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /usr/X11R6/lib64" + sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64 /usr/X11R6/lib64" + ;; + esac + # We used to test for /lib/ld.so.1 and disable shared libraries on # powerpc, because MkLinux only supported shared libraries with the # GNU dynamic linker. Since this was broken with cross compilers,