Fix msginit-4 test failure on mingw.

* gettext-tools/src/Makefile.am (DEFS): Define EXEEXT.
* gettext-tools/src/msginit.c (plural_forms): On Windows, invoke
"cldr-plurals.exe", not "cldr-plurals".

diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
index 83994be0bc208a05ea0cfff4ab48985c77b30814..09a3c153d7f8f31bdc3b33c8b2b266266f2d1aff 100644 (file)
--- a/gettext-tools/src/Makefile.am
+++ b/gettext-tools/src/Makefile.am
@@ -83,7 +83,8 @@ DEFS = \
   -DGETTEXTJAR=\"$(jardir)/gettext.jar\" \
   -DLIBDIR=\"$(libdir)\" \
   -DGETTEXTDATADIR=\"$(pkgdatadir)\" \
-  -DPROJECTSDIR=\"$(projectsdir)\" @DEFS@
+  -DPROJECTSDIR=\"$(projectsdir)\" \
+  -DEXEEXT=\"@EXEEXT@\" @DEFS@
 # Ensure that <stdint.h> defines SIZE_MAX in C++ mode, like it does in C mode.
 AM_CXXFLAGS = -D__STDC_LIMIT_MACROS
 

diff --git a/gettext-tools/src/msginit.c b/gettext-tools/src/msginit.c
index 0098bc74af3f84e9cd2cb56f8acff6ba3853e6d1..889bd46627af0cf6a936aad6d9af2de2f28e0f2c 100644 (file)
--- a/gettext-tools/src/msginit.c
+++ b/gettext-tools/src/msginit.c
@@ -1365,7 +1365,7 @@ plural_forms ()
       if (gettextlibdir == NULL || gettextlibdir[0] == '\0')
         gettextlibdir = relocate (LIBDIR "/gettext");
 
-      prog = xconcatenated_filename (gettextlibdir, "cldr-plurals", NULL);
+      prog = xconcatenated_filename (gettextlibdir, "cldr-plurals", EXEEXT);
 
       last_dir = xstrdup (gettextcldrdir);
       dirs[0] = "common";