From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sat, 12 Jan 2008 13:58:44 +0000 (+0000)
Subject: * ltmain.in (link mode): Fix warning about -l and -L for
X-Git-Tag: release-1-5-26~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8ad834593004c2a88a1646ffc64e15eb50928a81;p=thirdparty%2Flibtool.git

* ltmain.in (link mode): Fix warning about -l and -L for
archives and objects as output, to not trigger for *.la files.
Non-convenience archives are diagnosed later on.
---

diff --git a/ChangeLog b/ChangeLog
index f9be8fea1..3db01729a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-12  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* ltmain.in (link mode): Fix warning about -l and -L for
+	archives and objects as output, to not trigger for *.la files.
+	Non-convenience archives are diagnosed later on.
+
 2008-01-11  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* libtool.m4 (AC_LIBTOOL_PROG_LD_SHLIBS) <exclude_expsyms>:
diff --git a/ltmain.in b/ltmain.in
index 7f50ea885..572ffa0dd 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -3099,9 +3099,10 @@ EOF
 
     case $linkmode in
     oldlib)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-      fi
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
+      esac
 
       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
 	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
@@ -4238,9 +4239,10 @@ EOF
       ;;
 
     obj)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-      fi
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
+      esac
 
       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
 	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2