aboutsummaryrefslogtreecommitdiff
path: root/libXfont/configure.ac
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-06-08 15:03:35 +0200
committermarha <marha@users.sourceforge.net>2014-06-08 15:03:35 +0200
commitd435b20322433b335a4fc5693cce0399a3f27b2d (patch)
tree8d96b388ee1058340a9d7c1a3c4096169ac3839f /libXfont/configure.ac
parent2614b017fb8a28f360897ece66815934fd1562f5 (diff)
downloadvcxsrv-d435b20322433b335a4fc5693cce0399a3f27b2d.tar.gz
vcxsrv-d435b20322433b335a4fc5693cce0399a3f27b2d.tar.bz2
vcxsrv-d435b20322433b335a4fc5693cce0399a3f27b2d.zip
Updated to libXfont 1.4.8
Diffstat (limited to 'libXfont/configure.ac')
-rw-r--r--libXfont/configure.ac9
1 files changed, 4 insertions, 5 deletions
diff --git a/libXfont/configure.ac b/libXfont/configure.ac
index 01e7b6e58..ea3368442 100644
--- a/libXfont/configure.ac
+++ b/libXfont/configure.ac
@@ -21,7 +21,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXfont], [1.4.7],
+AC_INIT([libXfont], [1.4.8],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXfont])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h include/X11/fonts/fontconf.h])
@@ -64,9 +64,8 @@ PKG_PROG_PKG_CONFIG
XFONT_FONTFILE=no
#
-# Scalable fonts in files:
-# FreeType
-# Bitstream Speedo rasterizer
+# FreeType for all scalable (OpenType, TrueType, PostScript) and
+# some bitmap formats (BDF & PCF)
#
AC_ARG_ENABLE(freetype, [ --disable-freetype],[XFONT_FREETYPE=$enableval],[XFONT_FREETYPE=yes])
AM_CONDITIONAL(XFONT_FREETYPE, [test x$XFONT_FREETYPE = xyes])
@@ -181,7 +180,7 @@ fi
AC_CHECK_LIB(m, hypot, [MATH_LIBS=-lm
AC_SUBST(MATH_LIBS)], AC_MSG_ERROR([*** libm is required]))
-PKG_CHECK_MODULES(XFONT, xproto xtrans fontsproto fontenc)
+PKG_CHECK_MODULES(XFONT, [xproto xtrans fontsproto < 2.1.3 fontenc])
# Transport selection macro from xtrans.m4
XTRANS_CONNECTION_FLAGS