fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 13:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

autoconf: swrast does not require libdrm

Browse source 
This fixes

  $ ./configure --disable-driglx-direct \
                --with-dri-drivers=swrast \
                --with-gallium-drivers=
This commit is contained in:
Chia-I Wu 2011-07-02 09:49:17 +09:00
parent b115662607
commit 8123934d5a
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
configure.ac
View file

@ -819,11 +819,10 @@ if test "x$enable_dri" = xyes; then
AC_MSG_ERROR([Can't use static libraries for DRI drivers])
fi
if test "x$have_libdrm" != xyes; then
AC_MSG_ERROR([DRI drivers require libdrm >= $LIBDRM_REQUIRED])
# not a hard requirement as swrast does not depend on it
if test "x$have_libdrm" = xyes; then
DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED"
fi
DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED"
fi
dnl
@ -1206,6 +1205,13 @@ if test "x$enable_dri" = xyes; then
[AC_MSG_ERROR([Expat required for DRI.])])
fi
# libdrm is required for all except swrast
if test -n "$DRI_DIRS" -a x"$DRI_DIRS" != xswrast; then
if test "x$have_libdrm" != xyes; then
AC_MSG_ERROR([DRI drivers requires libdrm >= $LIBDRM_REQUIRED])
fi
fi
# put all the necessary libs together, including possibly libdricore
DRI_LIB_DEPS="$DRI_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm -lpthread $DLOPEN_LIBS"
fi
@ -1793,6 +1799,9 @@ dnl Gallium helper functions
dnl
gallium_check_st() {
if test "x$HAVE_ST_DRI" = xyes || test "x$HAVE_ST_XORG" = xyes; then
if test "x$have_libdrm" != xyes; then
AC_MSG_ERROR([DRI or Xorg DDX requires libdrm >= $LIBDRM_REQUIRED])
fi
GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS $1"
fi
if test "x$HAVE_ST_DRI" = xyes && test "x$2" != x; then