Make --disable-bundled-libtom work, based on patch from Mike Frysinger

This commit is contained in:
Matt Johnston 2013-10-15 22:55:44 +08:00
parent 4ba058986e
commit 920120d05a

View File

@ -364,10 +364,20 @@ AC_CHECK_FUNCS(setutxent utmpxname)
AC_CHECK_FUNCS(logout updwtmp logwtmp) AC_CHECK_FUNCS(logout updwtmp logwtmp)
AC_ARG_ENABLE(bundled-libtom, AC_ARG_ENABLE(bundled-libtom,
[ --enable-bundled-libtom Use bundled libtomcrypt/libtommath even if a system version exists], [ --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.
BUNDLED_LIBTOM=1 Default is to use system if available, otherwise bundled.],
AC_MSG_NOTICE(Forcing bundled libtom*) [
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 BUNDLED_LIBTOM=0