From c685b957089beda464724eaa13d28c4d90b88453 Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Fri, 7 Aug 2020 22:13:06 +0200 Subject: a11y-keyboard: Don't create a dummy object if AT-SPI is not available Instead guard the caller to only use it if available. --- plugins/a11y-keyboard/Makefile.am | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'plugins/a11y-keyboard/Makefile.am') diff --git a/plugins/a11y-keyboard/Makefile.am b/plugins/a11y-keyboard/Makefile.am index 92072e2..0ea0e4a 100644 --- a/plugins/a11y-keyboard/Makefile.am +++ b/plugins/a11y-keyboard/Makefile.am @@ -42,8 +42,6 @@ liba11y_keyboard_la_SOURCES = \ msd-a11y-keyboard-plugin.c \ msd-a11y-keyboard-manager.h \ msd-a11y-keyboard-manager.c \ - msd-a11y-keyboard-atspi.h \ - msd-a11y-keyboard-atspi.c \ msd-a11y-preferences-dialog.h \ msd-a11y-preferences-dialog.c \ $(NULL) @@ -57,7 +55,6 @@ liba11y_keyboard_la_CPPFLAGS = \ liba11y_keyboard_la_CFLAGS = \ $(SETTINGS_PLUGIN_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \ - $(LIBATSPI_CFLAGS) \ $(AM_CFLAGS) \ $(WARN_CFLAGS) \ $(NULL) @@ -69,9 +66,19 @@ liba11y_keyboard_la_LDFLAGS = \ liba11y_keyboard_la_LIBADD = \ $(SETTINGS_PLUGIN_LIBS) \ $(LIBNOTIFY_LIBS) \ - $(LIBATSPI_LIBS) \ $(NULL) +if HAVE_LIBATSPI +liba11y_keyboard_la_SOURCES += \ + msd-a11y-keyboard-atspi.h \ + msd-a11y-keyboard-atspi.c \ + $(NULL) +liba11y_keyboard_la_CFLAGS += \ + $(LIBATSPI_CFLAGS) +liba11y_keyboard_la_LIBADD += \ + $(LIBATSPI_LIBS) +endif + plugin_in_files = \ a11y-keyboard.mate-settings-plugin.desktop.in \ $(NULL) -- cgit v1.2.1