From df8e0f9bbe9eb3dc81194bcefc6339bcec6d8b94 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Tue, 12 Sep 2023 19:31:10 +0200 Subject: {src,tests}/Makefile.am: implement proper GTK+ 3/GTK 4 switching support. Fixes: https://github.com/ArcticaProject/arctica-greeter/issues/56 --- src/Makefile.am | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 4c10950..015bd17 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -44,6 +44,7 @@ logo_generator_SOURCES = logo-generator.vala arctica_greeter_CFLAGS = \ $(ARCTICA_GREETER_CFLAGS) \ + $(GTK_CFLAGS) \ -w \ -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \ -DLOCALEDIR=\"$(localedir)\" \ @@ -58,8 +59,21 @@ arctica_greeter_VALAFLAGS = \ $(AM_VALAFLAGS) \ --debug \ --pkg posix \ + $(NULL) + +if HAVE_GTK4 +arctica_greeter_VALAFLAGS += \ + --pkg gtk4 \ + --pkg gtk4-x11 \ + $(NULL) +else +arctica_greeter_VALAFLAGS += \ --pkg gtk+-3.0 \ --pkg gdk-x11-3.0 \ + $(NULL) +endif + +arctica_greeter_VALAFLAGS += \ --pkg gio-unix-2.0 \ --pkg x11 \ --pkg liblightdm-gobject-1 \ @@ -72,6 +86,7 @@ logo_generator_VALAFLAGS = $(arctica_greeter_VALAFLAGS) arctica_greeter_LDADD = \ $(ARCTICA_GREETER_LIBS) \ + $(GTK_LIBS) \ -lm logo_generator_LDADD = $(arctica_greeter_LDADD) -- cgit v1.2.3