summaryrefslogtreecommitdiff
path: root/configure.ac
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 /configure.ac
parentINSTALL: Update (diff)
downloadguile-ssh-01cafef0dd87b6afda41942070e73b55b45a5ed2.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 'configure.ac')
-rw-r--r--configure.ac7
1 files changed, 7 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index c818208..74271f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,6 +64,13 @@ PKG_CHECK_MODULES([LIBSSH_0_7_3], [libssh >= 0.7.3],
Using a potentially vulnerable version of libssh
<https://www.libssh.org/2016/02/23/libssh-0-7-3-security-and-bugfix-release/>])])
+dnl Checking for libssh 0.8.x
+PKG_CHECK_MODULES([LIBSSH_0_8], [libssh >= 0.8.0],
+ [AC_DEFINE(HAVE_LIBSSH_0_8, 1, [Use libssh 0.8])],
+ [AC_DEFINE(HAVE_LIBSSH_0_8, 0, [Use libssh < 0.8])])
+
+AM_CONDITIONAL(HAVE_LIBSSH_0_8, $HAVE_LIBSSH_0_8)
+
# -------------------------------------------------------------------------------
dnl These macros must be provided by guile.m4.