Index: ltmain.in
===================================================================
RCS file: /cvsroot/libtool/libtool/ltmain.in,v
retrieving revision 1.310
diff -u -r1.310 ltmain.in
--- ltmain.in	3 Nov 2002 17:35:36 -0000	1.310
+++ ltmain.in	3 Nov 2002 21:37:27 -0000
@@ -144,6 +144,60 @@
   echo $win32_libid_type
 }
 
+# GNU ar 2.10+ was changed to match POSIX; thus no paths are
+# encoded into archives.  This makes 'ar x' malfunction in
+# this piecewise linking case whenever conflicting object
+# names appear in one archive; check, warn and compensate.
+
+# Parameters: $xlib "$xdir"
+extract_ar_objects () {
+  xlib=$1
+  xdir="$2"
+
+  case $xlib in
+  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+  *) xabs=`pwd`"/$xlib" ;;
+  esac
+
+  $show "${rm}r $xdir"
+  $run ${rm}r "$xdir"
+  $show "$mkdir $xdir"
+  $run $mkdir "$xdir"
+  status=$?
+  if test "$status" -ne 0 && test ! -d "$xdir"; then
+    exit $status
+  fi
+
+  # We will extract separately just the conflicting names and we will no
+  # longer touch any unique names. It is faster to leave these extract
+  # automatically by $AR in one run.
+  $show "(cd $xdir && $AR x $xabs)"
+  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+  if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+    :
+  else
+    $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+    $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+    $AR t "$xabs" | sort | uniq -cd | while read -r count name
+    do
+      i=1
+      while test "$i" -le "$count"
+      do
+	# Put our $i before any first dot (extension)
+	# Never overwrite any file
+      	name_to="$name"
+	while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+	do
+	  name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+	done
+	$show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+	$run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+	i=`expr $i + 1`
+      done
+    done
+  fi
+}
+
 # End of Shell function definitions
 #####################################
 
@@ -3350,23 +3404,8 @@
 
 	    for xlib in $convenience; do
 	      # Extract the objects.
-	      case $xlib in
-	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	      *) xabs=`pwd`"/$xlib" ;;
-	      esac
-	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	      xdir="$gentop/$xlib"
-
-	      $show "${rm}r $xdir"
-	      $run ${rm}r "$xdir"
-	      $show "$mkdir $xdir"
-	      $run $mkdir "$xdir"
-	      status=$?
-	      if test "$status" -ne 0 && test ! -d "$xdir"; then
-		exit $status
-	      fi
-	      $show "(cd $xdir && $AR x $xabs)"
-	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+	      xdir="$gentop/"`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+	      extract_ar_objects $xlib "$xdir"
 
 	      libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
 	    done
@@ -3612,23 +3651,8 @@
 
 	  for xlib in $convenience; do
 	    # Extract the objects.
-	    case $xlib in
-	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	    *) xabs=`pwd`"/$xlib" ;;
-	    esac
-	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	    xdir="$gentop/$xlib"
-
-	    $show "${rm}r $xdir"
-	    $run ${rm}r "$xdir"
-	    $show "$mkdir $xdir"
-	    $run $mkdir "$xdir"
-	    status=$?
-	    if test "$status" -ne 0 && test ! -d "$xdir"; then
-	      exit $status
-	    fi
-	    $show "(cd $xdir && $AR x $xabs)"
-	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+	    xdir="$gentop/"`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+	    extract_ar_objects $xlib "$xdir"
 
 	    reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
 	  done
@@ -4389,23 +4413,8 @@
 	# Add in members from convenience archives.
 	for xlib in $addlibs; do
 	  # Extract the objects.
-	  case $xlib in
-	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	  *) xabs=`pwd`"/$xlib" ;;
-	  esac
-	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	  xdir="$gentop/$xlib"
-
-	  $show "${rm}r $xdir"
-	  $run ${rm}r "$xdir"
-	  $show "$mkdir $xdir"
-	  $run $mkdir "$xdir"
-	  status=$?
-	  if test "$status" -ne 0 && test ! -d "$xdir"; then
-	    exit $status
-	  fi
-	  $show "(cd $xdir && $AR x $xabs)"
-	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+	  xdir="$gentop/"`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+	  extract_ar_objects $xlib "$xdir"
 
 	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
 	done