From ca2e93b69de5dda051f0e2daccedc7aa5f5edf11 Mon Sep 17 00:00:00 2001 From: Vojtech Trefny Date: Tue, 29 Jun 2021 14:40:53 +0200 Subject: [PATCH] token ssh: Use autotools magic when linking libssh --- configure.ac | 2 ++ tokens/Makemodule.am | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 8aacfd8f..ab4d926d 100644 --- a/configure.ac +++ b/configure.ac @@ -560,6 +560,8 @@ AC_SUBST([JSON_C_LIBS]) AC_SUBST([LIBARGON2_LIBS]) AC_SUBST([BLKID_LIBS]) +AC_SUBST([LIBSSH_LIBS]) + AC_SUBST([LIBCRYPTSETUP_VERSION]) AC_SUBST([LIBCRYPTSETUP_VERSION_INFO]) diff --git a/tokens/Makemodule.am b/tokens/Makemodule.am index 896b0496..c228d136 100644 --- a/tokens/Makemodule.am +++ b/tokens/Makemodule.am @@ -9,7 +9,7 @@ libcryptsetup_token_ssh_la_LDFLAGS = $(TOKENS_LDFLAGS) libcryptsetup_token_ssh_la_SOURCES = tokens/ssh/libcryptsetup-token-ssh.c \ tokens/ssh/ssh-utils.c \ tokens/ssh/ssh-utils.h -libcryptsetup_token_ssh_la_LIBADD = -lssh libcryptsetup.la @JSON_C_LIBS@ +libcryptsetup_token_ssh_la_LIBADD = libcryptsetup.la @LIBSSH_LIBS@ @JSON_C_LIBS@ lib_LTLIBRARIES += libcryptsetup-token-ssh.la cryptsetup_ssh_SOURCES = tokens/ssh/cryptsetup-ssh.c \ @@ -19,7 +19,7 @@ cryptsetup_ssh_SOURCES = tokens/ssh/cryptsetup-ssh.c \ src/utils_password.c \ lib/utils_io.c \ lib/utils_loop.c -cryptsetup_ssh_LDADD = -lssh -lm libcryptsetup.la @JSON_C_LIBS@ @POPT_LIBS@ \ +cryptsetup_ssh_LDADD = -lm libcryptsetup.la @LIBSSH_LIBS@ @JSON_C_LIBS@ @POPT_LIBS@ \ @PWQUALITY_LIBS@ @PASSWDQC_LIBS@ cryptsetup_ssh_CFLAGS = $(AM_CFLAGS)