Mesa (master): glx: Check HAVE_XF86VIDMODE before adding it as an implicit link

Alan Hourihane alanh at kemper.freedesktop.org
Tue Jun 28 16:41:47 UTC 2011


Module: Mesa
Branch: master
Commit: 6479922499638b81569db20394c6cb59e6baf989
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6479922499638b81569db20394c6cb59e6baf989

Author: Alan Hourihane <alanh at vmware.com>
Date:   Tue Jun 28 17:40:24 2011 +0100

glx: Check HAVE_XF86VIDMODE before adding it as an implicit link
library.

---

 configure.ac |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7fbba7d..acf9f06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -883,7 +883,11 @@ dri|no) # these checks are still desired when there is no mesa_driver
     else
         # should check these...
         X11_INCLUDES="$X11_INCLUDES $X_CFLAGS"
-        GL_LIB_DEPS="$X_LIBS -lX11 -lXext -lXxf86vm -lXdamage -lXfixes"
+        if test "x$HAVE_XF86VIDMODE" == xyes; then
+           GL_LIB_DEPS="$X_LIBS -lX11 -lXext -lXxf86vm -lXdamage -lXfixes"
+	else
+           GL_LIB_DEPS="$X_LIBS -lX11 -lXext -lXdamage -lXfixes"
+	fi
         GL_PC_LIB_PRIV="$GL_LIB_DEPS"
         GL_PC_CFLAGS="$X11_INCLUDES"
 




More information about the mesa-commit mailing list