GLX: use glproto CFLAGS etc. when building
authorJesse Barnes <jbarnes@virtuousgeek.org>
Wed, 13 Jan 2010 20:48:14 +0000 (15:48 -0500)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Wed, 13 Jan 2010 20:48:14 +0000 (15:48 -0500)
Roll the glproto check into the dri2proto and libdrm check so we get the
proper CFLAGS and LDFLAGS for the package.

configure.ac

index 23bce96ca63532a3410bc5502a0be318f0ea64b1..4f28fc0d14d3cb85bf7cbfef5569e4f0a2890171 100644 (file)
@@ -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