From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 8 Dec 2009 00:51:55 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~10280
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=93ebefb1837123305d2f3caa7c725950e5d85728;p=imagemagick

---

diff --git a/PerlMagick/Changelog b/PerlMagick/Changelog
index 281d998df..c97d62608 100644
--- a/PerlMagick/Changelog
+++ b/PerlMagick/Changelog
@@ -1,3 +1,6 @@
+2009-12-08  6.5.8-5 <kmx@volny...>
+  * A couple of minor changes to Makefile.PL to support Strawberry Perl.
+
 2009-12-06  6.5.8-4 Cristy  <quetzlzacatenango@image...>
   * Support the crop() gravity option.
 
diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL
index 3ab58f8c1..3ad5729ce 100644
--- a/PerlMagick/Makefile.PL
+++ b/PerlMagick/Makefile.PL
@@ -76,7 +76,7 @@ sub AutodetectWin32gcc {
       unlink "$wrkdir/libMagickCore.def", "$wrkdir/libMagickCore.a";
       system("pexports \"$d\" >\"$wrkdir/libMagickCore.def\" 2>$devnull");
       open(DEF, "<$wrkdir/libMagickCore.def");
-      my @found = grep(/InitializeMagickResources/, <DEF>); #checking if we have taken the right DLL
+      my @found = grep(/MagickCoreGenesis/, <DEF>); #checking if we have taken the right DLL
       close(DEF);
       next unless(@found);
       print STDERR "Gonna create 'libMagickCore.a' from '$d'\n";
diff --git a/PerlMagick/Makefile.PL.in b/PerlMagick/Makefile.PL.in
index 2e2c89828..f108afdb9 100644
--- a/PerlMagick/Makefile.PL.in
+++ b/PerlMagick/Makefile.PL.in
@@ -76,7 +76,7 @@ sub AutodetectWin32gcc {
       unlink "$wrkdir/libMagickCore.def", "$wrkdir/libMagickCore.a";
       system("pexports \"$d\" >\"$wrkdir/libMagickCore.def\" 2>$devnull");
       open(DEF, "<$wrkdir/libMagickCore.def");
-      my @found = grep(/InitializeMagickResources/, <DEF>); #checking if we have taken the right DLL
+      my @found = grep(/MagickCoreGenesis/, <DEF>); #checking if we have taken the right DLL
       close(DEF);
       next unless(@found);
       print STDERR "Gonna create 'libMagickCore.a' from '$d'\n";
diff --git a/PerlMagick/t/x11/write.t b/PerlMagick/t/x11/write.t
index 2d3a084f5..d4d7151a4 100644
--- a/PerlMagick/t/x11/write.t
+++ b/PerlMagick/t/x11/write.t
@@ -17,7 +17,7 @@ chdir 't/x11' || die 'Cd failed';
 
 # 1) Test reading and displaying an image
 #
-if ( defined($ENV{'DISPLAY'}) ) {
+if ( defined($ENV{'DISPLAY'}) && ($^O ne 'MSWin32') ) {
   $image=Image::Magick->new;
   $x=$image->ReadImage('congrats.miff');
   if( "$x" ) {