summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac8
1 files changed, 5 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index f18199bf7..cd8c27c8c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.421 2009/07/12 11:56:29 dtucker Exp $ 1# $Id: configure.ac,v 1.422 2009/08/16 23:35:22 dtucker Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -15,7 +15,7 @@
15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 16
17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) 17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
18AC_REVISION($Revision: 1.421 $) 18AC_REVISION($Revision: 1.422 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -982,6 +982,7 @@ AC_ARG_WITH(zlib,
982 fi ] 982 fi ]
983) 983)
984 984
985AC_CHECK_HEADER([zlib.h], ,AC_MSG_ERROR([*** zlib.h missing - please install first or check config.log ***]))
985AC_CHECK_LIB(z, deflate, , 986AC_CHECK_LIB(z, deflate, ,
986 [ 987 [
987 saved_CPPFLAGS="$CPPFLAGS" 988 saved_CPPFLAGS="$CPPFLAGS"
@@ -1002,7 +1003,6 @@ AC_CHECK_LIB(z, deflate, ,
1002 ) 1003 )
1003 ] 1004 ]
1004) 1005)
1005AC_CHECK_HEADER([zlib.h], ,AC_MSG_ERROR([*** zlib.h missing - please install first or check config.log ***]))
1006 1006
1007AC_ARG_WITH(zlib-version-check, 1007AC_ARG_WITH(zlib-version-check,
1008 [ --without-zlib-version-check Disable zlib version check], 1008 [ --without-zlib-version-check Disable zlib version check],
@@ -1895,6 +1895,8 @@ AC_TRY_LINK_FUNC(RAND_add, AC_DEFINE(HAVE_OPENSSL, 1,
1895 LDFLAGS="-L/usr/local/ssl/lib ${saved_LDFLAGS}" 1895 LDFLAGS="-L/usr/local/ssl/lib ${saved_LDFLAGS}"
1896 fi 1896 fi
1897 CPPFLAGS="-I/usr/local/ssl/include ${saved_CPPFLAGS}" 1897 CPPFLAGS="-I/usr/local/ssl/include ${saved_CPPFLAGS}"
1898 AC_CHECK_HEADER([openssl/opensslv.h], ,
1899 AC_MSG_ERROR([*** OpenSSL headers missing - please install first or check config.log ***]))
1898 AC_TRY_LINK_FUNC(RAND_add, AC_DEFINE(HAVE_OPENSSL), 1900 AC_TRY_LINK_FUNC(RAND_add, AC_DEFINE(HAVE_OPENSSL),
1899 [ 1901 [
1900 AC_MSG_ERROR([*** Can't find recent OpenSSL libcrypto (see config.log for details) ***]) 1902 AC_MSG_ERROR([*** Can't find recent OpenSSL libcrypto (see config.log for details) ***])