From 4248e1c7eee3ab7aaf84915ce9bb660fff190995 Mon Sep 17 00:00:00 2001 From: rbuj Date: Thu, 10 Oct 2019 19:33:37 +0200 Subject: [PATCH] build: Use ENABLE_SKEY for setting AC_CONFIG_FILES and mate_terminal_LDADD --- configure.ac | 5 ++++- src/Makefile.am | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 028737f..225d1fa 100644 --- a/configure.ac +++ b/configure.ac @@ -127,10 +127,13 @@ mate-terminal.desktop.in src/Makefile src/org.mate.terminal.gschema.xml src/terminal-version.h -src/skey/Makefile help/Makefile po/Makefile.in ]) + +AM_COND_IF([ENABLE_SKEY], + [AC_CONFIG_FILES([src/skey/Makefile])]) + AC_OUTPUT # **************************** diff --git a/src/Makefile.am b/src/Makefile.am index 938120c..85a360e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -90,9 +90,13 @@ mate_terminal_CFLAGS = \ mate_terminal_LDFLAGS = -lICE mate_terminal_LDADD = \ - skey/libskey.la \ $(TERM_LIBS) +if ENABLE_SKEY +mate_terminal_LDADD += \ + skey/libskey.la +endif + mate_terminal_SOURCES += \ eggdesktopfile.c \ eggdesktopfile.h \