diff options
author | Johannes Schickel | 2016-01-10 21:56:10 +0100 |
---|---|---|
committer | Johannes Schickel | 2016-01-10 21:57:50 +0100 |
commit | 04760d3e2f9567938d59b33add2afc4ed42bde63 (patch) | |
tree | 9d31d0dbcd2cd0df64fdf585a2c3b7aada8bec2d | |
parent | 8c906fbb3ee56cf3869a66ad44277a7969e3964c (diff) | |
download | scummvm-rg350-04760d3e2f9567938d59b33add2afc4ed42bde63.tar.gz scummvm-rg350-04760d3e2f9567938d59b33add2afc4ed42bde63.tar.bz2 scummvm-rg350-04760d3e2f9567938d59b33add2afc4ed42bde63.zip |
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.
-rwxr-xr-x | configure | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -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 |