--- build/libtool.m4.orig	Fri Aug  8 23:08:06 2008
+++ build/libtool.m4	Mon Feb  2 23:27:08 2009
@@ -1806,6 +1806,19 @@
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
+  sys_lib_search_path_spec="/lib /usr/lib"
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      MACH_TYPE=`/usr/bin/isainfo -n`
+      sys_lib_search_path_spec="/lib/${MACH_TYPE} /usr/lib/${MACH_TYPE}"
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   # ldd complains unless libraries are executable
   postinstall_cmds='chmod +x $lib'
   ;;