From: Bruno Haible <bruno@clisp.org>
Date: Sun, 29 Sep 2024 22:06:43 +0000 (+0200)
Subject: build: Fix compilation error on mingw (regression 2024-09-26).
X-Git-Tag: v0.23~101
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=629ba077a6183fe54de34d52b3855266b1e20f8d;p=thirdparty%2Fgettext.git

build: Fix compilation error on mingw (regression 2024-09-26).

* autogen.sh (GNULIB_MODULES_LIBGETTEXTPO_OTHER): Add mixin/printf-posix.
---

diff --git a/.gitignore b/.gitignore
index fc421eab3..71aba41e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -108,7 +108,10 @@
 /gettext-tools/libgettextpo/float.c
 /gettext-tools/libgettextpo/float.in.h
 /gettext-tools/libgettextpo/fopen.c
+/gettext-tools/libgettextpo/fpucw.h
 /gettext-tools/libgettextpo/free.c
+/gettext-tools/libgettextpo/frexp.c
+/gettext-tools/libgettextpo/frexpl.c
 /gettext-tools/libgettextpo/fstat.c
 /gettext-tools/libgettextpo/fstrcmp.c
 /gettext-tools/libgettextpo/fstrcmp.h
@@ -152,6 +155,13 @@
 /gettext-tools/libgettextpo/intprops-internal.h
 /gettext-tools/libgettextpo/intprops.h
 /gettext-tools/libgettextpo/inttypes.in.h
+/gettext-tools/libgettextpo/isnan.c
+/gettext-tools/libgettextpo/isnand-nolibm.h
+/gettext-tools/libgettextpo/isnand.c
+/gettext-tools/libgettextpo/isnanf-nolibm.h
+/gettext-tools/libgettextpo/isnanf.c
+/gettext-tools/libgettextpo/isnanl-nolibm.h
+/gettext-tools/libgettextpo/isnanl.c
 /gettext-tools/libgettextpo/itold.c
 /gettext-tools/libgettextpo/lc-charset-dispatch.c
 /gettext-tools/libgettextpo/lc-charset-dispatch.h
@@ -165,6 +175,8 @@
 /gettext-tools/libgettextpo/malloca.h
 /gettext-tools/libgettextpo/markup.c
 /gettext-tools/libgettextpo/markup.h
+/gettext-tools/libgettextpo/math.c
+/gettext-tools/libgettextpo/math.in.h
 /gettext-tools/libgettextpo/mbrtoc32.c
 /gettext-tools/libgettextpo/mbrtowc.c
 /gettext-tools/libgettextpo/mbrtowc-impl.h
@@ -192,6 +204,10 @@
 /gettext-tools/libgettextpo/pathmax.h
 /gettext-tools/libgettextpo/printf-args.c
 /gettext-tools/libgettextpo/printf-args.h
+/gettext-tools/libgettextpo/printf-frexp.c
+/gettext-tools/libgettextpo/printf-frexp.h
+/gettext-tools/libgettextpo/printf-frexpl.c
+/gettext-tools/libgettextpo/printf-frexpl.h
 /gettext-tools/libgettextpo/printf-parse.c
 /gettext-tools/libgettextpo/printf-parse.h
 /gettext-tools/libgettextpo/pthread.in.h
@@ -213,6 +229,9 @@
 /gettext-tools/libgettextpo/setlocale_null.c
 /gettext-tools/libgettextpo/setlocale_null.h
 /gettext-tools/libgettextpo/signal.in.h
+/gettext-tools/libgettextpo/signbitd.c
+/gettext-tools/libgettextpo/signbitf.c
+/gettext-tools/libgettextpo/signbitl.c
 /gettext-tools/libgettextpo/sigprocmask.c
 /gettext-tools/libgettextpo/size_max.h
 /gettext-tools/libgettextpo/stat-time.c
@@ -868,6 +887,7 @@ core
 /gettext-tools/libgettextpo/inttypes.h
 /gettext-tools/libgettextpo/limits.h
 /gettext-tools/libgettextpo/locale.h
+/gettext-tools/libgettextpo/math.h
 /gettext-tools/libgettextpo/obstack.h
 /gettext-tools/libgettextpo/pthread.h
 /gettext-tools/libgettextpo/sched.h
diff --git a/autogen.sh b/autogen.sh
index db360cd27..984f571c1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -423,10 +423,17 @@ if ! $skip_gnulib; then
   # '#define GNULIB_STRERROR_R_POSIX 1'. Therefore on mingw,
   # libgettextpo/error.o references strerror_r. Therefore we need to include
   # strerror_r.lo in libgettextpo.la.
+  # Module 'mixin/printf-posix' is enabled in gettext-tools/config.status,
+  # because it occurs as dependency of some module ('xstring-buffer' ->
+  # 'string-buffer' -> 'vsnzprintf-posix') in GNULIB_MODULES_TOOLS_FOR_SRC.
+  # Therefore gettext-tools/config.h defines many NEED_* macros, from
+  # gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS. Therefore on mingw,
+  # libgettextpo/vasnprintf.c references isnand-nolibm.h.
   GNULIB_MODULES_LIBGETTEXTPO_OTHER='
     fdopen
     realloc-posix
     strerror_r-posix
+    mixin/printf-posix
   '
   $GNULIB_TOOL --dir=gettext-tools --source-base=libgettextpo --m4-base=libgettextpo/gnulib-m4 --macro-prefix=gtpo --makefile-name=Makefile.gnulib --libtool --local-dir=gnulib-local --local-symlink \
     --import --avoid=progname $GNULIB_MODULES_LIBGETTEXTPO $GNULIB_MODULES_LIBGETTEXTPO_OTHER || exit $?