updates from Imager-File-PNG

diff --git a/PNG/Makefile.PL b/PNG/Makefile.PL
index f11bb378a990c556e8384a0194fcabb9db552a00..c79d31799cbd2195223fe5d83ac7f54c0c8532e4 100644 (file)
--- a/PNG/Makefile.PL
+++ b/PNG/Makefile.PL
@@ -2,6 +2,7 @@
 use strict;
 use ExtUtils::MakeMaker qw(WriteMakefile WriteEmptyMakefile);
 use Getopt::Long;
+use Config;
 
 my $verbose = $ENV{IM_VERBOSE};
 my @libpaths;
@@ -25,16 +26,17 @@ my %opts =
 my @inc;
 if ($BUILDING_IMAGER) {
   push @inc, "-I..";
-  push @INC, "../lib";
+  unshift @INC, "../lib";
 }
 else {
+  unshift @INC, "inc";
   print "PNG: building independently\n";
   require Imager::ExtUtils;
   push @inc, Imager::ExtUtils->includes;
   $opts{TYPEMAPS} = [ Imager::ExtUtils->typemap ];
 
   # Imager required configure through use
-  my @Imager_req = ( Imager => "0.76" );
+  my @Imager_req = ( Imager => "0.77" );
   if ($MM_ver >= 6.46) {
     $opts{META_MERGE} =
       {
@@ -46,7 +48,17 @@ else {
        {
        @Imager_req,
        "Test::More" => "0.47",
-       }
+       },
+       resources =>
+       {
+       homepage => "http://imager.perl.org/",
+       repository =>
+       {
+        url => "http://imager.perl.org/svn/trunk/Imager-File-PNG",
+        web => "http://imager.perl.org/svnweb/public/browse/trunk/Imager-File-PNG",
+        type => "svn",
+       },
+       },
       };
     $opts{PREREQ_PM} =
       {
@@ -65,6 +77,8 @@ my %probe =
    libbase => "png",
    testcode => _png_test_code(),
    testcodeheaders => [ "png.h", "stdio.h" ],
+   incpath => join($Config{path_sep}, @incpaths),
+   libpath => join($Config{path_sep}, @libpaths),
   );
 
 my $probe_res = Imager::Probe->probe(\%probe);

diff --git a/PNG/PNG.pm b/PNG/PNG.pm
index 7c4c18a2c676e68383f55a7e36766ce945cf880b..98846cdfa2a568a3c3a1eb5a18a1079057890dd4 100644 (file)
--- a/PNG/PNG.pm
+++ b/PNG/PNG.pm
@@ -4,7 +4,7 @@ use Imager;
 use vars qw($VERSION @ISA);
 
 BEGIN {
-  $VERSION = "0.76";
+  $VERSION = "0.77";
 
   eval {
     require XSLoader;