eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-11 10:50:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

token ssh: Use autotools magic when linking libssh

Browse Source
This commit is contained in:
Vojtech Trefny
2021-06-29 14:40:53 +02:00
parent 3589f9578a
commit ca2e93b69d
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -560,6 +560,8 @@ AC_SUBST([JSON_C_LIBS])
AC_SUBST([LIBARGON2_LIBS]) AC_SUBST([LIBARGON2_LIBS])
AC_SUBST([BLKID_LIBS]) AC_SUBST([BLKID_LIBS])
AC_SUBST([LIBSSH_LIBS])
AC_SUBST([LIBCRYPTSETUP_VERSION]) AC_SUBST([LIBCRYPTSETUP_VERSION])
AC_SUBST([LIBCRYPTSETUP_VERSION_INFO]) AC_SUBST([LIBCRYPTSETUP_VERSION_INFO])

4
tokens/Makemodule.am
View File

@@ -9,7 +9,7 @@ libcryptsetup_token_ssh_la_LDFLAGS = $(TOKENS_LDFLAGS)
libcryptsetup_token_ssh_la_SOURCES = tokens/ssh/libcryptsetup-token-ssh.c \ libcryptsetup_token_ssh_la_SOURCES = tokens/ssh/libcryptsetup-token-ssh.c \
tokens/ssh/ssh-utils.c \ tokens/ssh/ssh-utils.c \
tokens/ssh/ssh-utils.h 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 lib_LTLIBRARIES += libcryptsetup-token-ssh.la
cryptsetup_ssh_SOURCES = tokens/ssh/cryptsetup-ssh.c \ cryptsetup_ssh_SOURCES = tokens/ssh/cryptsetup-ssh.c \
@@ -19,7 +19,7 @@ cryptsetup_ssh_SOURCES = tokens/ssh/cryptsetup-ssh.c \
src/utils_password.c \ src/utils_password.c \
lib/utils_io.c \ lib/utils_io.c \
lib/utils_loop.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@ @PWQUALITY_LIBS@ @PASSWDQC_LIBS@
cryptsetup_ssh_CFLAGS = $(AM_CFLAGS) cryptsetup_ssh_CFLAGS = $(AM_CFLAGS)