]> git.ipfire.org Git - thirdparty/gettext.git/commitdiff
Fix link error when building with --enable-shared on mingw.
authorBruno Haible <bruno@clisp.org>
Fri, 5 Oct 2018 08:43:53 +0000 (10:43 +0200)
committerBruno Haible <bruno@clisp.org>
Fri, 5 Oct 2018 20:55:11 +0000 (22:55 +0200)
* autogen.sh (GNULIB_MODULES_LIBGETTEXTPO_OTHER): Add 'realloc-posix'.

.gitignore
autogen.sh

index 55acf168ba4d1165f7a8a44ba63c01822ce3a3fa..bacba75b8208c03eb2d61daf8fae47b7f1ce1a7a 100644 (file)
 /gettext-tools/libgettextpo/raise.c
 /gettext-tools/libgettextpo/rawmemchr.c
 /gettext-tools/libgettextpo/rawmemchr.valgrind
+/gettext-tools/libgettextpo/realloc.c
 /gettext-tools/libgettextpo/ref-add.sin
 /gettext-tools/libgettextpo/ref-del.sin
 /gettext-tools/libgettextpo/relocatable.c
index bffda50b975e92671f115f702a9c2717fe734a12..b4435820a7c8b37902dcb8bc70de54b089fc0884 100755 (executable)
@@ -386,7 +386,13 @@ if ! $skip_gnulib; then
       xstriconv
       xvasprintf
     '
+    # Module 'realloc-posix' is enabled in gettext-tools/config.status, because
+    # it occurs as dependency of some module ('read-file') in
+    # GNULIB_MODULES_TOOLS_FOR_SRC. Therefore on mingw, libgettextpo/stdlib.h
+    # contains '#define realloc rpl_realloc'. Therefore we need to include
+    # realloc.lo in libgettextpo.la.
     GNULIB_MODULES_LIBGETTEXTPO_OTHER='
+      realloc-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 $GNULIB_MODULES_LIBGETTEXTPO $GNULIB_MODULES_LIBGETTEXTPO_OTHER || exit $?