* ltmain.in: Fix problem with .libs/.libs/libfoo.so appearing on

the link line, reported and fix confirmed by Dan S. Camper.

diff --git a/ChangeLog b/ChangeLog
index 26251429e73d652c688592aa1f0bd7803893d0ba..c26306a04e315fd8b166300c48fa2037e0fca279 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-29  Peter O'Gorman  <peter@pogma.com>
+
+       * ltmain.in: Fix problem with .libs/.libs/libfoo.so appearing on
+       the link line, reported and fix confirmed by Dan S. Camper.
+       
 2004-04-20  Gary V. Vaughan  <gary@gnu.org>
 
        * m4/libtool.m4 (_LT_LANG_CXX_CONFIG): Detect Intel C++ compiler

diff --git a/ltmain.in b/ltmain.in
index f0f38e334ee5407246058626b4679ba9ec38b3b7..09e2b3a84f26d3e2f89eec13070a8157b3a6381d 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -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//'`