From: Bruno Haible <bruno@clisp.org>
Date: Wed, 23 Oct 2024 07:59:49 +0000 (+0200)
Subject: Fix test failure of autopoint-3 on Cygwin.
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=24bfd1666958acf4f63d0419a85099da4901fb80;p=thirdparty%2Fgettext.git

Fix test failure of autopoint-3 on Cygwin.

It was broken since commit "tests: Use libtool in autopoint-3 test" (2014-09-05):
The Makefile specified to link the 'hello' program without libtool
(and thus Automake generated a direct link command without libtool),
but the LDADD variable used @LTLIBINTL@. On Cygwin, this led to a use of
the -R option, which the compiler does not understand:
x86_64-pc-cygwin-gcc: error: unrecognized command line option ‘-R’; did you mean ‘-R’?

* gettext-tools/tests/autopoint-3: Don't invoke LT_INIT. Use @LIBINTL@,
not @LTLIBINTL@. Don't touch ltmain.sh.
---

diff --git a/gettext-tools/tests/autopoint-3 b/gettext-tools/tests/autopoint-3
index 269a4f95c..af2e17fd9 100755
--- a/gettext-tools/tests/autopoint-3
+++ b/gettext-tools/tests/autopoint-3
@@ -48,7 +48,6 @@ export gettext_datadir
 cat <<EOF >configure.ac
 AC_INIT([hello], [0.0.0], [bug-gnu-gettext@gnu.org])
 AM_INIT_AUTOMAKE([foreign])
-LT_INIT
 
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -84,7 +83,7 @@ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 AM_CPPFLAGS = -I. -I$(srcdir)
 
 # Link time dependencies.
-LDADD = @LTLIBINTL@
+LDADD = @LIBINTL@
 EOF
 
 cp -p "$abs_top_srcdir"/gnulib-lib/gettext.h .
@@ -115,10 +114,6 @@ fi
 ${AUTOCONF} >/dev/null 2>autopoint.err
 test $? = 0 || { cat autopoint.err; Exit 1; }
 
-# If ltmain.sh is not present, some installations of Automake fail with an
-# error "configure.ac:3: error: required file './ltmain.sh' not found".
-touch ltmain.sh
-
 # Avoid an Automake 1.16.5 failure, in the presence of Autoconf 2.71, on an ext4
 # file system:
 #   PREFIX/share/automake-1.16/am/depend2.am: error: am__fastdepCC does not appear in AM_CONDITIONAL