From be2bdab4339e493bb0ac3d0e36508b7aa1cd6e92 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 15 Sep 2005 06:46:05 +0000 Subject: [PATCH] Bug #3990: Require glproto in the cases that it's necessary (DRI or DMX with GLX). (spyderous) --- ChangeLog | 6 ++++++ configure.ac | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/ChangeLog b/ChangeLog index dd909167b..338bc3bf4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-09-14 Eric Anholt + + * configure.ac: + Bug #3990: Require glproto in the cases that it's necessary (DRI or DMX + with GLX). (spyderous) + 2005-09-14 Eric Anholt * hw/xfree86/Makefile.am: diff --git a/configure.ac b/configure.ac index 5f72f6e40..7fcd148b5 100644 --- a/configure.ac +++ b/configure.ac @@ -436,6 +436,9 @@ if test "x$DRI" = xyes; then AC_DEFINE(XF86DRI, 1, [Build DRI extension]) PKG_CHECK_MODULES([DRIPROTO], [xf86driproto]) PKG_CHECK_MODULES([LIBDRM], [libdrm]) + if test "x$GLX" = xyes; then + PKG_CHECK_MODULES([GL], [glproto]) + fi AC_SUBST(DRIPROTO_CFLAGS) AC_SUBST(LIBDRM_CFLAGS) fi @@ -627,6 +630,9 @@ dnl USB sources in DMX require dnl Linux sources in DMX require AC_CHECK_HEADER([linux/keyboard.h], DMX_BUILD_LNX="yes", DMX_BUILD_LNX="no") + if test "x$GLX" = xyes; then + PKG_CHECK_MODULES([GL], [glproto]) + fi fi AM_CONDITIONAL([DMX_BUILD_LNX], [test "x$DMX_BUILD_LNX" = xyes]) AM_CONDITIONAL([DMX_BUILD_USB], [test "x$DMX_BUILD_USB" = xyes])