From: Bruno Haible <bruno@clisp.org>
Date: Fri, 20 Jun 2025 00:48:46 +0000 (+0200)
Subject: Fix 'make installcheck' failure on Cygwin.
X-Git-Tag: v0.26~98
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=91cb1f1cbb2d32b2e1d15a53be7bbc658006a8c0;p=thirdparty%2Fgettext.git

Fix 'make installcheck' failure on Cygwin.

* gettext-tools/configure.ac (INSTALLED_LIBINTL, INSTALLED_LIBGETTEXTPO_DEPS):
New variables.
* gettext-tools/install-tests/Makefile.am (installcheck): Use
INSTALLED_LIBGETTEXTPO_DEPS.
---

diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 94f6434f1..c440d1b1c 100644
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -696,6 +696,14 @@ AC_SUBST([HAVE_JAVAEXEC])
 
 dnl Test for features used in install-tests.
 dnl shlibpath_var and PATH_SEPARATOR are set by LT_INIT.
+if test $USE_INCLUDED_LIBINTL = yes; then
+  INSTALLED_LIBINTL="-lintl $LIBICONV $INTL_MACOSX_LIBS"
+  INSTALLED_LIBGETTEXTPO_DEPS="$INSTALLED_LIBINTL"
+else
+  INSTALLED_LIBINTL=
+  INSTALLED_LIBGETTEXTPO_DEPS="$LIBICONV"
+fi
+AC_SUBST([INSTALLED_LIBGETTEXTPO_DEPS])
 AC_SUBST([PATH_SEPARATOR])
 if test -n "${shlibpath_var}"; then
   if test "${shlibpath_var}" = PATH; then
diff --git a/gettext-tools/install-tests/Makefile.am b/gettext-tools/install-tests/Makefile.am
index 322840347..9eb963df2 100644
--- a/gettext-tools/install-tests/Makefile.am
+++ b/gettext-tools/install-tests/Makefile.am
@@ -20,14 +20,14 @@ installcheck-local:
 	$(CC) -I$(includedir) -L$(libdir) \
 	      $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	      $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-	      -o test-version $(srcdir)/test-version.c -lgettextpo
+	      -o test-version $(srcdir)/test-version.c -lgettextpo $(INSTALLED_LIBGETTEXTPO_DEPS)
 	@AUGMENT_SHLIBPATH@ ./test-version
 	rm -rf test-version test-version$(EXEEXT)
 	$(CC) -I$(includedir) -L$(libdir) \
 	      $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	      -DSRCDIR=\"$(srcdir)/\" \
 	      $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-	      -o test-api $(srcdir)/test-api.c -lgettextpo
+	      -o test-api $(srcdir)/test-api.c -lgettextpo $(INSTALLED_LIBGETTEXTPO_DEPS)
 	@AUGMENT_SHLIBPATH@ ./test-api
 	rm -rf test-api test-api$(EXEEXT)
 	PATH='$(bindir)'@PATH_SEPARATOR@"$$PATH"; xgettext --version | grep 'GNU gettext' > /dev/null