On 14/10/2016 14:10, Emil Velikov wrote:
On 14 October 2016 at 03:40, Mihail Konev <k....@ya.ru> wrote:
Commit 501d8e2b removed --enable-aiglx,
but made xwin always be --enable-glx.

This might have been the better idea indeed. Adding Jon just in case ;-)

Yes, I was kind of wondering where this had gone. I guess this was not quite right before.

Signed-off-by: Mihail Konev <k....@ya.ru>
---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4bb014d0d837..25168cc67306 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2233,7 +2233,7 @@ if test "x$XWIN" = xyes; then
        AC_DEFINE(DDXBEFORERESET, 1, [Use ddxBeforeReset ])

 dnl XWin requires OpenGL spec files in order to generate wrapper code for 
native GL functions
Nit: Xwin with GLX requires...

-       if [test "x$XWIN" = xyes] ; then
+       if [test "x$XWIN" = xyes && test "x$GLX" = xyes] ; then
            AC_CHECK_PROG(PYTHON3, python3, python3)
            if test -z "$PYTHON3"; then
                 AC_MSG_ERROR([python3 not found])
@@ -2256,7 +2256,7 @@ AM_CONDITIONAL(XWIN, [test "x$XWIN" = xyes])
 AM_CONDITIONAL(XWIN_MULTIWINDOW, [test "x$XWIN" = xyes])
 AM_CONDITIONAL(XWIN_MULTIWINDOWEXTWM, [test "x$XWIN" = xyes && test 
"x$WINDOWSWM" = xyes])
 AM_CONDITIONAL(XWIN_CLIPBOARD, [test "x$XWIN" = xyes])
-AM_CONDITIONAL(XWIN_GLX_WINDOWS, [test "x$XWIN" = xyes])
+AM_CONDITIONAL(XWIN_GLX_WINDOWS, [test "x$XWIN" = xyes && test "x$GLX" = xyes])

Regardless of the nitpick
Reviewed-by: Emil Velikov <emil.l.veli...@gmail.com>

Reviewed-by: Jon Turney <jon.tur...@dronecode.org.uk>

_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to