0024630: Support building with Freetype 2.5.1+

Detection of Freetype include path fixed to search only for ft2build.h, not freetype.h

diff --git a/src/WOKsite/wok_deps.tcl b/src/WOKsite/wok_deps.tcl
index 0003fc5828912ab845b50c0a92fe594bac4b2655..709738ff102679b805a157a0ee962bfd0daa1ae4 100644 (file)
--- a/src/WOKsite/wok_deps.tcl
+++ b/src/WOKsite/wok_deps.tcl
@@ -302,33 +302,28 @@ proc wokdep:SearchFreeType {theErrInc theErrLib32 theErrLib64 theErrBin32 theErr
   upvar $theErrBin64 anErrBin64
 
   set isFound "true"
-  set aFtPath      [wokdep:SearchHeader "freetype/freetype.h"]
   set aFtBuildPath [wokdep:SearchHeader "ft2build.h"]
 
-  # New version of headers
-  if { "$aFtPath" == "" } {
-    set aFtPath [wokdep:SearchHeader "freetype2/freetype.h"]
-  }
-  
+  # new layout of headers in Freetype 2.5.x
   if { "$aFtBuildPath" == "" } {
     set aFtBuildPath [wokdep:SearchHeader "freetype2/ft2build.h"]
   }
 
-  if { "$aFtPath"  == "" || "$aFtBuildPath" == "" } {
+  if { "$aFtBuildPath" == "" } {
     # TODO - use `freetype-config --cflags` instead
     set aSysFreeType "/usr/include/freetype2"
-    if { [file exists "$aSysFreeType/freetype/freetype.h"] } {
+    if { [file exists "$aSysFreeType/ftbuild.h"] } {
       lappend ::CSF_OPT_INC "$aSysFreeType"
-    } elseif { [file exists "$aSysFreeType/freetype2/freetype.h"] } {
+    } elseif { [file exists "$aSysFreeType/freetype2/ft2build.h"] } {
       lappend ::CSF_OPT_INC "$aSysFreeType/freetype2"
     } else {
       set aSysFreeType "/usr/X11/include/freetype2"
-      if { [file exists "$aSysFreeType/freetype/freetype.h"] } {
+      if { [file exists "$aSysFreeType/ft2build.h"] } {
         lappend ::CSF_OPT_INC "/usr/X11/include"
         lappend ::CSF_OPT_INC "$aSysFreeType"
       } else {
         set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{freetype}*] "$::VCVER" "$::ARCH" ]
-        if {"$aPath" != "" && ([file exists "$aPath/include/freetype/freetype.h"] || [file exists "$aPath/include/freetype2/freetype.h"])} {
+        if {"$aPath" != ""} {
           if {[file exists "$aPath/include/ft2build.h"]} {
             lappend ::CSF_OPT_INC "$aPath/include"
           } elseif {[file exists "$aPath/include/freetype2/ft2build.h"]} {