diff options
| author | Christian König <[email protected]> | 2011-05-07 14:11:40 +0200 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-05-07 14:11:40 +0200 |
| commit | 213b9004a6ee033a16af3dcd187aa68b56c39858 (patch) | |
| tree | f577f4dc276f70dad63f102f69f87f4d566186ef /configure.ac | |
| parent | 6ad846ee78d9d8ba93dcecdefbf89f2b981333ef (diff) | |
| parent | 03615c02d81437cf546609fc6a39c6c73be39360 (diff) | |
Merge remote-tracking branch 'origin/master' into pipe-video
Conflicts:
src/gallium/drivers/r600/r600_state.c
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 1a3ed77e635..70c84b76cac 100644 --- a/configure.ac +++ b/configure.ac @@ -1657,6 +1657,7 @@ yes) PKG_CHECK_MODULES([WAYLAND], [wayland-client wayland-server],, \ [AC_MSG_ERROR([cannot find libwayland-client])]) WAYLAND_EGL_LIB_DEPS="$WAYLAND_LIBS $LIBDRM_LIBS" + GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/wayland" fi done EGL_PLATFORMS="$egl_platforms" @@ -1708,9 +1709,14 @@ dnl Gallium LLVM dnl AC_ARG_ENABLE([gallium-llvm], [AS_HELP_STRING([--enable-gallium-llvm], - [build gallium LLVM support @<:@default=disabled@:>@])], + [build gallium LLVM support @<:@default=enabled on x86/x86_64@:>@])], [enable_gallium_llvm="$enableval"], [enable_gallium_llvm=auto]) +if test "x$enable_gallium_llvm" = xauto; then + case "$host_cpu" in + i*86|x86_64) enable_gallium_llvm=yes;; + esac +fi if test "x$enable_gallium_llvm" = xyes; then if test "x$LLVM_CONFIG" != xno; then LLVM_VERSION=`$LLVM_CONFIG --version` @@ -1805,9 +1811,23 @@ dnl Gallium Radeon r300g configuration dnl AC_ARG_ENABLE([gallium-r300], [AS_HELP_STRING([--enable-gallium-r300], - [build gallium r300 @<:@default=DRI-only@:>@])], + [build gallium r300 @<:@default=build DRI driver only@:>@])], [enable_gallium_r300="$enableval"], [enable_gallium_r300=auto]) + +if test "$mesa_driver" != dri ; then + if test "x$enable_gallium_r300" = xauto; then + enable_gallium_r300=no + fi +fi + +if test "x$enable_gallium_r300" != xno; then + if test "x$MESA_LLVM" = x0; then + case "$host_cpu" in + i*86|x86_64) AC_MSG_ERROR([LLVM is required to build Gallium R300 on x86 and x86_64]);; + esac + fi +fi if test "x$enable_gallium_r300" = xauto; then GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300" gallium_check_st "radeon/drm" "dri-r300" |