mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2026-02-15 22:05:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: Remove support for non-pkg-config Expat

Browse source 
The Expat XML library has shipped a pkg-config file for long enough to
be in Debian's oldstable (Jessie, April 2015) and Ubuntu's oldest
supported LTS (Trusty, 14.04). The pkg-config file was added in Expat
upstream's commit 352cfc8f59a7, in September 2007.

Drop build support for versions of Expat which do not ship a
pkg-config file.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Derek Foreman <derek.foreman.samsung@gmail.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Daniel Stone 2018-07-21 12:04:13 +01:00
parent 99c3c10ad0
commit bd56f9e29f
1 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
configure.ac
View file

@ -111,16 +111,7 @@ if test "x$enable_libraries" = "xyes"; then
[[#include <time.h>]])
fi
PKG_CHECK_MODULES(EXPAT, [expat], [],
[AC_CHECK_HEADERS(expat.h, [],
[AC_MSG_ERROR([Can't find expat.h. Please install expat.])])
SAVE_LIBS="$LIBS"
AC_SEARCH_LIBS(XML_ParserCreate, expat, [],
[AC_MSG_ERROR([Can't find expat library. Please install expat.])])
EXPAT_LIBS="$LIBS"
LIBS="$SAVE_LIBS"
AC_SUBST(EXPAT_LIBS)
])
PKG_CHECK_MODULES(EXPAT, [expat])
AM_CONDITIONAL([DTD_VALIDATION], [test "x$enable_dtd_validation" = "xyes"])
if test "x$enable_dtd_validation" = "xyes"; then