| DRC | 3cfb523 | 2009-03-18 08:32:11 +0000 | [diff] [blame] | 1 | diff -up xserver/configure.ac.vnc xserver/configure.ac |
| 2 | --- xserver/configure.ac.vnc 2009-03-17 14:04:36.000000000 -0500 |
| 3 | +++ xserver/configure.ac 2009-03-17 14:13:47.000000000 -0500 |
| 4 | *************** |
| 5 | *** 30,34 **** |
| 6 | AC_CONFIG_SRCDIR([Makefile.am]) |
| 7 | AM_INIT_AUTOMAKE([dist-bzip2 foreign]) |
| 8 | - AM_MAINTAINER_MODE |
| 9 | |
| 10 | dnl this gets generated by autoheader, and thus contains all the defines. we |
| 11 | --- 30,33 ---- |
| 12 | *************** |
| 13 | *** 54,57 **** |
| 14 | --- 53,57 ---- |
| 15 | |
| 16 | AC_PROG_CC |
| 17 | + AC_PROG_CXX |
| 18 | AM_PROG_AS |
| 19 | AC_PROG_INSTALL |
| 20 | *************** |
| 21 | *** 944,947 **** |
| 22 | --- 944,953 ---- |
| 23 | |
| 24 | |
| 25 | + dnl Xvnc DDX |
| 26 | + |
| Pierre Ossman | ef27ba1 | 2009-03-18 17:22:30 +0000 | [diff] [blame^] | 27 | + AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC $RANDR_INC"]) |
| DRC | 3cfb523 | 2009-03-18 08:32:11 +0000 | [diff] [blame] | 28 | + AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB"]) |
| 29 | + |
| 30 | + |
| 31 | dnl Xnest DDX |
| 32 | |
| 33 | *************** |
| 34 | *** 1037,1040 **** |
| 35 | --- 1043,1048 ---- |
| 36 | xorg_bus_sparc=no |
| 37 | |
| 38 | + AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) |
| 39 | + |
| 40 | if test "x$XORG" = xyes -o "x$XGL" = xyes; then |
| 41 | XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' |
| 42 | *************** |
| 43 | *** 1247,1251 **** |
| 44 | AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) |
| 45 | AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) |
| 46 | - AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) |
| 47 | AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) |
| 48 | AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) |
| 49 | --- 1255,1258 ---- |
| 50 | *************** |
| 51 | *** 1711,1714 **** |
| 52 | --- 1718,1722 ---- |
| 53 | hw/dmx/Makefile |
| 54 | hw/vfb/Makefile |
| 55 | + hw/vnc/Makefile |
| 56 | hw/xgl/Makefile |
| 57 | hw/xgl/egl/Makefile |
| 58 | diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am |
| 59 | --- xserver/Makefile.am.vnc 2009-03-17 14:13:54.000000000 -0500 |
| 60 | +++ xserver/Makefile.am 2009-03-17 14:14:50.000000000 -0500 |
| 61 | *************** |
| 62 | *** 74,78 **** |
| 63 | hw \ |
| 64 | $(XPDDX_DIR) \ |
| 65 | ! $(XPCONFIG_DIR) |
| 66 | |
| 67 | aclocaldir = $(datadir)/aclocal |
| 68 | --- 74,79 ---- |
| 69 | hw \ |
| 70 | $(XPDDX_DIR) \ |
| 71 | ! $(XPCONFIG_DIR) \ |
| 72 | ! hw/vnc |
| 73 | |
| 74 | aclocaldir = $(datadir)/aclocal |
| 75 | diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c |
| 76 | --- xserver/mi/miinitext.c.vnc 2009-03-17 14:15:12.000000000 -0500 |
| 77 | +++ xserver/mi/miinitext.c 2009-03-17 14:16:27.000000000 -0500 |
| 78 | *************** |
| 79 | *** 298,301 **** |
| 80 | --- 298,302 ---- |
| 81 | extern void MITMiscExtensionInit(INITARGS); |
| 82 | #endif |
| 83 | + extern void vncExtensionInit(INITARGS); |
| 84 | #ifdef XIDLE |
| 85 | extern void XIdleExtensionInit(INITARGS); |
| 86 | *************** |
| 87 | *** 578,581 **** |
| 88 | --- 579,583 ---- |
| 89 | if (!noMITMiscExtension) MITMiscExtensionInit(); |
| 90 | #endif |
| 91 | + vncExtensionInit(); |
| 92 | #ifdef XIDLE |
| 93 | if (!noXIdleExtension) XIdleExtensionInit(); |