]> git.ipfire.org Git - thirdparty/gettext.git/commit
build: Remove expat dependency
authorDaiki Ueno <ueno@gnu.org>
Wed, 9 Dec 2015 08:35:34 +0000 (17:35 +0900)
committerDaiki Ueno <ueno@gnu.org>
Wed, 9 Dec 2015 10:07:06 +0000 (19:07 +0900)
commit898e184a596c43abf1067089a03df3e79b4e4527
treee9f5596bb75f8a0ba47f9b34d26346f53d981613
parentf6dde6baeef8e6cb5ec92bc6c67c5c0304ba4396
build: Remove expat dependency

* DEPENDENCIES: Suggest libxml2 instead of expat.
* gnulib-local/lib/markup.c: New file.
* gnulib-local/lib/markup.h: New file.
* gnulib-local/modules/markup: New file.
* autogen.sh (GNULIB_MODULES_LIBGETTEXTPO): Add markup module.
* gettext-tools/configure.ac: Remove checks for expat.
* gettext-tools/gnulib-lib/.gitignore: Ignore modules pulled by
gnulib-tool due to the markup module usage.
* gettext-tools/gnulib-tests/.gitignore: Likewise.
* gettext-tools/libgettextpo/.gitignore: Likewise.
* gettext-tools/libgettextpo/Makefile.am (libgettextpo_la_AUXSOURCES):
Remove ../src/libexpat-compat.c.
(libgettextpo_la_LDFLAGS): Remove @LTLIBEXPAT@.
* gettext-tools/src/Makefile.am (noinst_HEADERS): Remove
libexpat-compat.h.
(libgettextsrc_la_SOURCES): Remove libexpat-compat.c.
(libgettextsrc_la_LDFLAGS): Remove @LTLIBEXPAT@.
* gettext-tools/src/format-kde-kuit.c: Use functions from markup.h, when
the file is being compiled as part of libgettextpo.  Otherwise use
libxml2.
* gettext-tools/src/libexpat-compat.c: Remove.
* gettext-tools/src/libexpat-compat.h: Remove.
15 files changed:
.gitignore
DEPENDENCIES
autogen.sh
gettext-tools/configure.ac
gettext-tools/gnulib-lib/.gitignore
gettext-tools/gnulib-tests/.gitignore
gettext-tools/libgettextpo/.gitignore
gettext-tools/libgettextpo/Makefile.am
gettext-tools/src/Makefile.am
gettext-tools/src/format-kde-kuit.c
gettext-tools/src/libexpat-compat.c [deleted file]
gettext-tools/src/libexpat-compat.h [deleted file]
gnulib-local/lib/markup.c [new file with mode: 0644]
gnulib-local/lib/markup.h [new file with mode: 0644]
gnulib-local/modules/markup [new file with mode: 0644]