]> git.ipfire.org Git - thirdparty/open-vm-tools.git/commitdiff
open-vm-tools: build for FreeBSD fails in fakeMouseWayland
authorOliver Kurth <okurth@vmware.com>
Tue, 19 Jun 2018 18:07:45 +0000 (11:07 -0700)
committerOliver Kurth <okurth@vmware.com>
Tue, 19 Jun 2018 18:07:45 +0000 (11:07 -0700)
Root Cause:
In the file fakeMouseWayland.cpp, several Linux related header files
are included:
  <linux/input.h>
  <linux/ioctl.h>
  <linux/uinput.h>

These header files do not exist for FreeBSD and Solaris.

Solution:
Lib fakeMouse is not needed by FreeBSD and Solaris, so update the makefile
to build the fakemouse related code only on Linux.

open-vm-tools/services/plugins/dndcp/Makefile.am

index e4555789389456ced928d9c10b1ee82ae1e7467c..6ce87b2f2733782525f14605d0ea2c18d1dd05cc 100644 (file)
@@ -27,7 +27,6 @@ libdndcp_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/dndcp/dnd
 libdndcp_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/dndcp/dndGuest
 libdndcp_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/dndcp/stringxx
 libdndcp_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/dndcp/xutils
-libdndcp_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/dndcp/fakeMouse
 libdndcp_la_CPPFLAGS += -I$(top_srcdir)/include
 libdndcp_la_CPPFLAGS += @XDR_CPPFLAGS@
 
@@ -78,8 +77,6 @@ libdndcp_la_SOURCES += dndGuest/dndCPTransportGuestRpc.cpp
 libdndcp_la_SOURCES += stringxx/string.cc
 libdndcp_la_SOURCES += xutils/xutils.cc
 
-libdndcp_la_SOURCES += fakeMouseWayland/fakeMouseWayland.cpp
-
 libdndcp_la_SOURCES += copyPasteCompat.c
 libdndcp_la_SOURCES += copyPasteCompatX11.c
 libdndcp_la_SOURCES += copyPasteDnDWrapper.cpp
@@ -90,6 +87,12 @@ libdndcp_la_SOURCES += dndcp.cpp
 libdndcp_la_SOURCES += dragDetWndX11.cpp
 libdndcp_la_SOURCES += pointer.cpp
 
+if LINUX
+libdndcp_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/dndcp/fakeMouse
+libdndcp_la_SOURCES  += fakeMouseWayland/fakeMouseWayland.cpp
+libdndcp_la_CPPFLAGS += -DUSE_UINPUT
+endif
+
 if HAVE_MKDTEMP
 libdndcp_la_CPPFLAGS += -DDND_IS_XDG
 libdndcp_la_SOURCES  += dnd/dndXdg.c