summaryrefslogtreecommitdiffstats
path: root/perl-install/common.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-02-08 17:50:15 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-02-08 17:50:15 +0000
commit092a51022843b9217bbbe8cbd2affc312450523e (patch)
tree9ae8eec1552f3d5c9ebfacf89c72db4c1d6907d8 /perl-install/common.pm
parent5f68450cc9d2f7c543a5d3cd5b8351a83ddffb4b (diff)
downloaddrakx-092a51022843b9217bbbe8cbd2affc312450523e.tar
drakx-092a51022843b9217bbbe8cbd2affc312450523e.tar.gz
drakx-092a51022843b9217bbbe8cbd2affc312450523e.tar.bz2
drakx-092a51022843b9217bbbe8cbd2affc312450523e.tar.xz
drakx-092a51022843b9217bbbe8cbd2affc312450523e.zip
move Xtest() and setMouseLive() out of c/stuff to xf86misc::main
so that we can use them (esp. setMouseLive) in standalone without making drakxtools-newt require xfree libs
Diffstat (limited to 'perl-install/common.pm')
-rw-r--r--perl-install/common.pm6
1 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/common.pm b/perl-install/common.pm
index d8072df85..c692bd175 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -276,7 +276,11 @@ sub require_root_capability() {
sub check_for_xserver() {
if (!defined $::xtest) {
- $::xtest = $ENV{DISPLAY} && system('/usr/X11R6/bin/xtest') == 0;
+ $::xtest = 0;
+ eval {
+ require xf86misc::main;
+ $::xtest = xf86misc::main::xtest($ENV{DISPLAY});
+ } if $ENV{DISPLAY};
}
return $::xtest;
}