On Tue, Apr 05, 2016 at 02:08:11PM +0300, Pekka Paalanen wrote:
> From: Pekka Paalanen
>
> SYSTEMD_DAEMON_LIBS does not belong in CFLAGS, but SYSTEMD_DAEMON_CFLAGS
> does. Fix that.
>
> Add the missing COMPOSITOR_CFLAGS. Otherwise compiling the plugin will
> use the system wayland-server.h when it should be using the one pointed
> to by pkg-config.
>
> The latter fixes the build for me, as my system libwayland-server is
> older than what Weston and this plugin require, and the correct version
> is only found in my install $prefix.
>
> Cc: Egor Starkov
> Cc: Eugen Friedrich
> Signed-off-by: Pekka Paalanen
Reviewed-by: Bryce Harrington
Went ahead and pushed it, too:
7b3a52a..aff703e master -> master
> ---
> Makefile.am | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/Makefile.am b/Makefile.am
> index d1644ac..9bed32c 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -102,7 +102,8 @@ module_LTLIBRARIES += systemd-notify.la
> systemd_notify_la_LDFLAGS = -module -avoid-version
> systemd_notify_la_LIBADD = $(SYSTEMD_DAEMON_LIBS)
> systemd_notify_la_CFLAGS = \
> - $(SYSTEMD_DAEMON_LIBS) \
> + $(COMPOSITOR_CFLAGS)\
> + $(SYSTEMD_DAEMON_CFLAGS)\
> $(PIXMAN_CFLAGS)\
> $(AM_CFLAGS)
> systemd_notify_la_SOURCES = \
> --
> 2.7.3
>
> ___
> wayland-devel mailing list
> wayland-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/wayland-devel
___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/wayland-devel
