diff options
| author | Damien Miller <djm@mindrot.org> | 2019-12-14 08:40:33 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2019-12-14 08:40:58 +1100 |
| commit | 633778d567ad50b63d2a3bca5e1b97d279d236d9 (patch) | |
| tree | 0ed6352af2e7f647084ace55100c71d05328d1e8 | |
| parent | 7b47b40b170db4d6f41da0479575f6d99dd7228a (diff) | |
| download | openssh-git-633778d567ad50b63d2a3bca5e1b97d279d236d9.tar.gz | |
only link ssh-sk-helper against libfido2
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | configure.ac | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index e9655e74..963f99fb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -229,7 +229,7 @@ ssh-pkcs11-helper$(EXEEXT): $(LIBCOMPAT) libssh.a $(P11HELPER_OBJS) $(LD) -o $@ $(P11HELPER_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) ssh-sk-helper$(EXEEXT): $(LIBCOMPAT) libssh.a $(SKHELPER_OBJS) - $(LD) -o $@ $(SKHELPER_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) + $(LD) -o $@ $(SKHELPER_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) $(LIBFIDO2) ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHKEYSCAN_OBJS) $(LD) -o $@ $(SSHKEYSCAN_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) diff --git a/configure.ac b/configure.ac index 6e70e52c..2671c4af 100644 --- a/configure.ac +++ b/configure.ac @@ -3107,7 +3107,6 @@ if test "x$enable_sk" = "xyes" -a "x$enable_sk_internal" = "xyes" ; then OTHERLIBS=`echo $LIBFIDO2 | sed 's/-lfido2//'` AC_CHECK_LIB([fido2], [fido_init], [ - LIBS="$LIBS $LIBFIDO2" # XXX avoid linking to all. AC_SUBST([LIBFIDO2]) AC_DEFINE([ENABLE_SK_INTERNAL], [], [Enable for built-in U2F/FIDO support]) |