Mercurial > dropbear
comparison 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 |
comparison
equal
deleted
inserted
replaced
807:75509065db53 | 835:4095b6d7c9fc |
---|---|
362 AC_CHECK_FUNCS(endutxent getutxent getutxid getutxline pututxline ) | 362 AC_CHECK_FUNCS(endutxent getutxent getutxid getutxline pututxline ) |
363 AC_CHECK_FUNCS(setutxent utmpxname) | 363 AC_CHECK_FUNCS(setutxent utmpxname) |
364 AC_CHECK_FUNCS(logout updwtmp logwtmp) | 364 AC_CHECK_FUNCS(logout updwtmp logwtmp) |
365 | 365 |
366 AC_ARG_ENABLE(bundled-libtom, | 366 AC_ARG_ENABLE(bundled-libtom, |
367 [ --enable-bundled-libtom Use bundled libtomcrypt/libtommath even if a system version exists], | 367 [ --enable-bundled-libtom Force using bundled libtomcrypt/libtommath even if a system version exists. |
368 [ | 368 --disable-bundled-libtom Force using system libtomcrypt/libtommath, fail if it does not exist. |
369 BUNDLED_LIBTOM=1 | 369 Default is to use system if available, otherwise bundled.], |
370 AC_MSG_NOTICE(Forcing bundled libtom*) | 370 [ |
371 if test "x$enableval" = "xyes"; then | |
372 BUNDLED_LIBTOM=1 | |
373 AC_MSG_NOTICE(Forcing bundled libtom*) | |
374 else | |
375 BUNDLED_LIBTOM=0 | |
376 AC_CHECK_LIB(tomcrypt, register_cipher, , | |
377 [AC_MSG_ERROR([Missing system libtomcrypt and --disable-bundled-libtom was specified])] ) | |
378 AC_CHECK_LIB(tommath, mp_exptmod, , | |
379 [AC_MSG_ERROR([Missing system libtomcrypt and --disable-bundled-libtom was specified])] ) | |
380 fi | |
371 ], | 381 ], |
372 [ | 382 [ |
373 BUNDLED_LIBTOM=0 | 383 BUNDLED_LIBTOM=0 |
374 AC_CHECK_LIB(tomcrypt, register_cipher, , BUNDLED_LIBTOM=1) | 384 AC_CHECK_LIB(tomcrypt, register_cipher, , BUNDLED_LIBTOM=1) |
375 AC_CHECK_LIB(tommath, mp_exptmod, , BUNDLED_LIBTOM=1) | 385 AC_CHECK_LIB(tommath, mp_exptmod, , BUNDLED_LIBTOM=1) |