summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrbuj <[email protected]>2019-10-10 19:33:37 +0200
committerraveit65 <[email protected]>2019-10-13 11:09:47 +0200
commit4248e1c7eee3ab7aaf84915ce9bb660fff190995 (patch)
treea4af89c5664f0ac5736fcc038beaf5704bedb9ee
parente83a3e402368901f7162362960af06b5a5dfa839 (diff)
downloadmate-terminal-4248e1c7eee3ab7aaf84915ce9bb660fff190995.tar.bz2
mate-terminal-4248e1c7eee3ab7aaf84915ce9bb660fff190995.tar.xz
build: Use ENABLE_SKEY for setting AC_CONFIG_FILES and mate_terminal_LDADD
-rw-r--r--configure.ac5
-rw-r--r--src/Makefile.am6
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 \