Obtain FreeType version being used for the build from freetype.h

Signed-off-by: Andrew Leonard <[email protected]>
adoptium · Oct 5, 2023 · dfd2a13 · dfd2a13
1 parent 9f67b5d
commit dfd2a13
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/sbin/build.sh b/sbin/build.sh
@@ -941,11 +941,16 @@ addFreeTypeVersionInfo() {
       local freetypeIncludeDirs=(${FREETYPE_CFLAGS})
       for i in "${!freetypeIncludeDirs[@]}"
       do
-          local include="${freetypeIncludeDirs[i]}/freetype/freetype.h"
-          echo "Checking for FreeType include ${include}"
-          if [[ -f "${include}" ]]; then
-              echo "Found ${include}"
-              freetypeInclude="${include}"
+          local include1="${freetypeIncludeDirs[i]}/freetype/freetype.h"
+          local include2="${freetypeIncludeDirs[i]}/freetype.h"
+
+          echo "Checking for FreeType include in path ${freetypeIncludeDirs[i]}"
+          if [[ -f "${include1}" ]]; then
+              echo "Found ${include1}"
+              freetypeInclude="${include1}"
+          elif [[ -f "${include2}" ]]; then
+              echo "Found ${include2}"
+              freetypeInclude="${include2}
           fi
       done
    elif [ "${FREETYPE_TO_USE}" == "bundled" ]; then