port to RHEL6 - fips.h

This commit is contained in:
Gerhard Rieger 2011-11-22 12:48:22 +01:00
parent 7a3ed71270
commit 0cf1e34018
2 changed files with 7 additions and 1 deletions

View File

@ -61,6 +61,10 @@ porting:
compilation does not fail on Cygwin (thanks to Peter Wagemans for
reporting this problem)
build failed on RHEL6 due to presence of fips.h; configure now checks
for fipsld too. Thanks to Andreas Gruenbacher for reporting this
problem
####################### V 1.7.1.3:
security:

View File

@ -525,7 +525,9 @@ AC_ARG_ENABLE(fips, [ --disable-fips disable OpenSSL FIPS support],
if test -n "$WITH_FIPS"; then
if test -n "$WITH_OPENSSL"; then
if test "$sc_cv_have_openssl_ssl_h" != "yes" -o "$sc_cv_have_libssl" != "yes"; then
AC_CHECK_PROG(HAVE_FIPSLD, fipsld, 1)
if test "$sc_cv_have_openssl_ssl_h" != "yes" -o "$sc_cv_have_libssl" != "yes" -o ! "$HAVE_FIPSLD";
then
AC_MSG_WARN([not all components of OpenSSL found, disabling FIPS]);
WITH_FIPS=
fi