summaryrefslogtreecommitdiff
path: root/libguile-ssh/Makefile.am
diff options
context:
space:
mode:
authorArtyom V. Poptsov <poptsov.artyom@gmail.com>2018-10-01 05:11:27 +0300
committerArtyom V. Poptsov <poptsov.artyom@gmail.com>2018-10-01 05:11:27 +0300
commit01cafef0dd87b6afda41942070e73b55b45a5ed2 (patch)
tree5e66f06e3f98fe929a71826a159fb249ed086715 /libguile-ssh/Makefile.am
parentINSTALL: Update (diff)
downloadguile-ssh-master.tar.gz
libguile-ssh: Fix building with libssh 0.8HEADmaster
The 'libguile-ssh' library would fail to build due to missing 'libssh_threads' library that was removed libssh 0.8. This patch fixes that. Reported by lantw44 in <https://github.com/artyom-poptsov/guile-ssh/issues/9> * configure.ac: Add check for libssh 0.8 * libguile-ssh/Makefile.am: Don't use 'libssh_threads' library when building with libssh 0.8+. * NEWS: Update.
Diffstat (limited to 'libguile-ssh/Makefile.am')
-rw-r--r--libguile-ssh/Makefile.am7
1 files changed, 6 insertions, 1 deletions
diff --git a/libguile-ssh/Makefile.am b/libguile-ssh/Makefile.am
index 1ffb6c0..523d77a 100644
--- a/libguile-ssh/Makefile.am
+++ b/libguile-ssh/Makefile.am
@@ -44,7 +44,12 @@ BUILT_SOURCES = auth.x channel-func.x channel-type.x error.x \
libguile_ssh_la_CPPFLAGS = $(GUILE_CFLAGS)
-libguile_ssh_la_LDFLAGS = -module -no-undefined -lssh_threads -lssh \
+SSH_LD_FLAGS = -lssh
+if ! HAVE_LIBSSH_0_8
+SSH_LD_FLAGS += -lssh_threads
+endif
+
+libguile_ssh_la_LDFLAGS = -module -no-undefined $(SSH_LD_FLAGS) \
-version-info $(LIBGUILE_SSH_INTERFACE) $(GUILE_LDFLAGS)
AM_CFLAGS = $(WARN_CFLAGS)