View | Details | Raw Unified | Return to bug 1631 | Differences between
and this patch

Collapse All | Expand All

(-)configure.ac (-1 / +3 lines)
Lines 982-987 AC_ARG_WITH(zlib, Link Here
982
	fi ]
982
	fi ]
983
)
983
)
984
984
985
AC_CHECK_HEADER([zlib.h], ,AC_MSG_ERROR([*** zlib.h missing - please install first or check config.log ***]))
985
AC_CHECK_LIB(z, deflate, ,
986
AC_CHECK_LIB(z, deflate, ,
986
	[
987
	[
987
		saved_CPPFLAGS="$CPPFLAGS"
988
		saved_CPPFLAGS="$CPPFLAGS"
Lines 1002-1008 AC_CHECK_LIB(z, deflate, , Link Here
1002
		)
1003
		)
1003
	]
1004
	]
1004
)
1005
)
1005
AC_CHECK_HEADER([zlib.h], ,AC_MSG_ERROR([*** zlib.h missing - please install first or check config.log ***]))
1006
1006
1007
AC_ARG_WITH(zlib-version-check,
1007
AC_ARG_WITH(zlib-version-check,
1008
	[  --without-zlib-version-check Disable zlib version check],
1008
	[  --without-zlib-version-check Disable zlib version check],
Lines 1895-1900 AC_TRY_LINK_FUNC(RAND_add, AC_DEFINE(HAV Link Here
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) ***])

Return to bug 1631