[Scummvm-cvs-logs] scummvm-tools master -> 5c633c7eb70bc3413e7021f6a29837acee83b07e

[lordhoto]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-tools' repo located at https://github.com/scummvm/scummvm-tools .

Summary:
5c633c7eb7 TOOLS: Update FreeType detection to work with static builds.


Commit: 5c633c7eb70bc3413e7021f6a29837acee83b07e
    https://github.com/scummvm/scummvm-tools/commit/5c633c7eb70bc3413e7021f6a29837acee83b07e
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-18T11:22:57+01:00

Commit Message:
TOOLS: Update FreeType detection to work with static builds.

Based on 04760d3e2f9567938d59b33add2afc4ed42bde63 of scummvm.

Changed paths:
    configure



diff --git a/configure b/configure
index 3b7c42f..08fb8e9 100755
--- a/configure
+++ b/configure
@@ -1373,7 +1373,7 @@ echo "$_zlib"
 #
 # Check for FreeType
 #
-echocheck "freetype"
+echocheck "FreeType"
 if test "$_freetype" = auto ; then
 	_freetype=no
 	if type freetype-config > /dev/null 2>&1 ; then
@@ -1382,10 +1382,35 @@ if test "$_freetype" = auto ; then
 fi
 
 if test "$_freetype" = yes ; then
-	freetype_version=`freetype-config --ftversion 2>/dev/null`
+	_freetype=no
+
+	cat > $TMPC << EOF
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+int main(int argc, char *argv[]) {
+	FT_Library library;
+	FT_Error error = FT_Init_FreeType(&library);
+	FT_Done_FreeType(library);
+}
+EOF
 
 	_freetypelibs=`freetype-config --libs`
 	_freetypeincludes=`freetype-config --cflags`
+
+	cc_check_no_clean $_freetypelibs $_freetypeincludes && _freetype=yes
+	# Modern freetype-config scripts accept --static to get all
+	# required flags for static linking. We abuse this to detect
+	# FreeType2 builds which are static themselves.
+	if test "$_freetype" != "yes"; then
+		_freetypelibs=`freetype-config --static --libs 2>/dev/null`
+		cc_check_no_clean $_freetypeincludes $_freetypelibs && _freetype=yes
+	fi
+	cc_check_clean
+fi
+
+if test "$_freetype" = yes ; then
+	freetype_version=`freetype-config --ftversion 2>/dev/null`
 else
 	freetype_version="no"
 fi