comparison configure.in @ 642:33fd2f3499d2 dropbear-tfm

A few build fixes
author Matt Johnston <matt@ucc.asn.au>
date Tue, 22 Nov 2011 19:28:58 +0700
parents 2b1bb792cd4d
children
comparison
equal deleted inserted replaced
641:2b1bb792cd4d 642:33fd2f3499d2
80 no_loginfunc_check=1 80 no_loginfunc_check=1
81 AC_MSG_NOTICE([Using uClibc - login() and logout() probably don't work, so we won't use them.]) 81 AC_MSG_NOTICE([Using uClibc - login() and logout() probably don't work, so we won't use them.])
82 ],,,) 82 ],,,)
83 83
84 # Checks for libraries. 84 # Checks for libraries.
85 AC_CHECK_LIB(crypt, crypt, LIBS="$LIBS -lcrypt") 85 AC_CHECK_LIB(crypt, crypt, CRYPTLIB="-lcrypt")
86 AC_SUBST(CRYPTLIB)
86 87
87 # Check if zlib is needed 88 # Check if zlib is needed
88 AC_ARG_WITH(zlib, 89 AC_ARG_WITH(zlib,
89 [ --with-zlib=PATH Use zlib in PATH], 90 [ --with-zlib=PATH Use zlib in PATH],
90 [ 91 [
143 [ --enable-pam Try to include PAM support], 144 [ --enable-pam Try to include PAM support],
144 [ 145 [
145 if test "x$enableval" = "xyes"; then 146 if test "x$enableval" = "xyes"; then
146 AC_CHECK_LIB(pam, pam_authenticate, , AC_MSG_ERROR([*** PAM missing - install first or check config.log ***])) 147 AC_CHECK_LIB(pam, pam_authenticate, , AC_MSG_ERROR([*** PAM missing - install first or check config.log ***]))
147 AC_MSG_NOTICE(Enabling PAM) 148 AC_MSG_NOTICE(Enabling PAM)
149 AC_CHECK_FUNCS(pam_fail_delay)
148 else 150 else
149 AC_DEFINE(DISABLE_PAM,, Use PAM) 151 AC_DEFINE(DISABLE_PAM,, Use PAM)
150 AC_MSG_NOTICE(Disabling PAM) 152 AC_MSG_NOTICE(Disabling PAM)
151 fi 153 fi
152 ], 154 ],
358 AC_CHECK_FUNCS(endutent getutent getutid getutline pututline setutent) 360 AC_CHECK_FUNCS(endutent getutent getutid getutline pututline setutent)
359 AC_CHECK_FUNCS(utmpname) 361 AC_CHECK_FUNCS(utmpname)
360 AC_CHECK_FUNCS(endutxent getutxent getutxid getutxline pututxline ) 362 AC_CHECK_FUNCS(endutxent getutxent getutxid getutxline pututxline )
361 AC_CHECK_FUNCS(setutxent utmpxname) 363 AC_CHECK_FUNCS(setutxent utmpxname)
362 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 BUNDLED_LIBTOM=1
370 AC_MSG_NOTICE(Forcing bundled libtom*)
371 ],
372 [
373 BUNDLED_LIBTOM=0
374 AC_CHECK_LIB(tomcrypt, register_cipher, , BUNDLED_LIBTOM=1)
375 AC_CHECK_LIB(tommath, mp_exptmod, , BUNDLED_LIBTOM=1)
376 ]
377 )
378
379 if test $BUNDLED_LIBTOM = 1 ; then
380 AC_DEFINE(BUNDLED_LIBTOM,,Use bundled libtom)
381 fi
382
383 AC_SUBST(BUNDLED_LIBTOM)
363 384
364 dnl Added from OpenSSH 3.6.1p2's configure.ac 385 dnl Added from OpenSSH 3.6.1p2's configure.ac
365 386
366 dnl allow user to disable some login recording features 387 dnl allow user to disable some login recording features
367 AC_ARG_ENABLE(lastlog, 388 AC_ARG_ENABLE(lastlog,
666 AS_MKDIR_P(libtomcrypt/src/pk/rsa) 687 AS_MKDIR_P(libtomcrypt/src/pk/rsa)
667 AS_MKDIR_P(libtomcrypt/src/prng) 688 AS_MKDIR_P(libtomcrypt/src/prng)
668 AC_CONFIG_HEADER(config.h) 689 AC_CONFIG_HEADER(config.h)
669 AC_OUTPUT(Makefile) 690 AC_OUTPUT(Makefile)
670 AC_OUTPUT(libtomcrypt/Makefile) 691 AC_OUTPUT(libtomcrypt/Makefile)
671 #AC_OUTPUT(libtommath/Makefile) 692 AC_OUTPUT(libtommath/Makefile)
693 AC_OUTPUT(tomsfastmath/Makefile)
694
695 AC_MSG_NOTICE()
696 if test $BUNDLED_LIBTOM = 1 ; then
697 AC_MSG_NOTICE(Using bundled libtomcrypt and libtommath)
698 else
699 AC_MSG_NOTICE(Using system libtomcrypt and libtommath)
700 fi
701
672 AC_MSG_NOTICE() 702 AC_MSG_NOTICE()
673 AC_MSG_NOTICE(Now edit options.h to choose features.) 703 AC_MSG_NOTICE(Now edit options.h to choose features.)