diff options
| author | Matt Turner <[email protected]> | 2012-01-15 10:20:30 -0500 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2012-01-20 15:54:08 -0500 |
| commit | 3f96434f86de1641296a9c39b9f75d85e6955207 (patch) | |
| tree | 1e7e7ab8b966f32ad0d1a25a47ad0dab54f0f29d /configure.ac | |
| parent | b38d7a0a248c2a3ad227cb5d21c1c95a6519e4ae (diff) | |
automake: src/mesa/drivers/dri/nouveau
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 95990016b46..2cd1ec4a4d1 100644 --- a/configure.ac +++ b/configure.ac @@ -1272,6 +1272,13 @@ case $DRI_DIRS in esac case $DRI_DIRS in +*nouveau*) + PKG_CHECK_MODULES([NOUVEAU], [libdrm_nouveau >= $LIBDRM_NOUVEAU_REQUIRED]) + HAVE_NOUVEAU_DRI=yes; + ;; +esac + +case $DRI_DIRS in *radeon*|*r200*) PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED]) @@ -1291,15 +1298,10 @@ esac AM_CONDITIONAL(HAVE_I915_DRI, test x$HAVE_I915_DRI = xyes) AM_CONDITIONAL(HAVE_I965_DRI, test x$HAVE_I965_DRI = xyes) +AM_CONDITIONAL(HAVE_NOUVEAU_DRI, test x$HAVE_NOUVEAU_DRI = xyes) AM_CONDITIONAL(HAVE_R200_DRI, test x$HAVE_R200_DRI = xyes) AM_CONDITIONAL(HAVE_RADEON_DRI, test x$HAVE_RADEON_DRI = xyes) -case $DRI_DIRS in -*nouveau*) - PKG_CHECK_MODULES([NOUVEAU], [libdrm_nouveau >= $LIBDRM_NOUVEAU_REQUIRED]) - ;; -esac - dnl dnl OSMesa configuration dnl @@ -1925,6 +1927,7 @@ dnl Substitute the config AC_CONFIG_FILES([configs/autoconf src/mesa/drivers/dri/i915/Makefile src/mesa/drivers/dri/i965/Makefile + src/mesa/drivers/dri/nouveau/Makefile src/mesa/drivers/dri/r200/Makefile src/mesa/drivers/dri/radeon/Makefile tests/Makefile |