patch 7.4.1106
Problem: The nsis script can't be used from the appveyor build.
Solution: Add "ifndef" to allow for variables to be set from the command
line. Remove duplicate SetCompressor command. Support using other
gettext binaries. (Ken Takata) Update build instructions to use
libintl-8.dll.
diff --git a/src/os_win32.c b/src/os_win32.c
index 69623f9..c5b23ca 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -463,6 +463,7 @@
#if defined(DYNAMIC_GETTEXT) || defined(PROTO)
# ifndef GETTEXT_DLL
# define GETTEXT_DLL "libintl.dll"
+# define GETTEXT_DLL_ALT "libintl-8.dll"
# endif
/* Dummy functions */
static char *null_libintl_gettext(const char *);
@@ -479,7 +480,7 @@
= null_libintl_bind_textdomain_codeset;
int
-dyn_libintl_init(char *libname)
+dyn_libintl_init()
{
int i;
static struct
@@ -498,7 +499,9 @@
if (hLibintlDLL)
return 1;
/* Load gettext library (libintl.dll) */
- hLibintlDLL = vimLoadLib(libname != NULL ? libname : GETTEXT_DLL);
+ hLibintlDLL = vimLoadLib(GETTEXT_DLL);
+ if (!hLibintlDLL)
+ hLibintlDLL = vimLoadLib(GETTEXT_DLL_ALT);
if (!hLibintlDLL)
{
if (p_verbose > 0)