Attachment 1666 Details for Bug 1631 – Check for header presence for zlib and openssl before checking llibraries.

[patch] Check for header presence for zlib and openssl before checking llibraries.

openssh-zlib-ssl-headers.patch (text/plain), 1.23 KB, created by Darren Tucker on 2009-08-07 13:41:35 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2009-08-07 13:41:35 AEST

Size: 1.23 KB

patch

obsolete

>? build
>Index: configure.ac
>===================================================================
>RCS file: /var/cvs/openssh/configure.ac,v
>retrieving revision 1.421
>diff -u -p -r1.421 configure.ac
>--- configure.ac	12 Jul 2009 11:56:29 -0000	1.421
>+++ configure.ac	7 Aug 2009 03:31:18 -0000
>@@ -982,6 +982,7 @@ AC_ARG_WITH(zlib,
> 	fi ]
> )
> 
>+AC_CHECK_HEADER([zlib.h], ,AC_MSG_ERROR([*** zlib.h missing - please install first or check config.log ***]))
> AC_CHECK_LIB(z, deflate, ,
> 	[
> 		saved_CPPFLAGS="$CPPFLAGS"
>@@ -1002,7 +1003,6 @@ AC_CHECK_LIB(z, deflate, ,
> 		)
> 	]
> )
>-AC_CHECK_HEADER([zlib.h], ,AC_MSG_ERROR([*** zlib.h missing - please install first or check config.log ***]))
> 
> AC_ARG_WITH(zlib-version-check,
> 	[  --without-zlib-version-check Disable zlib version check],
>@@ -1895,6 +1895,8 @@ AC_TRY_LINK_FUNC(RAND_add, AC_DEFINE(HAV
> 			LDFLAGS="-L/usr/local/ssl/lib ${saved_LDFLAGS}"
> 		fi
> 		CPPFLAGS="-I/usr/local/ssl/include ${saved_CPPFLAGS}"
>+		AC_CHECK_HEADER([openssl/opensslv.h], ,
>+		    AC_MSG_ERROR([*** OpenSSL headers missing - please install first or check config.log ***]))
> 		AC_TRY_LINK_FUNC(RAND_add, AC_DEFINE(HAVE_OPENSSL),
> 			[
> 				AC_MSG_ERROR([*** Can't find recent OpenSSL libcrypto (see config.log for details) ***])

Actions: View | Diff

Attachments on bug 1631: 1666 | 1682