Commit e13d28ee authored by Owen Taylor's avatar Owen Taylor Committed by Christophe Fergeau

Check for either xfont.pc or xfont2.pc

More recent versions of Xfont have a different API (with namespacing
for libXfont functions.) Check for xfont2.pc and if found, use that, and
use the new API. The rational for preferring libXfont2 is that as a recent
change the xserver module looks for and requires libXfont2, and it's better
not to have both versions of the library in process.
parent 2b7e4fb2
......@@ -60,8 +60,14 @@ XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
XORG_DRIVER_CHECK_EXT(XV, videoproto)
XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
# We can use either version 1 or version 2 of libXfont
PKG_CHECK_EXISTS(xfont2,
[xfont_pc=xfont2
AC_DEFINE(HAVE_XFONT2,1,[Version 2 of the libXfont library])],
[xfont_pc=xfont])
# Obtain compiler/linker options for the driver dependencies
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto xfont $REQUIRED_MODULES)
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $xfont_pc $REQUIRED_MODULES)
save_CFLAGS="$CFLAGS"
......
......@@ -35,7 +35,11 @@
#include <X11/X.h>
#include <X11/fonts/font.h>
#include <X11/fonts/fontstruct.h>
#ifdef HAVE_XFONT2
#include <X11/fonts/libxfont2.h>
#else
#include <X11/fonts/fontutil.h>
#endif
#include "uxa-damage.h"
......@@ -947,8 +951,12 @@ uxa_damage_chars (RegionPtr region,
{
ExtentInfoRec extents;
BoxRec box;
#ifdef HAVE_XFONT2
xfont2_query_glyph_extents(font, charinfo, n, &extents);
#else
QueryGlyphExtents(font, charinfo, n, &extents);
#endif
if (imageblt)
{
if (extents.overallWidth > extents.overallRight)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment