From: Bruno Haible Date: Fri, 5 Oct 2018 08:43:53 +0000 (+0200) Subject: Fix link error when building with --enable-shared on mingw. X-Git-Tag: v0.20~374 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=090d092ff231962f9b4fb105c0c96f0bd6ef91ad;p=thirdparty%2Fgettext.git Fix link error when building with --enable-shared on mingw. * autogen.sh (GNULIB_MODULES_LIBGETTEXTPO_OTHER): Add 'realloc-posix'. --- diff --git a/.gitignore b/.gitignore index 55acf168b..bacba75b8 100644 --- a/.gitignore +++ b/.gitignore @@ -181,6 +181,7 @@ /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 diff --git a/autogen.sh b/autogen.sh index bffda50b9..b4435820a 100755 --- a/autogen.sh +++ b/autogen.sh @@ -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 $?