X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FInstallationCheck.pm;h=6311d2b0c70415e41c3e94f69ee4097490996973;hb=515d5a58413076f0ed5d61f5001ff41db455e84f;hp=9dc3a2e5867c1ef100dc324b07f1bd6758f3a76b;hpb=559eae2013bbd4b634ca55e355fa5b35980cd069;p=kivitendo-erp.git diff --git a/SL/InstallationCheck.pm b/SL/InstallationCheck.pm index 9dc3a2e58..6311d2b0c 100644 --- a/SL/InstallationCheck.pm +++ b/SL/InstallationCheck.pm @@ -19,6 +19,7 @@ BEGIN { { name => "DBD::Pg", version => '1.49', url => "http://search.cpan.org/~dbdpg/", debian => 'libdbd-pg' }, { name => "Email::Address", url => "http://search.cpan.org/~rjbs/", debian => 'libemail-address-perl' }, { name => "FCGI", url => "http://search.cpan.org/~mstrout/", debian => 'libfcgi-perl' }, + { name => "JSON", url => "http://search.cpan.org/~makamaka", debian => 'libjson-perl' }, { name => "List::MoreUtils", version => '0.21', url => "http://search.cpan.org/~vparseval/", debian => 'liblist-moreutils-perl' }, { name => "Params::Validate", url => "http://search.cpan.org/~drolsky/", debian => 'libparams-validate-perl' }, { name => "PDF::API2", version => '2.000', url => "http://search.cpan.org/~areibens/", debian => 'libpdf-api2-perl' }, @@ -52,11 +53,8 @@ my %conditional_dependencies; sub check_for_conditional_dependencies { return if $conditional_dependencies{net_ldap}++; - my $self = {}; - eval do { local (@ARGV, $/) = 'config/authentication.pl'; <> } or return; - push @required_modules, { 'name' => 'Net::LDAP', 'url' => 'http://search.cpan.org/~gbarr/' } - if $self->{module} && ($self->{module} eq 'LDAP'); + if $::lx_office_conf{authentication} && ($::lx_office_conf{authentication}->{module} eq 'LDAP'); } sub test_all_modules {