diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2013-03-26 08:57:05 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-01 12:03:55 +0200 |
| commit | 6845a4fb0147117e8517d66f18792ca7acdbe06e (patch) | |
| tree | 68e35417b79989a7af8a4ea8c0d282b84dbe0a6e /src/3rdparty/freetype/builds/unix/freetype2.m4 | |
| parent | 0fcadcca3d0842354de07ffaa8c622e607aab22c (diff) | |
Update bundled FreeType sources to 2.3.12
Most important changes:
* SFNT cmap 13 table format support;
* fixed glitches when rasterizing stretched TTF (xsize!=ysize);
* various fixes in Type1, CFF, and PCF drivers
Change-Id: Ib9e2210ffbd0daa2fdbf518ea87f4be502de6b48
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/3rdparty/freetype/builds/unix/freetype2.m4')
| -rw-r--r-- | src/3rdparty/freetype/builds/unix/freetype2.m4 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/3rdparty/freetype/builds/unix/freetype2.m4 b/src/3rdparty/freetype/builds/unix/freetype2.m4 index d1da07d9c1..3d0ecb3554 100644 --- a/src/3rdparty/freetype/builds/unix/freetype2.m4 +++ b/src/3rdparty/freetype/builds/unix/freetype2.m4 @@ -1,7 +1,7 @@ # Configure paths for FreeType2 # Marcelo Magallon 2001-10-26, based on gtk.m4 by Owen Taylor # -# Copyright 2001, 2003, 2007 by +# Copyright 2001, 2003, 2007, 2009 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -15,7 +15,7 @@ # generated by Autoconf, under the same distribution terms as the rest of # that program. # -# serial 2 +# serial 3 # AC_CHECK_FT2([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) # Test for FreeType 2, and define FT2_CFLAGS and FT2_LIBS. @@ -60,7 +60,9 @@ AC_DEFUN([AC_CHECK_FT2], fi fi - AC_PATH_PROG([FT2_CONFIG], [freetype-config], [no]) + if test "x$FT2_CONFIG" = x ; then + AC_PATH_PROG([FT2_CONFIG], [freetype-config], [no]) + fi min_ft_version=m4_if([$1], [], [7.0.1], [$1]) AC_MSG_CHECKING([for FreeType -- version >= $min_ft_version]) |