Devel::CheckLib: handle the gcc-4 symlink on Cygwin

diff --git a/Changes b/Changes
index 5c5ce61201be6a04b58419008d8345c46d9c3e68..9bd12ae9297306519c7309a651c3d6bbcbd9b66c 100644 (file)
--- a/Changes
+++ b/Changes
@@ -22,6 +22,9 @@ Imager release history.  Older releases can be found in Changes.old
  - The --enable and --disable parameters to the top-level Makefile.PL
    work again.
 
  - The --enable and --disable parameters to the top-level Makefile.PL
    work again.
 

+ - update the bundled/modified Devel::CheckLib to handle the gcc-4
+   symlink on Cygwin
+

 Imager 1.000 - 28 Jul 2014
 ============
 
 Imager 1.000 - 28 Jul 2014
 ============
 

diff --git a/FT2/Changes b/FT2/Changes
index 7b1f9ba5cf2a5f95cc794bc66bc3a28fdbc71a3e..001f882592bd37a25b631bfcc3fac0d75f87fe21 100644 (file)
--- a/FT2/Changes
+++ b/FT2/Changes
@@ -1,3 +1,9 @@
+Imager-Font-FT2 0.93
+====================
+
+ - update the bundled/modified Devel::CheckLib to handle the gcc-4
+   symlink on Cygwin
+

 Imager-Font-FT2 0.92
 ====================
 
 Imager-Font-FT2 0.92
 ====================
 

