mirror of
git://git.savannah.gnu.org/libtool.git
synced 2024-12-15 06:49:57 +08:00
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>
This commit is contained in:
parent
3078821c7f
commit
4055972b1c
@ -1,5 +1,11 @@
|
|||||||
2010-08-07 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
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.
|
Ensure not to reverse preserving of --debug for relinking/finish.
|
||||||
* libltdl/config/ltmain.m4sh (func_check_version_match): Only
|
* libltdl/config/ltmain.m4sh (func_check_version_match): Only
|
||||||
preserve '--debug' switch if $opt_debug is not equal to ':'.
|
preserve '--debug' switch if $opt_debug is not equal to ':'.
|
||||||
|
@ -43,8 +43,9 @@ if $CXX $CPPFLAGS $CXXFLAGS $CXX_pic_flag -c foo.cpp; then :; else
|
|||||||
CXX_pic_flag=
|
CXX_pic_flag=
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AT_CHECK(["$abs_top_srcdir"/configure lt_cv_prog_compiler_pic="$C_pic_flag" ]dnl
|
LT_AT_CONFIGURE([lt_cv_prog_compiler_pic="$C_pic_flag" ]dnl
|
||||||
[lt_cv_prog_compiler_pic_CXX="$CXX_pic_flag"], [], [ignore], [ignore])
|
[lt_cv_prog_compiler_pic_CXX="$CXX_pic_flag"],
|
||||||
|
["$abs_top_srcdir"/configure])
|
||||||
: ${MAKE=make}
|
: ${MAKE=make}
|
||||||
AT_CHECK([$MAKE], [], [stdout], [ignore])
|
AT_CHECK([$MAKE], [], [stdout], [ignore])
|
||||||
AT_CHECK([if ./libtool --features | grep 'enable shared libraries'; then ]dnl
|
AT_CHECK([if ./libtool --features | grep 'enable shared libraries'; then ]dnl
|
||||||
|
@ -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],
|
m4_define([LT_AT_CONFIGURE],
|
||||||
[AT_CHECK([: ${CONFIG_SHELL=/bin/sh}; export CONFIG_SHELL; ]dnl
|
[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])
|
[0], [ignore], [ignore])
|
||||||
])
|
])
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user