diff options
| author | Daiki Ueno <ueno@gnu.org> | 2013-07-10 17:14:57 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2013-07-10 18:34:09 +0900 |
| commit | 6c0abd26de617b218e86360885c1a6674fe1a4ea (patch) | |
| tree | 7091011ed64116821ef6b5287d5713a7f605f6cd /gettext-tools/tests/lang-c++ | |
| parent | b877f85b1825a080fc7562bfbe4ed697d94016e8 (diff) | |
| download | external_gettext-6c0abd26de617b218e86360885c1a6674fe1a4ea.zip external_gettext-6c0abd26de617b218e86360885c1a6674fe1a4ea.tar.gz external_gettext-6c0abd26de617b218e86360885c1a6674fe1a4ea.tar.bz2 | |
gettext-tools: convert tests to use init.sh from Gnulib
Diffstat (limited to 'gettext-tools/tests/lang-c++')
| -rwxr-xr-x | gettext-tools/tests/lang-c++ | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gettext-tools/tests/lang-c++ b/gettext-tools/tests/lang-c++ index a14b223..4cc12fb 100755 --- a/gettext-tools/tests/lang-c++ +++ b/gettext-tools/tests/lang-c++ @@ -1,4 +1,5 @@ #! /bin/sh +. "${srcdir=.}/init.sh"; path_prepend_ . ../src # Test of gettext facilities in the C++ language. # Assumes an fr_FR locale is installed. @@ -60,7 +61,7 @@ int main (int argc, char *argv[]) EOF # Variable needed by LTLIBINTL. -top_builddir=.. +top_builddir=../.. tmpfiles="$tmpfiles l-c++-prog.${OBJEXT} l-c++-prog${EXEEXT}" # Compile in two steps from .cc to .o and from .o to 'l-c++-prog'. This way, @@ -68,12 +69,13 @@ tmpfiles="$tmpfiles l-c++-prog.${OBJEXT} l-c++-prog${EXEEXT}" # Put the -I flags before ${CXXFLAGS} ${CPPFLAGS}, to make sure that libintl.h # is found in the build directory, regardless of -I options present in # ${CXXFLAGS} or ${CPPFLAGS}. -${CXX} -I.. -I../../gettext-runtime/libasprintf -I$top_srcdir/gnulib-lib -I../intl ${CXXFLAGS} ${CPPFLAGS} -c l-c++-prog.cc \ +${CXX} -I../.. -I../../../gettext-runtime/libasprintf -I../$top_srcdir/gnulib-lib -I../../intl ${CXXFLAGS} ${CPPFLAGS} -c l-c++-prog.cc \ || exit 1 # 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} --quiet --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} \ +: ${LIBTOOL=/bin/sh ../../libtool} +${LIBTOOL} --quiet --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 tmpfiles="$tmpfiles l-c++-prog.tmp l-c++-prog.pot" |