]> git.ipfire.org Git - thirdparty/gettext.git/commitdiff
tests: Use libtool in autopoint-3 test
authorDaiki Ueno <ueno@gnu.org>
Fri, 5 Sep 2014 06:36:25 +0000 (15:36 +0900)
committerDaiki Ueno <ueno@gnu.org>
Fri, 5 Sep 2014 06:36:41 +0000 (15:36 +0900)
gettext-tools/tests/ChangeLog
gettext-tools/tests/autopoint-3

index dd1060a135546a2d011619ccd22dcad785dd15da..3da3dfd11b4111a1d308941100ba380d29bac7b8 100644 (file)
@@ -1,3 +1,7 @@
+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.
index 3d1fc61b3c5cb2ddbb2baa72f1e374f26a4c47fc..5847033f250bb3883c7f92940c72cd5454f13d71 100755 (executable)
@@ -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; }