comparison configure.in @ 587:1151059c5eff

Work properly again with bundled libtom*. autoconf is a hassle.
author Matt Johnston <matt@ucc.asn.au>
date Wed, 21 Jul 2010 13:27:44 +0000
parents d194db6f9453
children 2b1bb792cd4d 0ad95abf8d3c
comparison
equal deleted inserted replaced
586:b50f0107e505 587:1151059c5eff
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 Use bundled libtomcrypt/libtommath even if a system version exists],
368 [ 368 [
369 AC_MSG_NOTICE(use bundled)
370 AC_DEFINE(BUNDLED_LIBTOM,,Use bundled libtom)
371 BUNDLED_LIBTOM=1 369 BUNDLED_LIBTOM=1
372 ], 370 AC_MSG_NOTICE(Forcing bundled libtom*)
373 [ 371 ],
374 AC_MSG_NOTICE(not bundled) 372 [
375 BUNDLED_LIBTOM=0 373 BUNDLED_LIBTOM=0
376 AC_CHECK_LIB(tomcrypt, register_cipher, , BUNDLED_LIBTOM=1) 374 AC_CHECK_LIB(tomcrypt, register_cipher, , BUNDLED_LIBTOM=1)
377 AC_CHECK_LIB(tommath, mp_exptmod, , BUNDLED_LIBTOM=1) 375 AC_CHECK_LIB(tommath, mp_exptmod, , BUNDLED_LIBTOM=1)
378 ] 376 ]
379 ) 377 )
378
379 if test $BUNDLED_LIBTOM = 1 ; then
380 AC_DEFINE(BUNDLED_LIBTOM,,Use bundled libtom)
381 fi
380 382
381 AC_SUBST(BUNDLED_LIBTOM) 383 AC_SUBST(BUNDLED_LIBTOM)
382 384
383 dnl Added from OpenSSH 3.6.1p2's configure.ac 385 dnl Added from OpenSSH 3.6.1p2's configure.ac
384 386