--- kdelibs-3.2/admin/acinclude.m4.in	2004-07-20 12:34:54.352556663 -0400
+++ kdelibs-3.2/admin/acinclude.m4.in.no-x11-rpath	2004-07-20 12:34:41.520431824 -0400
@@ -353,7 +353,7 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
      fi
 
      if test -n "$x_libraries"; then
+       KDE_TEST_RPATH="$KDE_TEST_RPATH"
-       KDE_TEST_RPATH="$KDE_TEST_RPATH -R $x_libraries"
      fi
 
      KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
--- kdelibs-3.2/admin/libtool.m4.in	2004-07-20 12:36:16.337354266 -0400
+++ kdelibs-3.2/admin/libtool.m4.in.in.no-x11-rpath	2004-07-20 12:35:02.858639416 -0400
@@ -1403,8 +1403,8 @@ irix5* | irix6* | nonstopux*)
   esac
   shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
   shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/X11R6/lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/X11R6/lib${libsuff}"
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
   hardcode_into_libs=yes
   ;;
 
@@ -1430,8 +1430,8 @@ linux*)
   fi
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
+  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/X11R6/lib${libsuff}"
+  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/X11R6/lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.