handle spaces in the found paths for freetype2

diff --git a/Makefile.PL b/Makefile.PL
index e8cd64be8e65d227d2489c40a82136a778956f9c..137d72179977dd8c1e3ad0b66e04fbbcf54eecab 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -813,13 +813,22 @@ sub freetype2_probe_scan {
 
   return unless $found_inc && $found_lib;
 
 
   return unless $found_inc && $found_lib;
 

-  $frm->{cflags} = "-I$found_inc";
-  $frm->{cflags} .= " -I$found_inc2" if $found_inc2;
+  $frm->{cflags} = _make_I($found_inc);
+  $frm->{cflags} .= " " . _make_I($found_inc2) if $found_inc2;

   $frm->{libfiles} = "-lfreetype";
 
   return 1;
 }
 
   $frm->{libfiles} = "-lfreetype";
 
   return 1;
 }
 

+sub _make_I {
+  my ($inc_dir) = @_;
+
+  $definc{$inc_dir}
+    or return '';
+
+  $inc_dir =~ / / ? qq!-I"$inc_dir"! : "-I$inc_dir";
+}
+

 # probes for libpng via pkg-config
 sub png_probe {
   my ($frm, $frmkey) = @_;
 # probes for libpng via pkg-config
 sub png_probe {
   my ($frm, $frmkey) = @_;