[PATCH 2/2] Enforce the needed version of the Mesa source

Dan Nicholson dbn.lists at gmail.com
Sat Mar 8 14:07:33 PST 2008


We can only build GLX against Mesa master (7.1) right now, so this
formalizes that requirement in the configure script.
---
 configure.ac |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/configure.ac b/configure.ac
index f68513e..28d595f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -816,6 +816,17 @@ if test "x$GLX" = xyes && ! test "x$MESA_SOURCE" = x; then
 	# Try to get the mesa versions from the source files
 	XORG_MESA_SOURCE_VERSION
 
+	# The acceptable version of Mesa is 7.1+ (currently master)
+	MESA_MAJOR_REQUIRED=7
+	MESA_MINOR_REQUIRED=1
+	MESA_REQUIRED_VERSION="$MESA_MAJOR_REQUIRED.$MESA_MINOR_REQUIRED"
+	if test "$MESA_MAJOR" -lt "${MESA_MAJOR_REQUIRED-0}" || \
+		test "$MESA_MINOR" -lt "${MESA_MINOR_REQUIRED-0}" || \
+		test "$MESA_TINY" -lt "${MESA_TINY_REQUIRED-0}"
+	then
+		AC_MSG_ERROR([Mesa source is too old. $MESA_REQUIRED_VERSION is required.])
+	fi
+
 	test -d GL || mkdir GL
 	case $host_os in
 	  solaris*) 	
-- 
1.5.3.2




More information about the xorg mailing list