configure.ac: look for libdrm_radeon before building gallium/r300,r600
NOTE: This is a candidate for the 7.9 branch.
This commit is contained in:
parent
9e96c737f8
commit
a1aec2e2be
28
configure.ac
28
configure.ac
|
@ -696,6 +696,11 @@ AC_SUBST([GLESv2_PC_LIB_PRIV])
|
||||||
|
|
||||||
AC_SUBST([HAVE_XF86VIDMODE])
|
AC_SUBST([HAVE_XF86VIDMODE])
|
||||||
|
|
||||||
|
PKG_CHECK_MODULES([LIBDRM_RADEON],
|
||||||
|
[libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED],
|
||||||
|
HAVE_LIBDRM_RADEON=yes,
|
||||||
|
HAVE_LIBDRM_RADEON=no)
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
dnl More X11 setup
|
dnl More X11 setup
|
||||||
dnl
|
dnl
|
||||||
|
@ -914,12 +919,7 @@ esac
|
||||||
|
|
||||||
case $DRI_DIRS in
|
case $DRI_DIRS in
|
||||||
*radeon*|*r200*|*r300*|*r600*)
|
*radeon*|*r200*|*r300*|*r600*)
|
||||||
PKG_CHECK_MODULES([LIBDRM_RADEON],
|
if test "x$HAVE_LIBDRM_RADEON" = xyes; then
|
||||||
[libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED],
|
|
||||||
HAVE_LIBDRM_RADEON=yes,
|
|
||||||
HAVE_LIBDRM_RADEON=no)
|
|
||||||
|
|
||||||
if test "$HAVE_LIBDRM_RADEON" = yes; then
|
|
||||||
RADEON_CFLAGS="-DHAVE_LIBDRM_RADEON=1 $LIBDRM_RADEON_CFLAGS"
|
RADEON_CFLAGS="-DHAVE_LIBDRM_RADEON=1 $LIBDRM_RADEON_CFLAGS"
|
||||||
RADEON_LDFLAGS=$LIBDRM_RADEON_LIBS
|
RADEON_LDFLAGS=$LIBDRM_RADEON_LIBS
|
||||||
fi
|
fi
|
||||||
|
@ -1533,8 +1533,12 @@ AC_ARG_ENABLE([gallium-radeon],
|
||||||
[enable_gallium_radeon="$enableval"],
|
[enable_gallium_radeon="$enableval"],
|
||||||
[enable_gallium_radeon=auto])
|
[enable_gallium_radeon=auto])
|
||||||
if test "x$enable_gallium_radeon" = xyes || test "x$enable_gallium_radeon" = xauto; then
|
if test "x$enable_gallium_radeon" = xyes || test "x$enable_gallium_radeon" = xauto; then
|
||||||
GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
|
if test "x$HAVE_LIBDRM_RADEON" = xyes; then
|
||||||
gallium_check_st "radeon/drm" "dri-r300" "xorg-radeon"
|
GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
|
||||||
|
gallium_check_st "radeon/drm" "dri-r300" "xorg-radeon"
|
||||||
|
else
|
||||||
|
AC_MSG_WARN([libdrm_radeon is missing, not building gallium-radeon (r300)])
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
|
@ -1546,8 +1550,12 @@ AC_ARG_ENABLE([gallium-r600],
|
||||||
[enable_gallium_r600="$enableval"],
|
[enable_gallium_r600="$enableval"],
|
||||||
[enable_gallium_r600=auto])
|
[enable_gallium_r600=auto])
|
||||||
if test "x$enable_gallium_r600" = xyes; then
|
if test "x$enable_gallium_r600" = xyes; then
|
||||||
GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r600"
|
if test "x$HAVE_LIBDRM_RADEON" = xyes; then
|
||||||
gallium_check_st "r600/drm" "dri-r600"
|
GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r600"
|
||||||
|
gallium_check_st "r600/drm" "dri-r600"
|
||||||
|
else
|
||||||
|
AC_MSG_ERROR([libdrm_radeon is missing, cannot build gallium-r600])
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
|
|
Loading…
Reference in New Issue