Mercurial > dropbear
diff configure.ac @ 835:4095b6d7c9fc ecc
Merge in changes from the past couple of releases
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Fri, 18 Oct 2013 21:38:01 +0800 |
| parents | 7dcb46da72d9 4cf61252dfc3 |
| children | f56c41030c15 |
line wrap: on
line diff
--- a/configure.ac Sat May 25 00:54:19 2013 +0800 +++ b/configure.ac Fri Oct 18 21:38:01 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