From 9e5435d920c4c44596fb2d57f971c120b7ebc025 Mon Sep 17 00:00:00 2001
From: Henningstone <Henningstone@users.noreply.github.com>
Date: Sat, 13 Oct 2018 22:43:31 +0200
Subject: [PATCH] try using pkg-config for freetype2 as well

---
 other/freetype/freetype.lua | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/other/freetype/freetype.lua b/other/freetype/freetype.lua
index 269a8c5ac..bfd6523cc 100644
--- a/other/freetype/freetype.lua
+++ b/other/freetype/freetype.lua
@@ -4,11 +4,15 @@ FreeType = {
 	OptFind = function (name, required)
 		local check = function(option, settings)
 			option.value = false
+			option.use_pkgconfig = false
 			option.use_ftconfig = false
 			option.use_winlib = 0
 			option.lib_path = nil
 
-			if ExecuteSilent("freetype-config") > 0 and ExecuteSilent("freetype-config --cflags") == 0 then
+			if ExecuteSilent("pkg-config freetype2") == 0 then
+				option.value = true
+				option.use_pkgconfig = true
+			elseif ExecuteSilent("freetype-config") > 0 and ExecuteSilent("freetype-config --cflags") == 0 then
 				option.value = true
 				option.use_ftconfig = true
 			end
@@ -23,7 +27,10 @@ FreeType = {
 		end
 
 		local apply = function(option, settings)
-			if option.use_ftconfig == true then
+			if option.use_pkgconfig == true then
+				settings.cc.flags:Add("`pkg-config --cflags freetype2`")
+				settings.link.flags:Add("`pkg-config --libs freetype2`")
+			elseif option.use_ftconfig == true then
 				settings.cc.flags:Add("`freetype-config --cflags`")
 				settings.link.flags:Add("`freetype-config --libs`")
 			elseif option.use_winlib > 0 then
@@ -39,12 +46,14 @@ FreeType = {
 
 		local save = function(option, output)
 			output:option(option, "value")
+			output:option(option, "use_pkgconfig")
 			output:option(option, "use_ftconfig")
 			output:option(option, "use_winlib")
 		end
 
 		local display = function(option)
 			if option.value == true then
+				if option.use_pkgconfig == true then return "using pkg-config" end
 				if option.use_ftconfig == true then return "using freetype-config" end
 				if option.use_winlib == 32 then return "using supplied win32 libraries" end
 				if option.use_winlib == 64 then return "using supplied win64 libraries" end