fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-17 00:08:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

configure.ac: Remove redundant checks of enable_dri.

Browse source 
The whole block is enclosed inside if test "x$enable_dri" = xyes.
This commit is contained in:
Matt Turner 2013-03-05 10:27:22 -08:00
parent 79a0977241
commit 7de78ce5e5
1 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
configure.ac
View file

@ -1062,26 +1062,24 @@ if test "x$enable_dri" = xyes; then
DRI_DIRS=`echo "$DRI_DIRS" | $SED 's/ */ /g'` DRI_DIRS=`echo "$DRI_DIRS" | $SED 's/ */ /g'`
# Check for expat # Check for expat
if test "x$enable_dri" = xyes; then EXPAT_INCLUDES=""
EXPAT_INCLUDES="" EXPAT_LIB=-lexpat
EXPAT_LIB=-lexpat AC_ARG_WITH([expat],
AC_ARG_WITH([expat], [AS_HELP_STRING([--with-expat=DIR],
[AS_HELP_STRING([--with-expat=DIR], [expat install directory])],[
[expat install directory])],[ EXPAT_INCLUDES="-I$withval/include"
EXPAT_INCLUDES="-I$withval/include" CPPFLAGS="$CPPFLAGS $EXPAT_INCLUDES"
CPPFLAGS="$CPPFLAGS $EXPAT_INCLUDES" LDFLAGS="$LDFLAGS -L$withval/$LIB_DIR"
LDFLAGS="$LDFLAGS -L$withval/$LIB_DIR" EXPAT_LIB="-L$withval/$LIB_DIR -lexpat"
EXPAT_LIB="-L$withval/$LIB_DIR -lexpat" ])
]) AC_CHECK_HEADER([expat.h],[],[AC_MSG_ERROR([Expat required for DRI.])])
AC_CHECK_HEADER([expat.h],[],[AC_MSG_ERROR([Expat required for DRI.])]) save_LIBS="$LIBS"
save_LIBS="$LIBS" AC_CHECK_LIB([expat],[XML_ParserCreate],[],
AC_CHECK_LIB([expat],[XML_ParserCreate],[], [AC_MSG_ERROR([Expat required for DRI.])])
[AC_MSG_ERROR([Expat required for DRI.])]) LIBS="$save_LIBS"
LIBS="$save_LIBS"
fi
# if we are building any dri driver other than swrast or using the dri state tracker ... # if we are building any dri driver other than swrast or using the dri state tracker ...
if test -n "$DRI_DIRS" -a x"$DRI_DIRS" != xswrast -a "x$enable_dri" = xyes; then if test -n "$DRI_DIRS" -a x"$DRI_DIRS" != xswrast; then
# ... libdrm is required # ... libdrm is required
if test "x$have_libdrm" != xyes; then if test "x$have_libdrm" != xyes; then
AC_MSG_ERROR([DRI drivers requires libdrm >= $LIBDRM_REQUIRED]) AC_MSG_ERROR([DRI drivers requires libdrm >= $LIBDRM_REQUIRED])