[Scummvm-cvs-logs] scummvm master -> 04760d3e2f9567938d59b33add2afc4ed42bde63
lordhoto
lordhoto at gmail.com
Sun Jan 10 21:58:27 CET 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
04760d3e2f CONFIGURE: Allow detection of static FreeType2 builds.
Commit: 04760d3e2f9567938d59b33add2afc4ed42bde63
https://github.com/scummvm/scummvm/commit/04760d3e2f9567938d59b33add2afc4ed42bde63
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-10T21:57:50+01:00
Commit Message:
CONFIGURE: Allow detection of static FreeType2 builds.
This is actually a bit abusive of the --static option. However, it works and
prevents a lot of hassle to setup building when FreeType2 was built with
--disable-shared.
Changed paths:
configure
diff --git a/configure b/configure
index 2c94c24..19fc6df 100755
--- a/configure
+++ b/configure
@@ -4043,7 +4043,15 @@ int main(int argc, char *argv[]) {
}
EOF
- cc_check $FREETYPE2_CFLAGS $FREETYPE2_LIBS && _freetype2=yes
+ cc_check_no_clean $FREETYPE2_CFLAGS $FREETYPE2_LIBS && _freetype2=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 "_freetype2" != "yes"; then
+ FREETYPE2_LIBS=`$_freetypeconfig --prefix="$_freetypepath" --static --libs 2>/dev/null`
+ cc_check_no_clean $FREETYPE2_CFLAGS $FREETYPE2_LIBS && _freetype2=yes
+ fi
+ cc_check_clean
fi
if test "$_freetype2" = "yes"; then
More information about the Scummvm-git-logs
mailing list