Re: libtool-1.5.22, please hold a little

[Ralf Wildenhues]

Hi Peter,

* Peter O'Gorman wrote on Sat, Dec 17, 2005 at 06:50:38PM CET:
> 
> Yeah, I know, I have a patch here, if okay then I'll (or you can)
> apply it.  If not then, that's fine, no need to dealy farther.
> 
> In other places in ltmain we do as per patch, I have no idea why we exit 
> with an error here now.

Hmm.  We surely would not want those relative paths in the installed .la
file.  Right?

OMG.  A glance at the source, and another BIG brain fart, looming for
years.

OK to apply and forward-port?  (I'll just go ahead and apply this in a
few hours if noone complains.)

Cheers,
Ralf

2005-12-15  Peter O'Gorman  <address@hidden>,
            Ralf Wildenhues  <address@hidden>

        * ltmain.in (link mode): Don't die if -L<relative/path> does not
        exist.  Put in notinst_path though, so it won't end up in the
        installed .la file.
        (link mode): Really eliminate all temporary directories.

Index: ltmain.in
===================================================================
RCS file: /cvsroot/libtool/libtool/Attic/ltmain.in,v
retrieving revision 1.334.2.113
diff -u -r1.334.2.113 ltmain.in
--- ltmain.in   18 Dec 2005 18:11:06 -0000      1.334.2.113
+++ ltmain.in   18 Dec 2005 19:16:06 -0000
@@ -1080,6 +1117,7 @@
     no_install=no
     objs=
     non_pic_objects=
+    notinst_path= # paths that contain not-installed libtool libraries
     precious_files_regex=
     prefer_static_libs=no
     preload=no
@@ -1482,7 +1520,8 @@
          absdir=`cd "$dir" && pwd`
          if test -z "$absdir"; then
            $echo "$modename: cannot determine absolute directory name of 
\`$dir'" 1>&2
-           exit $EXIT_FAILURE
+           absdir="$dir"
+           notinst_path="$notinst_path $dir"
          fi
          dir="$absdir"
          ;;
@@ -2009,7 +2048,6 @@
     newlib_search_path=
     need_relink=no # whether we're linking any uninstalled libtool libraries
     notinst_deplibs= # not-installed libtool libraries
-    notinst_path= # paths that contain not-installed libtool libraries
     case $linkmode in
     lib)
        passes="conv link"
@@ -3373,9 +3411,9 @@
 
       # Eliminate all temporary directories.
       for path in $notinst_path; do
-       lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
-       deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
-       dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % 
%g'`
+       lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+       deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+       dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % 
%g"`
       done
 
       if test -n "$xrpath"; then