From 19edf483dd944e8d3ec1acd294e2cb58d47e89ad Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Fri, 21 Mar 2014 16:52:30 +0000 Subject: [PATCHv2] configure: drop duplicated libudev check For the purposes of configure.ac --enable-dri3 can be considered a subset of --enable-dri where the latter already checks for libudev. Additionally it's done in a platform aware manner, meaning that libudev will be required only on linux. v2: Disable dri3 on non-linux platforms. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76377 Signed-off-by: Emil Velikov --- configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index c5042f9..302b5c1 100644 --- a/configure.ac +++ b/configure.ac @@ -824,9 +824,6 @@ xyesno) PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= $DRI2PROTO_REQUIRED]) GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV libdrm >= $LIBDRM_REQUIRED" if test x"$enable_dri3" = xyes; then - if test x"$have_libudev" != xyes; then - AC_MSG_ERROR([DRI3 requires libudev >= $LIBUDEV_REQUIRED]) - fi PKG_CHECK_MODULES([DRI3PROTO], [dri3proto >= $DRI3PROTO_REQUIRED]) PKG_CHECK_MODULES([PRESENTPROTO], [presentproto >= $PRESENTPROTO_REQUIRED]) fi @@ -973,17 +970,20 @@ if test "x$enable_dri" = xyes; then esac ;; *freebsd* | dragonfly* | *netbsd* | openbsd*) + enable_dri3=no DEFINES="$DEFINES -DHAVE_PTHREAD -DUSE_EXTERNAL_DXTN_LIB=1" DEFINES="$DEFINES -DHAVE_ALIAS" ;; gnu*) DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1" DEFINES="$DEFINES -DHAVE_ALIAS" - ;; + ;; solaris*) + enable_dri3=no DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1" ;; cygwin*) + enable_dri3=no DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1" if test "x$with_dri_drivers" = "xyes"; then with_dri_drivers="swrast" -- 1.9.1