949600
diff -Nrup a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake
949600
--- a/Modules/FindFreetype.cmake	2014-01-16 12:15:08.000000000 -0500
949600
+++ b/Modules/FindFreetype.cmake	2016-03-02 17:06:31.962906464 -0500
949600
@@ -70,6 +70,19 @@ find_path(FREETYPE_INCLUDE_DIR_freetype2
949600
   PATH_SUFFIXES include/freetype2 include
949600
 )
949600
 
949600
+if(NOT FREETYPE_INCLUDE_DIR_freetype2)
949600
+  find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h
949600
+    HINTS
949600
+      ENV FREETYPE_DIR
949600
+    PATHS
949600
+      /usr/X11R6
949600
+      /usr/local/X11R6
949600
+      /usr/local/X11
949600
+      /usr/freeware
949600
+    PATH_SUFFIXES include/freetype2 include
949600
+  )
949600
+endif()
949600
+
949600
 find_library(FREETYPE_LIBRARY
949600
   NAMES freetype libfreetype freetype219
949600
   HINTS
949600
@@ -91,8 +104,14 @@ if(FREETYPE_INCLUDE_DIR_ft2build AND FRE
949600
 endif()
949600
 set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}")
949600
 
949600
-if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
949600
-    file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h" freetype_version_str
949600
+if(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
949600
+  set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
949600
+elseif(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
949600
+  set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
949600
+endif()
949600
+
949600
+if(FREETYPE_INCLUDE_DIR_freetype2 AND FREETYPE_H)
949600
+    file(STRINGS "${FREETYPE_H}" freetype_version_str
949600
          REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$")
949600
 
949600
     unset(FREETYPE_VERSION_STRING)