summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/printer/main.pm8
-rw-r--r--perl-install/printer/printerdrake.pm5
2 files changed, 11 insertions, 2 deletions
diff --git a/perl-install/printer/main.pm b/perl-install/printer/main.pm
index 996b4730d..cd56f0aae 100644
--- a/perl-install/printer/main.pm
+++ b/perl-install/printer/main.pm
@@ -54,7 +54,13 @@ sub spooler {
# LPRng is not officially supported any more since Mandrake 9.0, so
# show it only in the spooler menu when it was manually installed.
- return map { $spoolers{$_}{long_name} } qw(cups pdq), if_(files_exist(qw(/usr/lib/filters/lpf /usr/sbin/lpd)), 'lprng');
+
+ # PDQ is not officially supported any more since Mandrake 9.1, so
+ # show it only in the spooler menu when it was manually installed.
+
+ return map { $spoolers{$_}{long_name} } qw(cups),
+ if_(files_exist(qw(/usr/bin/pdq)), 'pdq'),
+ if_(files_exist(qw(/usr/lib/filters/lpf /usr/sbin/lpd)), 'lprng');
}
sub printer_type($) {
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index 77607404e..a03111d90 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -3646,7 +3646,10 @@ sub main {
},
val => ($::expert ? N("CUPS configuration") :
N("Printer sharing")) }) : ()),
- ($::expert ?
+ ($::expert &&
+ (files_exist(qw(/usr/bin/pdq)) ||
+ files_exist(qw(/usr/lib/filters/lpf
+ /usr/sbin/lpd))) ?
{ clicked_may_quit =>
sub {
# Save the cursor position