Replace module_installed with eval.

diff --git a/make/common.pm b/make/common.pm
index f0174e0b3bd8ab79b7af95a79c924001417d9ead..6ca280bece1f8307df33491fffca887385772e82 100644 (file)
--- a/make/common.pm
+++ b/make/common.pm
@@ -37,8 +37,7 @@ our @EXPORT = qw(create_directory
                  get_cpu_count
                  get_version
                  read_config_file
-                 write_config_file
-                 module_installed);
+                 write_config_file);
 
 sub create_directory($$) {
        my ($location, $permissions) = @_;
@@ -90,12 +89,6 @@ sub get_version {
        return %version;
 }
 
-sub module_installed($) {
-       my $module = shift;
-       eval("use $module;");
-       return !$@;
-}
-
 sub get_cpu_count {
        my $count = 1;
        if ($^O =~ /bsd/) {

diff --git a/modulemanager b/modulemanager
index 2681e83268c5ad0cd56d5e43adcade5f52e03b26..9f9c0334415c59e9fbaf68bd85611ff5cae55b83 100755 (executable)
--- a/modulemanager
+++ b/modulemanager
@@ -26,10 +26,10 @@ use warnings FATAL => qw(all);
 use make::common;
 
 BEGIN {
-       unless (module_installed("LWP::Simple")) {
+       unless (eval "use LWP::Simple; 1") {
                die "Your system is missing the LWP::Simple Perl module!";
        }
-       unless (module_installed("Crypt::SSLeay") || module_installed("IO::Socket::SSL")) {
+       unless (eval "use Crypt::SSLeay; 1" || eval "use IO::Socket::SSL; 1") {
                die "Your system is missing the Crypt::SSLeay or IO::Socket::SSL Perl modules!";
        }