[PATCH 2/2] Update configure and Makefile to support Present XWayland

[Axel Davy]

Signed-off-by: Axel Davy <axel.davy at ens.fr>
---
 configure.ac                    | 11 +++++++++--
 hw/xfree86/xwayland/Makefile.am |  2 +-
 present/Makefile.am             | 24 +++++++++++++++++++++++-
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 052a557..73468b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1028,6 +1028,8 @@ if test "x$WAYLAND" = xyes; then
         PKG_CHECK_MODULES(XWAYLAND, $WAYLAND_MODULES)
 	AC_DEFINE(XORG_WAYLAND, 1, [Support wayland mode])
 	WAYLAND_SCANNER_RULES(['$(top_srcdir)/hw/xfree86/xwayland'])
+	WAYLAND_INC='-I$(top_srcdir)/hw/xfree86/xwayland'
+	WAYLAND_LIB='$(top_builddir)/hw/xfree86/xwayland/libxwayland.la'
 fi
 AM_CONDITIONAL(WAYLAND, [test "x$WAYLAND" = xyes])
 
@@ -1318,6 +1320,11 @@ if test "x$PRESENT" = xyes; then
 	SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $PRESENTPROTO"
 	PRESENT_INC='-I$(top_srcdir)/present'
 	PRESENT_LIB='$(top_builddir)/present/libpresent.la'
+	if test "x$WAYLAND" = xyes; then
+		PRESENT_WAYLAND_LIB='$(top_builddir)/present/libpresentwayland.la'
+	else
+		PRESENT_WAYLAND_LIB='$(top_builddir)/present/libpresent.la'
+	fi
 fi
 
 AM_CONDITIONAL(XINERAMA, [test "x$XINERAMA" = xyes])
@@ -1756,7 +1763,7 @@ AC_EGREP_CPP([I_AM_SVR4],[
 AC_DEFINE([SVR4],1,[Define to 1 on systems derived from System V Release 4])
 AC_MSG_RESULT([yes])], AC_MSG_RESULT([no]))
 
-XSERVER_CFLAGS="$XSERVER_CFLAGS $CORE_INCS $XEXT_INC $COMPOSITE_INC $DAMAGE_INC $FIXES_INC $XI_INC $MI_INC $MIEXT_SYNC_INC $MIEXT_SHADOW_INC $MIEXT_LAYER_INC $MIEXT_DAMAGE_INC $RENDER_INC $RANDR_INC $FB_INC $DBE_INC $PRESENT_INC"
+XSERVER_CFLAGS="$XSERVER_CFLAGS $CORE_INCS $XEXT_INC $COMPOSITE_INC $DAMAGE_INC $FIXES_INC $XI_INC $MI_INC $MIEXT_SYNC_INC $MIEXT_SHADOW_INC $MIEXT_LAYER_INC $MIEXT_DAMAGE_INC $RENDER_INC $RANDR_INC $FB_INC $DBE_INC $PRESENT_INC  $WAYLAND_INC"
 
 dnl ---------------------------------------------------------------------------
 dnl DDX section.
@@ -1815,7 +1822,7 @@ if test "x$XORG" = xyes; then
 	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
 	XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"
 	XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H"
-	XORG_LIBS="$COMPOSITE_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $XI_LIB $XKB_LIB"
+	XORG_LIBS="$COMPOSITE_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_WAYLAND_LIB $WAYLAND_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $XI_LIB $XKB_LIB"
 
 	dnl ==================================================================
 	dnl symbol visibility
diff --git a/hw/xfree86/xwayland/Makefile.am b/hw/xfree86/xwayland/Makefile.am
index cc45444..ce70bfc 100644
--- a/hw/xfree86/xwayland/Makefile.am
+++ b/hw/xfree86/xwayland/Makefile.am
@@ -6,7 +6,7 @@ AM_CPPFLAGS =					\
 	-I$(srcdir)/../parser			\
 	-I$(srcdir)/../modes
 
-libxwayland_la_LTLIBRARIES = libxwayland.la
+noinst_LTLIBRARIES = libxwayland.la
 AM_CFLAGS = \
 	-DHAVE_XORG_CONFIG_H \
 	@DIX_CFLAGS@ @XORG_CFLAGS@ @XWAYLAND_CFLAGS@ \
diff --git a/present/Makefile.am b/present/Makefile.am
index 7fea669..1346156 100644
--- a/present/Makefile.am
+++ b/present/Makefile.am
@@ -1,8 +1,9 @@
 noinst_LTLIBRARIES = libpresent.la
-AM_CFLAGS = \
+libpresent_la_CFLAGS = \
 	-DHAVE_XORG_CONFIG_H \
 	@DIX_CFLAGS@ @XORG_CFLAGS@
 
+
 libpresent_la_SOURCES = \
 	present.h \
 	present.c \
@@ -14,4 +15,25 @@ libpresent_la_SOURCES = \
 	present_request.c \
 	present_screen.c
 
+
+if WAYLAND
+noinst_LTLIBRARIES += libpresentwayland.la
+
+libpresentwayland_la_CFLAGS = \
+	-DHAVE_XORG_CONFIG_H \
+	-DPRESENT_WAYLAND\
+	@DIX_CFLAGS@ @XORG_CFLAGS@
+
+libpresentwayland_la_SOURCES = \
+	present.h \
+	present.c \
+	present_event.c \
+	present_fake.c \
+	present_fence.c \
+	present_notify.c \
+	present_priv.h \
+	present_request.c \
+	present_screen.c \
+	present_wayland.c
+endif
 sdk_HEADERS = present.h presentext.h
-- 
1.8.3.2