diff options
| author | Damien Miller <djm@mindrot.org> | 2020-08-27 12:37:12 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-08-27 12:37:12 +1000 |
| commit | bbcc858ded3fbc46abfa7760e40389e3ca93884c (patch) | |
| tree | 0bb5dfff64eb542c718a4ad93adebae6bc84f493 /configure.ac | |
| parent | 9cbbdc12cb6a2ab1e9ffe9974cca91d213c185c2 (diff) | |
degrade semi-gracefully when libfido2 is too old
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 0f15ef2bf..756e26572 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -3180,9 +3180,14 @@ if test "x$enable_sk" = "xyes" -a "x$enable_sk_internal" = "xyes" ; then | |||
| 3180 | ], [ AC_MSG_ERROR([no usable libfido2 found]) ], | 3180 | ], [ AC_MSG_ERROR([no usable libfido2 found]) ], |
| 3181 | [ $OTHERLIBS ] | 3181 | [ $OTHERLIBS ] |
| 3182 | ) | 3182 | ) |
| 3183 | AC_CHECK_LIB([fido2], [fido_cred_set_prot], [], | 3183 | saved_LIBS="$LIBS" |
| 3184 | [ AC_MSG_ERROR([libfido2 missing fido_cred_set_prot; please use libfido2 >= 1.4.0]) ], | 3184 | LIBS="$LIBS $LIBFIDO2" |
| 3185 | ) | 3185 | AC_CHECK_FUNCS([ \ |
| 3186 | fido_cred_set_prot \ | ||
| 3187 | fido_dev_get_touch_status \ | ||
| 3188 | fido_dev_supports_cred_prot \ | ||
| 3189 | ]) | ||
| 3190 | LIBS="$saved_LIBS" | ||
| 3186 | AC_CHECK_HEADER([fido.h], [], | 3191 | AC_CHECK_HEADER([fido.h], [], |
| 3187 | AC_MSG_ERROR([missing fido.h from libfido2])) | 3192 | AC_MSG_ERROR([missing fido.h from libfido2])) |
| 3188 | AC_CHECK_HEADER([fido/credman.h], [], | 3193 | AC_CHECK_HEADER([fido/credman.h], [], |