diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2010-08-07 13:07:42 +0200 |
|---|---|---|
| committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2010-08-07 13:08:07 +0200 |
| commit | 3936d01df5d11a861710ecd58a9f9604a49fee08 (patch) | |
| tree | 7ddcf08a370ad55daf136e1ee728e2b4ad537bce | |
| parent | 4055972b1cb63285ddf43652205a5e4bf36eb12e (diff) | |
| download | libtool-3936d01df5d11a861710ecd58a9f9604a49fee08.tar.gz | |
Do not call toplevel configure in non-VPATH build.
* tests/deplibs-mingw.at (deplibs without file command): Use
LT_AT_CONFIGURE for consistency, update comment about why it
might fail.
* tests/pic_flag.at (override pic_flag at configure time): Skip
test if we are building in-tree.
Report by Rainer Tammer.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | tests/deplibs-mingw.at | 5 | ||||
| -rw-r--r-- | tests/pic_flag.at | 1 |
3 files changed, 12 insertions, 2 deletions
@@ -1,5 +1,13 @@ 2010-08-07 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + Do not call toplevel configure in non-VPATH build. + * tests/deplibs-mingw.at (deplibs without file command): Use + LT_AT_CONFIGURE for consistency, update comment about why it + might fail. + * tests/pic_flag.at (override pic_flag at configure time): Skip + test if we are building in-tree. + Report by Rainer Tammer. + Allow running pic_flag test with different shell. * tests/testsuite.at (LT_AT_CONFIGURE): Accept optional second argument specifying the configure script to run. diff --git a/tests/deplibs-mingw.at b/tests/deplibs-mingw.at index 68e83865..45aa0325 100644 --- a/tests/deplibs-mingw.at +++ b/tests/deplibs-mingw.at @@ -74,8 +74,9 @@ EOF chmod +x bin/file PATH=`pwd`/bin${PATH_SEPARATOR-:}$PATH cd new-libtool - AT_CHECK(["$abs_top_srcdir"/configure $configure_options || exit 77], - [], [ignore], [ignore]) + # configure might fail due to in-tree build of toplevel, or + # missing configure flags and other reasons. + LT_AT_CONFIGURE([|| exit 77], ["$abs_top_srcdir"/configure]) cd .. LIBTOOL=new-libtool/libtool export LIBTOOL diff --git a/tests/pic_flag.at b/tests/pic_flag.at index c045ed41..ffad8427 100644 --- a/tests/pic_flag.at +++ b/tests/pic_flag.at @@ -43,6 +43,7 @@ if $CXX $CPPFLAGS $CXXFLAGS $CXX_pic_flag -c foo.cpp; then :; else CXX_pic_flag= fi +AT_CHECK([test "$at_srcdir" != . || exit 77]) LT_AT_CONFIGURE([lt_cv_prog_compiler_pic="$C_pic_flag" ]dnl [lt_cv_prog_compiler_pic_CXX="$CXX_pic_flag"], ["$abs_top_srcdir"/configure]) |