diff --git a/ChangeLog b/ChangeLog index 443ee70c..edf24b31 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-02-08 Ralf Wildenhues + + * tests/archive-in-archive.at + (static library contains static library): Test also the actual + broken link command, and the following install command, as + UnixWare ar rightly refuses to put an archive into an archive. + Report by Tim Rice. + 2008-02-06 Peter O'Gorman * libltdl/m4/ltoptions.m4 (_LT_SET_OPTIONS): Only set default diff --git a/tests/archive-in-archive.at b/tests/archive-in-archive.at index 5e675df9..a57dfdd9 100644 --- a/tests/archive-in-archive.at +++ b/tests/archive-in-archive.at @@ -1,6 +1,6 @@ # dmacks.at -- test for dmacks bug -*- Autotest -*- # -# Copyright (C) 2007 Free Software Foundation, Inc. +# Copyright (C) 2007, 2008 Free Software Foundation, Inc. # Written by Peter O'Gorman, 2007 # # This file is part of GNU Libtool. @@ -42,9 +42,10 @@ $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([$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], + [], [ignore], [ignore]) +AT_CHECK([$LIBTOOL --mode=install cp libbar.la $thisdir], [], [ignore], [ignore]) 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])