glamor: fix build without glamor.h
PATCH 1/2 glamor: fix build without glamor.h
xorg-server can be built without glamor, which leads to:
CC nouveau_xv.lo
In file included from nouveau_xv.c:41:0:
nouveau_glamor.h:12:20: fatal error: glamor.h: No such file or directory compilation terminated.
--- configure.ac | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
configure.ac +7 -1
@@ -128,7 +128,13 @@ XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION AC_MSG_CHECKING([whether to include GLAMOR support]) -if pkg-config --exists "xorg-server >= 1.15.99.901" + +AC_COMPILE_IFELSE(AC_LANG_PROGRAM( +[[ + #include <glamor.h> +]],[[]]),[found_glamor_header=yes],[found_glamor_header=no]) + +if test "$found_glamor_header" = "yes" && pkg-config --exists "xorg-server >= 1.15.99.901" then AC_DEFINE(HAVE_GLAMOR, 1, [Build support for glamor acceleration]) AC_MSG_RESULT([yes])
Signature · 1 line
2.0.0
A message that is not in the archive (sent off-list or not yet received): [email protected]
Ben Skeggs
AppliedQuoted 1 line · Marcin Slusarz
xorg-server can be built without glamor, which leads to:
Hey Marcin,
Applied both patches, thanks.
Ben.
Quoted 37 lines
CC nouveau_xv.lo
In file included from nouveau_xv.c:41:0:
nouveau_glamor.h:12:20: fatal error:glamor.h: No such file or directory compilation terminated.Signed-off-by Marcin Slusarz <[email protected]>--- configure.ac | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)configure.ac +7
-2@@ -128,7 +128,13 @@ XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION AC_MSG_CHECKING([whether to include GLAMOR support]) -if pkg-config --exists "xorg-server >= 1.15.99.901" + +AC_COMPILE_IFELSE(AC_LANG_PROGRAM( +[[ + #include <glamor.h> +]],[[]]),[found_glamor_header=yes],[found_glamor_header=no]) + +if test "$found_glamor_header" = "yes" && pkg-config --exists "xorg-server >= 1.15.99.901" then AC_DEFINE(HAVE_GLAMOR, 1, [Build support for glamor acceleration]) AC_MSG_RESULT([yes]) --2.0.0
_______________________________________________
Nouveau mailing list [email protected]
http://lists.freedesktop.org/mailman/listinfo/nouveau