only link ssh-sk-helper against libfido2

diff --git a/Makefile.in b/Makefile.in
index e9655e747aebf9dda58dc20d9cbc21bf39ce0908..963f99fb5724a12bbc36bac41af1ab56f8fd1ce1 100644 (file)
--- 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 6e70e52c3bac598e859210f99e316ae4adcb1757..2671c4afe4117f2176b6c6e3959670d27480813d 100644 (file)
--- 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])