--- aclocal.m4	2005-03-30 16:35:19.000000000 +0200

+++ aclocal.m4.oden	2005-04-01 14:02:48.569185576 +0200

@@ -2089,6 +2089,20 @@

   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"

@@ -4160,6 +4174,13 @@

   # before this can be enabled.

   hardcode_into_libs=yes

+  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,