2007-06-03  Peter O'Gorman  <peter@pogma.com>

	* libltdl/m4/libtool.m4 (old_archive_cmds): Remove
	old_deplibs.
	* tests/dmacks.at: Check for archives as members of static
	archives. Currently XFAILS, above only eliminates one of the
	two static archives.
	* Makefile.am: Add test.
	Reported by Daniel Macks <dmacks@netspace.com>

Index: Makefile.am
===================================================================
RCS file: /sources/libtool/libtool/Makefile.am,v
retrieving revision 1.220
diff -u -r1.220 Makefile.am
--- Makefile.am	8 May 2007 14:38:50 -0000	1.220
+++ Makefile.am	3 Jun 2007 05:33:50 -0000
@@ -441,6 +441,7 @@
 		  tests/export.at \
 		  tests/search-path.at \
 		  tests/indirect_deps.at \
+		  tests/dmacks.at \
 		  tests/destdir.at \
 		  tests/old-m4-iface.at \
 		  tests/am-subdir.at \
Index: libltdl/m4/libtool.m4
===================================================================
RCS file: /sources/libtool/libtool/libltdl/m4/libtool.m4,v
retrieving revision 1.104
diff -u -r1.104 libtool.m4
--- libltdl/m4/libtool.m4	1 Jun 2007 06:35:05 -0000	1.104
+++ libltdl/m4/libtool.m4	3 Jun 2007 05:33:51 -0000
@@ -1232,7 +1232,7 @@
     [Commands used to install an old-style archive])
 
 # Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
 old_postinstall_cmds='chmod 644 $oldlib'
 old_postuninstall_cmds=
 
Index: tests/dmacks.at
===================================================================
RCS file: tests/dmacks.at
diff -N tests/dmacks.at
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/dmacks.at	3 Jun 2007 05:33:51 -0000
@@ -0,0 +1,51 @@
+# dmacks.at --  test for dmacks bug  -*- Autotest -*-
+#
+#   Copyright (C) 2007 Free Software Foundation, Inc.
+#   Written by Peter O'Gorman, 2007
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# GNU Libtool is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from  http://www.gnu.org/licenses/gpl.html,
+# or obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+####
+
+
+AT_SETUP([static library contains static library])
+AT_KEYWORDS([libtool])
+
+AT_DATA([foo.c],
+[
+int foo() { return 1;}
+])
+
+AT_DATA([bar.c],
+[
+int bar() { return 1;}
+])
+
+thisdir=`cd . && pwd`
+$LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c -o foo.lo foo.c
+$LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c -o bar.lo bar.c
+$LIBTOOL --mode=link --tag=CC --tag=disable-shared $CC $CFLAGS $LDFLAGS \
+-o libfoo.la foo.lo -version-info 1:0:0 -rpath $thisdir
+$LIBTOOL --mode=install cp libfoo.la $thisdir 
+$LIBTOOL --mode=link --tag=CC --tag=disable-shared $CC $CFLAGS $LDFLAGS \
+-o libbar.la bar.lo ./libfoo.a -version-info 1:0:0 -rpath $thisdir 
+$LIBTOOL --mode=install cp libbar.la $thisdir
+AT_CHECK([ar -t libbar.a | grep libfoo.a],[1],[ignore],[ignore])
+archive_contents=`ar -t libbar.a`
+AT_XFAIL_IF([case "$archive_contents" in *"libfoo.a"*) : ;; esac])
+AT_CLEANUP