ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-01-31 02:46:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Work properly again with bundled libtom*. autoconf is a hassle.

Browse Source 
--HG--
extra : convert_revision : 4077fc3332bd7c965aadbb05b02eba6d00fa9621
This commit is contained in:
Matt Johnston 2010-07-21 13:27:44 +00:00
parent fced1113d3
commit 27fddd2c35
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@ -76,7 +76,7 @@ RANLIB=@RANLIB@
STRIP=@STRIP@ STRIP=@STRIP@
INSTALL=@INSTALL@ INSTALL=@INSTALL@
CPPFLAGS=@CPPFLAGS@ CPPFLAGS=@CPPFLAGS@
CFLAGS=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@ CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@
LIBS+=@LIBS@ LIBS+=@LIBS@
LDFLAGS=@LDFLAGS@ LDFLAGS=@LDFLAGS@

8
configure.in
View File

@ -366,18 +366,20 @@ 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 Use bundled libtomcrypt/libtommath even if a system version exists],
[ [
AC_MSG_NOTICE(use bundled)
AC_DEFINE(BUNDLED_LIBTOM,,Use bundled libtom)
BUNDLED_LIBTOM=1 BUNDLED_LIBTOM=1
AC_MSG_NOTICE(Forcing bundled libtom*)
], ],
[ [
AC_MSG_NOTICE(not bundled)
BUNDLED_LIBTOM=0 BUNDLED_LIBTOM=0
AC_CHECK_LIB(tomcrypt, register_cipher, , BUNDLED_LIBTOM=1) AC_CHECK_LIB(tomcrypt, register_cipher, , BUNDLED_LIBTOM=1)
AC_CHECK_LIB(tommath, mp_exptmod, , BUNDLED_LIBTOM=1) AC_CHECK_LIB(tommath, mp_exptmod, , BUNDLED_LIBTOM=1)
] ]
) )
if test $BUNDLED_LIBTOM = 1 ; then
AC_DEFINE(BUNDLED_LIBTOM,,Use bundled libtom)
fi
AC_SUBST(BUNDLED_LIBTOM) AC_SUBST(BUNDLED_LIBTOM)
dnl Added from OpenSSH 3.6.1p2's configure.ac dnl Added from OpenSSH 3.6.1p2's configure.ac