Mesa (master): GLX: use glproto CFLAGS etc. when building

Jesse Barnes jbarnes at kemper.freedesktop.org
Wed Jan 13 20:49:13 UTC 2010


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

Author: Jesse Barnes <jbarnes at virtuousgeek.org>
Date:   Wed Jan 13 15:48:14 2010 -0500

GLX: use glproto CFLAGS etc. when building

Roll the glproto check into the dri2proto and libdrm check so we get the
proper CFLAGS and LDFLAGS for the package.

---

 configure.ac |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 23bce96..4f28fc0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -576,9 +576,9 @@ dri)
     # Check for libdrm
     PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED])
     PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= $DRI2PROTO_REQUIRED])
-    GL_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED dri2proto >= $DRI2PROTO_REQUIRED"
-    DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED"
     PKG_CHECK_MODULES([GLPROTO], [glproto >= $GLPROTO_REQUIRED])
+    GL_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED dri2proto >= $DRI2PROTO_REQUIRED glproto >= $GLPROTO_REQUIRED"
+    DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED"
 
     # find the DRI deps for libGL
     if test "$x11_pkgconfig" = yes; then




More information about the mesa-commit mailing list