build fixes for systems where BuildXF86DRI is NO

[Matthieu Herrb]

OK ? 

Index: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c
===================================================================
RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c,v
retrieving revision 1.237
diff -u -r1.237 mga_driver.c
--- xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c     21 Sep 2003 01:20:20 
-0000      1.237
+++ xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c     23 Sep 2003 22:34:43 
-0000
@@ -2402,13 +2402,14 @@
        xf86LoaderReqSymLists(shadowSymbols, NULL);
     }
 
+#ifdef XF86DRI
     /* Load the dri module if requested. */
     if (xf86ReturnOptValBool(pMga->Options, OPTION_DRI, FALSE)) {
        if (xf86LoadSubModule(pScrn, "dri")) {
          xf86LoaderReqSymLists(driSymbols, drmSymbols, NULL);
        }
     }
-
+#endif
     pMga->CurrentLayout.bitsPerPixel = pScrn->bitsPerPixel;
     pMga->CurrentLayout.depth = pScrn->depth;
     pMga->CurrentLayout.displayWidth = pScrn->displayWidth;
Index: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c
===================================================================
RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c,v
retrieving revision 1.100
diff -u -r1.100 tdfx_driver.c
--- xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c   21 Sep 2003 01:20:20 
-0000      1.100
+++ xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c   23 Sep 2003 22:34:52 
-0000
@@ -1092,13 +1092,14 @@
   pTDFX->writeLong(pTDFX, MISCINIT0, pTDFX->ModeReg.miscinit0);
 #endif
 
+#ifdef XF86DRI
   /* Load the dri module if requested. */
   if (xf86ReturnOptValBool(pTDFX->Options, OPTION_DRI, FALSE)) {
     if (xf86LoadSubModule(pScrn, "dri")) {
       xf86LoaderReqSymLists(driSymbols, drmSymbols, NULL);
     }
   }
-
+#endif
   return TRUE;
 }
 

                                        Matthieu
_______________________________________________
Devel mailing list
[EMAIL PROTECTED]
http://XFree86.Org/mailman/listinfo/devel