--- configure.orig	2010-07-02 00:30:20.000000000 +0200
+++ configure	2010-07-02 00:30:48.000000000 +0200
@@ -5433,7 +5433,7 @@
     if $WININET_CONFIG --rpath-dir > /dev/null 2>&1; then
               WININET_LIBDIR="`$WININET_CONFIG --rpath-dir`"
     else
-              WININET_LIBDIR="`$WININET_CONFIG --prefix`/lib"
+              WININET_LIBDIR="`$WININET_CONFIG --prefix`/lib64"
     fi
     echo "$as_me:$LINENO: result: $WININET_LIBDIR" >&5
 echo "${ECHO_T}$WININET_LIBDIR" >&6
@@ -5538,7 +5538,7 @@
     if $LIBWWW_CONFIG --rpath-dir > /dev/null 2>&1; then
               LIBWWW_LIBDIR="`$LIBWWW_CONFIG --rpath-dir`"
     else
-              LIBWWW_LIBDIR="`$LIBWWW_CONFIG --prefix`/lib"
+              LIBWWW_LIBDIR="`$LIBWWW_CONFIG --prefix`/lib64"
     fi
     echo "$as_me:$LINENO: result: $LIBWWW_LIBDIR" >&5
 echo "${ECHO_T}$LIBWWW_LIBDIR" >&6
@@ -5618,7 +5618,7 @@
 
                 echo "$as_me:$LINENO: checking for curl library directory" >&5
 echo $ECHO_N "checking for curl library directory... $ECHO_C" >&6
-        CURL_LIBDIR="`$CURL_CONFIG --prefix`/lib"
+        CURL_LIBDIR="`$CURL_CONFIG --prefix`/lib64"
 
     echo "$as_me:$LINENO: result: $CURL_LIBDIR" >&5
 echo "${ECHO_T}$CURL_LIBDIR" >&6
--- configure.in.orig	2010-07-02 00:30:51.000000000 +0200
+++ configure.in	2010-07-02 00:31:02.000000000 +0200
@@ -439,7 +439,7 @@
        WININET_LIBDIR="`$WININET_CONFIG --rpath-dir`"
     else
        dnl Yawn. We're using the regular boring version.
-       WININET_LIBDIR="`$WININET_CONFIG --prefix`/lib"
+       WININET_LIBDIR="`$WININET_CONFIG --prefix`/lib64"
     fi
     AC_MSG_RESULT($WININET_LIBDIR)
     AC_SUBST(WININET_LIBDIR)
@@ -510,7 +510,7 @@
        LIBWWW_LIBDIR="`$LIBWWW_CONFIG --rpath-dir`"
     else
        dnl Yawn. We're using the regular boring version.
-       LIBWWW_LIBDIR="`$LIBWWW_CONFIG --prefix`/lib"
+       LIBWWW_LIBDIR="`$LIBWWW_CONFIG --prefix`/lib64"
     fi
     AC_MSG_RESULT($LIBWWW_LIBDIR)
     AC_SUBST(LIBWWW_LIBDIR)
@@ -562,7 +562,7 @@
     dnl adjust the search patch manually. Just gag me with a backquote, OK?
     AC_MSG_CHECKING(for curl library directory)
     dnl Yawn. We're using the regular boring version.
-    CURL_LIBDIR="`$CURL_CONFIG --prefix`/lib"
+    CURL_LIBDIR="`$CURL_CONFIG --prefix`/lib64"
 
     AC_MSG_RESULT($CURL_LIBDIR)
     AC_SUBST(CURL_LIBDIR)
--- ltconfig.orig	2010-07-02 00:22:59.000000000 +0200
+++ ltconfig	2010-07-02 00:29:49.000000000 +0200
@@ -1774,8 +1774,8 @@
 shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+sys_lib_dlsearch_path_spec="/lib64 /usr/lib64"
+sys_lib_search_path_spec="/lib64 /usr/lib64"
 file_magic_cmd=
 file_magic_test_file=
 deplibs_check_method='unknown'
@@ -1957,7 +1957,7 @@
   ;;
 
 # This must be Linux ELF.
-linux-gnu*)
+linux*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -1968,9 +1968,9 @@
   shlibpath_overrides_runpath=no
   deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
   file_magic_cmd=/usr/bin/file
-  file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+  file_magic_test_file=`echo /lib64/libc.so* /lib64/libc-*.so`
 
-  if test -f /lib/ld.so.1; then
+  if true; then
     dynamic_linker='GNU ld.so'
   else
     # Only the GNU ld.so supports shared libraries on MkLinux.