From a93029c2d377daf4f1960346e9254b867d12a961 Mon Sep 17 00:00:00 2001 From: Peter O'Gorman Date: Thu, 29 Apr 2004 14:42:36 +0000 Subject: [PATCH] * ltmain.in: Fix problem with .libs/.libs/libfoo.so appearing on the link line, reported and fix confirmed by Dan S. Camper. --- ChangeLog | 5 +++++ ltmain.in | 15 +++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 26251429e..c26306a04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-04-29 Peter O'Gorman + + * 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 * m4/libtool.m4 (_LT_LANG_CXX_CONFIG): Detect Intel C++ compiler diff --git a/ltmain.in b/ltmain.in index f0f38e334..09e2b3a84 100644 --- 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//'` -- 2.47.3