0.84_01 development release

[imager.git] / GIF / Makefile.PL

diff --git a/GIF/Makefile.PL b/GIF/Makefile.PL
index 9e7997f165cda18948ce6f9e909d485b21a5ec59..3053185cec7b3e1cb4299180e204665d33245474 100644 (file)
--- a/GIF/Makefile.PL
+++ b/GIF/Makefile.PL
@@ -1,6 +1,6 @@
 #!perl -w
 use strict;
-use ExtUtils::MakeMaker qw(WriteMakefile WriteEmptyMakefile);
+use ExtUtils::MakeMaker;
 use Getopt::Long;
 use Config;
 
@@ -13,6 +13,7 @@ GetOptions("incpath=s", \@incpaths,
            "verbose|v" => \$verbose);
 
 our $BUILDING_IMAGER;
+our %IMAGER_LIBS;
 
 my $MM_ver = eval $ExtUtils::MakeMaker::VERSION;
 
@@ -21,6 +22,7 @@ my %opts =
    NAME => 'Imager::File::GIF',
    VERSION_FROM => 'GIF.pm',
    OBJECT => 'GIF.o imgif.o',
+   clean => { FILES => 'testout' },
   );
 
 my @inc;
@@ -36,7 +38,7 @@ else {
   $opts{TYPEMAPS} = [ Imager::ExtUtils->typemap ];
 
   # Imager required configure through use
-  my @Imager_req = ( Imager => "0.78" );
+  my @Imager_req = ( Imager => "0.84_01" );
   if ($MM_ver >= 6.46) {
     $opts{META_MERGE} =
       {
@@ -52,12 +54,8 @@ else {
        resources =>
        {
        homepage => "http://imager.perl.org/",
-       repository =>
-       {
-        url => "http://imager.perl.org/svn/trunk/Imager-File-GIF",
-        web => "http://imager.perl.org/svnweb/public/browse/trunk/Imager-File-GIF",
-        type => "svn",
-       },
+       repository => "git://git.imager.perl.org/imager.git",
+       bugtracker => "http://rt.cpan.org/NoAuth/Bugs.html?Dist=Imager",
        },
       };
     $opts{PREREQ_PM} =
@@ -76,27 +74,31 @@ my %probe =
    libbase => "gif",
    testcode => _gif_test_code(),
    testcodeheaders => [ "gif_lib.h", "stdio.h" ],
-   incpath => join($Config{path_sep}, @incpaths),
-   libpath => join($Config{path_sep}, @libpaths),
+   incpath => \@incpaths,
+   libpath => \@libpaths,
   );
 
 my $probe_res = Imager::Probe->probe(\%probe);
 if ($probe_res) {
+  $IMAGER_LIBS{GIF} = 1;
+
   push @inc, $probe_res->{INC};
   $opts{LIBS} = $probe_res->{LIBS};
-  
+  $opts{DEFINE} = $probe_res->{DEFINE};
   $opts{INC} = "@inc";
   
   if ($MM_ver > 6.06) {
-    $opts{AUTHOR} = 'Tony Cook <tony@imager.perl.org>';
+    $opts{AUTHOR} = 'Tony Cook <tonyc@cpan.org>';
     $opts{ABSTRACT} = 'GIF Image file support';
   }
   
   WriteMakefile(%opts);
 }
 else {
+  $IMAGER_LIBS{GIF} = 0;
+
   if ($BUILDING_IMAGER) {
-    WriteEmptyMakefile(%opts);
+    ExtUtils::MakeMaker::WriteEmptyMakefile(%opts);
   }
   else {
     # fail in good way