tests: Call included libtool script with $CONFIG_SHELL

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index e260c63b25265a8ae9e1492543aa74fdd89b303c..8aeb95dd6aef1172b226ed2fee181f9d4da15434 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,12 @@
+2014-03-11  Daiki Ueno  <ueno@gnu.org>
+
+       * init-env.in (top_builddir): Don't set $LIBTOOL.
+       * lang-c: Explicitly call $top_builddir/libtool script with
+       $CONFIG_SHELL; also separate compilation/link into two phase as
+       lang-c++.
+       * lang-c++: Likewise.
+       * lang-objc: Likewise.
+
 2014-03-10  Daiki Ueno  <ueno@gnu.org>
 
        php: Recognize single and double quotes around heredoc label

diff --git a/gettext-tools/tests/init-env.in b/gettext-tools/tests/init-env.in
index 7c71d186a77f41361909947e110a94dfa3f67462..fa428f92ec5cfbe6c4298d6af05e3e7157a4b135 100644 (file)
--- a/gettext-tools/tests/init-env.in
+++ b/gettext-tools/tests/init-env.in
@@ -1,4 +1,4 @@
-# Variable needed by LIBTOOL and LTLIBINTL.
+# Variable needed by LTLIBINTL.
 top_builddir=../..
 
 OBJEXT="@OBJEXT@"
@@ -9,7 +9,6 @@ CXX="@CXX@"
 CXXFLAGS="@CXXFLAGS@"
 CPPFLAGS="@CPPFLAGS@"
 LDFLAGS="@LDFLAGS@"
-LIBTOOL="@LIBTOOL@"
 LTLIBINTL="@LTLIBINTL@"
 JAVA_CHOICE="@JAVA_CHOICE@"
 BUILDJAVA="@BUILDJAVA@"

diff --git a/gettext-tools/tests/lang-c b/gettext-tools/tests/lang-c
index 33935dcbac169b183dcfcace21655d782ccf53a9..3d7b33247d063084c8ac9b4c3e8cfeddab9db85d 100755 (executable)
--- a/gettext-tools/tests/lang-c
+++ b/gettext-tools/tests/lang-c
@@ -42,9 +42,14 @@ EOF
 # Put the -I flags before ${CFLAGS} ${CPPFLAGS}, to make sure that libintl.h
 # is found in the build directory, regardless of -I options present in
 # ${CFLAGS} or ${CPPFLAGS}.
-: ${LIBTOOL=/bin/sh ../../libtool}
-${LIBTOOL} --quiet --tag=CC --mode=link ${CC} -I../.. -I"$abs_top_srcdir"/gnulib-lib ../../gnulib-lib/libgettextlib.la -I../../intl ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o l-c-prog prog.c ${LTLIBINTL} \
-  || exit 1
+${CC} -I../.. -I"$abs_top_srcdir"/gnulib-lib -I../../intl ${CFLAGS} \
+      ${CPPFLAGS} -c prog.c || exit 1
+
+: ${CONFIG_SHELL=${SHELL-/bin/sh}}
+${CONFIG_SHELL} "$top_builddir"/libtool --quiet --tag=CC --mode=link \
+                ${CC} -o l-c-prog prog.${OBJEXT} \
+                ../../gnulib-lib/libgettextlib.la ${LDFLAGS} ${LTLIBINTL} \
+               || exit 1
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} -o l-c-prog.tmp --omit-header --no-location -k_ prog.c || exit 1

diff --git a/gettext-tools/tests/lang-c++ b/gettext-tools/tests/lang-c++
index 110c511f589239289387e1d976913b1e2a55b8d1..26e45067008f975353684ad1ddf2670cd81409bf 100755 (executable)
--- a/gettext-tools/tests/lang-c++
+++ b/gettext-tools/tests/lang-c++
@@ -66,9 +66,12 @@ ${CXX} -I../.. -I../../../gettext-runtime/libasprintf -I"$abs_top_srcdir"/gnulib
 # Remove the -Wl,--disable-auto-import option here that is added by
 # woe32-dll.m4. Cygwin 1.7.2 does not support it in C++ mode: It gives
 # a link error about 'std::cout'.
-: ${LIBTOOL=/bin/sh ../../libtool}
-${LIBTOOL} --quiet --tag=CXX --mode=link --tag=CXX ${CXX} ${CXXFLAGS} `echo "X ${LDFLAGS} " | sed -e 's/^X//' -e 's/ -Wl,--disable-auto-import / /'` -o l-c++-prog l-c++-prog.${OBJEXT} ../../../gettext-runtime/libasprintf/libasprintf.la ../../gnulib-lib/libgettextlib.la ${LTLIBINTL} \
-  || exit 1
+: ${CONFIG_SHELL=${SHELL-/bin/sh}}
+${CONFIG_SHELL} "$top_builddir"/libtool --quiet --tag=CXX --mode=link \
+                ${CXX} ${CXXFLAGS} `echo "X ${LDFLAGS} " | sed -e 's/^X//' -e 's/ -Wl,--disable-auto-import / /'` -o l-c++-prog l-c++-prog.${OBJEXT} \
+                ../../../gettext-runtime/libasprintf/libasprintf.la \
+                ../../gnulib-lib/libgettextlib.la ${LTLIBINTL} \
+               || exit 1
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} -o l-c++-prog.tmp --omit-header --no-location -k_ l-c++-prog.cc || exit 1

diff --git a/gettext-tools/tests/lang-objc b/gettext-tools/tests/lang-objc
index b378d5df70d769fc7221392532d6d2390b7ccfe1..c7766e4608602c2334b26dbfc355a74c06471b5e 100755 (executable)
--- a/gettext-tools/tests/lang-objc
+++ b/gettext-tools/tests/lang-objc
@@ -57,9 +57,14 @@ EOF
 # Put the -I flags before ${CFLAGS} ${CPPFLAGS}, to make sure that libintl.h
 # is found in the build directory, regardless of -I options present in
 # ${CFLAGS} or ${CPPFLAGS}.
-: ${LIBTOOL=/bin/sh ../../libtool}
-${LIBTOOL} --quiet --tag=CC --mode=link ${CC} -I../.. -I"$abs_top_srcdir"/gnulib-lib ../../gnulib-lib/libgettextlib.la -I../../intl ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o l-objc-prog prog.m ${LTLIBINTL} \
-  || exit 1
+${CC} -I../.. -I"$abs_top_srcdir"/gnulib-lib -I../../intl ${CFLAGS} \
+      ${CPPFLAGS} -c prog.m || exit 1
+
+: ${CONFIG_SHELL=${SHELL-/bin/sh}}
+${CONFIG_SHELL} "$top_builddir"/libtool --quiet --tag=CC --mode=link \
+                ${CC} -o l-objc-prog prog.${OBJEXT} \
+                ../../gnulib-lib/libgettextlib.la ${LDFLAGS} ${LTLIBINTL} \
+               || exit 1
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} -o l-objc-prog.tmp --omit-header --no-location -k_ prog.m || exit 1