From 6f9298dbde63049da6f530ba4f4693ba78b01448 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Wed, 2 Aug 2017 19:39:04 +0100 Subject: [PATCH] configure.ac: unconditionally check for expat MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Earlier commits moved the xmlconfig library to a wider userbase. Thus having the check within --enable-dri is insufficient. Upon closer look, nine needed it from it's early days - 948e6c52282 ("nine: Add drirc options (v2)") Fixes: 601093f95ddf ("xmlconfig: move into src/util") Cc: Axel Davy Signed-off-by: Emil Velikov Reviewed-by: Nicolai Hähnle Reviewed-by: Eric Engestrom (IRC) --- configure.ac | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 3b45baf6d08..21092abebf7 100644 --- a/configure.ac +++ b/configure.ac @@ -1791,6 +1791,15 @@ if test "x$with_dri_drivers" = xno; then with_dri_drivers='' 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"]) + dnl If $with_dri_drivers is yes, drivers will be added through dnl platform checks. Set DEFINES and LIB_DEPS if test "x$enable_dri" = xyes; then @@ -1824,15 +1833,6 @@ if test "x$enable_dri" = xyes; then with_dri_drivers="i915 i965 nouveau r200 radeon swrast" 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"]) - # put all the necessary libs together DRI_LIB_DEPS="$DRI_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIBS -lm $PTHREAD_LIBS $DLOPEN_LIBS" fi