Annotation of /trunk/xorg-server/patches/xorg-server-1.4-fix-xephyr-link.patch
Parent Directory
| 
Revision Log
Revision 351 -
(hide annotations)
(download)
Sun Sep 9 11:09:06 2007 UTC (16 years, 8 months ago) by niro
File size: 850 byte(s)
Sun Sep 9 11:09:06 2007 UTC (16 years, 8 months ago) by niro
File size: 850 byte(s)
-fixes some build&link issues
| 1 | niro | 351 | diff --git a/configure.ac b/configure.ac |
| 2 | index 62fdd78..7a37590 100644 | ||
| 3 | --- a/configure.ac | ||
| 4 | +++ b/configure.ac | ||
| 5 | @@ -1802,7 +1802,7 @@ if test "$KDRIVE" = yes; then | ||
| 6 | XSDL_INCS="`sdl-config --cflags` $XSERVER_CFLAGS" | ||
| 7 | fi | ||
| 8 | |||
| 9 | - PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"]) | ||
| 10 | + PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp $PIXMAN, [xephyr="yes"], [xephyr="no"]) | ||
| 11 | if test "x$XEPHYR" = xauto; then | ||
| 12 | XEPHYR=$xephyr | ||
| 13 | fi | ||
| 14 | diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am | ||
| 15 | index cc3019f..1738d0f 100644 | ||
| 16 | --- a/hw/kdrive/ephyr/Makefile.am | ||
| 17 | +++ b/hw/kdrive/ephyr/Makefile.am | ||
| 18 | @@ -28,6 +28,7 @@ Xephyr_LDADD = \ | ||
| 19 | libxephyr-hostx.a \ | ||
| 20 | ../../../exa/libexa.la \ | ||
| 21 | @KDRIVE_LIBS@ \ | ||
| 22 | + @XSERVER_LIBS@ \ | ||
| 23 | @XEPHYR_LIBS@ | ||
| 24 | |||
| 25 | Xephyr_DEPENDENCIES = \ |