Initialize VNC extension inside #ifdef statement to allow to build TigerVNC inside
X.Org tree.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4402 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/unix/xserver18.patch b/unix/xserver18.patch
index 82932d1..77cf97c 100644
--- a/unix/xserver18.patch
+++ b/unix/xserver18.patch
@@ -1,8 +1,8 @@
diff -up xserver/configure.ac.vnc xserver/configure.ac
---- xserver/configure.ac.vnc 2010-05-18 15:44:44.830667880 +0200
-+++ xserver/configure.ac 2010-05-18 15:45:00.748164746 +0200
-@@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.8.1, [https://b
- RELEASE_DATE="2010-05-11"
+--- xserver/configure.ac.vnc 2011-05-11 11:11:33.803760465 +0200
++++ xserver/configure.ac 2011-05-11 11:11:40.998500216 +0200
+@@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.8.2, [https://b
+ RELEASE_DATE="2010-07-01"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-AM_MAINTAINER_MODE
@@ -57,8 +57,8 @@
hw/xwin/Makefile
hw/xquartz/Makefile
diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am
---- xserver/hw/Makefile.am.vnc 2010-05-18 15:44:44.918168513 +0200
-+++ xserver/hw/Makefile.am 2010-05-18 15:44:53.610664290 +0200
+--- xserver/hw/Makefile.am.vnc 2011-05-11 11:11:33.867758149 +0200
++++ xserver/hw/Makefile.am 2011-05-11 11:11:40.998500216 +0200
@@ -33,7 +33,8 @@ SUBDIRS = \
$(XNEST_SUBDIRS) \
$(DMX_SUBDIRS) \
@@ -70,21 +70,25 @@
DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive
diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c
---- xserver/mi/miinitext.c.vnc 2010-05-18 15:44:44.918168513 +0200
-+++ xserver/mi/miinitext.c 2010-05-18 15:44:53.610664290 +0200
-@@ -274,6 +274,7 @@ extern void DamageExtensionInit(INITARGS
+--- xserver/mi/miinitext.c.vnc 2011-05-11 11:11:33.941755471 +0200
++++ xserver/mi/miinitext.c 2011-05-11 11:12:04.454651752 +0200
+@@ -274,6 +274,9 @@ extern void DamageExtensionInit(INITARGS
extern void CompositeExtensionInit(INITARGS);
#endif
extern void GEExtensionInit(INITARGS);
++#ifdef TIGERVNC
+extern void vncExtensionInit(INITARGS);
++#endif
/* The following is only a small first step towards run-time
* configurable extensions.
-@@ -454,6 +455,7 @@ InitExtensions(int argc, char *argv[])
+@@ -454,6 +457,9 @@ InitExtensions(int argc, char *argv[])
#ifdef XF86BIGFONT
if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit();
#endif
++#ifdef TIGERVNC
+ vncExtensionInit();
++#endif
#if !defined(NO_HW_ONLY_EXTS)
#if defined(XF86VIDMODE)
if (!noXFree86VidModeExtension) XFree86VidModeExtensionInit();