- (djm) [configure.ac] Unconditionally define WITH_OPENSSL until we write

portability glue to support building without libcrypto
This commit is contained in:
Damien Miller 2014-05-15 14:43:37 +10:00
parent 3dc27178b4
commit b9c566788a
2 changed files with 7 additions and 2 deletions

View File

@ -87,6 +87,8 @@
Zap extra whitespace.
OK from djm@ and dtucker@
- (djm) [configure.ac] Unconditionally define WITH_OPENSSL until we write
portability glue to support building without libcrypto
20140430
- (dtucker) [defines.h] Define __GNUC_PREREQ__ macro if we don't already

View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.571 2014/02/21 17:09:34 tim Exp $
# $Id: configure.ac,v 1.572 2014/05/15 04:43:38 djm Exp $
#
# Copyright (c) 1999-2004 Damien Miller
#
@ -15,7 +15,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
AC_REVISION($Revision: 1.571 $)
AC_REVISION($Revision: 1.572 $)
AC_CONFIG_SRCDIR([ssh.c])
AC_LANG([C])
@ -2357,6 +2357,9 @@ AC_RUN_IFELSE(
]
)
# XXX make --without-openssl work
AC_DEFINE_UNQUOTED([WITH_OPENSSL], [1], [use libcrypto for cryptography])
AC_ARG_WITH([openssl-header-check],
[ --without-openssl-header-check Disable OpenSSL version consistency check],
[ if test "x$withval" = "xno" ; then