Module: Mesa Branch: mesa_7_7_branch Commit: 46cf606cd35d6740b28fd26bd32dbdfdde2c7833 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=46cf606cd35d6740b28fd26bd32dbdfdde2c7833
Author: Jakob Bornecrantz <ja...@vmware.com> Date: Thu Feb 18 16:42:06 2010 +0100 st/xorg: Fixup configure Make sure we always test for XEXT version. Make sure that the user has a recent version of libkms and libdrm installed. Not that the st/xorg code requires so new versions to work but these are needed to make a proper vmwgfx_drv.so driver which is the only real user. --- configure.ac | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index a15ca11..d8a1263 100644 --- a/configure.ac +++ b/configure.ac @@ -20,6 +20,8 @@ AC_CANONICAL_HOST dnl Versions for external dependencies LIBDRM_REQUIRED=2.4.15 LIBDRM_RADEON_REQUIRED=2.4.17 +LIBDRM_XORG_REQUIRED=2.4.17 +LIBKMS_XORG_REQUIRED=1.0.0 DRI2PROTO_REQUIRED=1.99.3 dnl Check for progs @@ -1149,7 +1151,7 @@ yes) GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS egl" fi # Have only tested st/xorg on 1.6.0 servers - PKG_CHECK_MODULES(XORG, [xorg-server >= 1.6.0], + PKG_CHECK_MODULES(XORG, [xorg-server >= 1.6.0 libdrm >= $LIBDRM_XORG_REQUIRED libkms >= $LIBKMS_XORG_REQUIRED], HAVE_XORG="yes"; GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS xorg", HAVE_XORG="no") ;; @@ -1166,15 +1168,21 @@ yes) AC_MSG_ERROR([cannot build egl state tracker without EGL library]) fi if test "$tracker" = xorg; then - PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], - HAVE_XEXTPROTO_71="yes"; DEFINES="$DEFINES -DHAVE_XEXTPROTO_71", - HAVE_XEXTPROTO_71="no") + PKG_CHECK_MODULES([LIBDRM_XORG], [libdrm >= $LIBDRM_XORG_REQUIRED]) + PKG_CHECK_MODULES([LIBKMS_XORG], [libkms >= $LIBKMS_XORG_REQUIRED]) + HAVE_XORG="yes" fi done GALLIUM_STATE_TRACKERS_DIRS="$state_trackers" ;; esac +if test "x$HAVE_XORG" = xyes; then + PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], + HAVE_XEXTPROTO_71="yes"; DEFINES="$DEFINES -DHAVE_XEXTPROTO_71", + HAVE_XEXTPROTO_71="no") +fi + AC_ARG_WITH([xorg-driver-dir], [AS_HELP_STRING([--with-xorg-driver-dir=DIR], [Default xorg driver directory[[default=${libdir}/xorg/modules/drivers]]])], _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit