comparison configure.in @ 585:d194db6f9453

Use system libtomcrypt/libtommath if available. Doesn't currently build due to clash in rsa_key identifier.
author Matt Johnston <matt@ucc.asn.au>
date Wed, 21 Jul 2010 12:38:46 +0000
parents d3ea8b9672f0
children 1151059c5eff
comparison
equal deleted inserted replaced
584:0442c18da5c9 585:d194db6f9453
360 AC_CHECK_FUNCS(endutent getutent getutid getutline pututline setutent) 360 AC_CHECK_FUNCS(endutent getutent getutid getutline pututline setutent)
361 AC_CHECK_FUNCS(utmpname) 361 AC_CHECK_FUNCS(utmpname)
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
366 AC_ARG_ENABLE(bundled-libtom,
367 [ --enable-bundled-libtom Use bundled libtomcrypt/libtommath even if a system version exists],
368 [
369 AC_MSG_NOTICE(use bundled)
370 AC_DEFINE(BUNDLED_LIBTOM,,Use bundled libtom)
371 BUNDLED_LIBTOM=1
372 ],
373 [
374 AC_MSG_NOTICE(not bundled)
375 BUNDLED_LIBTOM=0
376 AC_CHECK_LIB(tomcrypt, register_cipher, , BUNDLED_LIBTOM=1)
377 AC_CHECK_LIB(tommath, mp_exptmod, , BUNDLED_LIBTOM=1)
378 ]
379 )
380
381 AC_SUBST(BUNDLED_LIBTOM)
365 382
366 dnl Added from OpenSSH 3.6.1p2's configure.ac 383 dnl Added from OpenSSH 3.6.1p2's configure.ac
367 384
368 dnl allow user to disable some login recording features 385 dnl allow user to disable some login recording features
369 AC_ARG_ENABLE(lastlog, 386 AC_ARG_ENABLE(lastlog,
669 AS_MKDIR_P(libtomcrypt/src/prng) 686 AS_MKDIR_P(libtomcrypt/src/prng)
670 AC_CONFIG_HEADER(config.h) 687 AC_CONFIG_HEADER(config.h)
671 AC_OUTPUT(Makefile) 688 AC_OUTPUT(Makefile)
672 AC_OUTPUT(libtomcrypt/Makefile) 689 AC_OUTPUT(libtomcrypt/Makefile)
673 AC_OUTPUT(libtommath/Makefile) 690 AC_OUTPUT(libtommath/Makefile)
691
692 AC_MSG_NOTICE()
693 if test $BUNDLED_LIBTOM = 1 ; then
694 AC_MSG_NOTICE(Using bundled libtomcrypt and libtommath)
695 else
696 AC_MSG_NOTICE(Using system libtomcrypt and libtommath)
697 fi
698
674 AC_MSG_NOTICE() 699 AC_MSG_NOTICE()
675 AC_MSG_NOTICE(Now edit options.h to choose features.) 700 AC_MSG_NOTICE(Now edit options.h to choose features.)