From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Fri, 31 Oct 2014 19:11:22 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: upstream/2.2.0~1^2
X-Git-Url: https://git.piment-noir.org/?p=deb_libcec.git;a=commitdiff_plain;h=2a80b46be78e9d849de223ab73b6f3e7b4d9fc46;hp=b45bdacdeee5c96e0294717fbe2c47a49a110fd1

Merge branch 'master' into release
---

diff --git a/configure.ac b/configure.ac
index 2612d55..68b9856 100644
--- a/configure.ac
+++ b/configure.ac
@@ -233,6 +233,7 @@ case "${host}" in
     AC_CHECK_HEADER(mach/mach_time.h,,AC_MSG_ERROR($msg_required_header_missing))
     AC_CHECK_HEADER(CoreVideo/CVHostTime.h,,AC_MSG_ERROR($msg_required_header_missing))
     AC_DEFINE([TARGET_DARWIN], [1], [Darwin target])
+    AM_CONDITIONAL(USE_X11_RANDR, false)
     SUPPRESS_MANGLING_WARNINGS=""
     ;;
 esac