Module: Mesa Branch: master Commit: 95ef069e1cc2a98a77ea14d63ff1769beeb67c14 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=95ef069e1cc2a98a77ea14d63ff1769beeb67c14
Author: Chia-I Wu <[email protected]> Date: Sat Nov 5 15:09:36 2011 +0800 configure.ac: gbm_gallium requires DRI_LIB_DEPS to link gbm_gallium does not depend on DRI, but its build rules depend on DRI_LIB_DEPS being set. Output an error when the user enables gbm_gallium but disables DRI. This is just a workaround. --- configure.ac | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 707acf3..8885a6d 100644 --- a/configure.ac +++ b/configure.ac @@ -1427,8 +1427,8 @@ dnl dnl gbm Gallium configuration dnl if test "x$enable_gallium_gbm" = xauto; then - case "$enable_gbm$HAVE_ST_EGL$with_egl_platforms" in - yesyes*drm*) + case "$enable_gbm$HAVE_ST_EGL$enable_dri$with_egl_platforms" in + yesyesyes*drm*) enable_gallium_gbm=yes ;; *) enable_gallium_gbm=no ;; @@ -1441,6 +1441,10 @@ if test "x$enable_gallium_gbm" = xyes; then if test "x$enable_gbm" = xno; then AC_MSG_ERROR([cannot enable gbm_gallium without gbm]) fi + # gbm_gallium abuses DRI_LIB_DEPS to link. Make sure it is set. + if test "x$enable_dri" = xno; then + AC_MSG_ERROR([gbm_gallium requires --enable-dri to build]) + fi GALLIUM_STATE_TRACKERS_DIRS="gbm $GALLIUM_STATE_TRACKERS_DIRS" GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS gbm" _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
