lib/File/ConfigDir.pm: fix local::lib handling

Fix the utterly broken handling of local::lib and allow
configuration directories ("etc") in hierarchy below
PERL_LOCAL_LIB_ROOT.
Do not use local::lib before the class-method "active_paths"
is available.

Signed-off-by: Jens Rehsack <sno@netbsd.org>

Makefile.PL

@@ -60,6 +60,9 @@ WriteMakefile1(
             build   => {requires => {%BUILD_DEPS}},
             test    => {requires => {%TEST_DEPS}},
             runtime => {
+                suggests => {
+                    'local::lib' => '1.008008',
+                },
                 recommends => {
                     'File::HomeDir'       => '0.50',
                     'List::MoreUtils'     => '0.0.419',

lib/File/ConfigDir.pm

@@ -357,17 +357,20 @@ C<etc> directory below it.
 
 =cut
 
+my $haveLocalLib;
+
+BEGIN
+{
+    # uncoverable branch false
+    defined $haveLocalLib or $haveLocalLib = eval "use local::lib (); local::lib->can('active_paths');";
+    defined $haveLocalLib or $haveLocalLib = 0;
+}
+
 my $locallib_cfg_dir = sub {
     my @cfg_base = @_;
     my @dirs;
 
-    if (   $INC{'local/lib.pm'}
-        && $ENV{PERL_MM_OPT}
-        && $ENV{PERL_MM_OPT} =~ m/.*INSTALL_BASE=([^"']*)['"]?$/)
-    {
-        (my $cfgdir = $ENV{PERL_MM_OPT}) =~ s/.*INSTALL_BASE=([^"']*)['"]?$/$1/;
-        push(@dirs, File::Spec->catdir($cfgdir, "etc", @cfg_base));
-    }
+    $haveLocalLib and push(@dirs, map { File::Spec->catdir($_, "etc", @cfg_base) } local::lib->active_paths);
 
     @dirs;
 };
@@ -404,6 +407,7 @@ my $haveFileHomeDir;
 
 BEGIN
 {
+    # uncoverable branch false
     defined $haveFileHomeDir or $haveFileHomeDir = eval "use File::HomeDir; 1";
     defined $haveFileHomeDir or $haveFileHomeDir = 0;
 }

t/01-simple.t

@@ -3,10 +3,11 @@
 use strict;
 use warnings;
 
-eval {
-    require local::lib;
-    #local::lib->import();
-};
+use File::Temp qw(tempdir);
+
+my $dir = tempdir(CLEANUP => 1);
+
+eval "use local::lib '$dir'; 1;";
 
 use Test::More;
 
@@ -16,15 +17,15 @@ my @supported_functions = (
     qw(config_dirs system_cfg_dir desktop_cfg_dir),
     qw(core_cfg_dir site_cfg_dir vendor_cfg_dir),
     qw(local_cfg_dir here_cfg_dir singleapp_cfg_dir vendorapp_cfg_dir),
-    qw(xdg_config_dirs xdg_config_home user_cfg_dir),
+    qw(xdg_config_dirs xdg_config_home user_cfg_dir locallib_cfg_dir),
 );
 foreach my $fn (@supported_functions)
 {
     my $faddr;
     ok($faddr = File::ConfigDir->can($fn), "Can $fn");
     my @dirs = &{$faddr}();
     note("$fn: " . join(",", @dirs));
-    if ($fn =~ m/(?:xdg_)?config_dirs/ or $fn =~ m/(?:machine|desktop)_cfg_dir/)
+    if ($fn =~ m/(?:xdg_)?config_dirs/ or $fn =~ m/(?:machine|desktop|locallib)_cfg_dir/)
     {
         ok(scalar @dirs >= 1, "config_dirs") or diag(join(",", @dirs));    # we expect at least system_cfg_dir
     }