X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=scripts%2Finstallation_check.pl;h=c7a7cdc5a249f4880e4706388f5f6cbf0f9d8ec3;hb=b32553a3c1bf57303b430d0c68e21fdff854999c;hp=8b1017e2ebe880db183e4b07986d010c27d6b94b;hpb=170507ca80880ddcd65e8a91545b8bb2c37e5690;p=kivitendo-erp.git

diff --git a/scripts/installation_check.pl b/scripts/installation_check.pl
index 8b1017e2e..c7a7cdc5a 100755
--- a/scripts/installation_check.pl
+++ b/scripts/installation_check.pl
@@ -1,35 +1,37 @@
 #!/usr/bin/perl -w
 
-$| = 1;
+BEGIN {
+  unshift @INC, "modules/override"; # Use our own versions of various modules (e.g. YAML).
+  push    @INC, "modules/fallback"; # Only use our own versions of modules if there's no system version.
+}
 
-my @required_modules = (
-  { "name" => "Class::Accessor", "url" => "http://search.cpan.org/~kasei/" },
-  { "name" => "CGI", "url" => "http://search.cpan.org/~lds/" },
-  { "name" => "CGI::Ajax", "url" => "http://search.cpan.org/~bct/" },
-  { "name" => "DBI", "url" => "http://search.cpan.org/~timb/" },
-  { "name" => "DBD::Pg", "url" => "http://search.cpan.org/~dbdpg/" },
-  { "name" => "HTML::Template", "url" => "http://search.cpan.org/~samtregar/" },
-  { "name" => "Archive::Zip", "url" => "http://search.cpan.org/~adamk/" },
-  { "name" => "Text::Iconv", "url" => "http://search.cpan.org/~mpiotr/" },
-  );
+use SL::InstallationCheck;
 
-sub module_available {
-  my ($module) = @_;
+$| = 1;
 
-  if (!defined(eval("require $module;"))) {
-    return 0;
+foreach my $module (@SL::InstallationCheck::required_modules) {
+  print("Looking for $module->{name}...");
+  if (!SL::InstallationCheck::module_available($module->{"name"})) {
+    print(" NOT found\n" .
+          "  The module '$module->{name}' is not available on your system.\n" .
+          "  Please install it with the CPAN shell, e.g.\n" .
+          "    perl -MCPAN -e \"install $module->{name}\"\n" .
+          "  or download it from this URL and install it manually:\n" .
+          "    $module->{url}\n\n");
   } else {
-    return 1;
+    print(" ok\n");
   }
 }
 
-foreach my $module (@required_modules) {
-  print("Looking for $module->{name}...");
-  if (!module_available($module->{"name"})) {
+foreach my $module (@SL::InstallationCheck::optional_modules) {
+  print("Looking for $module->{name} (optional)...");
+  if (!SL::InstallationCheck::module_available($module->{"name"})) {
     print(" NOT found\n" .
           "  The module '$module->{name}' is not available on your system.\n" .
-          "  Please install it with the CPAN shell, e.g.\n" .
-          "    perl -MCPAN -e install \"install $module->{name}\"\n" .
+          "  While it is not strictly needed it provides extra functionality\n" .
+          "  and should be installed.\n" .
+          "  You can install it with the CPAN shell, e.g.\n" .
+          "    perl -MCPAN -e \"install $module->{name}\"\n" .
           "  or download it from this URL and install it manually:\n" .
           "    $module->{url}\n\n");
   } else {