summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Ham <rah@bash.sh>2009-05-25 12:22:13 +0200
committerArnaud Fontaine <arnau@debian.org>2010-11-14 20:17:53 +0900
commit9e868ede4ab0bc5aa85b72f8d3dc4ca52c0f0d81 (patch)
tree8825efdd2606c135d79e81a0175a3b4962769c8c
parentf510466a106dd0f4bc40e3604b44e84c3ac08d56 (diff)
Add a check on xproto version libxcb was compiled with
Signed-off-by: Julien Danjou <julien@danjou.info>
-rw-r--r--configure.ac21
1 files changed, 20 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 29ea438..f63a766 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,26 @@ AC_SUBST(xcbincludedir)
pkgconfigdir='${libdir}/pkgconfig'
AC_SUBST(pkgconfigdir)
-PKG_CHECK_MODULES(XCB, xcb >= 1.0)
+PKG_CHECK_MODULES(XCB, xcb >= 1.2)
+
+######
+# Check version of xcb-proto that xcb was compiled against
+######
+xcbproto_required=1.5
+
+# Moved from AX_COMPARE_VERSION to maintain proper output
+AC_PROG_AWK
+
+AC_MSG_CHECKING([whether libxcb was compiled against xcb-proto >= $xcbproto_required])
+xcbproto_version=`$PKG_CONFIG --variable=xcbproto_version xcb`
+AX_COMPARE_VERSION([$xcbproto_version],[ge],[$xcbproto_required], xcbproto_ok="yes", xcbproto_ok="no")
+AC_MSG_RESULT([$xcbproto_ok])
+
+if test $xcbproto_ok = no; then
+ AC_MSG_ERROR([libxcb was compiled against xcb-proto $xcbproto_version; it needs needs to be compiled against version $xcbproto_required or higher])
+fi
+
+
PKG_CHECK_MODULES(XCB_SHM, xcb-shm)
PKG_CHECK_MODULES(XCB_RENDER, xcb-render)
PKG_CHECK_MODULES(XPROTO, xproto >= 7.0.8)