aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlloyd <[email protected]>2008-09-29 18:19:37 +0000
committerlloyd <[email protected]>2008-09-29 18:19:37 +0000
commit8cf186b56b229dc56d0b5bbab7caa3afecfab0f2 (patch)
tree13ace2ed83a288d09da280fbd542a6b670258985
parent15bf47eb3e1ac2d11a379e52bf8cab0421f2e5cf (diff)
Don't load deps of a module that we won't load
-rwxr-xr-xconfigure.pl12
1 files changed, 6 insertions, 6 deletions
diff --git a/configure.pl b/configure.pl
index 5878d5cf7..e3c91890f 100755
--- a/configure.pl
+++ b/configure.pl
@@ -466,6 +466,11 @@ sub autoload_modules {
next;
}
+ if($modinfo{'load_on'} eq 'request') {
+ autoconfig("$mod ($realname): skipping, loaded by request only");
+ next;
+ }
+
foreach my $req_mod (@{$modinfo{'requires'}}) {
if(defined($$config{'modules'}{$req_mod})) {
if($$config{'modules'}{$req_mod} < 0) {
@@ -483,12 +488,7 @@ sub autoload_modules {
}
}
- if($modinfo{'load_on'} eq 'request') {
- autoconfig("$mod ($realname): skipping, loaded by request only");
- next;
- }
-
- autoconfig("$mod ($realname): loading");
+ autoconfig("Enabling $mod ($realname): loading");
$loaded{$type}{$mod} = 1;
$$config{'modules'}{$mod} = 1;
}