From 5c007203b73da88b9e76ce28027c6d27661e45b1 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Wed, 2 Aug 2017 19:39:05 +0100 Subject: [PATCH] configure.ac: drop manual detection of expat header/library MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Use the .pc file, as provided by version prior 2.1.0 onward and dropping the manual header/library check. Version 2.1.0 was released back in Mar 2012 and all major distributions use it. Signed-off-by: Emil Velikov Reviewed-by: Nicolai Hähnle Reviewed-by: Eric Engestrom (IRC) --- configure.ac | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 21092abebf7..5b12dd8506a 100644 --- a/configure.ac +++ b/configure.ac @@ -1792,13 +1792,7 @@ if test "x$with_dri_drivers" = xno; then fi # Check for expat -PKG_CHECK_MODULES([EXPAT], [expat], [], - # expat version 2.0 and earlier do not provide expat.pc - [AC_CHECK_HEADER([expat.h],[], - [AC_MSG_ERROR([Expat headers required for DRI not found])]) - AC_CHECK_LIB([expat],[XML_ParserCreate],[], - [AC_MSG_ERROR([Expat library required for DRI not found])]) - EXPAT_LIBS="-lexpat"]) +PKG_CHECK_MODULES([EXPAT], [expat]) dnl If $with_dri_drivers is yes, drivers will be added through dnl platform checks. Set DEFINES and LIB_DEPS -- 2.30.2