Allow running pic_flag test with different shell.

* tests/testsuite.at (LT_AT_CONFIGURE): Accept optional second
argument specifying the configure script to run.
* tests/pic_flag.at (override pic_flag at configure time):
Use LT_AT_CONFIGURE.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 8f6cb6524adfa169473b07de5270393d73b861e3..4f2d217f9a0ade8f8c06b7c69aeb554b133545f2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-08-07  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       Allow running pic_flag test with different shell.
+       * tests/testsuite.at (LT_AT_CONFIGURE): Accept optional second
+       argument specifying the configure script to run.
+       * tests/pic_flag.at (override pic_flag at configure time):
+       Use LT_AT_CONFIGURE.
+
        Ensure not to reverse preserving of --debug for relinking/finish.
        * libltdl/config/ltmain.m4sh (func_check_version_match): Only
        preserve '--debug' switch if $opt_debug is not equal to ':'.

diff --git a/tests/pic_flag.at b/tests/pic_flag.at
index e62e1b7a5a1589a68390fd54831c192d7ba9e049..c045ed410dc14ea1e2ce6ace729e6b0c0ac91bc0 100644 (file)
--- a/tests/pic_flag.at
+++ b/tests/pic_flag.at
@@ -43,8 +43,9 @@ if $CXX $CPPFLAGS $CXXFLAGS $CXX_pic_flag -c foo.cpp; then :; else
   CXX_pic_flag=
 fi
 
-AT_CHECK(["$abs_top_srcdir"/configure lt_cv_prog_compiler_pic="$C_pic_flag" ]dnl
-        [lt_cv_prog_compiler_pic_CXX="$CXX_pic_flag"], [], [ignore], [ignore])
+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])
 : ${MAKE=make}
 AT_CHECK([$MAKE], [], [stdout], [ignore])
 AT_CHECK([if ./libtool --features | grep 'enable shared libraries'; then ]dnl

diff --git a/tests/testsuite.at b/tests/testsuite.at
index 393596269ca872e14dec4ad15581bd31e258c536..35b920bdbeb1d90e9245efe139c0998684d316a1 100644 (file)
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -146,11 +146,13 @@ AT_KEYWORDS([autoconf automake])
 ])
 
 
-# LT_AT_CONFIGURE([OPTIONS])
-# --------------------------
+# LT_AT_CONFIGURE([OPTIONS], [CONFIGURE-SCRIPT])
+# ----------------------------------------------
+# Configure CONFIGURE-SCRIPT, defaulting to ./configure, with
+# additional OPTIONS.
 m4_define([LT_AT_CONFIGURE],
 [AT_CHECK([: ${CONFIG_SHELL=/bin/sh}; export CONFIG_SHELL; ]dnl
-         [$CONFIG_SHELL ./configure $configure_options $1],
+         [$CONFIG_SHELL m4_default([$2], [./configure]) $configure_options $1],
          [0], [ignore], [ignore])
 ])