*** /home/albinus/src/tramp/aclocal.m4.~2.36~	2010-12-19 20:44:45.488035000 +0100
--- /home/albinus/src/tramp/aclocal.m4	2010-12-19 20:39:08.679973080 +0100
***************
*** 201,208 ****
      if test "${USE_CONTRIB}" = "yes"; then
        if test -e contrib/$library; then
          TRAMP_CONTRIB_FILES="$library $TRAMP_CONTRIB_FILES"
!         ln -s ../contrib/$library lisp/$library
! dnl	AC_CONFIG_LINKS(lisp/$library:contrib/$library)
          AC_MSG_RESULT(linked to contrib directory)
        elif test -z "$3"; then
          AC_MSG_RESULT(not found)
--- 201,210 ----
      if test "${USE_CONTRIB}" = "yes"; then
        if test -e contrib/$library; then
          TRAMP_CONTRIB_FILES="$library $TRAMP_CONTRIB_FILES"
! 	dnl AC_CONFIG_LINKS cannot expand $library.  Therefore, we use
! 	dnl $2 and replace it afterwards.
! 	AC_CONFIG_LINKS(lisp/$2:contrib/$2)
! 	ac_config_links=`echo $ac_config_links | sed -e s/$2/$library/g`
          AC_MSG_RESULT(linked to contrib directory)
        elif test -z "$3"; then
          AC_MSG_RESULT(not found)