xf86-video-intel: configure.ac

Chris Wilson ickle at kemper.freedesktop.org
Wed Mar 4 07:30:28 PST 2015


 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 88e615425bd61856c3f039127fb90592dfac22df
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Mar 4 15:28:49 2015 +0000

    configure: Make sure that BUILD_TOOL_CURSOR is always defined
    
    Building intel driver with --disable-tools fails with following
    
      configure: error: conditional "BUILD_TOOL_CURSOR" was never defined.
    
    Reported-by: Tomas Pruzina <pruzinat at gmail.com>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89425
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/configure.ac b/configure.ac
index c5356e2..28a4749 100644
--- a/configure.ac
+++ b/configure.ac
@@ -313,7 +313,6 @@ if test "x$tools" != "xno"; then
 	fi
 
 	PKG_CHECK_MODULES(TOOL_CURSOR, [xfixes x11 libpng], [cursor="yes"], [ivo="no"])
-	AM_CONDITIONAL(BUILD_TOOL_CURSOR, test "x$cursor" != "xno")
 
 	IVO_CFLAGS="$IVO_CFLAGS $extra_cflags"
 fi
@@ -323,6 +322,7 @@ fi
 AC_MSG_CHECKING([whether to build additional tools])
 AC_MSG_RESULT([$tools])
 AM_CONDITIONAL(BUILD_TOOLS, test "x$tools" != "xno")
+AM_CONDITIONAL(BUILD_TOOL_CURSOR, test "x$cursor" = "xyes")
 
 # Define a configure option for an alternate module directory
 AC_ARG_WITH(xorg-module-dir,


More information about the xorg-commit mailing list