diff options
| author | Daiki Ueno <ueno@gnu.org> | 2014-09-05 15:36:25 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2014-09-05 15:36:41 +0900 |
| commit | d1e71423b911a70a36dc7b764e46954ba7f4f668 (patch) | |
| tree | 7baf9b866524e0cb758405c0aa46eee68538a3ae | |
| parent | 892692a6c57e8a8d10cca6ccda907c4c488a6ca4 (diff) | |
| download | gettext-d1e71423b911a70a36dc7b764e46954ba7f4f668.tar.gz | |
tests: Use libtool in autopoint-3 test
| -rw-r--r-- | gettext-tools/tests/ChangeLog | 4 | ||||
| -rwxr-xr-x | gettext-tools/tests/autopoint-3 | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog index dd1060a13..3da3dfd11 100644 --- a/gettext-tools/tests/ChangeLog +++ b/gettext-tools/tests/ChangeLog @@ -1,5 +1,9 @@ 2014-09-05 Daiki Ueno <ueno@gnu.org> + * autopoint-3: Use libtool when compiling included libintl. + +2014-09-05 Daiki Ueno <ueno@gnu.org> + * autopoint-2, autopoint-3: Collect error output. 2014-07-14 Daiki Ueno <ueno@gnu.org> diff --git a/gettext-tools/tests/autopoint-3 b/gettext-tools/tests/autopoint-3 index 3d1fc61b3..5847033f2 100755 --- a/gettext-tools/tests/autopoint-3 +++ b/gettext-tools/tests/autopoint-3 @@ -41,6 +41,10 @@ ${AUTOMAKE} --add-missing >/dev/null 2>/dev/null \ rm -f configure.ac Makefile.am +: ${LIBTOOLIZE=libtoolize} +${LIBTOOLIZE} --version >/dev/null 2>/dev/null \ + || { echo "Skipping test: libtoolize not found"; exit 77; } + : ${MAKE=make} ${MAKE} --version >/dev/null 2>/dev/null \ || { echo "Skipping test: make not found"; exit 77; } @@ -53,9 +57,10 @@ AC_CONFIG_MACRO_DIR([m4]) AC_INIT([hello], [0.0.0], [bug-gnu-gettext@gnu.org]) AM_INIT_AUTOMAKE([foreign]) +LT_INIT AC_PROG_CC -AM_GNU_GETTEXT +AM_GNU_GETTEXT([use-libtool]) AM_GNU_GETTEXT_VERSION([$required_gettext_version]) AC_CONFIG_HEADERS([config.h]) @@ -87,7 +92,7 @@ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ AM_CPPFLAGS = -I. -I$(srcdir) # Link time dependencies. -LDADD = @LIBINTL@ +LDADD = @LTLIBINTL@ EOF cp -p "$abs_top_srcdir"/gnulib-lib/gettext.h . @@ -106,6 +111,9 @@ test -f po/Makefile.in.in || exit 1 cp -p po/Makevars.template po/Makevars echo hello.c > po/POTFILES.in +${LIBTOOLIZE} -f -i >/dev/null 2>autopoint.err +test $? = 0 || { cat autopoint.err; exit 1; } + ${ACLOCAL} -I m4 >/dev/null 2>autopoint.err test $? = 0 || { cat autopoint.err; exit 1; } |