From b5095ab97f4cf4d2d0e5b99b7813a2e466c2459c Mon Sep 17 00:00:00 2001 From: Florent Thoumie Date: Mon, 28 Jul 2008 14:44:43 +0100 Subject: autoconf: disable dri drivers build if being asked Allow --with-dri-drivers={,no} to disable DRI drivers build. Signed-off-by: Florent Thoumie Signed-off-by: Robert Noland --- configure.ac | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 9014f8e158..c87dce6546 100644 --- a/configure.ac +++ b/configure.ac @@ -624,7 +624,10 @@ dnl If $with_dri_drivers is yes, directories will be added through dnl platform checks DRI_DIRS="" case "$with_dri_drivers" in -no|yes) ;; +no) ;; +yes) + DRI_DIRS="yes" + ;; *) # verify the requested driver directories exist dri_drivers=`IFS=', '; echo $with_dri_drivers` @@ -670,7 +673,7 @@ if test "$mesa_driver" = dri; then # converted to use the new interface. i810 are missing # because there is no x86-64 system where they could *ever* # be used. - if test "x$DRI_DIRS" = x; then + if test "x$DRI_DIRS" = "xyes"; then DRI_DIRS="i915 i965 mach64 mga r128 r200 r300 radeon \ savage tdfx unichrome swrast" fi @@ -678,13 +681,13 @@ if test "$mesa_driver" = dri; then powerpc*) # Build only the drivers for cards that exist on PowerPC. # At some point MGA will be added, but not yet. - if test "x$DRI_DIRS" = x; then + if test "x$DRI_DIRS" = "xyes"; then DRI_DIRS="mach64 r128 r200 r300 radeon tdfx swrast" fi ;; sparc*) # Build only the drivers for cards that exist on sparc` - if test "x$DRI_DIRS" = x; then + if test "x$DRI_DIRS" = "xyes"; then DRI_DIRS="mach64 r128 r200 r300 radeon ffb swrast" fi ;; @@ -703,7 +706,7 @@ if test "$mesa_driver" = dri; then # ffb and gamma are missing because they have not been converted # to use the new interface. - if test "x$DRI_DIRS" = x; then + if test "x$DRI_DIRS" = "xyes"; then DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 radeon tdfx \ unichrome savage sis swrast" fi @@ -718,7 +721,7 @@ if test "$mesa_driver" = dri; then esac # default drivers - if test "x$DRI_DIRS" = x; then + if test "x$DRI_DIRS" = "xyes"; then DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \ savage sis tdfx trident unichrome ffb swrast" fi @@ -1041,7 +1044,11 @@ fi if test "$mesa_driver" = dri; then # cleanup the drivers var dri_dirs=`echo $DRI_DIRS | $SED 's/^ *//;s/ */ /;s/ *$//'` +if test "x$DRI_DIRS" = x; then + echo " DRI drivers: no" +else echo " DRI drivers: $dri_dirs" +fi echo " DRI driver dir: $DRI_DRIVER_INSTALL_DIR" echo " TTM API support: $ttmapi" fi -- cgit v1.2.3