]> git.ipfire.org Git - thirdparty/gettext.git/commitdiff
build: Fix build error with MSVC.
authorBruno Haible <bruno@clisp.org>
Thu, 4 Jul 2019 14:27:41 +0000 (16:27 +0200)
committerBruno Haible <bruno@clisp.org>
Mon, 13 Apr 2020 10:52:06 +0000 (12:52 +0200)
* gettext-runtime/intl/Makefile.am (INTL_WINDOWS_LIBS): New variable.
(OTHER_LDFLAGS): Add it.

gettext-runtime/intl/Makefile.am

index c45f6d8fde84ba5d2ac2454b4d46e7721f92ebd5..f5b9787eb0ef15c2a7b230dcc829bfa58f17df51 100644 (file)
@@ -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)