From e82a7a7c0bcf0019b5331086a55a5b776a26a1b9 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 4 Jul 2019 16:27:41 +0200 Subject: [PATCH] build: Fix build error with MSVC. * gettext-runtime/intl/Makefile.am (INTL_WINDOWS_LIBS): New variable. (OTHER_LDFLAGS): Add it. --- gettext-runtime/intl/Makefile.am | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gettext-runtime/intl/Makefile.am b/gettext-runtime/intl/Makefile.am index c45f6d8fd..f5b9787eb 100644 --- a/gettext-runtime/intl/Makefile.am +++ b/gettext-runtime/intl/Makefile.am @@ -383,6 +383,14 @@ libintl_la_DEPENDENCIES = $(WOE32_LIBADD) libgnuintl_la_LIBADD = $(WOE32_LIBADD) libgnuintl_la_DEPENDENCIES = $(WOE32_LIBADD) +# langprefs.c (_nl_language_preferences_win32_95) uses functions from +# advapi32.dll. +if WINDOWS_NATIVE +INTL_WINDOWS_LIBS = -ladvapi32 +else +INTL_WINDOWS_LIBS = +endif + # Libtool's library version information for libintl. # Before making a gettext release, you must change this according to the # libtool documentation, section "Library interface versions". @@ -392,7 +400,8 @@ LTV_AGE=1 # How to build libintl.la and libgnuintl.la. OTHER_LDFLAGS = \ - @LTLIBICONV@ @INTL_MACOSX_LIBS@ @LTLIBTHREAD@ -no-undefined \ + @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(INTL_WINDOWS_LIBS) @LTLIBTHREAD@ \ + -no-undefined \ -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \ -rpath $(libdir) libintl_la_LDFLAGS = $(AM_LDFLAGS) $(OTHER_LDFLAGS) -- 2.47.2