diff options
author | Darren Tucker <dtucker@dtucker.net> | 2020-05-13 13:56:45 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2020-05-13 13:56:45 +1000 |
commit | 08ce6b2210f46f795e7db747809f8e587429dfd2 (patch) | |
tree | aa89e1cd8813a3ed289950ebbbd3d1bfc643b5a2 | |
parent | 102d106bc2e50347d0e545fad6ff5ce408d67247 (diff) |
Skip building sk-dummy library if no SK support.
-rw-r--r-- | Makefile.in | 4 | ||||
-rw-r--r-- | configure.ac | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 7c5ed0bd6..c9e4294d3 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -635,6 +635,8 @@ SK_DUMMY_OBJS=\ | |||
635 | regress/misc/sk-dummy/fatal.lo \ | 635 | regress/misc/sk-dummy/fatal.lo \ |
636 | ed25519.lo hash.lo ge25519.lo fe25519.lo sc25519.lo verify.lo | 636 | ed25519.lo hash.lo ge25519.lo fe25519.lo sc25519.lo verify.lo |
637 | 637 | ||
638 | SK_DUMMY_LIBRARY=@SK_DUMMY_LIBRARY@ | ||
639 | |||
638 | .c.lo: Makefile.in config.h | 640 | .c.lo: Makefile.in config.h |
639 | $(CC) $(CFLAGS_NOPIE) $(PICFLAG) $(CPPFLAGS) -c $< -o $@ | 641 | $(CC) $(CFLAGS_NOPIE) $(PICFLAG) $(CPPFLAGS) -c $< -o $@ |
640 | 642 | ||
@@ -648,7 +650,7 @@ regress-binaries: regress-prep $(LIBCOMPAT) \ | |||
648 | regress/netcat$(EXEEXT) \ | 650 | regress/netcat$(EXEEXT) \ |
649 | regress/check-perm$(EXEEXT) \ | 651 | regress/check-perm$(EXEEXT) \ |
650 | regress/mkdtemp$(EXEEXT) \ | 652 | regress/mkdtemp$(EXEEXT) \ |
651 | regress/misc/sk-dummy/sk-dummy.so | 653 | $(SK_DUMMY_LIBRARY) |
652 | 654 | ||
653 | regress-unit-binaries: regress-prep $(REGRESSLIBS) \ | 655 | regress-unit-binaries: regress-prep $(REGRESSLIBS) \ |
654 | regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ | 656 | regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ |
diff --git a/configure.ac b/configure.ac index 003b235e5..460383757 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -3137,6 +3137,10 @@ AC_MSG_RESULT([$enable_pkcs11]) | |||
3137 | AC_MSG_CHECKING([whether to enable U2F]) | 3137 | AC_MSG_CHECKING([whether to enable U2F]) |
3138 | if test "x$enable_sk" = "xyes" ; then | 3138 | if test "x$enable_sk" = "xyes" ; then |
3139 | AC_DEFINE([ENABLE_SK], [], [Enable for U2F/FIDO support]) | 3139 | AC_DEFINE([ENABLE_SK], [], [Enable for U2F/FIDO support]) |
3140 | AC_SUBST(SK_DUMMY_LIBRARY, [regress/misc/sk-dummy/sk-dummy.so]) | ||
3141 | else | ||
3142 | # Do not try to build sk-dummy library. | ||
3143 | AC_SUBST(SK_DUMMY_LIBRARY, [""]) | ||
3140 | fi | 3144 | fi |
3141 | AC_MSG_RESULT([$enable_sk]) | 3145 | AC_MSG_RESULT([$enable_sk]) |
3142 | 3146 | ||