diff -up mesa-20080218/configure.ac.jx mesa-20080218/configure.ac
--- mesa-20080218/configure.ac.jx	2008-02-18 12:01:51.000000000 -0500
+++ mesa-20080218/configure.ac	2008-02-21 13:09:44.000000000 -0500
@@ -459,12 +459,7 @@
         PROGRAM_DIRS="egl"
     fi
 
-    # default drivers
-    if test "x$DRI_DIRS" = x; then
-        DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
-            savage sis tdfx trident unichrome ffb"
-    fi
 
     # Platform specific settings and drivers to build
     case "$host_os" in
     linux*)
@@ -475,7 +470,7 @@
         fi
 
         case "$host_cpu" in
-        x86_64)
+        x86_64*)
             # ffb, gamma, and sis are missing because they have not be
             # converted to use the new interface.  i810 are missing
             # because there is no x86-64 system where they could *ever*
@@ -484,13 +479,15 @@
                 DRI_DIRS="i915 i965 mach64 mga r128 r200 r300 radeon \
                     savage tdfx unichrome"
             fi
+	    DRI_DIRS="`echo $DRI_DIRS | sed 's/i810//g'`"
             ;;
         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
-                DRI_DIRS="mach64 r128 r200 r300 radeon tdfx"
+                DRI_DIRS="mach64 mga r128 r200 r300 radeon savage tdfx"
             fi
+	    DRI_DIRS="`echo $DRI_DIRS | sed s/i810//g | sed s/i9.5//`"
             ;;
         esac
         ;;
@@ -513,6 +510,12 @@
         fi
         ;;
     esac
+    # default drivers
+    if test "x$DRI_DIRS" = x; then
+        DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
+            savage sis tdfx trident unichrome ffb"
+    fi
+
     DRI_DIRS=`echo "$DRI_DIRS" | $SED 's/  */ /g'`
 
     # Check for expat