[PATCH] configure: Move DRI2 value test after DRI2 auto resolves to yes/no

Adam Jackson ajax at redhat.com
Fri Nov 8 07:34:05 PST 2013


Otherwise you don't build the AIGLX loader, which breaks glamor drivers.

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 configure.ac | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6925df8..3cd011f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1085,11 +1085,6 @@ if test "x$GLX" = xno; then
         AIGLX=no
 fi
 
-if test "x$AIGLX" = xyes -a \( "x$DRI2" = xyes \); then
-	AC_DEFINE(AIGLX, 1, [Build AIGLX loader])
-fi
-AM_CONDITIONAL(AIGLX_DRI_LOADER, { test "x$DRI2" = xyes; } && test "x$AIGLX" = xyes)
-
 if test "x$GLX_USE_TLS" = xyes ; then
 	GLX_DEFINES="-DGLX_USE_TLS -DPTHREADS"
 	GLX_SYS_LIBS="$GLX_SYS_LIBS -lpthread"
@@ -1136,6 +1131,11 @@ case "$DRI3,$HAVE_DRI3PROTO" in
 		;;
 esac
 
+if test "x$AIGLX" = xyes -a \( "x$DRI2" = xyes \); then
+	AC_DEFINE(AIGLX, 1, [Build AIGLX loader])
+fi
+AM_CONDITIONAL(AIGLX_DRI_LOADER, { test "x$DRI2" = xyes; } && test "x$AIGLX" = xyes)
+
 PKG_CHECK_MODULES([XSHMFENCE], $XSHMFENCE,
 		  [HAVE_XSHMFENCE=yes], [HAVE_XSHMFENCE=no])
 
-- 
1.8.3.1



More information about the xorg-devel mailing list