--- ltmain.sh.orig	2003-12-15 19:39:01 +0300

+++ ltmain.sh	2004-09-03 19:26:55 +0400

@@ -771,6 +771,7 @@

     linker_flags=

     dllsearchpath=

     lib_search_path=`pwd`

+    inst_prefix_dir=

     avoid_version=no

     dlfiles=

@@ -901,6 +902,11 @@

 	  prev=

 	  continue

 	  ;;

+        inst_prefix)

+	  inst_prefix_dir="$arg"

+	  prev=

+	  continue

+	  ;;

 	release)

 	  release="-$arg"

 	  prev=

@@ -1002,6 +1008,11 @@

 	continue

 	;;

+      -inst-prefix-dir)

+	prev=inst_prefix

+	continue

+	;;

+

       # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*

       # so, if we see these flags be careful not to treat them like -L

       -L[A-Z][A-Z]*:*)

@@ -1896,7 +1907,16 @@

 	    if test "$hardcode_direct" = yes; then

 	      add="$libdir/$linklib"

 	    elif test "$hardcode_minus_L" = yes; then

-	      add_dir="-L$libdir"

+	      # Try looking first in the location we're being installed to.

+	      add_dir=

+	      if test -n "$inst_prefix_dir"; then

+		case "$libdir" in

+		[\\/]*)

+		  add_dir="-L$inst_prefix_dir$libdir"

+		  ;;

+		esac

+	      fi

+	      add_dir="$add_dir -L$libdir"

 	      add="-l$name"

 	    elif test "$hardcode_shlibpath_var" = yes; then

 	      case :$finalize_shlibpath: in

@@ -1906,7 +1926,17 @@

 	      add="-l$name"

 	    else

 	      # We cannot seem to hardcode it, guess we'll fake it.

-	      add_dir="-L$libdir"

+ 	      # Try looking first in the location we're being installed to.

+ 	      add_dir=

+ 	      if test -n "$inst_prefix_dir"; then

+ 		case "$libdir" in

+ 		[\\/]*)

+ 		  add_dir="-L$inst_prefix_dir$libdir"

+ 		  ;;

+ 		esac

+ 	      fi

+ 	      add_dir="$add_dir -L$libdir"

+

 	      add="-l$name"

 	    fi

@@ -3931,7 +3961,7 @@

 	fi

       done

       # Quote the link command for shipping.

-      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args)"

+      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"

       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`

       # Only create the output if not a dry run.

@@ -4232,12 +4262,30 @@

 	dir="$dir$objdir"

 	if test -n "$relink_command"; then

+	  # Determine the prefix the user has applied to our future dir.

+	  inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`

+

+	  # Don't allow the user to place us outside of our expected

+	  # location b/c this prevents finding dependent libraries that

+	  # are installed to the same prefix.

+	  if test "$inst_prefix_dir" = "$destdir"; then

+	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2

+	    exit 1

+	  fi

+

+	  if test -n "$inst_prefix_dir"; then

+	    # Stick the inst_prefix_dir data into the link command.

+	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`

+	  else

+	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`

+	  fi

+

 	  $echo "$modename: warning: relinking \`$file'" 1>&2

 	  $show "$relink_command"

 	  if $run eval "$relink_command"; then :

 	  else

 	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2

-	    continue

+	    exit 1

 	  fi

 	fi