Commit bd56f9e2 authored by Daniel Stone's avatar Daniel Stone

build: Remove support for non-pkg-config Expat

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's avatarDaniel Stone <daniels@collabora.com>
Reviewed-by: Derek Foreman's avatarDerek Foreman <derek.foreman.samsung@gmail.com>
Reviewed-by: default avatarEmil Velikov <emil.velikov@collabora.com>
parent 99c3c10a
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment