configure.ac: do not set HAVE_DRI(23) when libdrm is missing
These conditionals are used to guard both dri modules and loader(s). Currently if we try to build the gallium swrast dri module (without glx) on a system that's missing libdrm the build will fail. v2: Make sure we assign prior to checking the have_libdrm variable. Cc: 10.6 <mesa-stable@lists.freedesktop.org> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
This commit is contained in:
parent
fe42902009
commit
16f6d432de
18
configure.ac
18
configure.ac
|
@ -913,6 +913,13 @@ fi
|
||||||
AM_CONDITIONAL(HAVE_DRI_GLX, test "x$enable_glx" = xyes -a \
|
AM_CONDITIONAL(HAVE_DRI_GLX, test "x$enable_glx" = xyes -a \
|
||||||
"x$enable_dri" = xyes)
|
"x$enable_dri" = xyes)
|
||||||
|
|
||||||
|
# Check for libdrm
|
||||||
|
PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED],
|
||||||
|
[have_libdrm=yes], [have_libdrm=no])
|
||||||
|
if test "x$have_libdrm" = xyes; then
|
||||||
|
DEFINES="$DEFINES -DHAVE_LIBDRM"
|
||||||
|
fi
|
||||||
|
|
||||||
# Select which platform-dependent DRI code gets built
|
# Select which platform-dependent DRI code gets built
|
||||||
case "$host_os" in
|
case "$host_os" in
|
||||||
darwin*)
|
darwin*)
|
||||||
|
@ -925,8 +932,8 @@ esac
|
||||||
|
|
||||||
AM_CONDITIONAL(HAVE_DRICOMMON, test "x$enable_dri" = xyes )
|
AM_CONDITIONAL(HAVE_DRICOMMON, test "x$enable_dri" = xyes )
|
||||||
AM_CONDITIONAL(HAVE_DRISW, test "x$enable_dri" = xyes )
|
AM_CONDITIONAL(HAVE_DRISW, test "x$enable_dri" = xyes )
|
||||||
AM_CONDITIONAL(HAVE_DRI2, test "x$enable_dri" = xyes -a "x$dri_platform" = xdrm )
|
AM_CONDITIONAL(HAVE_DRI2, test "x$enable_dri" = xyes -a "x$dri_platform" = xdrm -a "x$have_libdrm" = xyes )
|
||||||
AM_CONDITIONAL(HAVE_DRI3, test "x$enable_dri3" = xyes -a "x$dri_platform" = xdrm )
|
AM_CONDITIONAL(HAVE_DRI3, test "x$enable_dri3" = xyes -a "x$dri_platform" = xdrm -a "x$have_libdrm" = xyes )
|
||||||
AM_CONDITIONAL(HAVE_APPLEDRI, test "x$enable_dri" = xyes -a "x$dri_platform" = xapple )
|
AM_CONDITIONAL(HAVE_APPLEDRI, test "x$enable_dri" = xyes -a "x$dri_platform" = xapple )
|
||||||
|
|
||||||
AC_ARG_ENABLE([shared-glapi],
|
AC_ARG_ENABLE([shared-glapi],
|
||||||
|
@ -1112,13 +1119,6 @@ if test "x$with_sha1" = "x"; then
|
||||||
fi
|
fi
|
||||||
AM_CONDITIONAL([ENABLE_SHADER_CACHE], [test x$enable_shader_cache = xyes])
|
AM_CONDITIONAL([ENABLE_SHADER_CACHE], [test x$enable_shader_cache = xyes])
|
||||||
|
|
||||||
# Check for libdrm
|
|
||||||
PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED],
|
|
||||||
[have_libdrm=yes], [have_libdrm=no])
|
|
||||||
if test "x$have_libdrm" = xyes; then
|
|
||||||
DEFINES="$DEFINES -DHAVE_LIBDRM"
|
|
||||||
fi
|
|
||||||
|
|
||||||
case "$host_os" in
|
case "$host_os" in
|
||||||
linux*)
|
linux*)
|
||||||
need_pci_id=yes ;;
|
need_pci_id=yes ;;
|
||||||
|
|
Loading…
Reference in New Issue