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>

diff --git a/ChangeLog b/ChangeLog
index 4f2d217f9a0ade8f8c06b7c69aeb554b133545f2..0eecbab22cfea0fa25596a3c68b72ac7934f7ac7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 68e838656e873d93c8ac830cd86d716710028c6e..45aa03251137b77c89847c72b8bf2c5a561dd6e9 100644 (file)
--- 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 c045ed410dc14ea1e2ce6ace729e6b0c0ac91bc0..ffad8427730e061415fed4f17087ab9ed34c6f31 100644 (file)
--- 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])