[PATCH xserver 1/3] hw/xwin: Don't unconditionally include rootless.h

[Jon Turney]

Don't unconditionally include rootless.h, and so we don't need to add
rootless to the include path unless building MWEXTWM.
---
 hw/xwin/Makefile.am | 4 ++--
 hw/xwin/win.h       | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am
index e71240a79..4d288c959 100644
--- a/hw/xwin/Makefile.am
+++ b/hw/xwin/Makefile.am
@@ -43,6 +43,7 @@ SRCS_MULTIWINDOWEXTWM = \
 	winwindowswm.c
 DEFS_MULTIWINDOWEXTWM = -DXWIN_MULTIWINDOWEXTWM
 MULTIWINDOWEXTWM_LIBS = $(top_builddir)/miext/rootless/librootless.la
+MULTIWINDOWEXTWM_CFLAGS = -I$(top_srcdir)/miext/rootless
 endif
 
 if XWIN_RANDR
@@ -132,8 +133,6 @@ SRCS =	InitInput.c \
 
 XWin_SOURCES = $(SRCS)
 
-AM_CPPFLAGS = -I$(top_srcdir)/miext/rootless
-
 XWIN_SYS_LIBS += -ldxguid
 
 XWIN_LIBS += \
@@ -178,6 +177,7 @@ AM_LFLAGS = -i
 AM_CFLAGS = -DHAVE_XWIN_CONFIG_H $(DIX_CFLAGS) \
             $(XWINMODULES_CFLAGS) \
             -I$(top_srcdir) \
+            $(MULTIWINDOWEXTWM_CFLAGS) \
             -Wno-bad-function-cast
 
 xwinconfigdir = $(sysconfdir)/X11
diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index 103c4b9a9..93103c4f8 100644
--- a/hw/xwin/win.h
+++ b/hw/xwin/win.h
@@ -165,7 +165,9 @@
 #include "miline.h"
 #include "shadow.h"
 #include "fb.h"
+#ifdef XWIN_MULTIWINDOWEXTWM
 #include "rootless.h"
+#endif
 
 #include "mipict.h"
 #include "picturestr.h"
-- 
2.12.3