*** ./ltmain.in.orig	Sun Dec 18 21:43:52 2005
--- ./ltmain.in	Sun Jun 11 19:57:58 2006
***************
*** 3880,3886 ****
  	     test -n "$hardcode_libdirs"; then
  	    libdir="$hardcode_libdirs"
  	    if test -n "$hardcode_libdir_flag_spec_ld"; then
! 	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
  	    else
  	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
  	    fi
--- 3880,3889 ----
  	     test -n "$hardcode_libdirs"; then
  	    libdir="$hardcode_libdirs"
  	    if test -n "$hardcode_libdir_flag_spec_ld"; then
! 	      case $archive_cmds in
! 	      *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
! 	      *)      eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
! 	      esac
  	    else
  	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
  	    fi
*** ./libtool.m4.orig	Sun Dec 18 21:53:17 2005
--- ./libtool.m4	Sun Jun 11 19:57:58 2006
***************
*** 3163,3171 ****
        _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
  
        case $host_cpu in
!       hppa*64*|ia64*)
! 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
!         ;;
        *)
  	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
          ;;
--- 3163,3169 ----
        _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
  
        case $host_cpu in
!       hppa*64*|ia64*) ;;
        *)
  	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
          ;;