Re: [Nouveau] [PATCH 1/2] glamor: fix build without glamor.h

2014-06-24 Thread Ben Skeggs
On Sun, Jun 22, 2014 at 9:31 AM, Marcin Slusarz
marcin.slus...@gmail.com wrote:
 xorg-server can be built without glamor, which leads to:
Hey Marcin,

Applied both patches, thanks.

Ben.


   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 marcin.slus...@gmail.com
 ---
  configure.ac | 8 +++-
  1 file changed, 7 insertions(+), 1 deletion(-)

 diff --git a/configure.ac b/configure.ac
 index c34e575..92e047a 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -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
 Nouveau@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/nouveau
___
Nouveau mailing list
Nouveau@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/nouveau


[Nouveau] [PATCH 1/2] glamor: fix build without glamor.h

2014-06-21 Thread Marcin Slusarz
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.

Signed-off-by: Marcin Slusarz marcin.slus...@gmail.com
---
 configure.ac | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index c34e575..92e047a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
Nouveau@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/nouveau