- avoid some Makefile.PL warnings

	- use Imager in Makefile.PL since I'd prefer to error on that
	  rather than Imager::ExtUtils
	- work around Debian strangeness

diff --git a/Changes b/Changes
index ea4e90b45ae6252a9b877b167ca257aeba310416..b38d0030bd39c53c653576d79d7bf28e8d90cbe3 100755 (executable)
--- a/Changes
+++ b/Changes
@@ -1,4 +1,8 @@
 0.003
+       - avoid some Makefile.PL warnings
+       - use Imager in Makefile.PL since I'd prefer to error on that
+         rather than Imager::ExtUtils
+       - work around Debian strangeness
        - the x11 capture wasn't releasing the XImage or the line
          and color buffers.
        - x11_open() incorrectly reset the error handler to junk

diff --git a/Makefile.PL b/Makefile.PL
index 099b5190d2b75b3386f95d78b8a37f6ece3ce806..7afadd6747e81b86e4452def33287499f392078e 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,6 +1,7 @@
 #!perl -w
 use strict;
 use ExtUtils::MakeMaker;
+use Imager 0.54;
 use Imager::ExtUtils;
 use Config;
 use File::Spec;
@@ -45,12 +46,17 @@ my %opts =
 $opts{LIBS} = "@lflags" if @lflags;
 $opts{INC} .= " @cflags" if @cflags;
 
-if ($ExtUtils::MakeMaker::VERSION > 6.06) {
+# avoid "... isn't numberic in numeric gt ..." warnings for dev versions
+my $eu_mm_version = eval $ExtUtils::MakeMaker::VERSION;
+if ($eu_mm_version > 6.06) {
   $opts{AUTHOR} = 'Tony Cook <tonyc@cpan.org>';
   $opts{ABSTRACT} = 'Screen/Window capture to Imager images';
 }
 
-if ($ExtUtils::MakeMaker::VERSION > 6.30) {
+# LICENSE was introduced in 6.30_01, but Debian etch includes
+# (as of 2007/01/12) an ExtUtils::MakeMaker versioned 6.30_01 without
+# LICENSE support
+if ($eu_mm_version > 6.3001) {
   $opts{LICENSE} = 'perl';
 }