Mercurial > dropbear
changeset 829:4cf61252dfc3
Make --disable-bundled-libtom work, based on patch from Mike Frysinger
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Tue, 15 Oct 2013 22:55:44 +0800 |
| parents | 93e04b9ff676 |
| children | b9f0058860f1 |
| files | configure.ac |
| diffstat | 1 files changed, 14 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Wed Oct 09 22:24:39 2013 +0800 +++ b/configure.ac Tue Oct 15 22:55:44 2013 +0800 @@ -364,10 +364,20 @@ AC_CHECK_FUNCS(logout updwtmp logwtmp) AC_ARG_ENABLE(bundled-libtom, - [ --enable-bundled-libtom Use bundled libtomcrypt/libtommath even if a system version exists], - [ - BUNDLED_LIBTOM=1 - AC_MSG_NOTICE(Forcing bundled libtom*) +[ --enable-bundled-libtom Force using bundled libtomcrypt/libtommath even if a system version exists. + --disable-bundled-libtom Force using system libtomcrypt/libtommath, fail if it does not exist. + Default is to use system if available, otherwise bundled.], + [ + if test "x$enableval" = "xyes"; then + BUNDLED_LIBTOM=1 + AC_MSG_NOTICE(Forcing bundled libtom*) + else + BUNDLED_LIBTOM=0 + AC_CHECK_LIB(tomcrypt, register_cipher, , + [AC_MSG_ERROR([Missing system libtomcrypt and --disable-bundled-libtom was specified])] ) + AC_CHECK_LIB(tommath, mp_exptmod, , + [AC_MSG_ERROR([Missing system libtomcrypt and --disable-bundled-libtom was specified])] ) + fi ], [ BUNDLED_LIBTOM=0