7 files changed, 12 insertions, 11 deletions
diff --git a/globetrotter/move.pm b/globetrotter/move.pm
index 770b9df14..075e3c258 100644
--- a/globetrotter/move.pm
+++ b/globetrotter/move.pm
@@ -146,7 +146,7 @@ sub automatic_xconf {
     local $o->{mouse}{device} = 'mouse';
     
     require Xconfig::default;
-    $o->{raw_X} = Xconfig::default::configure({ KEYBOARD => 'uk' }, $o->{mouse}); #- using uk instead of us for now to have less warnings
+    $o->{raw_X} = Xconfig::default::configure(class_discard->new, { KEYBOARD => 'uk' }, $o->{mouse}); #- using uk instead of us for now to have less warnings
     
     require Xconfig::main;
     require class_discard;
diff --git a/move/move.pm b/move/move.pm
index 093a56165..80894176d 100644
--- a/move/move.pm
+++ b/move/move.pm
@@ -784,7 +784,7 @@ sub automatic_xconf {
 	local $o->{mouse}{device} = 'mouse';
 
 	require Xconfig::default;
-	$o->{raw_X} = Xconfig::default::configure({ KEYBOARD => 'uk' }, $o->{mouse}); #- using uk instead of us for now to have less warnings
+	$o->{raw_X} = Xconfig::default::configure(class_discard->new, { KEYBOARD => 'uk' }, $o->{mouse}); #- using uk instead of us for now to have less warnings
     
 	require Xconfig::main;
 	require class_discard;
diff --git a/perl-install/Xconfig/default.pm b/perl-install/Xconfig/default.pm
index 75947bf11..f41fccaf7 100644
--- a/perl-install/Xconfig/default.pm
+++ b/perl-install/Xconfig/default.pm
@@ -10,7 +10,7 @@ use mouse;
 
 
 sub configure {
-    my ($o_keyboard, $o_mouse) = @_;
+    my ($do_pkgs, $o_keyboard, $o_mouse) = @_;
 
     my $keyboard = $o_keyboard || keyboard::read();
     my $mouse = $o_mouse || do {
@@ -24,14 +24,15 @@ sub configure {
     $raw_X->add_load_module($_) foreach qw(dbe v4l extmod type1 freetype);
 
     config_keyboard($raw_X, $keyboard);
-    config_mouse($raw_X, $mouse);
+    config_mouse($raw_X, $do_pkgs, $mouse);
 
     $raw_X;
 }
 
 sub config_mouse {
-    my ($raw_X, $mouse) = @_;
+    my ($raw_X, $do_pkgs, $mouse) = @_;
     mouse::set_xfree_conf($mouse, $raw_X);
+    mouse::various_xfree_conf($do_pkgs, $mouse);
 }
 
 sub config_keyboard {
diff --git a/perl-install/Xconfig/main.pm b/perl-install/Xconfig/main.pm
index f260d48b5..a794f3297 100644
--- a/perl-install/Xconfig/main.pm
+++ b/perl-install/Xconfig/main.pm
@@ -169,7 +169,7 @@ sub configure_everything_or_configure_chooser {
     }
 
     if (is_empty_array_ref($raw_X)) {
-	$raw_X = Xconfig::default::configure($o_keyboard, $o_mouse);
+	$raw_X = Xconfig::default::configure($in->do_pkgs, $o_keyboard, $o_mouse);
 	Xconfig::main::configure_everything($in, $raw_X, $in->do_pkgs, $auto, $options) or return;
     } else {
 	Xconfig::main::configure_chooser($in, $raw_X, $in->do_pkgs, $options) or return if !$auto;
diff --git a/perl-install/Xconfig/various.pm b/perl-install/Xconfig/various.pm
index 5532ee182..1ce1ce37e 100644
--- a/perl-install/Xconfig/various.pm
+++ b/perl-install/Xconfig/various.pm
@@ -98,13 +98,13 @@ Do you have this feature?")) or return;
 
     $norm = $in->ask_from_list('', N("What norm is your TV using?"), [ 'NTSC', 'PAL' ], $norm) or return;
 
-    configure_FB_TVOUT({ norm => $norm });
+    configure_FB_TVOUT($in->do_pkgs, { norm => $norm });
 }
 
 sub configure_FB_TVOUT {
-    my ($use_FB_TVOUT) = @_;
+    my ($do_pkgs, $use_FB_TVOUT) = @_;
 
-    my $raw_X = Xconfig::default::configure();
+    my $raw_X = Xconfig::default::configure($do_pkgs);
     return if is_empty_array_ref($raw_X);
 
     $raw_X->set_monitors({ HorizSync => '30-50', VertRefresh => ($use_FB_TVOUT->{norm} eq 'NTSC' ? 60 : 50) });
diff --git a/perl-install/harddrake/autoconf.pm b/perl-install/harddrake/autoconf.pm
index 91ec054d9..adf6d9957 100644
--- a/perl-install/harddrake/autoconf.pm
+++ b/perl-install/harddrake/autoconf.pm
@@ -9,7 +9,7 @@ sub xconf {
     log::l('automatic XFree configuration');
     
     require Xconfig::default;
-    $o->{raw_X} = Xconfig::default::configure();
+    $o->{raw_X} = Xconfig::default::configure(do_pkgs_standalone->new);
     
     require Xconfig::main;
     require do_pkgs;
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index acf354c3b..3884f755c 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -928,7 +928,7 @@ sub configureX {
     configureXBefore($o);
 
     require Xconfig::default;
-    $o->{raw_X} = Xconfig::default::configure($o->{keyboard}, $o->{mouse});
+    $o->{raw_X} = Xconfig::default::configure($o->do_pkgs, $o->{keyboard}, $o->{mouse});
 
     require Xconfig::main;
     Xconfig::main::configure_everything_auto_install($o->{raw_X}, $o->do_pkgs, $o->{X}, install_any::X_options_from_o($o));