1447N/AFrom 284532c0884893728b75ca37f5d2a9a33f7bc8db Mon Sep 17 00:00:00 2001

1447N/AFrom: Julien Cristau <jcristau@debian.org>

1447N/ADate: Sat, 22 Oct 2011 17:14:46 +0200

1447N/ASubject: [PATCH:xdm] greeter: link against -lXrender if xft is enabled

1447N/A

1447N/AXmuCvtStringToXftColor uses XRenderParseColor, so require xrender for

1447N/Athe xft option, and link against it.

1447N/A

1447N/ASigned-off-by: Julien Cristau <jcristau@debian.org>

1447N/AReviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>

1447N/A---

1447N/A configure.ac | 4 ++--

1447N/A greeter/Login.c | 4 ++++

1447N/A 2 files changed, 6 insertions(+), 2 deletions(-)

1447N/A

1447N/Adiff --git a/configure.ac b/configure.ac

1447N/Aindex b123a1f..2d95000 100644

1447N/A--- a/configure.ac

1447N/A+++ b/configure.ac

1447N/A@@ -311,10 +311,10 @@ AC_ARG_WITH(xft,

1447N/A AC_HELP_STRING([--with-xft],

1447N/A [Use Xft to draw text (default is YES if installed)]),

1447N/A [USE_XFT="$withval"],

1447N/A- PKG_CHECK_EXISTS(xft, [USE_XFT="yes"], [USE_XFT="no"]))

1447N/A+ PKG_CHECK_EXISTS(xft xrender, [USE_XFT="yes"], [USE_XFT="no"]))

1447N/A

1447N/A if test "x$USE_XFT" = "xyes" ; then

1447N/A- PKG_CHECK_MODULES(XFT, xft)

1447N/A+ PKG_CHECK_MODULES(XFT, xft xrender)

1447N/A GREETER_CFLAGS="$GREETER_CFLAGS $XFT_CFLAGS"

1447N/A GREETER_LIBS="$GREETER_LIBS $XFT_LIBS"

1447N/A AC_DEFINE([USE_XFT], 1,

1447N/Adiff --git a/greeter/Login.c b/greeter/Login.c

1447N/Aindex 4903ea2..2fec5f4 100644

1447N/A--- a/greeter/Login.c

1447N/A+++ b/greeter/Login.c

1447N/A@@ -91,6 +91,10 @@ from The Open Group.

1447N/A # include <X11/extensions/Xinerama.h>

1447N/A #endif

1447N/A

1447N/A+#ifdef USE_XFT

1447N/A+# include <X11/extensions/Xrender.h>

1447N/A+#endif

1447N/A+

1447N/A #ifndef DEBUG

1447N/A # define XDM_ASSERT(a) /* do nothing */

1447N/A #else