diff options
| author | Pierre Ossman <ossman@cendio.se> | 2024-02-20 13:03:55 +0100 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2024-06-19 16:39:07 +0200 |
| commit | ae651b43ff0049c25fdbe410d1abac1202240f59 (patch) | |
| tree | 8b64ee6f7310b8507958a8102cec7f0e72999cec /unix/xserver/hw/vnc | |
| parent | 55ef4dbc9b04a2a3312488e95de6c7cf5909913a (diff) | |
| download | tigervnc-ae651b43ff0049c25fdbe410d1abac1202240f59.tar.gz tigervnc-ae651b43ff0049c25fdbe410d1abac1202240f59.zip | |
Actually use config.h in Xvnc/libvnc.so
Rather than disabling this, make sure the build can find the relevant
file.
Diffstat (limited to 'unix/xserver/hw/vnc')
| -rw-r--r-- | unix/xserver/hw/vnc/Makefile.am | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/unix/xserver/hw/vnc/Makefile.am b/unix/xserver/hw/vnc/Makefile.am index e0200026..2d8b6b91 100644 --- a/unix/xserver/hw/vnc/Makefile.am +++ b/unix/xserver/hw/vnc/Makefile.am @@ -21,8 +21,9 @@ libvnccommon_la_SOURCES = $(HDRS) \ vncInput.c vncInputXKB.c qnum_to_xorgevdev.c qnum_to_xorgkbd.c libvnccommon_la_CPPFLAGS = \ + -I$(TIGERVNC_BUILDDIR) \ -I$(TIGERVNC_SRCDIR)/unix/common \ - -I$(TIGERVNC_SRCDIR)/common -UHAVE_CONFIG_H \ + -I$(TIGERVNC_SRCDIR)/common \ -I$(TIGERVNC_SRCDIR)/unix/vncconfig $(XVNC_CPPFLAGS) ${XSERVERLIBS_CFLAGS} \ -I$(top_srcdir)/include @@ -40,7 +41,7 @@ Xvnc_SOURCES = xvnc.c \ nodist_EXTRA_Xvnc_SOURCES = dummy.cxx Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DTIGERVNC -DNO_MODULE_EXTS \ - -UHAVE_CONFIG_H \ + -I$(TIGERVNC_BUILDDIR) \ -I$(TIGERVNC_SRCDIR)/common \ -I$(TIGERVNC_SRCDIR)/unix/common \ -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} @@ -64,7 +65,9 @@ libvnc_la_SOURCES = vncModule.c # See Xvnc magic above nodist_EXTRA_libvnc_la_SOURCES = dummy.cxx -libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I$(TIGERVNC_SRCDIR)/common -UHAVE_CONFIG_H \ +libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) \ + -I$(TIGERVNC_BUILDDIR) \ + -I$(TIGERVNC_SRCDIR)/common \ -I$(TIGERVNC_SRCDIR)/unix/common \ -I$(top_srcdir)/hw/xfree86/common \ -I$(top_srcdir)/hw/xfree86/os-support \ |