summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2015-11-22 22:05:01 +0000
committerEmil Velikov <[email protected]>2015-11-29 17:57:00 +0000
commit30e1c390b3ce927132848d93778cb5c240642be4 (patch)
treec2bc0f92d0dcb2d0d5e6159c5452be3c0fe771a9
parent72e51e5dfa22a0e966d60df43aceb09c68f1da2f (diff)
configure.ac: default to disabled dri3 when --disable-dri is set
Not too long ago, the dri3 code was living in src/glx, which in itself was guarded by HAVE_DRI_GLX. As the name suggests we didn't dive into the folder when dri was disabled, thus we missed that dri3 does not consider/honour --enable-dri. Cc: [email protected] Fixes: 6bd9ba7d074 "loader: Add dri3 helper" Cc: Pali Rohár <[email protected]> Reported-by: Pali Rohár <[email protected]> Signed-off-by: Emil Velikov <[email protected]> (cherry picked from commit b89d1b2ccf16c0bee3708560b69e99b6dbb212f0)
-rw-r--r--configure.ac5
1 files changed, 5 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 120c93e7e73..40168715fc6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -767,6 +767,11 @@ linux*)
dri3_default=no
;;
esac
+
+if test "x$enable_dri" = xno; then
+ dri3_default=no
+fi
+
AC_ARG_ENABLE([dri3],
[AS_HELP_STRING([--enable-dri3],
[enable DRI3 @<:@default=auto@:>@])],