From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 10 Oct 2010 01:07:26 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~8714
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a5962c4548b9f471b852a7a1f4d4daf428d1577;p=imagemagick

---

diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL
index b8fc6cde1..1a9b06508 100644
--- a/PerlMagick/Makefile.PL
+++ b/PerlMagick/Makefile.PL
@@ -124,10 +124,11 @@ EOF
 sub AutodetectDelegates {
   #try to get configuration info via identify or convert utilities
   my $devnull = devnull();
-  my $conf = `identify -list format 2>$devnull` || `convert -list format 2>$devnull`;
+  my $conf = `identify -list Configure 2>$devnull` || `convert -list Configure 2>$devnull`;
+  my @delegates = ();
   foreach my $line (split '\n', $conf) {
     next unless $line =~ /^DELEGATES\s+/;
-    my (undef, @delegates) = split /\s+/, $line;
+    (undef, @delegates) = split /\s+/, $line;
     last;
   };
   return @delegates;
@@ -141,7 +142,7 @@ my @supported_delegates = AutodetectDelegates();
 my %seen_delegates = ();
 $seen_delegates{$_}++ for @supported_delegates;
 foreach my $delegate (@tested_delegates) {
-  if ( $seen_delegates{$_} ) {
+  if ( $seen_delegates{$delegate} ) {
     if ( -d "t/$delegate" ) {
       if ( defined($ENV{'DISPLAY'}) && ($^O ne 'MSWin32') ) {
         if ( defined $ENV{'DISPLAY'} ) {
diff --git a/PerlMagick/Makefile.PL.in b/PerlMagick/Makefile.PL.in
index aed305240..23e650e0d 100644
--- a/PerlMagick/Makefile.PL.in
+++ b/PerlMagick/Makefile.PL.in
@@ -124,10 +124,11 @@ EOF
 sub AutodetectDelegates {
   #try to get configuration info via identify or convert utilities
   my $devnull = devnull();
-  my $conf = `identify -list format 2>$devnull` || `convert -list format 2>$devnull`;
+  my $conf = `identify -list Configure 2>$devnull` || `convert -list Configure 2>$devnull`;
+  my @delegates = ();
   foreach my $line (split '\n', $conf) {
     next unless $line =~ /^DELEGATES\s+/;
-    my (undef, @delegates) = split /\s+/, $line;
+    (undef, @delegates) = split /\s+/, $line;
     last;
   };
   return @delegates;
@@ -141,7 +142,7 @@ my @supported_delegates = AutodetectDelegates();
 my %seen_delegates = ();
 $seen_delegates{$_}++ for @supported_delegates;
 foreach my $delegate (@tested_delegates) {
-  if ( $seen_delegates{$_} ) {
+  if ( $seen_delegates{$delegate} ) {
     if ( -d "t/$delegate" ) {
       if ( defined($ENV{'DISPLAY'}) && ($^O ne 'MSWin32') ) {
         if ( defined $ENV{'DISPLAY'} ) {