summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.in2
-rw-r--r--configure.ac1
2 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index e9655e747..963f99fb5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -229,7 +229,7 @@ ssh-pkcs11-helper$(EXEEXT): $(LIBCOMPAT) libssh.a $(P11HELPER_OBJS)
229 $(LD) -o $@ $(P11HELPER_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) 229 $(LD) -o $@ $(P11HELPER_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
230 230
231ssh-sk-helper$(EXEEXT): $(LIBCOMPAT) libssh.a $(SKHELPER_OBJS) 231ssh-sk-helper$(EXEEXT): $(LIBCOMPAT) libssh.a $(SKHELPER_OBJS)
232 $(LD) -o $@ $(SKHELPER_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) 232 $(LD) -o $@ $(SKHELPER_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) $(LIBFIDO2)
233 233
234ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHKEYSCAN_OBJS) 234ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHKEYSCAN_OBJS)
235 $(LD) -o $@ $(SSHKEYSCAN_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) 235 $(LD) -o $@ $(SSHKEYSCAN_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS)
diff --git a/configure.ac b/configure.ac
index 6e70e52c3..2671c4afe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3107,7 +3107,6 @@ if test "x$enable_sk" = "xyes" -a "x$enable_sk_internal" = "xyes" ; then
3107 OTHERLIBS=`echo $LIBFIDO2 | sed 's/-lfido2//'` 3107 OTHERLIBS=`echo $LIBFIDO2 | sed 's/-lfido2//'`
3108 AC_CHECK_LIB([fido2], [fido_init], 3108 AC_CHECK_LIB([fido2], [fido_init],
3109 [ 3109 [
3110 LIBS="$LIBS $LIBFIDO2" # XXX avoid linking to all.
3111 AC_SUBST([LIBFIDO2]) 3110 AC_SUBST([LIBFIDO2])
3112 AC_DEFINE([ENABLE_SK_INTERNAL], [], 3111 AC_DEFINE([ENABLE_SK_INTERNAL], [],
3113 [Enable for built-in U2F/FIDO support]) 3112 [Enable for built-in U2F/FIDO support])