diff options
| author | Marek Olšák <[email protected]> | 2011-06-14 04:03:17 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2011-06-14 04:11:26 +0200 |
| commit | c17fb8539fcdeb6ebbc0c8a9ff010d1bc01b695f (patch) | |
| tree | 486405e12f352594490920db99d25e8d7f0a32c3 | |
| parent | e823ab1b002560c02edc2d9f165e3b150b5e020e (diff) | |
configure.ac: cleanup the gallium-r300 option
| -rw-r--r-- | configure.ac | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac index 3e814415218..69513c1c4e2 100644 --- a/configure.ac +++ b/configure.ac @@ -1741,6 +1741,14 @@ gallium_check_st() { fi } +gallium_require_llvm() { + if test "x$MESA_LLVM" = x0; then + case "$host_cpu" in + i*86|x86_64) AC_MSG_ERROR([LLVM is required to build $1 on x86 and x86_64]);; + esac + fi +} + dnl dnl Gallium SVGA configuration @@ -1793,28 +1801,14 @@ dnl dnl Gallium Radeon r300g configuration dnl AC_ARG_ENABLE([gallium-r300], - [AS_HELP_STRING([--enable-gallium-r300], - [build gallium r300 @<:@default=build DRI driver only@:>@])], + [AS_HELP_STRING([--disable-gallium-r300], + [build R300 driver @<:@default=enabled@:>@])], [enable_gallium_r300="$enableval"], - [enable_gallium_r300=auto]) + [enable_gallium_r300=yes]) -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" = xyes && test "x$mesa_driver" = xdri; then + gallium_require_llvm "Gallium R300" -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" -elif test "x$enable_gallium_r300" = xyes; then GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300" gallium_check_st "radeon/drm" "dri-r300" "xorg-r300" fi |