PNG re-work: remove unused variables

[imager.git] / PNG / Makefile.PL

diff --git a/PNG/Makefile.PL b/PNG/Makefile.PL
index ec5cdb335cb071675db3d06e398ee5991ba2f61f..bc735966b66fc09bc58cfbf6b9d8ce4c95e80b1a 100644 (file)
--- a/PNG/Makefile.PL
+++ b/PNG/Makefile.PL
@@ -38,7 +38,7 @@ else {
   $opts{TYPEMAPS} = [ Imager::ExtUtils->typemap ];
 
   # Imager required configure through use
-  my @Imager_req = ( Imager => "0.86" );
+  my @Imager_req = ( Imager => "0.90" );
   if ($MM_ver >= 6.46) {
     $opts{META_MERGE} =
       {
@@ -68,6 +68,30 @@ else {
 
 require Imager::Probe;
 
+my @alts =
+  (
+   {
+    altname => "v1.5",
+    incsuffix => "libpng15",
+    libbase => "png15",
+   },
+   {
+    altname => "v1.4",
+    incsuffix => "libpng14",
+    libbase => "png14",
+   },
+   {
+    altname => "v1.2",
+    incsuffix => "libpng12",
+    libbase => "png12",
+   },
+   {
+    altname => "v1.0",
+    incsuffix => "libpng10",
+    libbase => "png10",
+   },
+  );
+
 my %probe =
   (
    name => "PNG",
@@ -81,26 +105,18 @@ my %probe =
    libpath => \@libpaths,
    alternatives =>
    [
+    @alts,
     {
-     altname => "v1.5",
-     incsuffix => "libpng14",
-     libbase => "png14",
-    },
-    {
-     altname => "v1.4",
-     incsuffix => "libpng14",
-     libbase => "png14",
-    },
-    {
-     altname => "v1.2",
-     incsuffix => "libpng12",
-     libbase => "png12",
-    },
-    {
-     altname => "v1.0",
-     incsuffix => "libpng10",
-     libbase => "png10",
+     altname => "base (+libz)",
+     libbase => [ "png", "z" ],
     },
+    ( # a static libpng may require libz too
+     map +{
+          %$_,
+          altname => "$_->{altname} (+libz)",
+          libbase => [ $_->{libbase}, "z" ],
+         }, @alts
+    ),
    ],
   );