]>
Commit | Line | Data |
---|---|---|
358317c1 JR |
1 | --- tigervnc/unix/xserver110.patch~ 2010-12-08 17:10:47.000000000 +0100 |
2 | +++ tigervnc/unix/xserver110.patch 2011-03-06 00:46:19.785092000 +0100 | |
3 | @@ -10,9 +10,9 @@ | |
4 | # Require xorg-macros minimum of 1.10 for XORG_CHECK_SGML_DOCTOOLS | |
5 | m4_ifndef([XORG_MACROS_VERSION], | |
6 | @@ -65,6 +64,7 @@ dnl forcing an entire recompile.x | |
7 | + dnl forcing an entire recompile.x | |
8 | AC_CONFIG_HEADERS(include/version-config.h) | |
9 | ||
10 | - AC_PROG_CC | |
11 | +AC_PROG_CXX | |
12 | AM_PROG_AS | |
13 | AC_PROG_INSTALL | |
d84646a9 JR |
14 | @@ -23,7 +23,7 @@ |
15 | ||
16 | +dnl Xvnc DDX | |
17 | +AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC $RANDR_INC"]) | |
18 | -+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"]) | |
19 | ++AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"]) | |
20 | ||
21 | dnl Xnest DDX | |
22 | ||
358317c1 JR |
23 | @@ -45,13 +45,13 @@ |
24 | AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) | |
25 | AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) | |
26 | @@ -2245,6 +2249,7 @@ hw/dmx/input/Makefile | |
27 | - hw/dmx/glxProxy/Makefile | |
28 | - hw/dmx/Makefile | |
29 | + hw/dmx/man/Makefile | |
30 | hw/vfb/Makefile | |
31 | + hw/vfb/man/Makefile | |
32 | +hw/vnc/Makefile | |
33 | hw/xnest/Makefile | |
34 | + hw/xnest/man/Makefile | |
35 | hw/xwin/Makefile | |
36 | - hw/xwin/glx/Makefile | |
37 | diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am | |
38 | --- xserver/hw/Makefile.am.vnc 2010-12-08 17:09:34.469198303 +0100 | |
39 | +++ xserver/hw/Makefile.am 2010-12-08 17:09:46.789193164 +0100 |