(no commit message)

diff --git a/PerlMagick/Changelog b/PerlMagick/Changelog
index 281d998dfa0adbde4c2ef40a4060ffdd36fadeb2..c97d626084a326c86c931524e2b10fc9971e5ec3 100644 (file)
--- 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 3ab58f8c158feffc3c8a8809b14997c47c8202c4..3ad5729ce3f4e7d1fcb03e7b56070966471f8957 100644 (file)
--- 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 2e2c89828b879f353731d1d1f00338b777b681fe..f108afdb97d5ea38f6592038b7ebdfeaeef05af0 100644 (file)
--- 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 2d3a084f587d2cbf0bf6594839660f5bebae9c38..d4d7151a4d2f2e58bd8a7e45d3b83dbe0cf250c7 100644 (file)
--- a/PerlMagick/t/x11/write.t
+++ b/PerlMagick/t/x11/write.t
@@ -17,7 +17,7 @@ chdir 't/x11' || die 'Cd failed';
 \r
 # 1) Test reading and displaying an image\r
 #\r
-if ( defined($ENV{'DISPLAY'}) ) {\r
+if ( defined($ENV{'DISPLAY'}) && ($^O ne 'MSWin32') ) {\r
   $image=Image::Magick->new;\r
   $x=$image->ReadImage('congrats.miff');\r
   if( "$x" ) {\r