[gtk/gtk-3-24: 2/3] Use `wayland-scanner private-code` in autotools build

[Emmanuele Bassi <ebassi src gnome org>]

commit fb98242e18c626993cf21cd8bb738e7bf764972d
Author: Michael Forney <mforney mforney org>
Date:   Thu Jan 9 19:09:32 2020 -0800

    Use `wayland-scanner private-code` in autotools build
    
    The sed -i flag is non-standard, and may not be available in all
    implementations.
    
    The meson build already requires wayland >= 1.14.91 and uses
    private-code, so just do that in the autotools build as well.

 configure.ac              | 2 +-
 gdk/wayland/Makefile.am   | 6 ++----
 modules/input/Makefile.am | 6 ++----
 3 files changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2fc1678436..5d87e15cdf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,7 +60,7 @@ m4_define([atk_required_version], [2.15.1])
 m4_define([cairo_required_version], [1.14.0])
 m4_define([gdk_pixbuf_required_version], [2.30.0])
 m4_define([introspection_required_version], [1.39.0])
-m4_define([wayland_required_version], [1.9.91])
+m4_define([wayland_required_version], [1.14.91])
 m4_define([wayland_protocols_required_version], [1.14])
 m4_define([epoxy_required_version], [1.4])
 m4_define([cloudproviders_required_version], [0.2.5])
diff --git a/gdk/wayland/Makefile.am b/gdk/wayland/Makefile.am
index c7e31beb7c..31f12251b3 100644
--- a/gdk/wayland/Makefile.am
+++ b/gdk/wayland/Makefile.am
@@ -92,14 +92,12 @@ $(shell echo $1 | sed 's/\([a-z\-]\{1,\}\)-[a-z]\{1,\}-v[0-9]\{1,\}/\1/')
 endef
 
 %-protocol.c : $(WAYLAND_PROTOCOLS_DATADIR)/$$(call protostability,$$*)/$$(call protoname,$$*)/$$*.xml
-       $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
-       $(AM_V_GEN)$(SED) -i -e 's/WL_EXPORT //' $@
+       $(AM_V_GEN)$(WAYLAND_SCANNER) private-code < $< > $@
 %-client-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/$$(call protostability,$$*)/$$(call protoname,$$*)/$$*.xml
        $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@
 
 %-protocol.c : $(srcdir)/protocol/%.xml
-       $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
-       $(AM_V_GEN)$(SED) -i -e 's/WL_EXPORT //' $@
+       $(AM_V_GEN)$(WAYLAND_SCANNER) private-code < $< > $@
 
 %-server-protocol.h : $(srcdir)/protocol/%.xml
        $(AM_V_GEN)$(WAYLAND_SCANNER) server-header < $< > $@
diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am
index 631e580ca4..a53fab5860 100644
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
@@ -331,14 +331,12 @@ $(shell echo $1 | sed 's/\([a-z\-]\+\)-[a-z]\+-v[0-9]\+/\1/')
 endef
 
 %-protocol.c : $(WAYLAND_PROTOCOLS_DATADIR)/$$(call protostability,$$*)/$$(call protoname,$$*)/$$*.xml
-       $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
-       $(AM_V_GEN)$(SED) -i -e 's/WL_EXPORT //' $@
+       $(AM_V_GEN)$(WAYLAND_SCANNER) private-code < $< > $@
 %-client-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/$$(call protostability,$$*)/$$(call protoname,$$*)/$$*.xml
        $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@
 
 %-protocol.c : $(srcdir)/%.xml
-       $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
-       $(AM_V_GEN)$(SED) -i -e 's/WL_EXPORT //' $@
+       $(AM_V_GEN)$(WAYLAND_SCANNER) private-code < $< > $@
 %-client-protocol.h : $(srcdir)/%.xml
        $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@