[PATCH] Disable DRI3 and sync fence FD functions if xshmfence isn't available

[Keith Packard]

Gaetan Nadon <memsize at videotron.ca> writes:

> On 13-11-03 04:16 PM, Keith Packard wrote:
>> Make sure the server can build when the xshmfence library isn't present
>>
>> Signed-off-by: Keith Packard <keithp at keithp.com>
>> ---
>>  Xext/sync.c              |  8 ++++++++
>>  configure.ac             | 42 ++++++++++++++++++++++++++++++++++++++++--
>>  dri3/dri3.h              |  6 ++++++
>>  include/xorg-server.h.in |  3 +++
>>  miext/sync/Makefile.am   |  7 ++++++-
>>  5 files changed, 63 insertions(+), 3 deletions(-)
>
> Reviewed-by: Gaetan Nadon <gaetan.nadon at videotron.ca>
>
> Nit:
>
>     [...]/patch:95: trailing whitespace.
>     esac       
>     warning: 1 line adds whitespace errors.
>
> To be fixed later:
> Confusing/wrong messages when configuring with --disable-dri3 with
> library and dri3proto installed: 'case no,yes) caught in *)':

I think this will eliminate the spurious messages. If you concur, I'll
amend the previous patch with this change and push it to master.

diff --git a/configure.ac b/configure.ac
index 2ec61d3..6dd437b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1128,6 +1128,8 @@ case "$DRI3,$HAVE_DRI3PROTO" in
 		AC_MSG_ERROR([DRI3 requested, but dri3proto not found.])
 		DRI3=no
 		;;
+	no,*)
+		;;
 	*)
 		AC_MSG_NOTICE([DRI3 disabled because dri3proto not found.])
 		DRI3=no
@@ -1172,11 +1174,13 @@ case "$DRI3,$HAVE_XSHMFENCE" in
 		AC_MSG_ERROR("DRI3 requested, but xshmfence not found.])
 		DRI3=no
 		;;
+	no,*)
+		;;
 	*)
 		AC_MSG_NOTICE([DRI3 disabled because xshmfence not found.])
 		DRI3=no
 		;;
-esac		
+esac
 
 case x"$DRI3" in
 	xyes|xauto)


-- 
keith.packard at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 827 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20131103/c519d12c/attachment.pgp>