KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure.ac: unconditionally check for expat 

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 - 948e6c5228
("nine: Add drirc options (v2)")

Fixes: 601093f95d ("xmlconfig: move into src/util")
Cc: Axel Davy <axel.davy@ens.fr>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com> (IRC)
This commit is contained in:
Emil Velikov 2017-08-02 19:39:04 +01:00 committed by Emil Velikov
parent f99a733e38
commit 6f9298dbde
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure.ac
View File

@ -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