From: Bruno Haible <bruno@clisp.org>
Date: Fri, 15 Feb 2019 20:41:01 +0000 (+0100)
Subject: libtextstyle: Omit tests that rely on more than the public libtextstyle API.
X-Git-Tag: v0.20~151
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24090b92ca28b7c62c0fdd07548f4ee408fe3715;p=thirdparty%2Fgettext.git

libtextstyle: Omit tests that rely on more than the public libtextstyle API.

* libtextstyle/autogen.sh: Don't pass --with-tests to gnulib-tool.
(GNULIB_MODULES): Add term-ostream-tests.
* gnulib-local/modules/term-ostream-tests (Makefile.am): Don't add
@INTL_MACOSX_LIBS@ to test_term_ostream_LDADD.
* gettext-tools/gnulib-tests/Makefile.am (test_term_ostream_LDADD): Add
@INTL_MACOSX_LIBS@ here.
---

diff --git a/gettext-tools/gnulib-tests/Makefile.am b/gettext-tools/gnulib-tests/Makefile.am
index 0d13afc3e..e30881a01 100644
--- a/gettext-tools/gnulib-tests/Makefile.am
+++ b/gettext-tools/gnulib-tests/Makefile.am
@@ -24,6 +24,10 @@ AUTOMAKE_OPTIONS += 1.11 color-tests
 # Ensure that test-quotearg.c finds libintl.h.
 AM_CPPFLAGS += -I../intl
 
+# Ensure that test-term-ostream links correctly when using --disable-shared
+# on macOS.
+test_term_ostream_LDADD += @INTL_MACOSX_LIBS@
+
 
 # Remove .deps directories creates by 'configure'.
 # I would say that this left-over is an Automake 1.16.1 bug.
diff --git a/gnulib-local/modules/term-ostream-tests b/gnulib-local/modules/term-ostream-tests
index 6de0c87ba..f6613bcb7 100644
--- a/gnulib-local/modules/term-ostream-tests
+++ b/gnulib-local/modules/term-ostream-tests
@@ -27,4 +27,4 @@ Makefile.am:
 TESTS += test-term-ostream-xterm.sh
 TESTS_ENVIRONMENT += srcdir='$(srcdir)'
 check_PROGRAMS += test-term-ostream
-test_term_ostream_LDADD = $(LIBTERMCAP) $(LDADD) @INTL_MACOSX_LIBS@
+test_term_ostream_LDADD = $(LIBTERMCAP) $(LDADD)
diff --git a/libtextstyle/autogen.sh b/libtextstyle/autogen.sh
index e4a86e765..6773c22a1 100755
--- a/libtextstyle/autogen.sh
+++ b/libtextstyle/autogen.sh
@@ -86,9 +86,11 @@ if test $skip_gnulib = false; then
       filename
       xalloc
       xconcat-filename
+
+      term-ostream-tests
     '
     $GNULIB_TOOL --lib=libtextstyle --source-base=lib --m4-base=gnulib-m4 --tests-base=tests \
-      --with-tests --makefile-name=Makefile.gnulib --libtool \
+      --makefile-name=Makefile.gnulib --libtool \
       --local-dir=gnulib-local --local-dir=../gnulib-local \
       --import --avoid=hash-tests $GNULIB_MODULES
     $GNULIB_TOOL --copy-file build-aux/config.guess; chmod a+x build-aux/config.guess