From: Bruno Haible Date: Sat, 23 Dec 2006 16:02:48 +0000 (+0000) Subject: Avoid link error due to xmlFree on mingw and cygwin. X-Git-Tag: v0.17~528 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dc171b3ee999d47ad2df3ca238f2f73c5c1598c4;p=thirdparty%2Fgettext.git Avoid link error due to xmlFree on mingw and cygwin. --- diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog index 1baa887e8..a7c079303 100644 --- a/gettext-tools/ChangeLog +++ b/gettext-tools/ChangeLog @@ -1,3 +1,8 @@ +2006-12-23 Bruno Haible + + * gnulib-lib/Makefile.am (AM_CPPFLAGS): Define LIBXML_STATIC. + Needed for mingw and cygwin. + 2006-12-22 Bruno Haible * woe32dll/c++html-styled-ostream.cc: New file. diff --git a/gettext-tools/gnulib-lib/Makefile.am b/gettext-tools/gnulib-lib/Makefile.am index 410c05984..df6ce8467 100644 --- a/gettext-tools/gnulib-lib/Makefile.am +++ b/gettext-tools/gnulib-lib/Makefile.am @@ -48,6 +48,13 @@ AM_CPPFLAGS += -I$(top_builddir) -I$(top_srcdir) # Parametrization of the 'relocatable' module. AM_CPPFLAGS += -DDEPENDS_ON_LIBICONV=1 -DDEPENDS_ON_LIBINTL=1 +# Parametrization of the 'libxml' module: +# When building a shared library, don't export the variables +# xmlMalloc, xmlMallocAtomic, xmlRealloc, xmlFree, xmlMemStrdup. +if INCLUDED_LIBXML +AM_CPPFLAGS += -DLIBXML_STATIC +endif + # Rules generated and collected by gnulib-tool. include Makefile.gnulib