x11-base/xorg-server/files/1.4.0.90/0040-xephyr-fix-linking-by-adding-pixman-and-using-XSERV.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38

From 09df8eb5321d92817f2dd398ad0ae4551163fc82 Mon Sep 17 00:00:00 2001
From: Donnie Berkholz <dberkholz@gentoo.org>
Date: Thu, 8 May 2008 00:06:16 -0700
Subject: [PATCH] xephyr: fix linking by adding pixman and using XSERVER_LIBS.

---
 configure.ac                |    2 +-
 hw/kdrive/ephyr/Makefile.am |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index c73f4a7..6145aa2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1814,7 +1814,7 @@ if test "$KDRIVE" = yes; then
        XSDL_INCS="`sdl-config --cflags` $XSERVER_CFLAGS"
     fi
 
-    PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"])
+    PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp $PIXMAN, [xephyr="yes"], [xephyr="no"])
     if test "x$XEPHYR" = xauto; then
         XEPHYR=$xephyr
     fi
diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am
index cc3019f..1738d0f 100644
--- a/hw/kdrive/ephyr/Makefile.am
+++ b/hw/kdrive/ephyr/Makefile.am
@@ -28,6 +28,7 @@ Xephyr_LDADD = 						\
 	libxephyr-hostx.a			        \
 	../../../exa/libexa.la				\
 	@KDRIVE_LIBS@					\
+	@XSERVER_LIBS@					\
         @XEPHYR_LIBS@
 
 Xephyr_DEPENDENCIES =	\
-- 
1.5.5.1