libjava.exp (libjava_find_lib): Remove duplicate .la files.

2002-02-10  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>

	* lib/libjava.exp (libjava_find_lib): Remove duplicate .la files.

From-SVN: r49659

libjava/testsuite/ChangeLog

+2002-02-10  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* lib/libjava.exp (libjava_find_lib): Remove duplicate .la files.
+
 2002-01-05  H.J. Lu <hjl@gnu.org>
 
 	* libjava.jni/jni.exp: Add -I.. for generated header.

libjava/testsuite/lib/libjava.exp

-# Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation
+# Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation
 
 load_lib "libgloss.exp"
 
@@ -175,11 +175,15 @@ proc libjava_find_lib {dir name} {
     foreach sub {.libs _libs} {
 	if {$gp != ""} {
 	    if {[file exists $gp/$dir/$sub/lib${name}.a]} then {
-		return "$gp/$dir/lib${name}.la -L$gp/$dir/$sub"
+		# Just return the `-L' option.  The library itself
+		# will be picked up via the spec file.
+		return "-L$gp/$dir/$sub"
 	    }
 	}
+	# Just return the `-L' option.  The library itself will be
+	# picked up via the spec file.
 	set lib [findfile $base_dir/../../$dir/$sub/lib${name}.a \
-		   "$base_dir/../../$dir/lib${name}.la -L$base_dir/../../$dir/$sub" \
+		   "-L$base_dir/../../$dir/$sub" \
 		   ""]
 	if {$lib != ""} {
 	    return $lib