split IM_INCPATH and IM_LIBPATH with $Config{path_sep}, so they work

on Windows

diff --git a/Changes b/Changes
index 1f8a2054a650acb5c31f48b5f3d4cf8ca7f76904..0c93e5aff1dc5187fc71b8c1d29812452467c458 100644 (file)
--- a/Changes
+++ b/Changes
@@ -564,6 +564,8 @@ Revision history for Perl extension Imager.
         - don't allocate hashboxes as locals since it overflows the 
          stack by default in Darwin
         - applied T1 afm patch from Claes Jacobsson
         - don't allocate hashboxes as locals since it overflows the 
          stack by default in Darwin
         - applied T1 afm patch from Claes Jacobsson

+        - split IM_INCPATH and IM_LIBPATH with $Config{path_sep}, so they
+          work on Windows

 
 =================================================================
 
 
 =================================================================
 

diff --git a/Makefile.PL b/Makefile.PL
index cce7b9c3da92e0d68e651dde0cc8ba354d144c8d..7439c3fc84076efcad4c99fdc5921ad84980f9ee 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -263,8 +263,8 @@ sub pathcheck {
 sub init {
 
   @definc{'/usr/include'}=();
 sub init {
 
   @definc{'/usr/include'}=();

-  @incs=(qw(/usr/include/freetype2 /usr/local/include/freetype2 /usr/include /usr/local/include /usr/include/freetype /usr/local/include/freetype), split /:/, $INCPATH );
-  @libs=(split(/ /, $Config{'libpth'}), split(/:/, $LIBPATH) );
+  @incs=(qw(/usr/include/freetype2 /usr/local/include/freetype2 /usr/include /usr/local/include /usr/include/freetype /usr/local/include/freetype), split /\Q$Config{path_sep}/, $INCPATH );
+  @libs=(split(/ /, $Config{'libpth'}), split(/\Q$Config{path_sep}/, $LIBPATH) );

   if ($^O =~ /win32/i && $Config{cc} =~ /\bcl\b/i) {
     push(@incs, split /;/, $ENV{INCLUDE}) if exists $ENV{INCLUDE};
     push(@libs, split /;/, $ENV{LIB}) if exists $ENV{LIB};
   if ($^O =~ /win32/i && $Config{cc} =~ /\bcl\b/i) {
     push(@incs, split /;/, $ENV{INCLUDE}) if exists $ENV{INCLUDE};
     push(@libs, split /;/, $ENV{LIB}) if exists $ENV{LIB};