diff --git a/FT2/FT2.pm b/FT2/FT2.pm
index 0c112a452c8c326eb3a2415c66aee1aeffd2af0c..48969962778ef67340882a4c56e73941c2c88f08 100644 (file)
--- a/FT2/FT2.pm
+++ b/FT2/FT2.pm
@@ -6,7 +6,7 @@ use vars qw($VERSION @ISA);
 @ISA = qw(Imager::Font);
 
 BEGIN {
 @ISA = qw(Imager::Font);
 
 BEGIN {

-  $VERSION = "0.92";
+  $VERSION = "0.93";

 
   require XSLoader;
   XSLoader::load('Imager::Font::FT2', $VERSION);
 
   require XSLoader;
   XSLoader::load('Imager::Font::FT2', $VERSION);

diff --git a/FT2/inc/Devel/CheckLib.pm b/FT2/inc/Devel/CheckLib.pm
index 1cac79b7154d1721ab21960ee9c6225c3816aeb4..df7c379d99381fd57195c50f810d0850e7cf0d76 100644 (file)
--- a/FT2/inc/Devel/CheckLib.pm
+++ b/FT2/inc/Devel/CheckLib.pm
@@ -1,6 +1,6 @@
 # $Id: CheckLib.pm,v 1.25 2008/10/27 12:16:23 drhyde Exp $
 # This is a modified version of Devel::CheckLib 0.93 including the patches from
 # $Id: CheckLib.pm,v 1.25 2008/10/27 12:16:23 drhyde Exp $
 # This is a modified version of Devel::CheckLib 0.93 including the patches from

-# RT issues 60176 and 61645
+# RT issues 60176 and 61645 and other changes I need to backport

 
 package #
 Devel::CheckLib;
 
 package #
 Devel::CheckLib;


@@ -8,7 +8,7 @@ Devel::CheckLib;
 use 5.00405; #postfix foreach
 use strict;
 use vars qw($VERSION @ISA @EXPORT);
 use 5.00405; #postfix foreach
 use strict;
 use vars qw($VERSION @ISA @EXPORT);

-$VERSION = '0.93_001';
+$VERSION = '0.93_002';

 use Config qw(%Config);
 use Text::ParseWords 'quotewords';
 
 use Config qw(%Config);
 use Text::ParseWords 'quotewords';
 


@@ -406,7 +406,11 @@ sub _findcc {
     my @cc = split(/\s+/, $Config{cc});
     return ( [ @cc, @ccflags ], \@ldflags ) if -x $cc[0];
     foreach my $path (@paths) {
     my @cc = split(/\s+/, $Config{cc});
     return ( [ @cc, @ccflags ], \@ldflags ) if -x $cc[0];
     foreach my $path (@paths) {

-        my $compiler = File::Spec->catfile($path, $cc[0]) . $Config{_exe};
+        my $compiler = File::Spec->catfile($path, $cc[0]) . ($^O eq 'cygwin' ? '' : $Config{_exe});
+        return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
+            if -x $compiler;
+        next if ! length $Config{_exe};
+        $compiler = File::Spec->catfile($path, $cc[0]);

         return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
             if -x $compiler;
     }
         return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
             if -x $compiler;
     }

diff --git a/GIF/Changes b/GIF/Changes
index bdd6cd838f2951039f16ca674f88383496d72da2..68ccac290bc14c54b40ecd5a813ae1a0bd6e738d 100644 (file)
--- a/GIF/Changes
+++ b/GIF/Changes
@@ -4,6 +4,9 @@ Imager-File-GIF 0.89
  - don't leave a test file behind when probing for the 4.2.0 file
    version bug fails.
 
  - don't leave a test file behind when probing for the 4.2.0 file
    version bug fails.
 

+ - update the bundled/modified Devel::CheckLib to handle the gcc-4
+   symlink on Cygwin
+

 Imager-File-GIF 0.89
 ====================
 
 Imager-File-GIF 0.89
 ====================
 

diff --git a/GIF/inc/Devel/CheckLib.pm b/GIF/inc/Devel/CheckLib.pm
index 1cac79b7154d1721ab21960ee9c6225c3816aeb4..df7c379d99381fd57195c50f810d0850e7cf0d76 100644 (file)
--- a/GIF/inc/Devel/CheckLib.pm
+++ b/GIF/inc/Devel/CheckLib.pm
@@ -1,6 +1,6 @@
 # $Id: CheckLib.pm,v 1.25 2008/10/27 12:16:23 drhyde Exp $
 # This is a modified version of Devel::CheckLib 0.93 including the patches from
 # $Id: CheckLib.pm,v 1.25 2008/10/27 12:16:23 drhyde Exp $
 # This is a modified version of Devel::CheckLib 0.93 including the patches from

-# RT issues 60176 and 61645
+# RT issues 60176 and 61645 and other changes I need to backport

 
 package #
 Devel::CheckLib;
 
 package #
 Devel::CheckLib;


@@ -8,7 +8,7 @@ Devel::CheckLib;
 use 5.00405; #postfix foreach
 use strict;
 use vars qw($VERSION @ISA @EXPORT);
 use 5.00405; #postfix foreach
 use strict;
 use vars qw($VERSION @ISA @EXPORT);

-$VERSION = '0.93_001';
+$VERSION = '0.93_002';

 use Config qw(%Config);
 use Text::ParseWords 'quotewords';
 
 use Config qw(%Config);
 use Text::ParseWords 'quotewords';
 


@@ -406,7 +406,11 @@ sub _findcc {
     my @cc = split(/\s+/, $Config{cc});
     return ( [ @cc, @ccflags ], \@ldflags ) if -x $cc[0];
     foreach my $path (@paths) {
     my @cc = split(/\s+/, $Config{cc});
     return ( [ @cc, @ccflags ], \@ldflags ) if -x $cc[0];
     foreach my $path (@paths) {

-        my $compiler = File::Spec->catfile($path, $cc[0]) . $Config{_exe};
+        my $compiler = File::Spec->catfile($path, $cc[0]) . ($^O eq 'cygwin' ? '' : $Config{_exe});
+        return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
+            if -x $compiler;
+        next if ! length $Config{_exe};
+        $compiler = File::Spec->catfile($path, $cc[0]);

         return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
             if -x $compiler;
     }
         return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
             if -x $compiler;
     }

diff --git a/JPEG/Changes b/JPEG/Changes
index 7c536e2be820f23a12d714f553ae20bf83c56acd..08fddf4298da8fc64e40d9fd163a11ac5487311e 100644 (file)
--- a/JPEG/Changes
+++ b/JPEG/Changes
@@ -1,3 +1,11 @@
+Imager-File-JPEG 0.90
+=====================
+
+ - update the bundled/modified Devel::CheckLib to handle the gcc-4
+   symlink on Cygwin
+
+Imager-File-JPEG 0.89
+=====================

 
  - added the jpeg_optimize parameter for writing JPEG files.  This can
    significantly reduce file sizes, but uses more memory and time.
 
  - added the jpeg_optimize parameter for writing JPEG files.  This can
    significantly reduce file sizes, but uses more memory and time.

diff --git a/JPEG/JPEG.pm b/JPEG/JPEG.pm
index 97dd9cf93b4658698eac5e370cdfae0e4308f67e..972621154cf8e70ea760141dacba9f19945b0bff 100644 (file)
--- a/JPEG/JPEG.pm
+++ b/JPEG/JPEG.pm
@@ -4,7 +4,7 @@ use Imager;
 use vars qw($VERSION @ISA);
 
 BEGIN {
 use vars qw($VERSION @ISA);
 
 BEGIN {

-  $VERSION = "0.89";
+  $VERSION = "0.90";

 
   require XSLoader;
   XSLoader::load('Imager::File::JPEG', $VERSION);
 
   require XSLoader;
   XSLoader::load('Imager::File::JPEG', $VERSION);

diff --git a/JPEG/inc/Devel/CheckLib.pm b/JPEG/inc/Devel/CheckLib.pm
index 1cac79b7154d1721ab21960ee9c6225c3816aeb4..df7c379d99381fd57195c50f810d0850e7cf0d76 100644 (file)
--- a/JPEG/inc/Devel/CheckLib.pm
+++ b/JPEG/inc/Devel/CheckLib.pm
@@ -1,6 +1,6 @@
 # $Id: CheckLib.pm,v 1.25 2008/10/27 12:16:23 drhyde Exp $
 # This is a modified version of Devel::CheckLib 0.93 including the patches from
 # $Id: CheckLib.pm,v 1.25 2008/10/27 12:16:23 drhyde Exp $
 # This is a modified version of Devel::CheckLib 0.93 including the patches from

-# RT issues 60176 and 61645
+# RT issues 60176 and 61645 and other changes I need to backport

 
 package #
 Devel::CheckLib;
 
 package #
 Devel::CheckLib;


@@ -8,7 +8,7 @@ Devel::CheckLib;
 use 5.00405; #postfix foreach
 use strict;
 use vars qw($VERSION @ISA @EXPORT);
 use 5.00405; #postfix foreach
 use strict;
 use vars qw($VERSION @ISA @EXPORT);

-$VERSION = '0.93_001';
+$VERSION = '0.93_002';

 use Config qw(%Config);
 use Text::ParseWords 'quotewords';
 
 use Config qw(%Config);
 use Text::ParseWords 'quotewords';
 


@@ -406,7 +406,11 @@ sub _findcc {
     my @cc = split(/\s+/, $Config{cc});
     return ( [ @cc, @ccflags ], \@ldflags ) if -x $cc[0];
     foreach my $path (@paths) {
     my @cc = split(/\s+/, $Config{cc});
     return ( [ @cc, @ccflags ], \@ldflags ) if -x $cc[0];
     foreach my $path (@paths) {

-        my $compiler = File::Spec->catfile($path, $cc[0]) . $Config{_exe};
+        my $compiler = File::Spec->catfile($path, $cc[0]) . ($^O eq 'cygwin' ? '' : $Config{_exe});
+        return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
+            if -x $compiler;
+        next if ! length $Config{_exe};
+        $compiler = File::Spec->catfile($path, $cc[0]);

         return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
             if -x $compiler;
     }
         return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
             if -x $compiler;
     }

diff --git a/PNG/Changes b/PNG/Changes
index 7685d1fe2783c33a74f3a91f263c5b758aa32e27..3023808648b4d25ae3e864920c9d529ed25bcd74 100644 (file)
--- a/PNG/Changes
+++ b/PNG/Changes
@@ -1,3 +1,9 @@
+Imager-File-PNG 0.91
+====================
+
+ - update the bundled/modified Devel::CheckLib to handle the gcc-4
+   symlink on Cygwin
+

 Imager-File-PNG 0.91
 ====================
 
 Imager-File-PNG 0.91
 ====================
 

diff --git a/PNG/PNG.pm b/PNG/PNG.pm
index 05670754b411b998e54b68a8a0b7113065e1b034..954e964179202cd3d28cb453d8328ad7e9b52af0 100644 (file)
--- a/PNG/PNG.pm
+++ b/PNG/PNG.pm
@@ -4,7 +4,7 @@ use Imager;
 use vars qw($VERSION @ISA);
 
 BEGIN {
 use vars qw($VERSION @ISA);
 
 BEGIN {

-  $VERSION = "0.91";
+  $VERSION = "0.92";

 
   require XSLoader;
   XSLoader::load('Imager::File::PNG', $VERSION);
 
   require XSLoader;
   XSLoader::load('Imager::File::PNG', $VERSION);

diff --git a/PNG/inc/Devel/CheckLib.pm b/PNG/inc/Devel/CheckLib.pm
index 1cac79b7154d1721ab21960ee9c6225c3816aeb4..df7c379d99381fd57195c50f810d0850e7cf0d76 100644 (file)
--- a/PNG/inc/Devel/CheckLib.pm
+++ b/PNG/inc/Devel/CheckLib.pm
@@ -1,6 +1,6 @@
 # $Id: CheckLib.pm,v 1.25 2008/10/27 12:16:23 drhyde Exp $
 # This is a modified version of Devel::CheckLib 0.93 including the patches from
 # $Id: CheckLib.pm,v 1.25 2008/10/27 12:16:23 drhyde Exp $
 # This is a modified version of Devel::CheckLib 0.93 including the patches from

-# RT issues 60176 and 61645
+# RT issues 60176 and 61645 and other changes I need to backport

 
 package #
 Devel::CheckLib;
 
 package #
 Devel::CheckLib;


@@ -8,7 +8,7 @@ Devel::CheckLib;
 use 5.00405; #postfix foreach
 use strict;
 use vars qw($VERSION @ISA @EXPORT);
 use 5.00405; #postfix foreach
 use strict;
 use vars qw($VERSION @ISA @EXPORT);

-$VERSION = '0.93_001';
+$VERSION = '0.93_002';

 use Config qw(%Config);
 use Text::ParseWords 'quotewords';
 
 use Config qw(%Config);
 use Text::ParseWords 'quotewords';
 


@@ -406,7 +406,11 @@ sub _findcc {
     my @cc = split(/\s+/, $Config{cc});
     return ( [ @cc, @ccflags ], \@ldflags ) if -x $cc[0];
     foreach my $path (@paths) {
     my @cc = split(/\s+/, $Config{cc});
     return ( [ @cc, @ccflags ], \@ldflags ) if -x $cc[0];
     foreach my $path (@paths) {

-        my $compiler = File::Spec->catfile($path, $cc[0]) . $Config{_exe};
+        my $compiler = File::Spec->catfile($path, $cc[0]) . ($^O eq 'cygwin' ? '' : $Config{_exe});
+        return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
+            if -x $compiler;
+        next if ! length $Config{_exe};
+        $compiler = File::Spec->catfile($path, $cc[0]);

         return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
             if -x $compiler;
     }
         return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
             if -x $compiler;
     }

diff --git a/T1/Changes b/T1/Changes
index 25e2aead04f37abd3c05ece54495708db0f706d5..14cdf0eeffc771fcec54d15dcf0fd5b119389abd 100644 (file)
--- a/T1/Changes
+++ b/T1/Changes
@@ -1,3 +1,9 @@
+Imager::Font::T1 1.024
+======================
+
+ - update the bundled/modified Devel::CheckLib to handle the gcc-4
+   symlink on Cygwin
+

 Imager::Font::T1 1.023
 ======================
 
 Imager::Font::T1 1.023
 ======================
 

diff --git a/T1/T1.pm b/T1/T1.pm
index c03757d7dc05546ee46b1418401f5d66b2f011de..11ef74d5ca2375e3e174c69569906538a61dad98 100644 (file)
--- a/T1/T1.pm
+++ b/T1/T1.pm
@@ -6,7 +6,7 @@ use vars qw(@ISA $VERSION);
 use Scalar::Util ();
 
 BEGIN {
 use Scalar::Util ();
 
 BEGIN {

-  $VERSION = "1.023";
+  $VERSION = "1.024";

 
   require XSLoader;
   XSLoader::load('Imager::Font::T1', $VERSION);
 
   require XSLoader;
   XSLoader::load('Imager::Font::T1', $VERSION);

diff --git a/T1/inc/Devel/CheckLib.pm b/T1/inc/Devel/CheckLib.pm
index 1cac79b7154d1721ab21960ee9c6225c3816aeb4..df7c379d99381fd57195c50f810d0850e7cf0d76 100644 (file)
--- a/T1/inc/Devel/CheckLib.pm
+++ b/T1/inc/Devel/CheckLib.pm
@@ -1,6 +1,6 @@
 # $Id: CheckLib.pm,v 1.25 2008/10/27 12:16:23 drhyde Exp $
 # This is a modified version of Devel::CheckLib 0.93 including the patches from
 # $Id: CheckLib.pm,v 1.25 2008/10/27 12:16:23 drhyde Exp $
 # This is a modified version of Devel::CheckLib 0.93 including the patches from

-# RT issues 60176 and 61645
+# RT issues 60176 and 61645 and other changes I need to backport

 
 package #
 Devel::CheckLib;
 
 package #
 Devel::CheckLib;


@@ -8,7 +8,7 @@ Devel::CheckLib;
 use 5.00405; #postfix foreach
 use strict;
 use vars qw($VERSION @ISA @EXPORT);
 use 5.00405; #postfix foreach
 use strict;
 use vars qw($VERSION @ISA @EXPORT);

-$VERSION = '0.93_001';
+$VERSION = '0.93_002';

 use Config qw(%Config);
 use Text::ParseWords 'quotewords';
 
 use Config qw(%Config);
 use Text::ParseWords 'quotewords';
 


@@ -406,7 +406,11 @@ sub _findcc {
     my @cc = split(/\s+/, $Config{cc});
     return ( [ @cc, @ccflags ], \@ldflags ) if -x $cc[0];
     foreach my $path (@paths) {
     my @cc = split(/\s+/, $Config{cc});
     return ( [ @cc, @ccflags ], \@ldflags ) if -x $cc[0];
     foreach my $path (@paths) {

-        my $compiler = File::Spec->catfile($path, $cc[0]) . $Config{_exe};
+        my $compiler = File::Spec->catfile($path, $cc[0]) . ($^O eq 'cygwin' ? '' : $Config{_exe});
+        return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
+            if -x $compiler;
+        next if ! length $Config{_exe};
+        $compiler = File::Spec->catfile($path, $cc[0]);

         return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
             if -x $compiler;
     }
         return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
             if -x $compiler;
     }

diff --git a/TIFF/Changes b/TIFF/Changes
index e42c78e5ce8da801e66d8997c7f371bc47a63ea0..e36e0092d62213d30260b841771bae2c0d50dac5 100644 (file)
--- a/TIFF/Changes
+++ b/TIFF/Changes
@@ -1,3 +1,9 @@
+Imager-File-TIFF 0.89
+=====================
+
+ - update the bundled/modified Devel::CheckLib to handle the gcc-4
+   symlink on Cygwin
+

 Imager-File-TIFF 0.88
 =====================
 
 Imager-File-TIFF 0.88
 =====================
 

diff --git a/TIFF/TIFF.pm b/TIFF/TIFF.pm
index 204ebcc8af7de5d3999e786ac91ab7108a77396f..f31103a560d9747b8abb951ece4e79aec7b6adf6 100644 (file)
--- a/TIFF/TIFF.pm
+++ b/TIFF/TIFF.pm
@@ -4,7 +4,7 @@ use Imager;
 use vars qw($VERSION @ISA);
 
 BEGIN {
 use vars qw($VERSION @ISA);
 
 BEGIN {

-  $VERSION = "0.88";
+  $VERSION = "0.89";

 
   require XSLoader;
   XSLoader::load('Imager::File::TIFF', $VERSION);
 
   require XSLoader;
   XSLoader::load('Imager::File::TIFF', $VERSION);

diff --git a/TIFF/inc/Devel/CheckLib.pm b/TIFF/inc/Devel/CheckLib.pm
index 1cac79b7154d1721ab21960ee9c6225c3816aeb4..df7c379d99381fd57195c50f810d0850e7cf0d76 100644 (file)
--- a/TIFF/inc/Devel/CheckLib.pm
+++ b/TIFF/inc/Devel/CheckLib.pm
@@ -1,6 +1,6 @@
 # $Id: CheckLib.pm,v 1.25 2008/10/27 12:16:23 drhyde Exp $
 # This is a modified version of Devel::CheckLib 0.93 including the patches from
 # $Id: CheckLib.pm,v 1.25 2008/10/27 12:16:23 drhyde Exp $
 # This is a modified version of Devel::CheckLib 0.93 including the patches from

-# RT issues 60176 and 61645
+# RT issues 60176 and 61645 and other changes I need to backport

 
 package #
 Devel::CheckLib;
 
 package #
 Devel::CheckLib;


@@ -8,7 +8,7 @@ Devel::CheckLib;
 use 5.00405; #postfix foreach
 use strict;
 use vars qw($VERSION @ISA @EXPORT);
 use 5.00405; #postfix foreach
 use strict;
 use vars qw($VERSION @ISA @EXPORT);

-$VERSION = '0.93_001';
+$VERSION = '0.93_002';

 use Config qw(%Config);
 use Text::ParseWords 'quotewords';
 
 use Config qw(%Config);
 use Text::ParseWords 'quotewords';
 


@@ -406,7 +406,11 @@ sub _findcc {
     my @cc = split(/\s+/, $Config{cc});
     return ( [ @cc, @ccflags ], \@ldflags ) if -x $cc[0];
     foreach my $path (@paths) {
     my @cc = split(/\s+/, $Config{cc});
     return ( [ @cc, @ccflags ], \@ldflags ) if -x $cc[0];
     foreach my $path (@paths) {

-        my $compiler = File::Spec->catfile($path, $cc[0]) . $Config{_exe};
+        my $compiler = File::Spec->catfile($path, $cc[0]) . ($^O eq 'cygwin' ? '' : $Config{_exe});
+        return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
+            if -x $compiler;
+        next if ! length $Config{_exe};
+        $compiler = File::Spec->catfile($path, $cc[0]);

         return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
             if -x $compiler;
     }
         return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
             if -x $compiler;
     }

diff --git a/W32/Changes b/W32/Changes
index cc81090b47f94115ca2464eb81c764305ffaa65e..c3c5e927c13045f0ecfe1bc9440e3872a6c1ecfe 100644 (file)
--- a/W32/Changes
+++ b/W32/Changes
@@ -1,3 +1,9 @@
+Imager-Font-W32 0.89
+====================
+
+ - update the bundled/modified Devel::CheckLib to handle the gcc-4
+   symlink on Cygwin
+

 Imager-Font-W32 0.88
 ====================
 
 Imager-Font-W32 0.88
 ====================
 

diff --git a/W32/W32.pm b/W32/W32.pm
index 151a63c3665aeeb542fd4efae6ef3237e9839898..89feecea7dcf80c719aa8a10100e08f7b544ce4b 100644 (file)
--- a/W32/W32.pm
+++ b/W32/W32.pm
@@ -5,7 +5,7 @@ use vars qw($VERSION @ISA);
 @ISA = qw(Imager::Font);
 
 BEGIN {
 @ISA = qw(Imager::Font);
 
 BEGIN {

-  $VERSION = "0.88";
+  $VERSION = "0.89";

 
   require XSLoader;
   XSLoader::load('Imager::Font::W32', $VERSION);
 
   require XSLoader;
   XSLoader::load('Imager::Font::W32', $VERSION);

diff --git a/W32/inc/Devel/CheckLib.pm b/W32/inc/Devel/CheckLib.pm
index 1cac79b7154d1721ab21960ee9c6225c3816aeb4..df7c379d99381fd57195c50f810d0850e7cf0d76 100644 (file)
--- a/W32/inc/Devel/CheckLib.pm
+++ b/W32/inc/Devel/CheckLib.pm
@@ -1,6 +1,6 @@
 # $Id: CheckLib.pm,v 1.25 2008/10/27 12:16:23 drhyde Exp $
 # This is a modified version of Devel::CheckLib 0.93 including the patches from
 # $Id: CheckLib.pm,v 1.25 2008/10/27 12:16:23 drhyde Exp $
 # This is a modified version of Devel::CheckLib 0.93 including the patches from

-# RT issues 60176 and 61645
+# RT issues 60176 and 61645 and other changes I need to backport

 
 package #
 Devel::CheckLib;
 
 package #
 Devel::CheckLib;


@@ -8,7 +8,7 @@ Devel::CheckLib;
 use 5.00405; #postfix foreach
 use strict;
 use vars qw($VERSION @ISA @EXPORT);
 use 5.00405; #postfix foreach
 use strict;
 use vars qw($VERSION @ISA @EXPORT);

-$VERSION = '0.93_001';
+$VERSION = '0.93_002';

 use Config qw(%Config);
 use Text::ParseWords 'quotewords';
 
 use Config qw(%Config);
 use Text::ParseWords 'quotewords';
 


@@ -406,7 +406,11 @@ sub _findcc {
     my @cc = split(/\s+/, $Config{cc});
     return ( [ @cc, @ccflags ], \@ldflags ) if -x $cc[0];
     foreach my $path (@paths) {
     my @cc = split(/\s+/, $Config{cc});
     return ( [ @cc, @ccflags ], \@ldflags ) if -x $cc[0];
     foreach my $path (@paths) {

-        my $compiler = File::Spec->catfile($path, $cc[0]) . $Config{_exe};
+        my $compiler = File::Spec->catfile($path, $cc[0]) . ($^O eq 'cygwin' ? '' : $Config{_exe});
+        return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
+            if -x $compiler;
+        next if ! length $Config{_exe};
+        $compiler = File::Spec->catfile($path, $cc[0]);

         return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
             if -x $compiler;
     }
         return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
             if -x $compiler;
     }

diff --git a/inc/Devel/CheckLib.pm b/inc/Devel/CheckLib.pm
index 1cac79b7154d1721ab21960ee9c6225c3816aeb4..df7c379d99381fd57195c50f810d0850e7cf0d76 100644 (file)
--- a/inc/Devel/CheckLib.pm
+++ b/inc/Devel/CheckLib.pm
@@ -1,6 +1,6 @@
 # $Id: CheckLib.pm,v 1.25 2008/10/27 12:16:23 drhyde Exp $
 # This is a modified version of Devel::CheckLib 0.93 including the patches from
 # $Id: CheckLib.pm,v 1.25 2008/10/27 12:16:23 drhyde Exp $
 # This is a modified version of Devel::CheckLib 0.93 including the patches from

-# RT issues 60176 and 61645
+# RT issues 60176 and 61645 and other changes I need to backport

 
 package #
 Devel::CheckLib;
 
 package #
 Devel::CheckLib;


@@ -8,7 +8,7 @@ Devel::CheckLib;
 use 5.00405; #postfix foreach
 use strict;
 use vars qw($VERSION @ISA @EXPORT);
 use 5.00405; #postfix foreach
 use strict;
 use vars qw($VERSION @ISA @EXPORT);

-$VERSION = '0.93_001';
+$VERSION = '0.93_002';

 use Config qw(%Config);
 use Text::ParseWords 'quotewords';
 
 use Config qw(%Config);
 use Text::ParseWords 'quotewords';
 


@@ -406,7 +406,11 @@ sub _findcc {
     my @cc = split(/\s+/, $Config{cc});
     return ( [ @cc, @ccflags ], \@ldflags ) if -x $cc[0];
     foreach my $path (@paths) {
     my @cc = split(/\s+/, $Config{cc});
     return ( [ @cc, @ccflags ], \@ldflags ) if -x $cc[0];
     foreach my $path (@paths) {

-        my $compiler = File::Spec->catfile($path, $cc[0]) . $Config{_exe};
+        my $compiler = File::Spec->catfile($path, $cc[0]) . ($^O eq 'cygwin' ? '' : $Config{_exe});
+        return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
+            if -x $compiler;
+        next if ! length $Config{_exe};
+        $compiler = File::Spec->catfile($path, $cc[0]);

         return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
             if -x $compiler;
     }
         return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
             if -x $compiler;
     }