Re: Problem with /.libs/.libs/ during link

[Peter O'Gorman]

Dan S. Camper wrote:

> Thank you VERY much for the prompt and -- better yet -- working fix!

Thank you.

Note, I just applied the attached patch to branch-1-5.

Peter
--
Peter O'Gorman - http://www.pogma.com

Index: ChangeLog
2004-04-29  Peter O'Gorman  <address@hidden>

        * ltmain.in: Fix problem with .libs/.libs/libfoo.so appearing on
        the link line, reported and fix confirmed by Dan S. Camper.

from  Gary V. Vaughan  <address@hidden>
Index: ltmain.in
===================================================================
RCS file: /cvsroot/libtool/libtool/ltmain.in,v
retrieving revision 1.334.2.32
diff -u -3 -p -u -r1.334.2.32 ltmain.in
--- ltmain.in 1 Apr 2004 04:34:22 -0000 1.334.2.32
+++ ltmain.in 29 Apr 2004 14:39:36 -0000
@@ -2151,10 +2151,17 @@ EOF
            absdir="$libdir"
          fi
        else
-         dir="$ladir/$objdir"
-         absdir="$abs_ladir/$objdir"
-         # Remove this search path later
-         notinst_path="$notinst_path $abs_ladir"
+         if test ! -f "$ladir/$objdir/$linklib" && test -f 
"$abs_ladir/$linklib"; then
+           dir="$ladir"
+           absdir="$abs_ladir"
+           # Remove this search path later
+           notinst_path="$notinst_path $abs_ladir"
+         else
+           dir="$ladir/$objdir"
+           absdir="$abs_ladir/$objdir"
+           # Remove this search path later
+           notinst_path="$notinst_path $abs_ladir"
+         fi
        fi # $installed = yes
        name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`