diff options
| author | marha <marha@users.sourceforge.net> | 2011-10-19 10:44:43 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-10-19 10:44:43 +0200 |
| commit | 9f986778bd4393c5a9108426969d45aa7f10f334 (patch) | |
| tree | 27d7bd08dac54a54a923e76dccf2b8e388be2a03 /libXft/configure.ac | |
| parent | afbd3947071a33f59dda122f1ac396442a02c128 (diff) | |
| download | vcxsrv-9f986778bd4393c5a9108426969d45aa7f10f334.tar.gz vcxsrv-9f986778bd4393c5a9108426969d45aa7f10f334.tar.bz2 vcxsrv-9f986778bd4393c5a9108426969d45aa7f10f334.zip | |
libX11 libXext libXft mesa libxcb mkfontscale pixman xserver
xkeyboard-config git update 19 oct 2011
Diffstat (limited to 'libXft/configure.ac')
| -rw-r--r-- | libXft/configure.ac | 39 |
1 files changed, 2 insertions, 37 deletions
diff --git a/libXft/configure.ac b/libXft/configure.ac index 8df0cb032..61d6c4dbe 100644 --- a/libXft/configure.ac +++ b/libXft/configure.ac @@ -67,29 +67,10 @@ AC_SUBST([XFT_LT_VERSION]) PKG_CHECK_MODULES(XRENDER, xrender >= 0.8.2 x11) # Check freetype configuration -AC_ARG_WITH(freetype-config, [ --with-freetype-config=PROG Use FreeType configuration program PROG], freetype_config=$withval, freetype_config=auto) - -if test "$freetype_config" = "auto"; then - PKG_CHECK_MODULES(FREETYPE, freetype2, - freetype_config=no, freetype_config=yes) -fi - -if test "$freetype_config" = "yes"; then - AC_PATH_PROG(ft_config,freetype-config,no) - if test "$ft_config" = "no"; then - AC_MSG_ERROR([You must have freetype installed; see http://www.freetype.org/]) - fi -else - ft_config="$freetype_config" -fi - -if test "$freetype_config" != "no"; then - FREETYPE_CFLAGS="`$ft_config --cflags`" - FREETYPE_LIBS="`$ft_config --libs`" -fi +PKG_CHECK_MODULES(FREETYPE, freetype2 >= 2.1.6) # Check fontconfig configuration -PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 2.2) +PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 2.5.92) AC_SUBST(XRENDER_CFLAGS) AC_SUBST(XRENDER_LIBS) @@ -98,22 +79,6 @@ AC_SUBST(FREETYPE_LIBS) AC_SUBST(FONTCONFIG_CFLAGS) AC_SUBST(FONTCONFIG_LIBS) -fontconfig_save_libs="$LIBS" -fontconfig_save_cflags="$CFLAGS" -LIBS="$LIBS $FREETYPE_LIBS" -CFLAGS="$CFLAGS $FREETYPE_CFLAGS" -AC_CHECK_FUNCS(FT_Get_Next_Char FT_Get_BDF_Property FT_Get_PS_Font_Info FT_Has_PS_Glyph_Names FT_GlyphSlot_Embolden) -AC_CHECK_MEMBER(FT_Bitmap_Size.y_ppem, - HAVE_FT_BITMAP_SIZE_Y_PPEM=1, - HAVE_FT_BITMAP_SIZE_Y_PPEM=0, -[#include <ft2build.h> -#include FT_FREETYPE_H]) -AC_DEFINE_UNQUOTED(HAVE_FT_BITMAP_SIZE_Y_PPEM,$HAVE_FT_BITMAP_SIZE_Y_PPEM, - [FT_Bitmap_Size structure includes y_ppem field]) - -LIBS="$fontconfig_save_libs" -CFLAGS="$fontconfig_save_cflags" - if test "$VERSION" = "" ; then VERSION=$PACKAGE_VERSION; fi |