* 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.

diff --git a/ChangeLog b/ChangeLog
index 185a2eca54bc93b2ce8187f6b4f7b9f109cff0bb..638bbd925aa993fe07e24c08d6e25ba20c8fc81a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-12-18  Peter O'Gorman  <peter@pogma.com>,
+           Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * 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.
+
 2005-12-18  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
        * ltmain.in <duplicate_deps, preserve_args, linknames>:

diff --git a/ltmain.in b/ltmain.in
index 1f2aea6d8a907e9e2f78feabd49b71e4b7630293..05b0687ca8239bddcaf43dd8f204a8ceb878a61a 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -1080,6 +1080,7 @@ EOF
     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 +1483,8 @@ EOF
          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 +2011,6 @@ EOF
     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 +3374,9 @@ EOF
 
       # 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