Make Xvnc compilable.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/unified_buildsys@3894 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/unix/xserver/hw/vnc/Makefile.am b/unix/xserver/hw/vnc/Makefile.am
index c2e78df79dbb41c6e44eec63b6ac2feb5388c7cb..223fe53d02641e5a4a48277ee96a6e8758345a93 100644 (file)
--- a/unix/xserver/hw/vnc/Makefile.am
+++ b/unix/xserver/hw/vnc/Makefile.am
@@ -16,7 +16,7 @@ libvnccommon_la_SOURCES = $(HDRS) vncExtInit.cc vncHooks.cc XserverDesktop.cc \
        Input.cc
 
 libvnccommon_la_CPPFLAGS = -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
-       -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(LIB_DIR) \
+       -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(LIB_DIR) -UHAVE_CONFIG_H \
        -I$(BIN_DIR)/vncconfig $(XVNC_CPPFLAGS) -I$(includedir)/pixman-1 -I$(includedir)
 
 bin_PROGRAMS = Xvnc
@@ -29,7 +29,7 @@ Xvnc_SOURCES = xvnc.cc $(top_srcdir)/Xext/dpmsstubs.c \
 
 nodist_Xvnc_SOURCES = fbrop.h fb.h pixman.h
 
-Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DNO_HW_ONLY_EXTS -DNO_MODULE_EXTS \
+Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DNO_HW_ONLY_EXTS -DNO_MODULE_EXTS -UHAVE_CONFIG_H \
        -DXFree86Server -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
        -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(LIB_DIR) \
        -I$(top_srcdir)/include -I$(includedir)/pixman-1 -I$(includedir)
@@ -44,7 +44,7 @@ libvnc_ladir = $(moduledir)/extensions
 
 libvnc_la_SOURCES = xf86vncModule.cc
 
-libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I$(LIB_DIR) \
+libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I$(LIB_DIR) -UHAVE_CONFIG_H \
        -I$(top_srcdir)/hw/xfree86/common \
        -I$(top_srcdir)/hw/xfree86/os-support \
        -I$(top_srcdir)/hw/xfree86/os-support/bus \