xserver: Branch 'master'

[David Nusinow]

 hw/xfree86/common/xf86Config.c |    3 +++
 1 files changed, 3 insertions(+)

New commits:
diff-tree 021e5df85d7c9373a2fed55512751d16e08128db (from 1b3a0508a7aee1c7b14cd62216b4727fcc9181d4)
Author: David Nusinow <dnusinow at debian.org>
Date:   Mon May 7 21:03:40 2007 -0400

    Add more informative logging for module default loading
    
    When the modules section is parsed, if a module is set to be loaded by
    default, this will be logged. If it is redundantly specified in xorg.conf,
    this will also be noted. None of this logging will happen if the xorg.conf
    lacks a modules section.

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index f44f042..7f1105f 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -290,6 +290,7 @@ xf86ModulelistFromConfig(pointer **optli
             modp = xf86configptr->conf_modules->mod_load_lst;
             while (modp) {
                 if (strcmp(modp->load_name, ModuleDefaults[i].name) == 0) {
+                    xf86Msg(X_INFO, "\"%s\" will be loaded. This was enabled by default and also specified in the config file.\n", ModuleDefaults[i].name);
                     found = TRUE;
                     break;
                 }
@@ -299,6 +300,7 @@ xf86ModulelistFromConfig(pointer **optli
                 modp = xf86configptr->conf_modules->mod_disable_lst;
                 while (modp) {
                     if (strcmp(modp->load_name, ModuleDefaults[i].name) == 0) {
+                        xf86Msg(X_INFO, "\"%s\" will be loaded even though the default is to disable it.\n", ModuleDefaults[i].name);
                         found = TRUE;
                         break;
                     }
@@ -308,6 +310,7 @@ xf86ModulelistFromConfig(pointer **optli
             if (found == FALSE) {
 	            XF86ConfModulePtr ptr = xf86configptr->conf_modules;
 	            ptr = xf86addNewLoadDirective(ptr, ModuleDefaults[i].name, XF86_LOAD_MODULE, ModuleDefaults[i].load_opt);
+                xf86Msg(X_INFO, "\"%s\" will be loaded by default.\n", ModuleDefaults[i].name);
             }
          }
     } else {